You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
170 lines
4.9 KiB
170 lines
4.9 KiB
--- a/src/interface/virtinterfaced.service.in
|
|
+++ b/src/interface/virtinterfaced.service.in
|
|
@@ -13,7 +13,6 @@
|
|
|
|
[Service]
|
|
Type=notify
|
|
-EnvironmentFile=-@sysconfdir@/sysconfig/virtinterfaced
|
|
ExecStart=@sbindir@/virtinterfaced $VIRTINTERFACED_ARGS
|
|
ExecReload=/bin/kill -HUP $MAINPID
|
|
Restart=on-failure
|
|
--- a/src/libxl/virtxend.service.in
|
|
+++ b/src/libxl/virtxend.service.in
|
|
@@ -17,7 +17,6 @@
|
|
|
|
[Service]
|
|
Type=notify
|
|
-EnvironmentFile=-@sysconfdir@/sysconfig/virtxend
|
|
ExecStart=@sbindir@/virtxend $VIRTXEND_ARGS
|
|
ExecReload=/bin/kill -HUP $MAINPID
|
|
Restart=on-failure
|
|
--- a/src/locking/virtlockd.service.in
|
|
+++ b/src/locking/virtlockd.service.in
|
|
@@ -7,8 +7,7 @@
|
|
Documentation=https://libvirt.org
|
|
|
|
[Service]
|
|
-EnvironmentFile=-@sysconfdir@/sysconfig/virtlockd
|
|
-ExecStart=@sbindir@/virtlockd $VIRTLOCKD_ARGS
|
|
+ExecStart=@sbindir@/virtlockd
|
|
ExecReload=/bin/kill -USR1 $MAINPID
|
|
# Loosing the locks is a really bad thing that will
|
|
# cause the machine to be fenced (rebooted), so make
|
|
--- a/src/logging/virtlogd.service.in
|
|
+++ b/src/logging/virtlogd.service.in
|
|
@@ -7,8 +7,7 @@
|
|
Documentation=https://libvirt.org
|
|
|
|
[Service]
|
|
-EnvironmentFile=-@sysconfdir@/sysconfig/virtlogd
|
|
-ExecStart=@sbindir@/virtlogd $VIRTLOGD_ARGS
|
|
+ExecStart=@sbindir@/virtlogd
|
|
ExecReload=/bin/kill -USR1 $MAINPID
|
|
# Loosing the logs is a really bad thing that will
|
|
# cause the machine to be fenced (rebooted), so make
|
|
--- a/src/lxc/virtlxcd.service.in
|
|
+++ b/src/lxc/virtlxcd.service.in
|
|
@@ -18,7 +18,6 @@
|
|
|
|
[Service]
|
|
Type=notify
|
|
-EnvironmentFile=-@sysconfdir@/sysconfig/virtlxcd
|
|
ExecStart=@sbindir@/virtlxcd $VIRTLXCD_ARGS
|
|
ExecReload=/bin/kill -HUP $MAINPID
|
|
KillMode=process
|
|
--- a/src/network/virtnetworkd.service.in
|
|
+++ b/src/network/virtnetworkd.service.in
|
|
@@ -16,7 +16,6 @@
|
|
|
|
[Service]
|
|
Type=notify
|
|
-EnvironmentFile=-@sysconfdir@/sysconfig/virtnetworkd
|
|
ExecStart=@sbindir@/virtnetworkd $VIRTNETWORKD_ARGS
|
|
ExecReload=/bin/kill -HUP $MAINPID
|
|
Restart=on-failure
|
|
--- a/src/node_device/virtnodedevd.service.in
|
|
+++ b/src/node_device/virtnodedevd.service.in
|
|
@@ -13,7 +13,6 @@
|
|
|
|
[Service]
|
|
Type=notify
|
|
-EnvironmentFile=-@sysconfdir@/sysconfig/virtnodedevd
|
|
ExecStart=@sbindir@/virtnodedevd $VIRTNODEDEVD_ARGS
|
|
ExecReload=/bin/kill -HUP $MAINPID
|
|
Restart=on-failure
|
|
--- a/src/nwfilter/virtnwfilterd.service.in
|
|
+++ b/src/nwfilter/virtnwfilterd.service.in
|
|
@@ -13,7 +13,6 @@
|
|
|
|
[Service]
|
|
Type=notify
|
|
-EnvironmentFile=-@sysconfdir@/sysconfig/virtnwfilterd
|
|
ExecStart=@sbindir@/virtnwfilterd $VIRTNWFILTERD_ARGS
|
|
ExecReload=/bin/kill -HUP $MAINPID
|
|
Restart=on-failure
|
|
--- a/src/qemu/virtqemud.service.in
|
|
+++ b/src/qemu/virtqemud.service.in
|
|
@@ -18,7 +18,6 @@
|
|
|
|
[Service]
|
|
Type=notify
|
|
-EnvironmentFile=-@sysconfdir@/sysconfig/virtqemud
|
|
ExecStart=@sbindir@/virtqemud $VIRTQEMUD_ARGS
|
|
ExecReload=/bin/kill -HUP $MAINPID
|
|
KillMode=process
|
|
--- a/src/remote/libvirtd.service.in
|
|
+++ b/src/remote/libvirtd.service.in
|
|
@@ -28,8 +28,7 @@
|
|
|
|
[Service]
|
|
Type=notify
|
|
-EnvironmentFile=-@sysconfdir@/sysconfig/libvirtd
|
|
-ExecStart=@sbindir@/libvirtd $LIBVIRTD_ARGS
|
|
+ExecStart=@sbindir@/libvirtd
|
|
ExecReload=/bin/kill -HUP $MAINPID
|
|
KillMode=process
|
|
Restart=on-failure
|
|
--- a/src/remote/virtproxyd.service.in
|
|
+++ b/src/remote/virtproxyd.service.in
|
|
@@ -13,7 +13,6 @@
|
|
|
|
[Service]
|
|
Type=notify
|
|
-EnvironmentFile=-@sysconfdir@/sysconfig/virtproxyd
|
|
ExecStart=@sbindir@/virtproxyd $VIRTPROXYD_ARGS
|
|
ExecReload=/bin/kill -HUP $MAINPID
|
|
Restart=on-failure
|
|
--- a/src/secret/virtsecretd.service.in
|
|
+++ b/src/secret/virtsecretd.service.in
|
|
@@ -13,7 +13,6 @@
|
|
|
|
[Service]
|
|
Type=notify
|
|
-EnvironmentFile=-@sysconfdir@/sysconfig/virtsecretd
|
|
ExecStart=@sbindir@/virtsecretd $VIRTSECRETD_ARGS
|
|
ExecReload=/bin/kill -HUP $MAINPID
|
|
Restart=on-failure
|
|
--- a/src/storage/virtstoraged.service.in
|
|
+++ b/src/storage/virtstoraged.service.in
|
|
@@ -15,7 +15,6 @@
|
|
|
|
[Service]
|
|
Type=notify
|
|
-EnvironmentFile=-@sysconfdir@/sysconfig/virtstoraged
|
|
ExecStart=@sbindir@/virtstoraged $VIRTSTORAGED_ARGS
|
|
ExecReload=/bin/kill -HUP $MAINPID
|
|
Restart=on-failure
|
|
--- a/src/vbox/virtvboxd.service.in
|
|
+++ b/src/vbox/virtvboxd.service.in
|
|
@@ -14,7 +14,6 @@
|
|
|
|
[Service]
|
|
Type=notify
|
|
-EnvironmentFile=-@sysconfdir@/sysconfig/virtvboxd
|
|
ExecStart=@sbindir@/virtvboxd $VIRTVBOXD_ARGS
|
|
ExecReload=/bin/kill -HUP $MAINPID
|
|
Restart=on-failure
|
|
--- a/tools/libvirt-guests.service.in
|
|
+++ b/tools/libvirt-guests.service.in
|
|
@@ -10,7 +10,7 @@
|
|
Documentation=https://libvirt.org
|
|
|
|
[Service]
|
|
-EnvironmentFile=-@sysconfdir@/sysconfig/libvirt-guests
|
|
+EnvironmentFile=-/etc/libvirt/libvirt-guests.conf
|
|
# Hack just call traditional service until we factor
|
|
# out the code
|
|
ExecStart=@libexecdir@/libvirt-guests.sh start
|
|
--- a/tools/libvirt-guests.sysconf
|
|
+++ b/tools/libvirt-guests.sysconf
|
|
@@ -1,3 +1,9 @@
|
|
+#
|
|
+# Warning: This configuration file is only sourced by the systemd
|
|
+# libvirt-guests.service unit. The coresponding openrc facility is in
|
|
+# /etc/init.d/libvirtd and /etc/conf.d/libvirtd
|
|
+#
|
|
+
|
|
# Customizations for the libvirt-guests.service systemd unit
|
|
|
|
# URIs to check for running guests
|