diff options
| author | Chen Qi <Qi.Chen@windriver.com> | 2013-12-05 17:11:17 +0800 | 
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-12-05 14:25:29 +0000 | 
| commit | abbc34580e5e280eca92d12f4ebd510da88eabcf (patch) | |
| tree | 88bc309e3078f738a9d33c0f534d7c1d1891f591 | |
| parent | e2e6756083aa52a10923b8c0c748085dc8baa6a3 (diff) | |
| download | poky-abbc34580e5e280eca92d12f4ebd510da88eabcf.tar.gz | |
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.
(From OE-Core rev: 6f50ccb8ae9e11870f99bb3b191f677c3633cd0d)
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.sh | 2 | 
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() { | |||
| 89 | mount -n --move /dev ${ROOT_MOUNT}/dev | 89 | mount -n --move /dev ${ROOT_MOUNT}/dev | 
| 90 | 90 | ||
| 91 | cd $ROOT_MOUNT | 91 | cd $ROOT_MOUNT | 
| 92 | exec switch_root -c /dev/console $ROOT_MOUNT /sbin/init | 92 | exec switch_root $ROOT_MOUNT /sbin/init | 
| 93 | } | 93 | } | 
| 94 | 94 | ||
| 95 | fatal() { | 95 | fatal() { | 
