From: Chris Gianelloni <wolf31o2@gentoo.org>
Date: Mon, 12 Feb 2007 18:44:01 +0000 (+0000)
Subject: Fix REAL_INIT for bug #160635.
X-Git-Tag: v3.4.10.902~270
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=48440a0dcc1012944f596bcc74d9cf7806465e44;p=genkernel.git

Fix REAL_INIT for bug #160635.

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

diff --git a/ChangeLog b/ChangeLog
index a7cdf37..481ed7c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 2006-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  12 Feb 2007; Chris Gianelloni <wolf31o2@gentoo.org> generic/linuxrc:
+  Fix REAL_INIT for bug #160635.
+
   12 Feb 2007; Chris Gianelloni <wolf31o2@gentoo.org> gen_cmdline.sh,
   gen_compile.sh, genkernel:
   Added patch from Fabio Erculiani <lxnay@lxnaydesign.net> to fix unionfs
diff --git a/generic/linuxrc b/generic/linuxrc
index e22357f..7b370fa 100644
--- a/generic/linuxrc
+++ b/generic/linuxrc
@@ -731,7 +731,7 @@ then
 		umount /proc || echo '*: Failed to unmount the initrd /proc!'
 	echo -n '.'
 
-	exec switch_root -c "/dev/console" "${CHROOT}" /sbin/init ${REAL_INIT}
+	exec switch_root -c "/dev/console" "${CHROOT}" ${REAL_INIT:-/sbin/init} ${INIT_OPTS}
 fi
 
 splash 'verbose'