[libvirt PATCH v2 13/33] systemd: Switch virtstoraged to common templates
Signed-off-by: Andrea Bolognani <abologna(a)redhat.com>
---
src/storage/meson.build | 5 +----
src/storage/virtstoraged.service.extra.in | 3 +++
src/storage/virtstoraged.service.in | 27 -----------------------
3 files changed, 4 insertions(+), 31 deletions(-)
create mode 100644 src/storage/virtstoraged.service.extra.in
delete mode 100644 src/storage/virtstoraged.service.in
diff --git a/src/storage/meson.build b/src/storage/meson.build
index e0a1e9f4de..fb7feea81d 100644
--- a/src/storage/meson.build
+++ b/src/storage/meson.build
@@ -111,11 +111,8 @@ if conf.has('WITH_STORAGE')
virt_daemon_units += {
'service': 'virtstoraged',
- 'service_in': files('virtstoraged.service.in'),
'name': 'Libvirt storage',
- 'socket_in': libvirtd_socket_in,
- 'socket_ro_in': libvirtd_socket_ro_in,
- 'socket_admin_in': libvirtd_socket_admin_in,
+ 'service_extra_in': files('virtstoraged.service.extra.in'),
}
openrc_init_files += {
diff --git a/src/storage/virtstoraged.service.extra.in
b/src/storage/virtstoraged.service.extra.in
new file mode 100644
index 0000000000..d134ae18da
--- /dev/null
+++ b/src/storage/virtstoraged.service.extra.in
@@ -0,0 +1,3 @@
+[Unit]
+After=iscsid.service
+After=remote-fs.target
diff --git a/src/storage/virtstoraged.service.in b/src/storage/virtstoraged.service.in
deleted file mode 100644
index 235fbc6798..0000000000
--- a/src/storage/virtstoraged.service.in
+++ /dev/null
@@ -1,27 +0,0 @@
-[Unit]
-Description=Virtualization storage daemon
-Conflicts=libvirtd.service
-Requires=virtstoraged.socket
-Requires=virtstoraged-ro.socket
-Requires=virtstoraged-admin.socket
-After=network.target
-After=dbus.service
-After=iscsid.service
-After=apparmor.service
-After=remote-fs.target
-Documentation=man:virtstoraged(8)
-Documentation=https://libvirt.org
-
-[Service]
-Type=notify
-Environment=VIRTSTORAGED_ARGS="--timeout 120"
-EnvironmentFile=-@initconfdir@/virtstoraged
-ExecStart=@sbindir@/virtstoraged $VIRTSTORAGED_ARGS
-ExecReload=/bin/kill -HUP $MAINPID
-Restart=on-failure
-
-[Install]
-WantedBy=multi-user.target
-Also=virtstoraged.socket
-Also=virtstoraged-ro.socket
-Also=virtstoraged-admin.socket
--
2.41.0