From 48ef7901abbb8e7b5726f224778b7b5f347a27e3 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Thu, 21 Apr 2022 11:58:56 -0400 Subject: [PATCH] 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 --- recipes-extended/xen/xen-tools.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/recipes-extended/xen/xen-tools.inc b/recipes-extended/xen/xen-tools.inc index 27972c16..eabb8fac 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"