[libvirt PATCH v2 17/33] systemd: Switch virtxend to common templates

Signed-off-by: Andrea Bolognani <abologna(a)redhat.com&gt; --- src/libxl/meson.build | 7 ++----- src/libxl/virtxend.service.extra.in | 12 +++++++++++ src/libxl/virtxend.service.in | 32 ----------------------------- src/libxl/virtxend.socket.extra.in | 2 ++ 4 files changed, 16 insertions(+), 37 deletions(-) create mode 100644 src/libxl/virtxend.service.extra.in delete mode 100644 src/libxl/virtxend.service.in create mode 100644 src/libxl/virtxend.socket.extra.in diff --git a/src/libxl/meson.build b/src/libxl/meson.build index a1553dbe27..171d6ca005 100644 --- a/src/libxl/meson.build +++ b/src/libxl/meson.build @@ -66,12 +66,9 @@ if conf.has('WITH_LIBXL') virt_daemon_units += { 'service': 'virtxend', - 'service_in': files('virtxend.service.in'), 'name': 'Libvirt libxl', - 'socket_in': libvirtd_socket_in, - 'socket_ro_in': libvirtd_socket_ro_in, - 'socket_admin_in': libvirtd_socket_admin_in, - 'deps': 'ConditionPathExists=/proc/xen/capabilities', + 'service_extra_in': files('virtxend.service.extra.in'), + 'socket_extra_in': files('virtxend.socket.extra.in'), } openrc_init_files += { diff --git a/src/libxl/virtxend.service.extra.in b/src/libxl/virtxend.service.extra.in new file mode 100644 index 0000000000..ba38ba9160 --- /dev/null +++ b/src/libxl/virtxend.service.extra.in @@ -0,0 +1,12 @@ +[Unit] +Wants=virtlockd.socket +After=remote-fs.target +After=xencommons.service +Conflicts=xendomains.service +ConditionPathExists=/proc/xen/capabilities + +[Service] +KillMode=process + +[Install] +Also=virtlockd.socket diff --git a/src/libxl/virtxend.service.in b/src/libxl/virtxend.service.in deleted file mode 100644 index c6a88f7fe9..0000000000 --- a/src/libxl/virtxend.service.in +++ /dev/null @@ -1,32 +0,0 @@ -[Unit] -Description=Virtualization xen daemon -Conflicts=libvirtd.service -Requires=virtxend.socket -Requires=virtxend-ro.socket -Requires=virtxend-admin.socket -Wants=virtlockd.socket -After=network.target -After=dbus.service -After=apparmor.service -After=remote-fs.target -After=xencommons.service -Conflicts=xendomains.service -Documentation=man:virtxend(8) -Documentation=https://libvirt.org -ConditionPathExists=/proc/xen/capabilities - -[Service] -Type=notify -Environment=VIRTXEND_ARGS="--timeout 120" -EnvironmentFile=-@initconfdir@/virtxend -ExecStart=@sbindir@/virtxend $VIRTXEND_ARGS -ExecReload=/bin/kill -HUP $MAINPID -Restart=on-failure -KillMode=process - -[Install] -WantedBy=multi-user.target -Also=virtlockd.socket -Also=virtxend.socket -Also=virtxend-ro.socket -Also=virtxend-admin.socket diff --git a/src/libxl/virtxend.socket.extra.in b/src/libxl/virtxend.socket.extra.in new file mode 100644 index 0000000000..c8322efbbc --- /dev/null +++ b/src/libxl/virtxend.socket.extra.in @@ -0,0 +1,2 @@ +[Unit] +ConditionPathExists=/proc/xen/capabilities -- 2.41.0