[libvirt PATCH 25/42] systemd: Switch virtvzd to common templates
Signed-off-by: Andrea Bolognani <abologna(a)redhat.com>
---
src/vz/meson.build | 7 +++----
src/vz/virtvzd.service.in | 26 --------------------------
2 files changed, 3 insertions(+), 30 deletions(-)
delete mode 100644 src/vz/virtvzd.service.in
diff --git a/src/vz/meson.build b/src/vz/meson.build
index 9c2eb90463..dceea1aaac 100644
--- a/src/vz/meson.build
+++ b/src/vz/meson.build
@@ -48,11 +48,10 @@ if conf.has('WITH_VZ')
virt_daemon_units += {
'service': 'virtvzd',
- 'service_in': files('virtvzd.service.in'),
'name': 'Libvirt vz',
- 'socket_in': libvirtd_socket_in,
- 'socket_ro_in': libvirtd_socket_ro_in,
- 'socket_admin_in': libvirtd_socket_admin_in,
+ 'service_unit_extra': [
+ 'After=remote-fs.target',
+ ],
}
openrc_init_files += {
diff --git a/src/vz/virtvzd.service.in b/src/vz/virtvzd.service.in
deleted file mode 100644
index 5521e89e10..0000000000
--- a/src/vz/virtvzd.service.in
+++ /dev/null
@@ -1,26 +0,0 @@
-[Unit]
-Description=Virtualization vz daemon
-Conflicts=libvirtd.service
-Requires=virtvzd.socket
-Requires=virtvzd-ro.socket
-Requires=virtvzd-admin.socket
-After=network.target
-After=dbus.service
-After=apparmor.service
-After=remote-fs.target
-Documentation=man:virtvzd(8)
-Documentation=https://libvirt.org
-
-[Service]
-Type=notify
-Environment=VIRTVZD_ARGS="--timeout 120"
-EnvironmentFile=-@initconfdir@/virtvzd
-ExecStart=@sbindir@/virtvzd $VIRTVZD_ARGS
-ExecReload=/bin/kill -HUP $MAINPID
-Restart=on-failure
-
-[Install]
-WantedBy=multi-user.target
-Also=virtvzd.socket
-Also=virtvzd-ro.socket
-Also=virtvzd-admin.socket
--
2.41.0