nfs/parse-nfsroot.sh: don't unset netroot, if not nfs

2015-03-20 15:48:15 +01:00 · 2015-03-20 15:48:15 +01:00 · afcc697cb8
parent 636d2d46a5
commit afcc697cb8
1 changed files with 8 additions and 1 deletions
--- a/modules.d/95nfs/parse-nfsroot.sh
+++ b/modules.d/95nfs/parse-nfsroot.sh
@ -57,7 +57,14 @@ fi

 case "$netroot" in
    /dev/nfs) netroot=nfs;;
-    /dev/*) unset netroot; return;;
+    /dev/*)
+        if [ -n "$oldnetroot" ]; then
+            netroot="$oldnetroot"
+        else
+            unset netroot
+        fi
+	return
+	;;
    # LEGACY: root=<server-ip>:/<path
    [0-9]*:/*|[0-9]*\.[0-9]*\.[0-9]*[!:]|/*)
        netroot=nfs:$netroot;;