Minor changes to network scripts to bring inline with my current patch series

diff --git a/modules.d/40network/dhclient-script b/modules.d/40network/dhclient-script
index 34d53edb5a242329a0c42a95437cd4f09f57a0e1..dc2d9e1e13441c4fb9f72aa0c52edd49c66ffaa3 100755 (executable)
--- a/modules.d/40network/dhclient-script
+++ b/modules.d/40network/dhclient-script
@@ -2,8 +2,6 @@
 # very simple dhclient-script.  All it cares about is bringing the interface
 # up, and it does not even try to do anything else.
 
-PATH="/sbin:$PATH"
-
 case $reason in
     PREINIT) ip link set "$interface" up ;;
     BOUND) ipopts="$new_ip_address"

diff --git a/modules.d/40network/ifup b/modules.d/40network/ifup
index c22325d46550e33a006a979b70f7b024b7735f46..3878c416c72d15527f6d127096023a90b0a7905b 100755 (executable)
--- a/modules.d/40network/ifup
+++ b/modules.d/40network/ifup
@@ -1,7 +1,7 @@
 #!/bin/sh
 
-PATH="/sbin:$PATH"
-
+# bail immediatly if the interface is already up
+[ -f "/net.$1.up" ] && exit 0
 
 # loopback is always handled the same way
 [ "$1" = "lo" ] && {
@@ -33,4 +33,4 @@ for p in $(cat /proc/cmdline); do
                ) ;;
        *) continue;;
     esac
-done
+done
\ No newline at end of file

diff --git a/modules.d/40network/run-dhclient.sh b/modules.d/40network/run-dhclient.sh
index 8cfbc0d8bcfcb98609df9b9f024f28b6043e1f42..afab037006e21422ec16192267bf88e6f0c4e9ca 100755 (executable)
--- a/modules.d/40network/run-dhclient.sh
+++ b/modules.d/40network/run-dhclient.sh
@@ -1,11 +1,8 @@
 #!/bin/sh
-PATH="/sbin:$PATH"
-
-
 for i in /net.*.dhcp; do
     dev=${i#net.}; dev=${i%.dhcp}
     [ -f "/net.$dev.up" ] && continue
     dhclient -1 -q $dev &
 done
 wait
-    
+    
\ No newline at end of file