]> code.ossystems Code Review - openembedded-core.git/commitdiff
init-live.sh: remove the '-c /dev/console' for switch_root
authorChen Qi <Qi.Chen@windriver.com>
Thu, 5 Dec 2013 09:11:17 +0000 (17:11 +0800)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Thu, 5 Dec 2013 13:30:20 +0000 (13:30 +0000)
The '-c DEV' option is specific to the switch_root provided by busybox.
switch_root from util-linux doesn't recognize this option. As a result,
if we we this init-live.sh script together with util-linux, we would get
a kernel panic when executing switch_root.

Besides, this option doesn't seem to have any useful effect as far as I
can see. Removing it doesn't affect the behaviours of our live images.

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/recipes-core/initrdscripts/files/init-live.sh

index 3f5fde83bff41d8d995ba16c35c6aa6c5805f931..bd259b990222bf2dbf1d9bf08c63a8ccbdbdaebd 100644 (file)
@@ -89,7 +89,7 @@ boot_live_root() {
     mount -n --move /dev ${ROOT_MOUNT}/dev
 
     cd $ROOT_MOUNT
-    exec switch_root -c /dev/console $ROOT_MOUNT /sbin/init
+    exec switch_root $ROOT_MOUNT /sbin/init
 }
 
 fatal() {