Allow root= for initramfs, instead of only real_root= to specify the root volume...

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/genkernel/trunk@449 67a159dc-881f-0410-a524-ba9dfbe2cb84

diff --git a/ChangeLog b/ChangeLog
index 9542b056c474d337b33356d999ce9feafbf3bfc8..e38affe3fbf96b600f0955822bbdf9e421b316c7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 2006-2006 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  13 Oct 2006; Chris Gianelloni <wolf31o2@gentoo.org> generic/linuxrc:
+  Allow root= for initramfs, instead of only real_root= to specify the root
+  volume. Patch by Salah Coronya <salahx@yahoo.com> from bug #142606.
+
   13 Oct 2006; Chris Gianelloni <wolf31o2@gentoo.org> genkernel.8:
   Added patch from Salah Coronya <salahx@yahoo.com> to document dolvm2 and
   doevms2 in the genkernel man page from bug #142606.

diff --git a/generic/linuxrc b/generic/linuxrc
index 824cdb16edb47673eb86cba4dc4cf6cfe66ba277..cf365fdc28fcedd420c1ca5e7d03b1434a69d4a2 100644 (file)
--- a/generic/linuxrc
+++ b/generic/linuxrc
@@ -44,12 +44,16 @@ quiet_kmsg
 CMDLINE="`cat /proc/cmdline`"
 # Scan CMDLINE for any specified real_root= or cdroot arguments
 REAL_ROOT=''
+FAKE_ROOT=''
 for x in ${CMDLINE}
 do
        case "${x}" in
                real_root\=*)
                        REAL_ROOT=`parse_opt "${x}"`
                ;;
+               root\=*)
+                       FAKE_ROOT=`parse_opt "${x}"`
+               ;;
                subdir\=*)
                        SUBDIR=`parse_opt "${x}"`
                ;;
@@ -171,6 +175,11 @@ do
        esac
 done
 
+if [ -z "${REAL_ROOT}" -a \( "${CDROOT}" -eq 0 \)  -a \( "${FAKE_ROOT}" != "/dev/ram0" \) ]
+then
+       REAL_ROOT="${FAKE_ROOT}"        
+fi
+
 splash 'init'
 
 detect_sbp2_devices