rpm/drbd
SHA256
1
0
Fork 0
forked from pool/drbd
Code Pull Requests Activity

Accepting request 127449 from Base:System

Browse Source 
(forwarded request 127448 from tserong)

OBS-URL: https://build.opensuse.org/request/show/127449
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/drbd?expand=0&rev=39
This commit is contained in:
Stephan Kulow 2012-07-10 11:41:01 +00:00 committed by Git OBS Bridge
parent 8b1ddb6695
commit 66ad1cdeb8
3 changed files with 28 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drbd.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Jul 10 07:51:21 UTC 2012 - tserong@suse.com
- Don't use /var/lock/subsys in init script (bnc#714643)
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Dec 16 03:45:16 UTC 2011 - tserong@suse.com Fri Dec 16 03:45:16 UTC 2011 - tserong@suse.com

6
drbd.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package drbd # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -15,6 +15,7 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/ # Please submit bugfixes or comments via http://bugs.opensuse.org/
# #
Name: drbd Name: drbd
BuildRequires: bison BuildRequires: bison
BuildRequires: flex BuildRequires: flex
@ -26,7 +27,8 @@ Version: 8.3.11
Release: 0 Release: 0
Source: %{name}-%{version}.tar.bz2 Source: %{name}-%{version}.tar.bz2
Patch1: init-script-fixes.diff Patch1: init-script-fixes.diff
Provides: drbdsetup drbd-control Provides: drbd-control
Provides: drbdsetup
Url: http://www.drbd.org/ Url: http://www.drbd.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires(post): %insserv_prereq %fillup_prereq Requires(post): %insserv_prereq %fillup_prereq

20
init-script-fixes.diff
View File

@ -1,4 +1,6 @@
--- scripts/drbd Index: scripts/drbd
===================================================================
--- scripts/drbd.orig
+++ scripts/drbd +++ scripts/drbd
@@ -9,8 +9,8 @@ @@ -9,8 +9,8 @@
# #
@ -11,3 +13,19 @@
# Should-Start: sshd multipathd # Should-Start: sshd multipathd
# Should-Stop: sshd multipathd # Should-Stop: sshd multipathd
# Default-Start: 2 3 4 5 # 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)