summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Zoffoli <xmerlin@gentoo.org>2007-10-05 20:55:59 +0000
committerChristian Zoffoli <xmerlin@gentoo.org>2007-10-05 20:55:59 +0000
commit10bc64aa92591ac4fb03120b7840f43eafb5a318 (patch)
treee496fd2f4b410d292bb62a0a000a030a7032f609 /sys-cluster
parentQuote DESTDIR. (diff)
downloadgentoo-2-10bc64aa92591ac4fb03120b7840f43eafb5a318.tar.gz
gentoo-2-10bc64aa92591ac4fb03120b7840f43eafb5a318.tar.bz2
gentoo-2-10bc64aa92591ac4fb03120b7840f43eafb5a318.zip
Fixed bug #191231, replaced exit with return in init script.
(Portage version: 2.1.3.9)
Diffstat (limited to 'sys-cluster')
-rw-r--r--sys-cluster/drbd/ChangeLog5
-rwxr-xr-xsys-cluster/drbd/files/drbd-0.7.rc6
2 files changed, 7 insertions, 4 deletions
diff --git a/sys-cluster/drbd/ChangeLog b/sys-cluster/drbd/ChangeLog
index 6a697f30ee7f..3b76521ddc01 100644
--- a/sys-cluster/drbd/ChangeLog
+++ b/sys-cluster/drbd/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for sys-cluster/drbd
# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/drbd/ChangeLog,v 1.75 2007/10/05 20:34:56 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/drbd/ChangeLog,v 1.76 2007/10/05 20:55:59 xmerlin Exp $
+
+ 05 Oct 2007; Christian Zoffoli <xmerlin@gentoo.org> files/drbd-0.7.rc:
+ Fixed bug #191231, replaced exit with return in init script.
05 Oct 2007; Christian Zoffoli <xmerlin@gentoo.org> drbd-0.7.24.ebuild,
drbd-0.7.24-r1.ebuild, drbd-8.0.6-r1.ebuild:
diff --git a/sys-cluster/drbd/files/drbd-0.7.rc b/sys-cluster/drbd/files/drbd-0.7.rc
index 19619cf85dd6..d73c8aa39dd3 100755
--- a/sys-cluster/drbd/files/drbd-0.7.rc
+++ b/sys-cluster/drbd/files/drbd-0.7.rc
@@ -1,7 +1,7 @@
#!/sbin/runscript
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/drbd/files/drbd-0.7.rc,v 1.1 2006/05/20 14:00:44 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/drbd/files/drbd-0.7.rc,v 1.2 2007/10/05 20:55:59 xmerlin Exp $
opts="${opts} reload"
@@ -26,9 +26,9 @@ load_module() {
fi
# make sure udev has time to create the device files
- RESOURCE=`${DRBDADM} sh-resources` || exit 20
+ RESOURCE=`${DRBDADM} sh-resources` || return 20
RESOURCE=${RESOURCE%%\ *}
- DEVICE=`${DRBDADM} sh-dev ${RESOURCE}` || exit 20
+ DEVICE=`${DRBDADM} sh-dev ${RESOURCE}` || return 20
while [ ! -e ${DEVICE} ] && [ ${UDEV_TIMEOUT} -gt 0 ] ; do
sleep 1