Skip to contentSkip to conversation

libvirt: Drop the deprecated workaround

PATCH In review Zhixiong Chi 2 participants 2 messages Apr 21 – Apr 22

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 libvirt: Drop the deprecated workaround

The workaround is not needed anymore as the systemd supporting. The libvirtd.service Type has been changed from notify to notify-reload, so the final Type will be 'forking-reload', that's invalid for systemd. Here we delete it to avoid the following output information:

Quoted 1 line

/lib/systemd/system/libvirtd.service:29: Failed to parse Type=forking-reload, ignoring: Invalid argument

---
 recipes-extended/libvirt/libvirt_git.bb | 7 -------
 1 file changed, 7 deletions(-)
recipes-extended/libvirt/libvirt_git.bb +0 -7
index 62931d17..b5b0a5f2 100644
@@ -232,13 +232,6 @@ do_install:append() {
                 mv ${D}${prefix}/lib/systemd/system/* ${D}${systemd_system_unitdir}
                 rmdir ${D}${prefix}/lib/systemd/system ${D}${prefix}/lib/systemd
             fi
-
-	    # 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
 
 	# The /run/libvirt directories created by the Makefile are 
Signature · 1 line
2.53.0
#1 lore raw
Quoted 17 lines · Zhixiong Chi via lists.yoctoproject.org

The workaround is not needed anymore as the systemd supporting. The libvirtd.service Type has been changed from notify to notify-reload, so the final Type will be 'forking-reload', that's invalid for systemd. Here we delete it to avoid the following output information:

Quoted 1 line

/lib/systemd/system/libvirtd.service:29: Failed to parse Type=forking-reload, ignoring: Invalid argument

---
  recipes-extended/libvirt/libvirt_git.bb | 7 -------
  1 file changed, 7 deletions(-)
recipes-extended/libvirt/libvirt_git.bb +0 -0
index 62931d17..b5b0a5f2 100644
@@ -232,13 +232,6 @@ do_install:append() {
                  mv ${D}${prefix}/lib/systemd/system/* ${D}${systemd_system_unitdir}

recipes-extended/libvirt/libvirt_git.bb do_install:append() { · line 235

Quoted 10 lines
recipes-extended/libvirt/libvirt_git.bb +0 -7
                  rmdir ${D}${prefix}/lib/systemd/system ${D}${prefix}/lib/systemd
              fi
-
-	    # 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

This should be patch to source, that way it is better for tracking changes.

Quoted 13 lines
recipes-extended/libvirt/libvirt_git.bb +0 -1
  	# The /run/libvirt directories created by the Makefile are
 
 
 
-=-=-=-=-=-=-=-=-=-=-=-

Links: You receive all messages sent to this group.
View/Reply Online (#9719): https://lists.yoctoproject.org/g/meta-virtualization/message/9719
Mute This Topic: https://lists.yoctoproject.org/mt/118934411/1997914
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-