TODO: Legacy NFS should be root= only

TODO: Legacy NFS should be root= only

[Warren Togami]

mkinitrd Legacy
	root=IP:path
	(IP:path is OK in DHCP root-path too.)
nfsroot.tx Legacy
	root=/dev/nfs [nfsroot=...]

netroot= equivalents of the two Legacy we shouldn't support.  They are 
not from legacy precedents.

(I tried to get de-support netroot= by unconditionally netroot=$root, 
but the argument parser can't recognize root=dhcp in that case.  Dillow 
says he has an idea to split and clean up argument parsing.)

Warren Togami
wtogami-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org
--
To unsubscribe from this list: send the line "unsubscribe initramfs" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: TODO: Legacy NFS should be root= only

[Seewer Philippe]

Warren Togami wrote:
> mkinitrd Legacy
>     root=IP:path
>     (IP:path is OK in DHCP root-path too.)
> nfsroot.tx Legacy
>     root=/dev/nfs [nfsroot=...]
> 
> netroot= equivalents of the two Legacy we shouldn't support.  They are 
> not from legacy precedents.
> 
> (I tried to get de-support netroot= by unconditionally netroot=$root, 
> but the argument parser can't recognize root=dhcp in that case.  Dillow 
> says he has an idea to split and clean up argument parsing.)

Mind giving the patch below a go? This should fix the issue.


diff --git a/modules.d/95nfs/parse-nfsroot.sh b/modules.d/95nfs/parse-nfsroot.sh
index 96076fd..72f3c2e 100755
--- a/modules.d/95nfs/parse-nfsroot.sh
+++ b/modules.d/95nfs/parse-nfsroot.sh
@@ -72,6 +72,17 @@ netroot_to_var() {
 [ -z "$netroot" ] && netroot=$(getarg netroot=)
 [ -z "$nfsroot" ] && nfsroot=$(getarg nfsroot=)
 
+# Netroot cmdline argument must be ignored, but must be used if
+# we're inside netroot to parse dhcp root-path
+if [ -n "$netroot" ] ; then
+    if [ "$netroot" = "$(getarg netroot=)" ] ; then
+    warn "Ignoring netroot argument for NFS"
+    netroot=$root
+    fi
+else
+    netroot=$root;
+fi
+
 # Handle old style <server-ip>:/<path
 # FIXME: root= is not handled by this yet.
 case "$netroot" in
@@ -79,17 +90,6 @@ case "$netroot" in
        netroot=nfs:$netroot;;
 esac
 
-# Root takes precedence over netroot
-case "${root%%:*}" in
-    nfs|nfs4|/dev/nfs)
-    if [ -n "$netroot" ] ; then
-	warn "root takes precedence over netroot. Ignoring netroot"
-
-    fi
-    netroot=$root
-    ;;
-esac
-
 # Continue if nfs or blank prefix
 case "${netroot%%:*}" in
     ''|nfs|nfs4|/dev/nfs);;
--
To unsubscribe from this list: send the line "unsubscribe initramfs" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html