From: Harald Hoyer <harald@redhat.com>
Date: Wed, 30 Sep 2009 15:24:52 +0000 (+0200)
Subject: network: move netroot to initqueue
X-Git-Tag: 003~147
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f57b5bc735615b76597bba61c1e26b0a9c41d5be;p=thirdparty%2Fdracut.git

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 a86695236..27bd76521 100755
--- 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 37b78cd7e..d73049e8a 100755
--- 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 ba369cc4e..fdb6ab67a 100755
--- 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