[pve-devel] [PATCHV5 3/4] Fix systemd start condition

Wolfgang Link w.link at proxmox.com
Tue Sep 6 10:31:25 CEST 2016


Sheepdog requires on corosync to start successfully.
In Proxmox VE there is no syslog.target so remove it to avoid warnings.

Conflicts:
	debian/patches/series
---
 debian/patches/series                   |  5 +++--
 debian/patches/systemd-adaptation.patch | 13 +++++++++++++
 debian/rules                            |  2 ++
 3 files changed, 18 insertions(+), 2 deletions(-)
 create mode 100644 debian/patches/systemd-adaptation.patch

diff --git a/debian/patches/series b/debian/patches/series
index 5dd8fec..e9f6f52 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,5 +2,6 @@
 simplify-log-rotation.patch
 set-no-file-limit.patch
 cleanup-systemd-service.patch
-add-service-start-condition.patch
-Revert-dog-move-dog-binary-to-bin-dir-instead-of-sbi.patch
\ No newline at end of file
+Revert-dog-move-dog-binary-to-bin-dir-instead-of-sbi.patch
+systemd-adaptation.patch
+
diff --git a/debian/patches/systemd-adaptation.patch b/debian/patches/systemd-adaptation.patch
new file mode 100644
index 0000000..872be8e
--- /dev/null
+++ b/debian/patches/systemd-adaptation.patch
@@ -0,0 +1,13 @@
+Index: sheepdog.git/script/sheepdog.service.in
+===================================================================
+--- sheepdog.git.orig/script/sheepdog.service.in
++++ sheepdog.git/script/sheepdog.service.in
+@@ -1,7 +1,7 @@
+ [Unit]
+ Description=Sheepdog QEMU/KVM Block Storage
+ After=network.target
+-Wants=syslog.target
++After=corosync.service
+ 
+ [Service]
+ EnvironmentFile=- at SYSCONFDIR@/default/sheepdog
diff --git a/debian/rules b/debian/rules
index e56a21f..b05e7d9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,3 +22,5 @@ override_dh_auto_configure:
 	./autogen.sh
 	dh_auto_configure -- --enable-zookeeper --enable-systemd
 
+override_dh_systemd_enable:
+	dh_systemd_enable -p pve-sheepdog --name sheepdog sheepdog.service
-- 
2.1.4




More information about the pve-devel mailing list