Hello community,
here is the log from the commit of package ha-cluster-bootstrap for
openSUSE:Factory checked in at 2014-06-30 21:45:10
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-24 15:16:13.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.ha-cluster-bootstrap.new/ha-cluster-bootstrap.changes
2014-06-30 21:45:34.000000000 +0200
@@ -1,0 +2,7 @@
+
+Fri Jun 20 02:26:46 UTC 2014 - lw...@suse.com
+
+- used `sed` only change the values present
+ add: fix-ha-cluster-init-not-to-overwrite-sbd-conf-881484.patch
+
+-------------------------------------------------------------------
New:
----
fix-ha-cluster-init-not-to-overwrite-sbd-conf-881484.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ha-cluster-bootstrap.spec ++++++
--- /var/tmp/diff_new_pack.YkE7En/_old 2014-06-30 21:45:36.000000000 +0200
+++ /var/tmp/diff_new_pack.YkE7En/_new 2014-06-30 21:45:36.000000000 +0200
@@ -33,6 +33,8 @@
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
+# PATCH-FIX:
+Patch5: fix-ha-cluster-init-not-to-overwrite-sbd-conf-881484.patch
Requires: csync2
Requires: hawk
@@ -55,6 +57,7 @@
%patch2 -p1
%patch3 -p1
%patch4 -p1
+%patch5 -p1
%build
%install
++++++ fix-ha-cluster-init-not-to-overwrite-sbd-conf-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
@@ -474,50 +474,10 @@ Configure SBD:
status_long 'Initializing SBD...'
invoke sbd -d $SBD_DEVICE create || error "Failed to initialize SBD
device"
status_done
+
+ sed -i -e "s/SBD_DEVICE=.*/SBD_DEVICE=\"$(echo $SBD_DEVICE | sed
's/\//\\\//g')\"/g" $SYSCONFIG_SBD
+ sed -i -e "s/SBD_WATCHDOG=.*/SBD_WATCHDOG=$SBD_WATCHDOG/g"
$SYSCONFIG_SBD
- local tmp_conf=$SYSCONFIG_SBD.$$
- cat > $tmp_conf <<END
-## Type: string
-## Default: ""
-#
-# SBD_DEVICE specifies the devices to use for exchanging sbd messages
-# and to monitor. If specifying more than one path, use ";" as
-# separator.
-#
-SBD_DEVICE="$SBD_DEVICE"
-
-## Type: yesno
-## Default: yes
-#
-# Whether to enable the pacemaker integration.
-#
-SBD_PACEMAKER=
-
-## Type: list(always,clean)
-## Default: always
-#
-# Specify the start mode for sbd. Setting this to "clean" will only
-# allow sbd to start if it was not previously fenced. See the -S option
-# in the man page.
-#
-SBD_STARTMODE=
-
-## Type: yesno
-## Default: yes
-#
-# Whether to use a watchdog.
-#
-SBD_WATCHDOG=$SBD_WATCHDOG
-
-## Type: string
-## Default: ""
-#
-# Additional options for starting sbd
-#
-SBD_OPTS=
-
-END
- install_tmp $tmp_conf $SYSCONFIG_SBD
invoke csync2 -m $SYSCONFIG_SBD
invoke csync2 -f $SYSCONFIG_SBD
invoke csync2 -xv $SYSCONFIG_SBD
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
