Hello community,
here is the log from the commit of package ha-cluster-bootstrap for
openSUSE:Factory checked in at 2014-06-24 15:16:03
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ha-cluster-bootstrap (Old)
and /work/SRC/openSUSE:Factory/.ha-cluster-bootstrap.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ha-cluster-bootstrap"
Changes:
--------
---
/work/SRC/openSUSE:Factory/ha-cluster-bootstrap/ha-cluster-bootstrap.changes
2014-06-16 21:26:40.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.ha-cluster-bootstrap.new/ha-cluster-bootstrap.changes
2014-06-24 15:16:13.000000000 +0200
@@ -1,0 +2,7 @@
+Mon Jun 16 10:50:30 UTC 2014 - [email protected]
+
+- improve ha-cluster-init will check sbd watchdog, if watchdog not work,
+ confirm with user whether to use watchdog.
+ Add: improve-ha-cluster-init-check-sbd-watchdog-bnc-881484.patch-
+
+-------------------------------------------------------------------
New:
----
improve-ha-cluster-init-check-sbd-watchdog-bnc-881484.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ha-cluster-bootstrap.spec ++++++
--- /var/tmp/diff_new_pack.wDUw1p/_old 2014-06-24 15:16:13.000000000 +0200
+++ /var/tmp/diff_new_pack.wDUw1p/_new 2014-06-24 15:16:13.000000000 +0200
@@ -31,6 +31,8 @@
Patch2: 0002-Add-etc-drbd.conf-to-csync2-configuration-bnc-881683.patch
# PATCH-FIX: fix ha-cluster-init to init sbd configuration with new
style(bnc#881484)
Patch3: fix-ha-cluster-init-sbd-with-new-style-bnc-881484.patch
+# PATCH-IMPROVE: improve ha-cluster-init to check sbd watchdog
+Patch4: improve-ha-cluster-init-check-sbd-watchdog-bnc-881484.patch
Requires: csync2
Requires: hawk
@@ -52,6 +54,7 @@
%patch1 -p1
%patch2 -p1
%patch3 -p1
+%patch4 -p1
%build
%install
++++++ improve-ha-cluster-init-check-sbd-watchdog-bnc-881484.patch ++++++
Index: sleha-bootstrap-0.4+git.1396958965.7f1629a/scripts/ha-cluster-init
===================================================================
--- sleha-bootstrap-0.4+git.1396958965.7f1629a.orig/scripts/ha-cluster-init
+++ sleha-bootstrap-0.4+git.1396958965.7f1629a/scripts/ha-cluster-init
@@ -445,6 +445,25 @@ Configure SBD:
fi
done
SBD_DEVICE="$dev"
+
+ watchdog_dev=$(cat /etc/modules-load.d/watchdog.conf 2>&1|grep
watchdog-device |cut -d"=" -f2 >/dev/null 2>&1)
+ if [ -z "$watchdog_dev" ]; then
+ watchdog_dev="/dev/watchdog"
+ fi
+
+ sbd_watchdog="yes"
+ wdctl $watchdog_dev >/dev/null 2>&1
+ if [ $? -ne 0 ]; then
+ if confirm "Watchdog does not work. Do you still wish
to use watchdog for SBD?"; then
+ error "Please make sure watchdog works or
disable watchdog for SBD."
+ return
+ else
+ sbd_watchdog="no"
+ fi
+
+ fi
+ SBD_WATCHDOG="$sbd_watchdog"
+
fi
[ -b "$SBD_DEVICE" ] || error "SBD device $SBD_DEVICE does not exist"
@@ -488,7 +507,7 @@ SBD_STARTMODE=
#
# Whether to use a watchdog.
#
-SBD_WATCHDOG=
+SBD_WATCHDOG=$SBD_WATCHDOG
## Type: string
## Default: ""
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
