Signed-off-by: Andrea Bolognani <abologna@xxxxxxxxxx> --- src/libxl/meson.build | 21 ++++++++++++++++----- src/libxl/virtxend.service.in | 32 -------------------------------- 2 files changed, 16 insertions(+), 37 deletions(-) delete mode 100644 src/libxl/virtxend.service.in diff --git a/src/libxl/meson.build b/src/libxl/meson.build index a1553dbe27..e84999e14d 100644 --- a/src/libxl/meson.build +++ b/src/libxl/meson.build @@ -66,12 +66,23 @@ 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_unit_extra': [ + 'Wants=virtlockd.socket', + 'After=remote-fs.target', + 'After=xencommons.service', + 'Conflicts=xendomains.service', + 'ConditionPathExists=/proc/xen/capabilities', + ], + 'service_service_extra': [ + 'KillMode=process', + ], + 'service_install_extra': [ + 'Also=virtlockd.socket', + ], + 'socket_unit_extra': [ + 'ConditionPathExists=/proc/xen/capabilities', + ], } openrc_init_files += { 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 -- 2.41.0