diff options
| author |   Anuj Mittal <anuj.mittal@intel.com> | 2018-10-11 16:41:10 +0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-10-12 08:44:05 +0100 |
| commit | 239a4fc1db530f201e1f7069b2045135699a85a7 (patch) | |
| tree | f07903991e1a2eee233c4544d268fabcf8dac740 /meta | |
| parent | a5993d9afab060d07213c14c0188422c9e258693 (diff) | |
| download | openembedded-core-239a4fc1db530f201e1f7069b2045135699a85a7.tar.gz | |
busybox: move reboot out of init.cfg
reboot is needed for initramfs where no init manager is set. This
partially reverts:
commit b6fbb3f3d4d6367b0fd7921078f67057551c7ede
Author: Chen Qi <Qi.Chen@windriver.com>
Date: Mon Jul 30 17:41:57 2018 +0800
busybox: move init related configs to init.cfg
Move init related configs to init.cfg.
These config items do not make much sense unless busybox is selected
as the init manager. They should belong to init.cfg.
We would need to set up ALTERNATIVES for reboot in this case.
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-core/busybox/busybox/defconfig | 2 | ||||
| -rw-r--r-- | meta/recipes-core/busybox/busybox/init.cfg | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/meta/recipes-core/busybox/busybox/defconfig b/meta/recipes-core/busybox/busybox/defconfig index f081f281cc..32213c0675 100644 --- a/meta/recipes-core/busybox/busybox/defconfig +++ b/meta/recipes-core/busybox/busybox/defconfig @@ -480,7 +480,7 @@ CONFIG_FEATURE_XARGS_SUPPORT_REPL_STR=y # CONFIG_FEATURE_BOOTCHARTD_CONFIG_FILE is not set # CONFIG_HALT is not set # CONFIG_POWEROFF is not set -# CONFIG_REBOOT is not set +CONFIG_REBOOT=y # CONFIG_FEATURE_CALL_TELINIT is not set # CONFIG_TELINIT_PATH is not set # CONFIG_INIT is not set diff --git a/meta/recipes-core/busybox/busybox/init.cfg b/meta/recipes-core/busybox/busybox/init.cfg index b69fe0ea9c..e96700682a 100644 --- a/meta/recipes-core/busybox/busybox/init.cfg +++ b/meta/recipes-core/busybox/busybox/init.cfg @@ -3,7 +3,6 @@ CONFIG_RUNLEVEL=y CONFIG_FEATURE_USE_INITTAB=y CONFIG_HALT=y CONFIG_POWEROFF=y -CONFIG_REBOOT=y CONFIG_FEATURE_KILL_DELAY=0 CONFIG_TELINIT_PATH="" CONFIG_INIT_TERMINAL_TYPE="" |