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 <harald@redhat.com>
Cc: Dave Young <dyoung@redhat.com>
Cc: Vivek Goyal <vgoyal@redhat.com>
Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>

diff --git a/dracut.cmdline.7.asc b/dracut.cmdline.7.asc
index c131f1c..5539c00 100644 (file)
--- 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=_<vlanname>_:_<phydevice>_**::
     Setup vlan device named <vlanname> on <phydeivce>.
     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 (executable)
--- 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 (executable)
--- 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