aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rwxr-xr-xdefaults/linuxrc2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 47a81ea2..d4530803 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@
# Distributed under the GPL v2
# $Id$
+ 03 Oct 2012; Dustin Frisch <dustin.frisch@gmail.com> defaults/linuxrc:
+ With boot parameter real_init=/foo look for ${NEW_ROOT}/foo, not
+ ${NEW_ROOT}/sbin/init (bug #437080)
+
23 Sep 2012; Sebastian Pipping <sping@gentoo.org> gen_initramfs.sh:
Append e2fsck and mke2fs to initramfs. Original patch by Rick Farina
diff --git a/defaults/linuxrc b/defaults/linuxrc
index 4a12c21c..d6766b88 100755
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -623,7 +623,7 @@ do
# else not a good root and start over.
if [ "$?" = '0' ]
then
- if [ -d ${NEW_ROOT}/dev -a -x ${NEW_ROOT}/sbin/init ] || [ "${REAL_ROOT}" = "/dev/nfs" ]
+ if [ -d ${NEW_ROOT}/dev -a -x "${NEW_ROOT}${REAL_INIT:-/sbin/init}" ] || [ "${REAL_ROOT}" = "/dev/nfs" ]
then
break
else