[Debian-ha-commits] [corosync] 03/05: Use debian initscript within corosync.service

[Adrian Vondendriesch]

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

discostu-guest pushed a commit to branch master
in repository corosync.

commit 1270c3039ff19d57a95f622934279f51acdf8db5
Author: Adrian Vondendriesch <adrian.vondendriesch at credativ.de>
Date:   Fri May 1 18:36:23 2015 +0200

    Use debian initscript within corosync.service
    
    Signed-off-by: Adrian Vondendriesch <adrian.vondendriesch at credativ.de>
---
 debian/changelog                                          |  4 +++-
 ...-debian-sysv-initscript-in-corosync.service-file.patch | 15 +++++++++++++++
 debian/patches/series                                     |  3 ++-
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c8626cf..fdb01a2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -76,7 +76,9 @@ corosync (2.3.4-1) UNRELEASED; urgency=medium
     documentation.
   * Add myself to Uploaders.
   * Install upstream systemd service files for corsync and corosync-notifyd.
-  * debian/patches: patch upstream corosync-notifyd.service file.
+  * debian/patches:
+    - Patch upstream corosync-notifyd.service file
+    - Use debian initscript within corosync.service
   * Add OPTIONS within /etc/default/corosync-notifyd
 
  -- Richard B Winters <rik at mmogp.com>  Wed, 22 Apr 2015 15:51:34 -0400
diff --git a/debian/patches/0013-use-debian-sysv-initscript-in-corosync.service-file.patch b/debian/patches/0013-use-debian-sysv-initscript-in-corosync.service-file.patch
new file mode 100644
index 0000000..269d091
--- /dev/null
+++ b/debian/patches/0013-use-debian-sysv-initscript-in-corosync.service-file.patch
@@ -0,0 +1,15 @@
+Modify init/corosync.service.in to use debian sysV-initscript instead of
+upstream sysV-initscript.
+--- a/init/corosync.service.in
++++ b/init/corosync.service.in
+@@ -5,8 +5,8 @@
+ After=network-online.target
+ 
+ [Service]
+-ExecStart=@INITWRAPPERSDIR@/corosync start
+-ExecStop=@INITWRAPPERSDIR@/corosync stop
++ExecStart=/etc/default/corosync start
++ExecStop=/etc/default/corosync stop
+ Type=forking
+ 
+ # The following config is for corosync with enabled watchdog service.
diff --git a/debian/patches/series b/debian/patches/series
index 233bf76..e1239bf 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-0012-Debianize-corosync-notifyd-systemd-service-file.patch
 0001-Add-missing-ChangeLog-to-source-directory.patch
 0002-Fix-incorrect-spelling-of-retrieve-from-retreive.patch
 0003-Add-section-in-manual-title-for-cpg_zcb_alloc-3.patch
@@ -10,3 +9,5 @@
 0009-Fix-spelling-error-in-binary-corosync-cfgtool.patch
 0010-Fix-spelling-error-in-binary-corosync.patch
 0011-Remove-deprecated-doxygen-flags.patch
+0012-Debianize-corosync-notifyd-systemd-service-file.patch
+0013-use-debian-sysv-initscript-in-corosync.service-file.patch

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