[oe-commits] Chen Qi : init-live.sh: remove the '-c /dev/console' for switch_root

git at git.openembedded.org git at git.openembedded.org
Thu Dec 5 10:57:37 UTC 2013


Module: openembedded-core.git
Branch: master-next
Commit: dc4d61f1e7707273ec9c884ec334f3381925df1c
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=dc4d61f1e7707273ec9c884ec334f3381925df1c

Author: Chen Qi <Qi.Chen at windriver.com>
Date:   Thu Dec  5 17:11:17 2013 +0800

init-live.sh: remove the '-c /dev/console' for switch_root

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 at windriver.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 meta/recipes-core/initrdscripts/files/init-live.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-core/initrdscripts/files/init-live.sh b/meta/recipes-core/initrdscripts/files/init-live.sh
index 3f5fde8..bd259b9 100644
--- a/meta/recipes-core/initrdscripts/files/init-live.sh
+++ b/meta/recipes-core/initrdscripts/files/init-live.sh
@@ -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() {



More information about the Openembedded-commits mailing list