From: Warren Togami <wtogami@redhat.com>
Date: Wed, 10 Jun 2009 14:21:11 +0000 (-0400)
Subject: dhclient.* files become net.* only after successful netboot.
X-Git-Tag: 0.1~74
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bf4626d93363f44f55d2c307a53e310abcf03370;p=thirdparty%2Fdracut.git

dhclient.* files become net.* only after successful netboot.
This is an attempt to avoid confusing post-boot scripts by having them
consider only net.* files.
---

diff --git a/modules.d/40network/dhclient-script b/modules.d/40network/dhclient-script
index 1ee78fe40..8997477a9 100755
--- a/modules.d/40network/dhclient-script
+++ b/modules.d/40network/dhclient-script
@@ -75,7 +75,7 @@ case $reason in
 	setup_interface 
 	set | while read line; do
 	    [ "${line#new_}" = "$line" ] && continue
-	    echo "$line" >>/tmp/net.$netif.dhcpopts
+	    echo "$line" >>/tmp/dhclient.$netif.dhcpopts
 	done
 	>/tmp/net.$netif.up
 	echo online > /sys/class/net/$netif/uevent ;;
diff --git a/modules.d/40network/ifup b/modules.d/40network/ifup
index de459c32f..9e2327425 100755
--- a/modules.d/40network/ifup
+++ b/modules.d/40network/ifup
@@ -51,7 +51,7 @@ do_static() {
 	    hostname $hostname
     }
     [ -n "$srv" ] &&
-	echo "new_dhcp_server_identifier=$srv" > /tmp/net.$netif.dhcpopts
+	echo "new_dhcp_server_identifier=$srv" > /tmp/dhclient.$netif.dhcpopts
 
     >/tmp/net.$netif.up
     echo online > /sys/class/net/$netif/uevent
@@ -70,7 +70,7 @@ do_dhcp() {
     # /sbin/dhclient-script will mark the netif up and generate the online
     # event for nfsroot
     # XXX add -V vendor class and option parsing per kernel
-    dhclient -1 -q -R ${reqs} -pf /tmp/dhclient.$netif.pid -lf /tmp/net.$netif.lease $netif
+    dhclient -1 -q -R ${reqs} -pf /tmp/dhclient.$netif.pid -lf /tmp/dhclient.$netif.lease $netif
 }
 
 ip_to_var() {
diff --git a/modules.d/40network/netroot b/modules.d/40network/netroot
index 3d03e7287..5ce99c552 100755
--- a/modules.d/40network/netroot
+++ b/modules.d/40network/netroot
@@ -30,7 +30,7 @@ netif=$1
 #
 . /tmp/root.info
 . /tmp/netroot.info
-[ -e /tmp/net.$netif.dhcpopts ] && . /tmp/net.$netif.dhcpopts
+[ -e /tmp/dhclient.$netif.dhcpopts ] && . /tmp/dhclient.$netif.dhcpopts
 
 # Now, let the installed network root handlers figure this out
 #
@@ -47,6 +47,8 @@ fi
 # XXX other variables to export?
 export NEWROOT
 if $handler $netif $root; then
+    [ -f /tmp/dhclient.$netif.lease ] &&    cp /tmp/dhclient.$netif.lease    /tmp/net.$netif.lease
+    [ -f /tmp/dhclient.$netif.dhcpopts ] && cp /tmp/dhclient.$netif.dhcpopts /tmp/net.$netif.dhcpopts
     >/tmp/netroot.done
 fi
 exit 0