From ad06f5b943f8ec3563ff6714fe8bd750ef5ebd73 Mon Sep 17 00:00:00 2001 From: Vivien Didelot Date: Thu, 18 Feb 2021 17:42:02 -0500 Subject: local.conf.sample.extended: prefer INIT_MANAGER Since the INIT_MANAGER variable has been introduced, there is no need to append the distro features and set the init manager manually. Replace the busybox/mdev and systemd examples with the 4 values currently supported for the INIT_MANAGER variable. (From meta-yocto rev: 9fa107b017c1619a4a3969d452ae93ffa088f60f) Signed-off-by: Vivien Didelot Signed-off-by: Richard Purdie (cherry picked from commit 2433a0f78a7fdb8450ef9ec64fa044274ac7a9e1) Signed-off-by: Steve Sakoman Signed-off-by: Richard Purdie --- meta-poky/conf/local.conf.sample.extended | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/meta-poky/conf/local.conf.sample.extended b/meta-poky/conf/local.conf.sample.extended index 5e1edef58e..9e857360ae 100644 --- a/meta-poky/conf/local.conf.sample.extended +++ b/meta-poky/conf/local.conf.sample.extended @@ -368,20 +368,9 @@ DISTRO_FEATURES_remove = "x11" # # -# Use busybox/mdev for system initialization -# -#VIRTUAL-RUNTIME_dev_manager = "busybox-mdev" -#VIRTUAL-RUNTIME_login_manager = "busybox" -#VIRTUAL-RUNTIME_init_manager = "busybox" -#VIRTUAL-RUNTIME_initscripts = "initscripts" -#VIRTUAL-RUNTIME_keymaps = "keymaps" -#DISTRO_FEATURES_BACKFILL_CONSIDERED += "sysvinit" - -# -# Use systemd for system initialization +# System initialization # -#DISTRO_FEATURES_append = " systemd" -#DISTRO_FEATURES_BACKFILL_CONSIDERED += "sysvinit" -#VIRTUAL-RUNTIME_login_manager = "shadow-base" -#VIRTUAL-RUNTIME_init_manager = "systemd" -#VIRTUAL-RUNTIME_initscripts = "systemd-compat-units" +#INIT_MANAGER = "none" +#INIT_MANAGER = "sysvinit" +#INIT_MANAGER = "systemd" +#INIT_MANAGER = "mdev-busybox" -- cgit v1.2.3-54-g00ecf