From: Chris Gianelloni Date: Mon, 13 Nov 2006 19:32:42 +0000 (+0000) Subject: Added patch from Tim Steiner to add a real_rootflags paramete... X-Git-Tag: v3.4.10.902~294 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c6db6d2542854671532e29101eedd1e40af09ebc;p=genkernel.git Added patch from Tim Steiner to add a real_rootflags parameter for bug #122672. git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/genkernel/trunk@458 67a159dc-881f-0410-a524-ba9dfbe2cb84 --- diff --git a/ChangeLog b/ChangeLog index b5e2bbe..c7cbc07 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,10 @@ # Copyright 2006-2006 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 13 Nov 2006; Chris Gianelloni generic/linuxrc: + Added patch from Tim Steiner to add a real_rootflags + parameter for bug #122672. + 13 Nov 2006; Chris Gianelloni generic/initrd.scripts, generic/linuxrc: Added patch to support resuming from encrypted swap. The patch was submitted diff --git a/generic/linuxrc b/generic/linuxrc index ecf96c7..1856595 100644 --- a/generic/linuxrc +++ b/generic/linuxrc @@ -45,6 +45,7 @@ CMDLINE="`cat /proc/cmdline`" # Scan CMDLINE for any specified real_root= or cdroot arguments REAL_ROOT='' FAKE_ROOT='' +REAL_ROOTFLAGS='' for x in ${CMDLINE} do case "${x}" in @@ -178,6 +179,9 @@ do crypt_swap\=*) LUKS_SWAP=`parse_opt "${x}"` ;; + real_rootflags\=*) + REAL_ROOTFLAGS=`parse_opt "${x}"` + ;; esac done @@ -406,7 +410,12 @@ do # mount ro so fsck doesn't barf later # REAL_ROOT_TYPE=`vol_id -t ${REAL_ROOT}` # mount -t ${REAL_ROOT_TYPE} -o ro ${REAL_ROOT} ${NEW_ROOT} - mount -o ro ${REAL_ROOT} ${NEW_ROOT} + if [ "${REAL_ROOTFLAGS}" = '' ]; then + mount -o ro ${REAL_ROOT} ${NEW_ROOT} + else + good_msg "Using mount -o ro,${REAL_ROOTFLAGS}" + mount -o ro,${REAL_ROOTFLAGS} ${REAL_ROOT} ${NEW_ROOT} + fi fi # If mount is successful break out of the loop