summaryrefslogtreecommitdiffstats
path: root/recipes-extended
diff options
context:
space:
mode:
authorMark Asselstine <mark.asselstine@windriver.com>2015-09-11 10:42:04 -0400
committerBruce Ashfield <bruce.ashfield@windriver.com>2015-09-11 15:51:07 -0400
commitc917cafe47655708a094a227444a3d5aa5cb182c (patch)
treeec24e1215d2bbfd2ce5ddae515902d201d370569 /recipes-extended
parent9f177c12d8361341853fe9c34f6c5b8df3cbcc1a (diff)
downloadmeta-virtualization-c917cafe47655708a094a227444a3d5aa5cb182c.tar.gz
libvirt: get libvirt-guests systemd service running
While testing libvirt with the new systemd init I found that the libvirt-guests service was failing to run since the libvirt-guests.sh script was not where it was expected. If we are building for systemd init system use the default installation location which is used upstream for the libvirt-guests.sh script. Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Diffstat (limited to 'recipes-extended')
-rw-r--r--recipes-extended/libvirt/libvirt_1.2.17.bb9
1 files changed, 6 insertions, 3 deletions
diff --git a/recipes-extended/libvirt/libvirt_1.2.17.bb b/recipes-extended/libvirt/libvirt_1.2.17.bb
index 28a22bb2..6f269f99 100644
--- a/recipes-extended/libvirt/libvirt_1.2.17.bb
+++ b/recipes-extended/libvirt/libvirt_1.2.17.bb
@@ -107,6 +107,7 @@ FILES_${PN}-libvirtd = " \
107 /usr/lib/sysctl.d/60-libvirtd.conf \ 107 /usr/lib/sysctl.d/60-libvirtd.conf \
108 ${sbindir}/libvirtd \ 108 ${sbindir}/libvirtd \
109 ${systemd_unitdir}/system/* \ 109 ${systemd_unitdir}/system/* \
110 ${@base_contains('DISTRO_FEATURES', 'sysvinit', '', '${libexecdir}/libvirt-guests.sh', d)} \
110 " 111 "
111 112
112FILES_${PN}-virsh = "${bindir}/virsh" 113FILES_${PN}-virsh = "${bindir}/virsh"
@@ -215,9 +216,11 @@ do_install_append() {
215 install -m 0755 ${WORKDIR}/libvirtd.sh ${D}/etc/init.d/libvirtd 216 install -m 0755 ${WORKDIR}/libvirtd.sh ${D}/etc/init.d/libvirtd
216 install -m 0644 ${WORKDIR}/libvirtd.conf ${D}/etc/libvirt/libvirtd.conf 217 install -m 0644 ${WORKDIR}/libvirtd.conf ${D}/etc/libvirt/libvirtd.conf
217 218
218 # This will wind up in the libvirtd package, but will NOT be invoked by default. 219 if ${@bb.utils.contains('DISTRO_FEATURES','sysvinit','true','false',d)}; then
219 # 220 # This will wind up in the libvirtd package, but will NOT be invoked by default.
220 mv ${D}/${libexecdir}/libvirt-guests.sh ${D}/${sysconfdir}/init.d 221 #
222 mv ${D}/${libexecdir}/libvirt-guests.sh ${D}/${sysconfdir}/init.d
223 fi
221 224
222 # The /var/run/libvirt directories created by the Makefile 225 # The /var/run/libvirt directories created by the Makefile
223 # are wiped out in volatile, we need to create these at boot. 226 # are wiped out in volatile, we need to create these at boot.