Merge branch 'upstream'

[automated-distro-installer] / fai / config / scripts / DEBIAN / 20-capabilities

diff --git a/fai/config/scripts/DEBIAN/20-capabilities b/fai/config/scripts/DEBIAN/20-capabilities
index 6e63c92dade3f4cf0c054698eb1bf25c25247d71..b057587a65d9f5328592f7c1772a0b384576a125 100755 (executable)
--- a/fai/config/scripts/DEBIAN/20-capabilities
+++ b/fai/config/scripts/DEBIAN/20-capabilities
@@ -4,6 +4,9 @@
 # Restore them here.
 #
 
+# note on an ubuntu 16.04 system, these caps were set without this script
+# running. I wonder if it is actually needed on a debian 8 system.
+
 set -e
 
 if [ ! -x $target/sbin/setcap ] ; then
@@ -11,7 +14,7 @@ if [ ! -x $target/sbin/setcap ] ; then
 fi
 
 for FILE in /bin/ping /bin/ping6 /usr/bin/fping /usr/bin/fping6; do
-    if [ -x $target/$FILE ] ; then
+    if [ -x $target/$FILE -a ! -h $target/$FILE ] ; then
         if $ROOTCMD /sbin/setcap cap_net_raw+ep $FILE; then
             echo "Setcap worked! $FILE is not suid!"
         fi