From b7e56624053b1abf0b7e34a401838d36fe7f1d38 Mon Sep 17 00:00:00 2001 From: He Zhe Date: Tue, 17 May 2022 15:49:07 +0800 Subject: libvirt: Fix keeping restarting LIBVIRTD_ARGS has been moved to libvirtd.service since v8.1.0. Move our mode setting accordingly, otherwise libvirt would keep restarting and VMs would be constantly stopped. Signed-off-by: He Zhe Signed-off-by: Bruce Ashfield --- recipes-extended/libvirt/libvirt_8.1.0.bb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/recipes-extended/libvirt/libvirt_8.1.0.bb b/recipes-extended/libvirt/libvirt_8.1.0.bb index f8deba45..89f82bf8 100644 --- a/recipes-extended/libvirt/libvirt_8.1.0.bb +++ b/recipes-extended/libvirt/libvirt_8.1.0.bb @@ -208,12 +208,11 @@ do_install:append() { rmdir ${D}${prefix}/lib/systemd/system ${D}${prefix}/lib/systemd fi - # This variable is used by libvirtd.service to start libvirtd in the right mode - sed -i '/#LIBVIRTD_ARGS="--listen"/a LIBVIRTD_ARGS="--listen --daemon"' ${D}/${sysconfdir}/init.d/libvirtd - # We can't use 'notify' when we don't support 'sd_notify' dbus capabilities. + # Change default LIBVIRTD_ARGS to start libvirtd in the right mode. sed -i -e 's/Type=notify/Type=forking/' \ -e '/Type=forking/a PIDFile=/run/libvirtd.pid' \ + -e 's/\(Environment=LIBVIRTD_ARGS="--timeout 120"\)/#\1\nEnvironment=LIBVIRTD_ARGS="--listen --daemon"/' \ ${D}/${systemd_system_unitdir}/libvirtd.service fi -- cgit v1.2.3-54-g00ecf