From: Anuj Mittal <anuj.mittal@intel.com>
To: openembedded-core@lists.openembedded.org
Subject: [PATCH 2/3] busybox: move reboot out of init.cfg
Date: Thu, 11 Oct 2018 16:41:10 +0800 [thread overview]
Message-ID: <20181011084111.11619-2-anuj.mittal@intel.com> (raw)
In-Reply-To: <20181011084111.11619-1-anuj.mittal@intel.com>
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>
---
meta/recipes-core/busybox/busybox/defconfig | 2 +-
meta/recipes-core/busybox/busybox/init.cfg | 1 -
2 files changed, 1 insertion(+), 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 3c1fdd42b6..3b839c515c 100644
--- a/meta/recipes-core/busybox/busybox/init.cfg
+++ b/meta/recipes-core/busybox/busybox/init.cfg
@@ -2,7 +2,6 @@ CONFIG_INIT=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=""
--
2.17.1
next prev parent reply other threads:[~2018-10-11 8:41 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-11 8:41 [PATCH 1/3] init-install-efi.sh: improve info message Anuj Mittal
2018-10-11 8:41 ` Anuj Mittal [this message]
2018-10-11 8:47 ` [PATCH 2/3] busybox: move reboot out of init.cfg Martin Jansa
2018-10-11 8:41 ` [PATCH 3/3] systemd: add ALTERNATIVE for reboot Anuj Mittal
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181011084111.11619-2-anuj.mittal@intel.com \
--to=anuj.mittal@intel.com \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox