Blame 0007-network-reintroduce-rd.neednet.patch

Harald Hoyer 7e00d9
From 48dba7f9ace186871528eb4d83cd96e92e853c6c Mon Sep 17 00:00:00 2001
Harald Hoyer 7e00d9
From: Harald Hoyer <harald@redhat.com>
Harald Hoyer 7e00d9
Date: Tue, 21 Aug 2012 14:47:14 +0200
Harald Hoyer 7e00d9
Subject: [PATCH] network: reintroduce rd.neednet
Harald Hoyer 7e00d9
Harald Hoyer 7e00d9
rd.neednet is used by anaconda and the network interfaces cannot
Harald Hoyer 7e00d9
be known in advance.
Harald Hoyer 7e00d9
---
Harald Hoyer 7e00d9
 dracut.cmdline.7.asc                | 3 +++
Harald Hoyer 7e00d9
 modules.d/40network/net-genrules.sh | 4 +++-
Harald Hoyer 7e00d9
 2 files changed, 6 insertions(+), 1 deletion(-)
Harald Hoyer 7e00d9
Harald Hoyer 7e00d9
diff --git a/dracut.cmdline.7.asc b/dracut.cmdline.7.asc
Harald Hoyer 7e00d9
index 71d02ca..c376d79 100644
Harald Hoyer 7e00d9
--- a/dracut.cmdline.7.asc
Harald Hoyer 7e00d9
+++ b/dracut.cmdline.7.asc
Harald Hoyer 7e00d9
@@ -384,6 +384,9 @@ interface name. Better name it "bootnet" or "bluesocket".
Harald Hoyer 7e00d9
 **biosdevname=0**::
Harald Hoyer 7e00d9
     boolean, turn off biosdevname network interface renaming
Harald Hoyer 7e00d9
 
Harald Hoyer 7e00d9
+**rd.neednet=1**::
Harald Hoyer 7e00d9
+    boolean, bring up network even without netroot set
Harald Hoyer 7e00d9
+
Harald Hoyer 7e00d9
 **vlan=_<vlanname>_:_<phydevice>_**::
Harald Hoyer 7e00d9
     Setup vlan device named <vlanname> on <phydeivce>.
Harald Hoyer 7e00d9
     We support the four styles of vlan names: VLAN_PLUS_VID (vlan0005), VLAN_PLUS_VID_NO_PAD (vlan5),
Harald Hoyer 7e00d9
diff --git a/modules.d/40network/net-genrules.sh b/modules.d/40network/net-genrules.sh
Harald Hoyer 7e00d9
index 8aeee2d..6a58ab5 100755
Harald Hoyer 7e00d9
--- a/modules.d/40network/net-genrules.sh
Harald Hoyer 7e00d9
+++ b/modules.d/40network/net-genrules.sh
Harald Hoyer 7e00d9
@@ -15,7 +15,9 @@ fix_bootif() {
Harald Hoyer 7e00d9
 }
Harald Hoyer 7e00d9
 
Harald Hoyer 7e00d9
 # Don't continue if we don't need network
Harald Hoyer 7e00d9
-[ -z "$netroot" ] && ! [ -e "/tmp/net.ifaces" ] && return;
Harald Hoyer 7e00d9
+if [ -z "$netroot" ] && [ ! -e "/tmp/net.ifaces" ] && ! getargbool 0 rd.neednet >/dev/null; then
Harald Hoyer 7e00d9
+    return
Harald Hoyer 7e00d9
+fi
Harald Hoyer 7e00d9
 
Harald Hoyer 7e00d9
 # Write udev rules
Harald Hoyer 7e00d9
 {