aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@gmail.com>2022-04-21 11:58:56 -0400
committerBruce Ashfield <bruce.ashfield@gmail.com>2022-04-21 11:58:56 -0400
commit48ef7901abbb8e7b5726f224778b7b5f347a27e3 (patch)
treeae51ca0400921d604587335c9d6552e942d0f87c
parent6ed391fdb046eaf4eb0c4ade3cd184231b985f10 (diff)
downloadmeta-virtualization-48ef7901abbb8e7b5726f224778b7b5f347a27e3.tar.gz
meta-virtualization-48ef7901abbb8e7b5726f224778b7b5f347a27e3.tar.bz2
meta-virtualization-48ef7901abbb8e7b5726f224778b7b5f347a27e3.zip
xen-tools: don't declare xencommons as an initscript for systemd
We previously disabled init.d/xencommons when systemd is the init system (to fix duplicate initialization of some resources), but during rootfs install, update-rc.d will look for the script if xencommons is declared as an initscript package. We match the installation and only delcare it as an initscript in a non systemd configuration. Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
-rw-r--r--recipes-extended/xen/xen-tools.inc3
1 files changed, 2 insertions, 1 deletions
diff --git a/recipes-extended/xen/xen-tools.inc b/recipes-extended/xen/xen-tools.inc
index 27972c1..eabb8fa 100644
--- a/recipes-extended/xen/xen-tools.inc
+++ b/recipes-extended/xen/xen-tools.inc
@@ -716,7 +716,8 @@ ALLOW_EMPTY:${PN}-xen-vmtrace = "1"
INSANE_SKIP:${PN} = "already-stripped"
# configure init.d scripts
-INITSCRIPT_PACKAGES = "${PN}-xend ${PN}-xencommons ${PN}-xen-watchdog ${PN}-xendomains ${PN}-devd"
+INITSCRIPT_PACKAGES = "${PN}-xend ${PN}-xen-watchdog ${PN}-xendomains ${PN}-devd"
+INITSCRIPT_PACKAGES += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '${PN}-xencommons}', '', d)}"
INITSCRIPT_NAME:${PN}-xencommons = "xencommons"
INITSCRIPT_PARAMS:${PN}-xencommons = "defaults 80"
INITSCRIPT_NAME:${PN}-xen-watchdog = "xen-watchdog"