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 a7cdf378101b3c6d9faa04e803deb267ffa4cacd..481ed7c19a71ce861766f8f04f7906bbbd043864 100644 (file)
--- 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 e22357f04964cbcfb1e9a16f9af53c31b7d540e9..7b370facfd9983bf0901bc46e5b374fe1e5fc8ac 100644 (file)
--- 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'