improved init script

Package-Manager: portage-2.0.51.19

1 files changed, 27 insertions, 17 deletions

diff --git a/sys-cluster/dlm/files/dlm.rc b/sys-cluster/dlm/files/dlm.rc
index c40a3f886af4..36f4750c9d49 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.2 2005/03/23 14:39:02 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/dlm/files/dlm.rc,v 1.3 2005/03/25 02:14:00 xmerlin Exp $
 
 depend() {
 	use net
@@ -9,35 +9,45 @@ depend() {
 	provide cluster-locking-manager
 }
 
+load_modules() {
+	local module modules
+	modules=$1
+	
+	for module in ${modules}; do
+		ebegin "Loading ${module} kernel module"
+		modprobe ${module}
+		eend $? "Failed to load ${module} kernel module"
+	done
+}
+
+unload_modules() {
+	local module modules
+	modules=$1
+	
+	for module in ${modules}; do
+		ebegin "Unloading ${module} kernel module"
+		modprobe -r ${module}
+		eend $? "Failed to unload ${module} kernel module"
+	done
+}
+
 start() {
 	ebegin "Loading dlm module"
-	modprobe dlm
+	load_modules dlm
 	eend $?
 }
 
 stop() {
 
-	local module modules
+	local modules
 
 	if [ -d /proc/cluster/lock_dlm ]; then
 		modules="${modules} lock_dlm"
 	fi
-	if [ -d /proc/cluster/dlm_dir ]; then
+	if [ -d /proc/cluster/config/dlm ]; 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
+	unload_modules ${modules}
 
 }