summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChen Qi <Qi.Chen@windriver.com>2013-12-05 17:11:17 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-12-05 13:30:20 +0000
commit6f50ccb8ae9e11870f99bb3b191f677c3633cd0d (patch)
treeaeb8359fda54368675b626d45c0c1190c7e8a7d5
parenta3c906102d19924ad3b38ef1cd3d8094dd35aa64 (diff)
downloadopenembedded-core-6f50ccb8ae9e11870f99bb3b191f677c3633cd0d.tar.gz
openembedded-core-6f50ccb8ae9e11870f99bb3b191f677c3633cd0d.tar.bz2
openembedded-core-6f50ccb8ae9e11870f99bb3b191f677c3633cd0d.zip
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@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/initrdscripts/files/init-live.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-core/initrdscripts/files/init-live.sh b/meta/recipes-core/initrdscripts/files/init-live.sh
index 3f5fde83bf..bd259b9902 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() {