ocfs2-tools/ocfs2-devel.diff
Yan Gao 76184cf7b3 Accepting request 131534 from home:goldwynr:branches:network:ha-clustering:Factory
- Updated to 1.8.2
  - o2cluster: change cluster stack stamped on ocfs2 filesystem
  - added man pages ocfs2, ocfs2.cluster.conf, o2hbmonitor
  - fsck: faster fsck times because of aio; progress
- fix-indexed-dirs.patch: Fix corrupt indexed directories through
  fsck

OBS-URL: https://build.opensuse.org/request/show/131534
OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/ocfs2-tools?expand=0&rev=40
2012-08-26 23:53:00 +00:00

58 lines
1.7 KiB
Diff

Index: ocfs2-tools/vendor/common/o2cb.init.sh
===================================================================
--- ocfs2-tools.orig/vendor/common/o2cb.init.sh 2012-08-24 10:22:54.000000000 -0500
+++ ocfs2-tools/vendor/common/o2cb.init.sh 2012-08-24 10:23:09.000000000 -0500
@@ -8,7 +8,8 @@
# Provides: o2cb
# Required-Start: $network
# Should-Start:
-# Required-Stop:
+# Should-Stop:
+# Required-Stop: $null
# Default-Start: 2 3 5
# Default-Stop:
# Short-Description: Load O2CB cluster services at system boot.
@@ -671,7 +672,7 @@ status_filesystem()
status_daemon()
{
- DAEMON="/sbin/ocfs2_controld.${O2CB_STACK}"
+ DAEMON="/usr/sbin/ocfs2_controld.${O2CB_STACK}"
echo -n "Checking for control daemon: "
if [ -n "$(pidofproc "$DAEMON")" ]
then
@@ -700,6 +701,7 @@ bringup_daemon()
fi
sleep 1
done
+ sleep 2
return 0
}
@@ -707,7 +709,7 @@ bringup_daemon()
kill_daemon()
{
SIGNAL="$1"
- DAEMON="/sbin/ocfs2_controld.${O2CB_STACK}"
+ DAEMON="/usr/sbin/ocfs2_controld.${O2CB_STACK}"
status_daemon >/dev/null 2>&1 || return 2
Index: ocfs2-tools/vendor/common/ocfs2.init
===================================================================
--- ocfs2-tools.orig/vendor/common/ocfs2.init 2012-08-24 10:22:54.000000000 -0500
+++ ocfs2-tools/vendor/common/ocfs2.init 2012-08-24 10:23:09.000000000 -0500
@@ -8,9 +8,9 @@
### BEGIN INIT INFO
# Provides: ocfs2
# Required-Start: $network o2cb
-# Required-Stop:
-# X-UnitedLinux-Should-Start:
-# X-UnitedLinux-Should-Stop:
+# Required-Stop: $null
+# Should-Start:
+# Should-Stop:
# Default-Start: 2 3 5
# Default-Stop:
# Short-Description: Mount OCFS2 volumes at boot.