From: Chris Gianelloni Date: Fri, 13 Oct 2006 20:08:08 +0000 (+0000) Subject: Allow root= for initramfs, instead of only real_root= to specify the root volume... X-Git-Tag: v3.4.10.902~303 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=dc87eb99e4cc0477563d8035c8ecf23e3857946c;p=genkernel.git Allow root= for initramfs, instead of only real_root= to specify the root volume. Patch by Salah Coronya from bug #142606. 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 9542b05..e38affe 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,10 @@ # Copyright 2006-2006 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 13 Oct 2006; Chris Gianelloni generic/linuxrc: + Allow root= for initramfs, instead of only real_root= to specify the root + volume. Patch by Salah Coronya from bug #142606. + 13 Oct 2006; Chris Gianelloni genkernel.8: Added patch from Salah Coronya to document dolvm2 and doevms2 in the genkernel man page from bug #142606. diff --git a/generic/linuxrc b/generic/linuxrc index 824cdb1..cf365fd 100644 --- 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