commit: 694a32701cb36b5bba132f0a99394402aae743d8 Author: Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org> AuthorDate: Thu Aug 20 16:05:32 2015 +0000 Commit: Richard Farina <zerochaos <AT> gentoo <DOT> org> CommitDate: Thu Aug 20 16:05:32 2015 +0000 URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=694a3270
fix for bug #444574 from floppym also fixed bug #461910, possibly others defaults/linuxrc | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/defaults/linuxrc b/defaults/linuxrc index ebf26b5..35f39bc 100644 --- a/defaults/linuxrc +++ b/defaults/linuxrc @@ -39,7 +39,6 @@ CMDLINE=$(cat /proc/cmdline) FAKE_ROOT='' FAKE_INIT='' FAKE_ROOTFLAGS='' -INIT_OPTS='' ROOTFSTYPE='auto' CRYPT_SILENT=0 QUIET='' @@ -63,9 +62,6 @@ do init=*) FAKE_INIT=${x#*=} ;; - init_opts=*) - INIT_OPTS=${x#*=} - ;; # Livecd options cdroot) CDROOT=1 @@ -1020,7 +1016,8 @@ fi # Run debug shell if requested rundebugshell "before entering switch_root" -exec /sbin/switch_root -c "/dev/console" "${CHROOT}" "${REAL_INIT:-/sbin/init}" "${INIT_OPTS}" +# init_opts is set in the environment by the kernel when it parses the command line +exec /sbin/switch_root -c "/dev/console" "${CHROOT}" "${REAL_INIT:-/sbin/init}" ${init_opts} # If we get here, something bad has happened splash 'verbose'