summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'sys-cluster')
-rw-r--r--sys-cluster/dlm/ChangeLog5
-rwxr-xr-xsys-cluster/dlm/files/dlm.rc28
2 files changed, 28 insertions, 5 deletions
diff --git a/sys-cluster/dlm/ChangeLog b/sys-cluster/dlm/ChangeLog
index 7e9c48260564..dd6d01018327 100644
--- a/sys-cluster/dlm/ChangeLog
+++ b/sys-cluster/dlm/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for sys-cluster/dlm
# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/dlm/ChangeLog,v 1.8 2005/03/23 02:39:25 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/dlm/ChangeLog,v 1.9 2005/03/23 14:39:02 xmerlin Exp $
+
+ 23 Mar 2005; Christian Zoffoli <xmerlin@gentoo.org> files/dlm.rc:
+ added lock_dlm module unload in init
23 Mar 2005; Christian Zoffoli <xmerlin@gentoo.org> dlm-1.0_pre21.ebuild:
ebuild cleanup
diff --git a/sys-cluster/dlm/files/dlm.rc b/sys-cluster/dlm/files/dlm.rc
index 620b4fe9b58b..c40a3f886af4 100755
--- a/sys-cluster/dlm/files/dlm.rc
+++ b/sys-cluster/dlm/files/dlm.rc
@@ -1,7 +1,7 @@
#!/sbin/runscript
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/dlm/files/dlm.rc,v 1.1 2005/03/22 13:39:42 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/dlm/files/dlm.rc,v 1.2 2005/03/23 14:39:02 xmerlin Exp $
depend() {
use net
@@ -16,8 +16,28 @@ start() {
}
stop() {
- ebegin "Removing dlm module"
- modprobe -r dlm &>/dev/null
- eend $?
+
+ local module modules
+
+ if [ -d /proc/cluster/lock_dlm ]; then
+ modules="${modules} lock_dlm"
+ fi
+ if [ -d /proc/cluster/dlm_dir ]; then
+ modules="${modules} dlm"
+ fi
+
+ local module
+ for module in ${modules}; do
+ ebegin "Unloading ${module} kernel module"
+ modprobe -r ${module}
+
+ if [ "$?" -ne 0 ]
+ then
+ ewend 1 "Failed to unload ${module} kernel module"
+ else
+ eend 0
+ fi
+ done
+
}