MIRRORS/meta-virtualization
1
0
Fork 0
mirror of git://git.yoctoproject.org/meta-virtualization.git synced 2025-07-19 12:50:22 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

xen-tools: remove unused systemd/sysvinit files

Browse Source 
The commit [ xen: only package xencommon systemd components if systemd
is enabled] attempted to only package init.d scripts for non-systemd
systems (and vice-versa for unit files).

But the xen-tools builds installs the files uncondtionally, so we can
end up with unpackaged files in some configurations. We can test on
the init system and removed the unused versions of the init to avoid
both packging and runtime issues.

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
This commit is contained in:
Bruce Ashfield 2022-04-19 20:10:52 -04:00
parent 1f9c37e1a6
commit 51e404af98
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
recipes-extended/xen/xen-tools.inc
View File

@ -807,13 +807,24 @@ do_install() {
done
fi
# fixup default path to qemu-system-i386
sed -i 's#\(test -z "$QEMU_XEN" && QEMU_XEN=\).*$#\1"/usr/bin/qemu-system-i386"#' ${D}/etc/init.d/xencommons
if [ -e ${D}${systemd_unitdir}/system/xen-qemu-dom0-disk-backend.service ]; then
sed -i 's#ExecStart=.*qemu-system-i386\(.*\)$#ExecStart=/usr/bin/qemu-system-i386\1#' \
${D}${systemd_unitdir}/system/xen-qemu-dom0-disk-backend.service
fi
if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
rm -f ${D}/${sysconfdir}/init.d/xencommons
else
# fixup default path to qemu-system-i386
sed -i 's#\(test -z "$QEMU_XEN" && QEMU_XEN=\).*$#\1"/usr/bin/qemu-system-i386"#' ${D}/etc/init.d/xencommons
# remove the uncondiontally installed systemd service files
rm -f ${D}/${systemd_unitdir}/system/xen-qemu-dom0-disk-backend.service
rm -f ${D}/${systemd_unitdir}/system/xenconsoled.service
rm -f ${D}/${systemd_unitdir}/system/xen-init-dom0.service
rm -f ${D}/${systemd_unitdir}/system/xenstored.service
rm -f ${D}/${systemd_unitdir}/system/var-lib-xenstored.mount
fi
}
pkg_postinst:${PN}-volatiles() {