Hello community, here is the log from the commit of package drbd for openSUSE:Factory checked in at 2012-07-10 13:41:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/drbd (Old) and /work/SRC/openSUSE:Factory/.drbd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "drbd", Maintainer is "l...@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/drbd/drbd.changes 2011-12-21 09:59:58.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.drbd.new/drbd.changes 2012-07-10 13:41:02.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Jul 10 07:51:21 UTC 2012 - tser...@suse.com + +- Don't use /var/lock/subsys in init script (bnc#714643) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ drbd.spec ++++++ --- /var/tmp/diff_new_pack.onlvSo/_old 2012-07-10 13:41:05.000000000 +0200 +++ /var/tmp/diff_new_pack.onlvSo/_new 2012-07-10 13:41:05.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package drbd # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: drbd BuildRequires: bison BuildRequires: flex @@ -26,7 +27,8 @@ Release: 0 Source: %{name}-%{version}.tar.bz2 Patch1: init-script-fixes.diff -Provides: drbdsetup drbd-control +Provides: drbd-control +Provides: drbdsetup Url: http://www.drbd.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires(post): %insserv_prereq %fillup_prereq ++++++ init-script-fixes.diff ++++++ --- /var/tmp/diff_new_pack.onlvSo/_old 2012-07-10 13:41:05.000000000 +0200 +++ /var/tmp/diff_new_pack.onlvSo/_new 2012-07-10 13:41:05.000000000 +0200 @@ -1,4 +1,6 @@ ---- scripts/drbd +Index: scripts/drbd +=================================================================== +--- scripts/drbd.orig +++ scripts/drbd @@ -9,8 +9,8 @@ # @@ -11,3 +13,19 @@ # Should-Start: sshd multipathd # Should-Stop: sshd multipathd # Default-Start: 2 3 4 5 +@@ -184,7 +184,6 @@ case "$1" in + done + done + +- [ -d /var/lock/subsys ] && touch /var/lock/subsys/drbd # for RedHat + $DRBDADM wait-con-int # User interruptible version of wait-connect all + + $DRBDADM sh-b-pri all # Become primary if configured +@@ -211,7 +210,6 @@ case "$1" in + _udev_settle &> /dev/null + $RMMOD drbd + fi +- [ -f /var/lock/subsys/drbd ] && rm /var/lock/subsys/drbd + log_end_msg 0 + ;; + status) -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
