[gentoo-commits] proj/genkernel:master commit in: /, defaults/

["Sebastian Pipping" <sping@gentoo.org>]

commit:     d89f3d59e8e0ee31b228d28888b302031838a672
Author:     Dustin Frisch <dustin.frisch <AT> gmail <DOT> com>
AuthorDate: Wed Oct  3 16:20:16 2012 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Wed Oct  3 16:21:09 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=d89f3d59

Check for file from real_init=FILE rather than /sbin/init (bug #437080)

---
 ChangeLog        |    4 ++++
 defaults/linuxrc |    2 +-
 2 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 47a81ea..d453080 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 4a12c21..d6766b8 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