systemd: Switch virtstoraged to common templates

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Andrea Bolognani 2023-09-19 19:54:52 +02:00
parent 78f2a26a94
commit e6331394e5
3 changed files with 4 additions and 31 deletions

View File

@ -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 += {

View File

@ -0,0 +1,3 @@
[Unit]
After=iscsid.service
After=remote-fs.target

View File

@ -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