network: move netroot to initqueue

Schedule netroot for the initqueue inside ifup and dhclient.

diff --git a/modules.d/40network/dhclient-script b/modules.d/40network/dhclient-script
index a866952367404024533f4a73df84fae756ea0691..27bd7652126c501a27ebca56addc78e78641ad0a 100755 (executable)
--- a/modules.d/40network/dhclient-script
+++ b/modules.d/40network/dhclient-script
@@ -60,6 +60,7 @@ case $reason in
            echo "$line" 
        done >/tmp/dhclient.$netif.dhcpopts
        echo online > /sys/class/net/$netif/uevent
+       /sbin/initqueue --onetime --name netroot-$netif  /sbin/netroot $netif 
        ;;
     *) ;;
 esac

diff --git a/modules.d/40network/ifup b/modules.d/40network/ifup
index 37b78cd7e8bd8ea4f6d00f05197f7e1fcabb329c..d73049e8aa589918e62646fa8b58e2a4ed20e3e4 100755 (executable)
--- a/modules.d/40network/ifup
+++ b/modules.d/40network/ifup
@@ -42,6 +42,7 @@ do_static() {
     [ -n "$hostname" ] && echo hostname $hostname > /tmp/net.$netif.hostname
 
     echo online > /sys/class/net/$netif/uevent
+    /sbin/initqueue --onetime --name netroot-$netif  /sbin/netroot $netif 
 }
 
 PATH=$PATH:/sbin:/usr/sbin

diff --git a/modules.d/40network/net-genrules.sh b/modules.d/40network/net-genrules.sh
index ba369cc4e1eac21bebe84a99a5960c588eb29376..fdb6ab67a131c062272ff2f859d985fb6bfe4745 100755 (executable)
--- a/modules.d/40network/net-genrules.sh
+++ b/modules.d/40network/net-genrules.sh
@@ -37,7 +37,4 @@ fix_bootif() {
        printf 'ACTION=="add", SUBSYSTEM=="net", RUN+="/sbin/ifup $env{INTERFACE}"\n'
     fi
 
-    # Udev event 'online' only gets fired from ifup/dhclient-script.
-    # No special rules required
-    printf 'ACTION=="online", SUBSYSTEM=="net", RUN+="/sbin/netroot $env{INTERFACE}"\n'
 } > /etc/udev/rules.d/60-net.rules