From: Cong Wang Date: Tue, 29 May 2012 09:00:35 +0000 (+0800) Subject: Remove rd.neednet cmdline X-Git-Tag: 019~31 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=db2b12fa91022a36b1907d906dfae45054c2147a;p=platform%2Fupstream%2Fdracut.git Remove rd.neednet cmdline rd.neednet could be removed, as we can check /tmp/net.ifaces. After this patch, kdump can bring up the NIC without rd.neednet. Cc: Harald Hoyer Cc: Dave Young Cc: Vivek Goyal Signed-off-by: Cong Wang --- diff --git a/dracut.cmdline.7.asc b/dracut.cmdline.7.asc index c131f1c..5539c00 100644 --- a/dracut.cmdline.7.asc +++ b/dracut.cmdline.7.asc @@ -301,9 +301,6 @@ auto6::: do IPv6 autoconfiguration **biosdevname=0**:: boolean, turn off biosdevname network interface renaming -**rd.neednet=1**:: - boolean, bring up network even without netroot set - **vlan=__:__**:: Setup vlan device named on . We support the four styles of vlan names: VLAN_PLUS_VID (vlan0005), VLAN_PLUS_VID_NO_PAD (vlan5), diff --git a/modules.d/40network/net-genrules.sh b/modules.d/40network/net-genrules.sh index 142634e..ca47b2b 100755 --- a/modules.d/40network/net-genrules.sh +++ b/modules.d/40network/net-genrules.sh @@ -14,7 +14,7 @@ fix_bootif() { } # Don't continue if we don't need network -[ -z "$netroot" ] && ! getargbool 0 rd.neednet && return; +[ -z "$netroot" ] && ! [ -e "/tmp/net.ifaces" ] && return; # Write udev rules { diff --git a/modules.d/90livenet/parse-livenet.sh b/modules.d/90livenet/parse-livenet.sh index d1eb474..365eca1 100755 --- a/modules.d/90livenet/parse-livenet.sh +++ b/modules.d/90livenet/parse-livenet.sh @@ -10,7 +10,7 @@ updates=$(getarg live.updates=) if [ -n "$updates" ]; then # make sure network comes up even if we're doing a local live device if [ -z "$netroot" ]; then - echo "rd.neednet=1" > /etc/cmdline.d/90livenet.conf + echo > /tmp/net.ifaces unset CMDLINE fi echo "$updates" > /tmp/liveupdates.info