Skip to content
Snippets Groups Projects
Commit d0f1ab7a authored by Andrea Bolognani's avatar Andrea Bolognani
Browse files

patches: Drop debian/Debianize-systemd-service-files.patch

It's no longer needed, as the upstream build system now provides
a way to configure service files so that their configuration is
loaded from /etc/default instead of /etc/sysconfig.
parent 6bc6ecf6
No related branches found
No related tags found
1 merge request!194Prepare 9.4.0-1
From: =?utf-8?q?Guido_G=C3=BCnther?= <agx@sigxcpu.org>
Date: Tue, 26 Jun 2012 09:30:39 +0200
Subject: Debianize systemd service files
Forwarded: not-needed
---
src/locking/virtlockd.service.in | 2 +-
src/logging/virtlogd.service.in | 2 +-
src/remote/libvirtd.service.in | 2 +-
tools/libvirt-guests.service.in | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/locking/virtlockd.service.in b/src/locking/virtlockd.service.in
index 19271d1..bd45fcc 100644
--- a/src/locking/virtlockd.service.in
+++ b/src/locking/virtlockd.service.in
@@ -8,7 +8,7 @@ Documentation=https://libvirt.org
[Service]
Environment=VIRTLOCKD_ARGS=
-EnvironmentFile=-@sysconfdir@/sysconfig/virtlockd
+EnvironmentFile=-@sysconfdir@/default/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 8ab5478..dd25c7c 100644
--- a/src/logging/virtlogd.service.in
+++ b/src/logging/virtlogd.service.in
@@ -7,7 +7,7 @@ Documentation=man:virtlogd(8)
Documentation=https://libvirt.org
[Service]
-EnvironmentFile=-@sysconfdir@/sysconfig/virtlogd
+EnvironmentFile=-@sysconfdir@/default/virtlogd
ExecStart=@sbindir@/virtlogd $VIRTLOGD_ARGS
ExecReload=/bin/kill -USR1 $MAINPID
# Losing the logs is a really bad thing that will
diff --git a/src/remote/libvirtd.service.in b/src/remote/libvirtd.service.in
index 3058827..ad1314d 100644
--- a/src/remote/libvirtd.service.in
+++ b/src/remote/libvirtd.service.in
@@ -28,7 +28,7 @@ Documentation=https://libvirt.org
[Service]
Type=notify
Environment=LIBVIRTD_ARGS="--timeout 120"
-EnvironmentFile=-@sysconfdir@/sysconfig/libvirtd
+EnvironmentFile=-@sysconfdir@/default/libvirtd
ExecStart=@sbindir@/libvirtd $LIBVIRTD_ARGS
ExecReload=/bin/kill -HUP $MAINPID
KillMode=process
diff --git a/tools/libvirt-guests.service.in b/tools/libvirt-guests.service.in
index 1c569c3..b98e58a 100644
--- a/tools/libvirt-guests.service.in
+++ b/tools/libvirt-guests.service.in
@@ -14,7 +14,7 @@ Documentation=man:libvirt-guests(8)
Documentation=https://libvirt.org
[Service]
-EnvironmentFile=-@sysconfdir@/sysconfig/libvirt-guests
+EnvironmentFile=-@sysconfdir@/default/libvirt-guests
# Hack just call traditional service until we factor
# out the code
ExecStart=@libexecdir@/libvirt-guests.sh start
forward/Reduce-udevadm-settle-timeout-to-10-seconds.patch
forward/Pass-GPG_TTY-env-var-to-the-ssh-binary.patch
debian/Debianize-libvirt-guests.patch
debian/Debianize-systemd-service-files.patch
debian/apparmor_profiles_local_include.patch
debian/Use-sensible-editor-by-default.patch
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment