[Debian-ha-commits] [ocfs2-tools] 02/06: Move init scripts out of rcS

[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 deac2edd98bda861100696611421e067fc4e8961
Author: Valentin Vidic <Valentin.Vidic at CARNet.hr>
Date:   Thu Jul 7 21:47:49 2016 +0200

    Move init scripts out of rcS
---
 debian/ocfs2-tools.lintian-overrides   |  7 -------
 debian/patches/o2cb-init-script.patch  | 10 ++++------
 debian/patches/ocfs2-init-script.patch | 10 ++++------
 3 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/debian/ocfs2-tools.lintian-overrides b/debian/ocfs2-tools.lintian-overrides
deleted file mode 100644
index ce9740d..0000000
--- a/debian/ocfs2-tools.lintian-overrides
+++ /dev/null
@@ -1,7 +0,0 @@
-# ocfs2 should only be stopped on shutdown or reboot
-ocfs2-tools: init.d-script-possible-missing-stop etc/init.d/ocfs2 1
-ocfs2-tools: init.d-script-possible-missing-stop etc/init.d/o2cb 1
-
-# too complex for systemd right now
-ocfs2-tools: systemd-no-service-for-init-rcS-script o2cb
-ocfs2-tools: systemd-no-service-for-init-rcS-script ocfs2
diff --git a/debian/patches/o2cb-init-script.patch b/debian/patches/o2cb-init-script.patch
index 47458bb..1a5e1c1 100644
--- a/debian/patches/o2cb-init-script.patch
+++ b/debian/patches/o2cb-init-script.patch
@@ -1,7 +1,5 @@
-Index: my/vendor/common/o2cb.init.sh
-===================================================================
---- my.orig/vendor/common/o2cb.init.sh
-+++ my/vendor/common/o2cb.init.sh
+--- a/vendor/common/o2cb.init.sh
++++ b/vendor/common/o2cb.init.sh
 @@ -6,11 +6,11 @@
  #
  ### BEGIN INIT INFO
@@ -13,8 +11,8 @@ Index: my/vendor/common/o2cb.init.sh
 -# Default-Start: 2 3 5
 -# Default-Stop:
 +# Required-Stop: $network $local_fs
-+# Default-Start: S
-+# Default-Stop: 0 6
++# Default-Start: 2 3 4 5
++# Default-Stop: 0 1 6
  # Short-Description: Load O2CB cluster services at system boot.
  # Description: Load O2CB cluster services at system boot.
  ### END INIT INFO
diff --git a/debian/patches/ocfs2-init-script.patch b/debian/patches/ocfs2-init-script.patch
index aa93aa5..3fe0326 100644
--- a/debian/patches/ocfs2-init-script.patch
+++ b/debian/patches/ocfs2-init-script.patch
@@ -1,7 +1,5 @@
-Index: my/vendor/common/ocfs2.init
-===================================================================
---- my.orig/vendor/common/ocfs2.init
-+++ my/vendor/common/ocfs2.init
+--- a/vendor/common/ocfs2.init
++++ b/vendor/common/ocfs2.init
 @@ -7,16 +7,25 @@
  #
  ### BEGIN INIT INFO
@@ -15,8 +13,8 @@ Index: my/vendor/common/ocfs2.init
 -# Default-Start:  2 3 5
 -# Default-Stop:
 +# X-Stop-After: sendsigs
-+# Default-Start: S
-+# Default-Stop: 0 6
++# Default-Start: 2 3 4 5
++# Default-Stop: 0 1 6
  # Short-Description: Mount OCFS2 volumes at boot.
  # Description:  Mount OCFS2 volumes at boot.
  ### END INIT INFO

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