From 10d65f10a76c7478c4ec0c65ffeec7f4b18929f9 Mon Sep 17 00:00:00 2001 Message-Id: <10d65f10a76c7478c4ec0c65ffeec7f4b18929f9.1646212419.git.mprivozn@redhat.com> From: Michal Privoznik Date: Wed, 2 Mar 2022 10:01:04 +0100 Subject: [PATCH] libvirt-8.2.0-do-not-use-sysconfig.patch Signed-off-by: Michal Privoznik --- src/interface/virtinterfaced.service.in | 1 - src/libxl/virtxend.service.in | 1 - src/locking/virtlockd.service.in | 1 - src/logging/virtlogd.service.in | 3 +-- src/lxc/virtlxcd.service.in | 1 - src/network/virtnetworkd.service.in | 1 - src/node_device/virtnodedevd.service.in | 1 - src/nwfilter/virtnwfilterd.service.in | 1 - src/qemu/virtqemud.service.in | 1 - src/remote/libvirtd.service.in | 1 - src/remote/virtproxyd.service.in | 1 - src/secret/virtsecretd.service.in | 1 - src/storage/virtstoraged.service.in | 1 - src/vbox/virtvboxd.service.in | 1 - tools/libvirt-guests.service.in | 2 +- 15 files changed, 2 insertions(+), 16 deletions(-) diff --git a/src/interface/virtinterfaced.service.in b/src/interface/virtinterfaced.service.in index cb860ff1c4..090b198ac7 100644 --- a/src/interface/virtinterfaced.service.in +++ b/src/interface/virtinterfaced.service.in @@ -14,7 +14,6 @@ Documentation=https://libvirt.org [Service] Type=notify Environment=VIRTINTERFACED_ARGS="--timeout 120" -EnvironmentFile=-@sysconfdir@/sysconfig/virtinterfaced ExecStart=@sbindir@/virtinterfaced $VIRTINTERFACED_ARGS ExecReload=/bin/kill -HUP $MAINPID Restart=on-failure diff --git a/src/libxl/virtxend.service.in b/src/libxl/virtxend.service.in index 6b083c414f..597f5d1905 100644 --- a/src/libxl/virtxend.service.in +++ b/src/libxl/virtxend.service.in @@ -19,7 +19,6 @@ ConditionPathExists=/proc/xen/capabilities [Service] Type=notify Environment=VIRTXEND_ARGS="--timeout 120" -EnvironmentFile=-@sysconfdir@/sysconfig/virtxend ExecStart=@sbindir@/virtxend $VIRTXEND_ARGS ExecReload=/bin/kill -HUP $MAINPID Restart=on-failure diff --git a/src/locking/virtlockd.service.in b/src/locking/virtlockd.service.in index 19271d1e7d..87193952cb 100644 --- a/src/locking/virtlockd.service.in +++ b/src/locking/virtlockd.service.in @@ -8,7 +8,6 @@ Documentation=https://libvirt.org [Service] Environment=VIRTLOCKD_ARGS= -EnvironmentFile=-@sysconfdir@/sysconfig/virtlockd ExecStart=@sbindir@/virtlockd $VIRTLOCKD_ARGS ExecReload=/bin/kill -USR1 $MAINPID # Losing the locks is a really bad thing that will diff --git a/src/logging/virtlogd.service.in b/src/logging/virtlogd.service.in index 8ab5478517..fe5c58b8ed 100644 --- a/src/logging/virtlogd.service.in +++ b/src/logging/virtlogd.service.in @@ -7,8 +7,7 @@ Documentation=man:virtlogd(8) Documentation=https://libvirt.org [Service] -EnvironmentFile=-@sysconfdir@/sysconfig/virtlogd -ExecStart=@sbindir@/virtlogd $VIRTLOGD_ARGS +ExecStart=@sbindir@/virtlogd ExecReload=/bin/kill -USR1 $MAINPID # Losing the logs is a really bad thing that will # cause the machine to be fenced (rebooted), so make diff --git a/src/lxc/virtlxcd.service.in b/src/lxc/virtlxcd.service.in index 334c34db44..1b9689017e 100644 --- a/src/lxc/virtlxcd.service.in +++ b/src/lxc/virtlxcd.service.in @@ -19,7 +19,6 @@ Documentation=https://libvirt.org [Service] Type=notify Environment=VIRTLXCD_ARGS="--timeout 120" -EnvironmentFile=-@sysconfdir@/sysconfig/virtlxcd ExecStart=@sbindir@/virtlxcd $VIRTLXCD_ARGS ExecReload=/bin/kill -HUP $MAINPID KillMode=process diff --git a/src/network/virtnetworkd.service.in b/src/network/virtnetworkd.service.in index 05ce672b73..ee4cd9bca1 100644 --- a/src/network/virtnetworkd.service.in +++ b/src/network/virtnetworkd.service.in @@ -17,7 +17,6 @@ Documentation=https://libvirt.org [Service] Type=notify Environment=VIRTNETWORKD_ARGS="--timeout 120" -EnvironmentFile=-@sysconfdir@/sysconfig/virtnetworkd ExecStart=@sbindir@/virtnetworkd $VIRTNETWORKD_ARGS ExecReload=/bin/kill -HUP $MAINPID Restart=on-failure diff --git a/src/node_device/virtnodedevd.service.in b/src/node_device/virtnodedevd.service.in index cd9de362fd..7693aa52c4 100644 --- a/src/node_device/virtnodedevd.service.in +++ b/src/node_device/virtnodedevd.service.in @@ -14,7 +14,6 @@ Documentation=https://libvirt.org [Service] Type=notify Environment=VIRTNODEDEVD_ARGS="--timeout 120" -EnvironmentFile=-@sysconfdir@/sysconfig/virtnodedevd ExecStart=@sbindir@/virtnodedevd $VIRTNODEDEVD_ARGS ExecReload=/bin/kill -HUP $MAINPID Restart=on-failure diff --git a/src/nwfilter/virtnwfilterd.service.in b/src/nwfilter/virtnwfilterd.service.in index ab65419e0c..16d8b377b0 100644 --- a/src/nwfilter/virtnwfilterd.service.in +++ b/src/nwfilter/virtnwfilterd.service.in @@ -14,7 +14,6 @@ Documentation=https://libvirt.org [Service] Type=notify Environment=VIRTNWFILTERD_ARGS="--timeout 120" -EnvironmentFile=-@sysconfdir@/sysconfig/virtnwfilterd ExecStart=@sbindir@/virtnwfilterd $VIRTNWFILTERD_ARGS ExecReload=/bin/kill -HUP $MAINPID Restart=on-failure diff --git a/src/qemu/virtqemud.service.in b/src/qemu/virtqemud.service.in index 5ad968ace9..c63147d31f 100644 --- a/src/qemu/virtqemud.service.in +++ b/src/qemu/virtqemud.service.in @@ -21,7 +21,6 @@ Documentation=https://libvirt.org [Service] Type=notify Environment=VIRTQEMUD_ARGS="--timeout 120" -EnvironmentFile=-@sysconfdir@/sysconfig/virtqemud ExecStart=@sbindir@/virtqemud $VIRTQEMUD_ARGS ExecReload=/bin/kill -HUP $MAINPID KillMode=process diff --git a/src/remote/libvirtd.service.in b/src/remote/libvirtd.service.in index 5d4d412fcc..27cfc34b90 100644 --- a/src/remote/libvirtd.service.in +++ b/src/remote/libvirtd.service.in @@ -29,7 +29,6 @@ Documentation=https://libvirt.org [Service] Type=notify Environment=LIBVIRTD_ARGS="--timeout 120" -EnvironmentFile=-@sysconfdir@/sysconfig/libvirtd ExecStart=@sbindir@/libvirtd $LIBVIRTD_ARGS ExecReload=/bin/kill -HUP $MAINPID KillMode=process diff --git a/src/remote/virtproxyd.service.in b/src/remote/virtproxyd.service.in index f9bb6b84a9..0eddf5ee93 100644 --- a/src/remote/virtproxyd.service.in +++ b/src/remote/virtproxyd.service.in @@ -14,7 +14,6 @@ Documentation=https://libvirt.org [Service] Type=notify Environment=VIRTPROXYD_ARGS="--timeout 120" -EnvironmentFile=-@sysconfdir@/sysconfig/virtproxyd ExecStart=@sbindir@/virtproxyd $VIRTPROXYD_ARGS ExecReload=/bin/kill -HUP $MAINPID Restart=on-failure diff --git a/src/secret/virtsecretd.service.in b/src/secret/virtsecretd.service.in index 6d298c5334..92e54f175f 100644 --- a/src/secret/virtsecretd.service.in +++ b/src/secret/virtsecretd.service.in @@ -14,7 +14,6 @@ Documentation=https://libvirt.org [Service] Type=notify Environment=VIRTSECRETD_ARGS="--timeout 120" -EnvironmentFile=-@sysconfdir@/sysconfig/virtsecretd ExecStart=@sbindir@/virtsecretd $VIRTSECRETD_ARGS ExecReload=/bin/kill -HUP $MAINPID Restart=on-failure diff --git a/src/storage/virtstoraged.service.in b/src/storage/virtstoraged.service.in index eda4d86d37..abe91e3d80 100644 --- a/src/storage/virtstoraged.service.in +++ b/src/storage/virtstoraged.service.in @@ -16,7 +16,6 @@ Documentation=https://libvirt.org [Service] Type=notify Environment=VIRTSTORAGED_ARGS="--timeout 120" -EnvironmentFile=-@sysconfdir@/sysconfig/virtstoraged ExecStart=@sbindir@/virtstoraged $VIRTSTORAGED_ARGS ExecReload=/bin/kill -HUP $MAINPID Restart=on-failure diff --git a/src/vbox/virtvboxd.service.in b/src/vbox/virtvboxd.service.in index 6f447276e9..54fbd0be4a 100644 --- a/src/vbox/virtvboxd.service.in +++ b/src/vbox/virtvboxd.service.in @@ -15,7 +15,6 @@ Documentation=https://libvirt.org [Service] Type=notify Environment=VIRTVBOXD_ARGS="--timeout 120" -EnvironmentFile=-@sysconfdir@/sysconfig/virtvboxd ExecStart=@sbindir@/virtvboxd $VIRTVBOXD_ARGS ExecReload=/bin/kill -HUP $MAINPID Restart=on-failure diff --git a/tools/libvirt-guests.service.in b/tools/libvirt-guests.service.in index 3cf6476196..5668009ae4 100644 --- a/tools/libvirt-guests.service.in +++ b/tools/libvirt-guests.service.in @@ -20,7 +20,7 @@ Documentation=man:libvirt-guests(8) 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 -- 2.34.1