diff options
author | Will Woods <wwoods@redhat.com> | 2012-08-17 15:12:06 -0400 |
---|---|---|
committer | Will Woods <wwoods@redhat.com> | 2012-08-20 11:59:13 -0400 |
commit | 74590166a5c841f03f1d39ba43ee56b33467c8c8 (patch) | |
tree | 9928b188861942eff5f56dcea343d2addb5f4ea2 | |
parent | c12357900996258bba3a0949b25aa47eecbe1d46 (diff) | |
download | anaconda-74590166a5c841f03f1d39ba43ee56b33467c8c8.tar.gz anaconda-74590166a5c841f03f1d39ba43ee56b33467c8c8.tar.xz anaconda-74590166a5c841f03f1d39ba43ee56b33467c8c8.zip |
dracut: drop save_netinfo
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.
-rwxr-xr-x | dracut/anaconda-lib.sh | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/dracut/anaconda-lib.sh b/dracut/anaconda-lib.sh index 98b80e6e2..cdae49f01 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 |