[Debian-ha-commits] [ocfs2-tools] 01/07: debian/rules: include upstream systemd services

[Valentin Vidic]

This is an automated email from the git hooks/post-receive script.

vvidic-guest pushed a commit to branch master
in repository ocfs2-tools.

commit 2030cfccc1b16ee9e9a74eb03bbf7e18cb1b4078
Author: Valentin Vidic <Valentin.Vidic at CARNet.hr>
Date:   Thu Jul 6 08:12:57 2017 +0200

    debian/rules: include upstream systemd services
---
 debian/patches/series                |  1 +
 debian/patches/systemd-service.patch | 35 +++++++++++++++++++++++++++++++++++
 debian/rules                         |  2 ++
 3 files changed, 38 insertions(+)

diff --git a/debian/patches/series b/debian/patches/series
index 3bcdede..78cd504 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ libo2dlm-dlopen-libdlm_lt.patch
 ocfs2-init-script.patch
 o2cb-init-script.patch
 dead_threshold.patch
+systemd-service.patch
diff --git a/debian/patches/systemd-service.patch b/debian/patches/systemd-service.patch
new file mode 100644
index 0000000..ea42f89
--- /dev/null
+++ b/debian/patches/systemd-service.patch
@@ -0,0 +1,35 @@
+--- a/vendor/common/o2cb.service
++++ b/vendor/common/o2cb.service
+@@ -1,13 +1,13 @@
+ [Unit]
+ Description=Load o2cb Modules
+-Requires=network.service
+-After=network.service
++Requires=network-online.target
++After=network-online.target
+ 
+ [Service]
+ Type=oneshot
+ RemainAfterExit=yes
+-ExecStart=/sbin/o2cb.init enable
+-ExecStop=/sbin/o2cb.init disable
++ExecStart=/etc/init.d/o2cb start
++ExecStop=/etc/init.d/o2cb stop
+ 
+ [Install]
+ WantedBy=multi-user.target
+--- a/vendor/common/ocfs2.service
++++ b/vendor/common/ocfs2.service
+@@ -6,9 +6,9 @@
+ [Service]
+ Type=oneshot
+ RemainAfterExit=yes
+-ExecStart=/sbin/ocfs2.init start
+-ExecStop=/sbin/ocfs2.init stop
+-ExecReload=/sbin/ocfs2.init restart
++ExecStart=/etc/init.d/ocfs2 start
++ExecStop=/etc/init.d/ocfs2 stop
++ExecReload=/etc/init.d/ocfs2 restart
+ 
+ [Install]
+ WantedBy=multi-user.target
diff --git a/debian/rules b/debian/rules
index bf177f5..7351196 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,5 +15,7 @@ override_dh_auto_configure:
 override_dh_installinit:
 	cp -f vendor/common/o2cb.init debian/ocfs2-tools.o2cb.init
 	cp -f vendor/common/ocfs2.init debian/ocfs2-tools.ocfs2.init
+	cp -f vendor/common/o2cb.service debian/ocfs2-tools.o2cb.service
+	cp -f vendor/common/ocfs2.service debian/ocfs2-tools.ocfs2.service
 	dh_installinit -pocfs2-tools --name=o2cb --no-restart-on-upgrade
 	dh_installinit -pocfs2-tools --name=ocfs2 --no-restart-on-upgrade

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-ha/ocfs2-tools.git