[patch] Use init_opts from the environment

linuxrc.patch (text/plain), 984 bytes, created by Mike Gilbert on 2012-11-24 18:15:41 UTC

Use the value of init_opts as proved by the kenrel in the environment

The kernel does the whitespace parsing for us; using /proc/cmdline only
makes it more difficult.

diff --git a/defaults/linuxrc b/defaults/linuxrc
index f1e20ce..ccf3fd2 100755
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -38,7 +38,6 @@ CMDLINE=$(cat /proc/cmdline)
 FAKE_ROOT=''
 FAKE_INIT=''
 REAL_ROOTFLAGS=''
-INIT_OPTS=''
 ROOTFSTYPE='auto'
 CRYPT_SILENT=0
 
@@ -61,9 +60,6 @@ do
 		init=*)
 			FAKE_INIT=${x#*=}
 		;;
-		init_opts=*)
-			INIT_OPTS=${x#*=}
-		;;
 		# Livecd options
 		cdroot)
 			CDROOT=1
@@ -940,7 +936,8 @@ fi
 
 echo -e "${BOLD}.${NORMAL}"
 
-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'