* [gentoo-commits] gentoo-x86 commit in sys-cluster/drbd/files: drbd-8.0.rc drbd-0.7.rc
@ 2010-08-02 4:42 Kacper Kowalik (xarthisius)
0 siblings, 0 replies; only message in thread
From: Kacper Kowalik (xarthisius) @ 2010-08-02 4:42 UTC (permalink / raw
To: gentoo-commits
xarthisius 10/08/02 04:42:37
Modified: drbd-8.0.rc drbd-0.7.rc
Log:
Check if drbd was built as a module before removing it. Fixes bug 330295. Thanks to Anthony Basile <blueness@gentoo.org> for the patch
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Revision Changes Path
1.6 sys-cluster/drbd/files/drbd-8.0.rc
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/drbd/files/drbd-8.0.rc?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/drbd/files/drbd-8.0.rc?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/drbd/files/drbd-8.0.rc?r1=1.5&r2=1.6
Index: drbd-8.0.rc
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-cluster/drbd/files/drbd-8.0.rc,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- drbd-8.0.rc 12 Nov 2007 00:18:35 -0000 1.5
+++ drbd-8.0.rc 2 Aug 2010 04:42:36 -0000 1.6
@@ -1,7 +1,7 @@
#!/sbin/runscript
# Copyright 1999-2007 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-8.0.rc,v 1.5 2007/11/12 00:18:35 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/drbd/files/drbd-8.0.rc,v 1.6 2010/08/02 04:42:36 xarthisius Exp $
opts="${opts} reload"
@@ -118,7 +118,9 @@
if [ -e ${PROC_DRBD} ]; then
${DRBDADM} down all
sleep 3
- ${RMMOD} drbd
+ if grep -q '^drbd' /proc/modules ; then
+ ${RMMOD} drbd
+ fi
fi
ret=$?
eend $ret
1.3 sys-cluster/drbd/files/drbd-0.7.rc
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/drbd/files/drbd-0.7.rc?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/drbd/files/drbd-0.7.rc?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/drbd/files/drbd-0.7.rc?r1=1.2&r2=1.3
Index: drbd-0.7.rc
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-cluster/drbd/files/drbd-0.7.rc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- drbd-0.7.rc 5 Oct 2007 20:55:59 -0000 1.2
+++ drbd-0.7.rc 2 Aug 2010 04:42:36 -0000 1.3
@@ -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.2 2007/10/05 20:55:59 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/drbd/files/drbd-0.7.rc,v 1.3 2010/08/02 04:42:36 xarthisius Exp $
opts="${opts} reload"
@@ -50,7 +50,9 @@
if ! grep -q '^/dev/drbd' /proc/mounts &>/dev/null; then
if [ -f ${PROC_DRBD} ]; then
${DRBDADM} down all
- ${RMMOD} drbd
+ if grep -q '^drbd' /proc/modules ; then
+ ${RMMOD} drbd
+ fi
fi
eend $?
else
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2010-08-02 5:02 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-08-02 4:42 [gentoo-commits] gentoo-x86 commit in sys-cluster/drbd/files: drbd-8.0.rc drbd-0.7.rc Kacper Kowalik (xarthisius)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox