summaryrefslogtreecommitdiffstats
path: root/meta-poky
diff options
context:
space:
mode:
authorVivien Didelot <vdidelot@pbsc.com>2021-02-18 17:42:02 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-03-10 00:22:52 +0000
commitad06f5b943f8ec3563ff6714fe8bd750ef5ebd73 (patch)
treebbbe16a4a75f824b19e926ba4b2c05e1061fb55d /meta-poky
parentfb98bed7a1ada1b0480f46475a55be051ef2524d (diff)
downloadpoky-ad06f5b943f8ec3563ff6714fe8bd750ef5ebd73.tar.gz
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 <vdidelot@pbsc.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 2433a0f78a7fdb8450ef9ec64fa044274ac7a9e1) Signed-off-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta-poky')
-rw-r--r--meta-poky/conf/local.conf.sample.extended21
1 files 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"
368# 368#
369 369
370# 370#
371# Use busybox/mdev for system initialization 371# System initialization
372#
373#VIRTUAL-RUNTIME_dev_manager = "busybox-mdev"
374#VIRTUAL-RUNTIME_login_manager = "busybox"
375#VIRTUAL-RUNTIME_init_manager = "busybox"
376#VIRTUAL-RUNTIME_initscripts = "initscripts"
377#VIRTUAL-RUNTIME_keymaps = "keymaps"
378#DISTRO_FEATURES_BACKFILL_CONSIDERED += "sysvinit"
379
380#
381# Use systemd for system initialization
382# 372#
383#DISTRO_FEATURES_append = " systemd" 373#INIT_MANAGER = "none"
384#DISTRO_FEATURES_BACKFILL_CONSIDERED += "sysvinit" 374#INIT_MANAGER = "sysvinit"
385#VIRTUAL-RUNTIME_login_manager = "shadow-base" 375#INIT_MANAGER = "systemd"
386#VIRTUAL-RUNTIME_init_manager = "systemd" 376#INIT_MANAGER = "mdev-busybox"
387#VIRTUAL-RUNTIME_initscripts = "systemd-compat-units"