[libvirt PATCH v2 12/33] systemd: Switch virtnetworkd to common templates

Signed-off-by: Andrea Bolognani <abologna(a)redhat.com&gt; --- src/network/meson.build | 5 +---- src/network/virtnetworkd.service.extra.in | 2 ++ src/network/virtnetworkd.service.in | 26 ----------------------- 3 files changed, 3 insertions(+), 30 deletions(-) create mode 100644 src/network/virtnetworkd.service.extra.in delete mode 100644 src/network/virtnetworkd.service.in diff --git a/src/network/meson.build b/src/network/meson.build index 2e51d5d47b..ed7707c714 100644 --- a/src/network/meson.build +++ b/src/network/meson.build @@ -62,11 +62,8 @@ if conf.has('WITH_NETWORK') virt_daemon_units += { 'service': 'virtnetworkd', - 'service_in': files('virtnetworkd.service.in'), 'name': 'Libvirt network', - 'socket_in': libvirtd_socket_in, - 'socket_ro_in': libvirtd_socket_ro_in, - 'socket_admin_in': libvirtd_socket_admin_in, + 'service_extra_in': files('virtnetworkd.service.extra.in'), } openrc_init_files += { diff --git a/src/network/virtnetworkd.service.extra.in b/src/network/virtnetworkd.service.extra.in new file mode 100644 index 0000000000..9fcabf652d --- /dev/null +++ b/src/network/virtnetworkd.service.extra.in @@ -0,0 +1,2 @@ +[Service] +KillMode=process diff --git a/src/network/virtnetworkd.service.in b/src/network/virtnetworkd.service.in deleted file mode 100644 index 3d7374715d..0000000000 --- a/src/network/virtnetworkd.service.in +++ /dev/null @@ -1,26 +0,0 @@ -[Unit] -Description=Virtualization network daemon -Conflicts=libvirtd.service -Requires=virtnetworkd.socket -Requires=virtnetworkd-ro.socket -Requires=virtnetworkd-admin.socket -After=network.target -After=dbus.service -After=apparmor.service -Documentation=man:virtnetworkd(8) -Documentation=https://libvirt.org - -[Service] -Type=notify -Environment=VIRTNETWORKD_ARGS="--timeout 120" -EnvironmentFile=-@initconfdir@/virtnetworkd -ExecStart=@sbindir@/virtnetworkd $VIRTNETWORKD_ARGS -ExecReload=/bin/kill -HUP $MAINPID -Restart=on-failure -KillMode=process - -[Install] -WantedBy=multi-user.target -Also=virtnetworkd.socket -Also=virtnetworkd-ro.socket -Also=virtnetworkd-admin.socket -- 2.41.0