Blame SOURCES/0255-nfs-parse-nfsroot.sh-don-t-unset-netroot-if-not-nfs.patch

64b87c
From fe15c6b6cb03f518c79d990b7054792e1d23c7ba Mon Sep 17 00:00:00 2001
64b87c
From: Harald Hoyer <harald@redhat.com>
64b87c
Date: Fri, 20 Mar 2015 15:48:15 +0100
64b87c
Subject: [PATCH] nfs/parse-nfsroot.sh: don't unset netroot, if not nfs
64b87c
64b87c
(cherry picked from commit afcc697cb8c588eef68bb635f790991411209089)
64b87c
---
64b87c
 modules.d/95nfs/parse-nfsroot.sh | 9 ++++++++-
64b87c
 1 file changed, 8 insertions(+), 1 deletion(-)
64b87c
64b87c
diff --git a/modules.d/95nfs/parse-nfsroot.sh b/modules.d/95nfs/parse-nfsroot.sh
64b87c
index 9fc2a8c..a84cd43 100755
64b87c
--- a/modules.d/95nfs/parse-nfsroot.sh
64b87c
+++ b/modules.d/95nfs/parse-nfsroot.sh
64b87c
@@ -59,7 +59,14 @@ fi
64b87c
 
64b87c
 case "$netroot" in
64b87c
     /dev/nfs) netroot=nfs;;
64b87c
-    /dev/*) unset netroot; return;;
64b87c
+    /dev/*)
64b87c
+        if [ -n "$oldnetroot" ]; then
64b87c
+            netroot="$oldnetroot"
64b87c
+        else
64b87c
+            unset netroot
64b87c
+        fi
64b87c
+	return
64b87c
+	;;
64b87c
     # LEGACY: root=<server-ip>:/
64b87c
     [0-9]*:/*|[0-9]*\.[0-9]*\.[0-9]*[!:]|/*)
64b87c
         netroot=nfs:$netroot;;