[PATCH 04/10] dracut: drop save_netinfo

Will Woods wwoods at redhat.com
Fri Aug 17 22:30:41 UTC 2012


save_netinfo moved into upstream dracut's net-lib.sh, so we don't need
our own version here.

The only place we currently use save_netinfo is in the initqueue/online
hook, which will always have sourced net-lib.sh first, so we don't need
to worry about changing anything else.
---
 dracut/anaconda-lib.sh | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/dracut/anaconda-lib.sh b/dracut/anaconda-lib.sh
index 98b80e6..cdae49f 100755
--- a/dracut/anaconda-lib.sh
+++ b/dracut/anaconda-lib.sh
@@ -149,24 +149,6 @@ set_neednet() {
     unset CMDLINE
 }
 
-# Save the dhclient lease and put the interface name into /tmp/net.ifaces,
-# so the 'ifcfg' module will write out a proper ifcfg etc. for NetworkManager.
-# FIXME: this will probably be in 40network/net-lib.sh soon
-save_netinfo() {
-    local netif="$1" IFACES="" f="" i=""
-    [ -e /tmp/net.ifaces ] && read IFACES < /tmp/net.ifaces
-    # Add $netif to the front of IFACES (if it's not there already).
-    set -- "$netif"
-    for i in $IFACES; do [ "$i" != "$netif" ] && set -- "$@" "$i"; done
-    IFACES="$*"
-    for i in $IFACES; do
-        for f in /tmp/dhclient.$i.*; do
-            [ -f $f ] && cp -f $f /tmp/net.${f#/tmp/dhclient.}
-        done
-    done
-    echo $IFACES > /tmp/net.ifaces
-}
-
 parse_kickstart() {
     /sbin/parse-kickstart $1 > /etc/cmdline.d/80-kickstart.conf
     unset CMDLINE  # re-read the commandline
-- 
1.7.11.2



More information about the anaconda-patches mailing list