SOURCES: open-iscsi.init - use functions

glen glen at pld-linux.org
Mon Mar 3 20:36:00 CET 2008


Author: glen                         Date: Mon Mar  3 19:36:00 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- use functions

---- Files affected:
SOURCES:
   open-iscsi.init (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: SOURCES/open-iscsi.init
diff -u SOURCES/open-iscsi.init:1.3 SOURCES/open-iscsi.init:1.4
--- SOURCES/open-iscsi.init:1.3	Mon Mar  3 17:11:24 2008
+++ SOURCES/open-iscsi.init	Mon Mar  3 20:35:54 2008
@@ -27,9 +27,7 @@
 	exit 0
 fi
 
-RETVAL=0
-case "$1" in
-  start)
+start() {
 	# Start daemons.
 	if [ ! -f /var/lock/subsys/iscsid ]; then
 		msg_starting "iSCSI Initiator"
@@ -40,8 +38,9 @@
 	else
 		msg_already_running "iSCSI Initiator"
 	fi
-	;;
-  stop)
+}
+
+stop() {
 	# Stop daemons.
 	if [ -f /var/lock/subsys/iscsid ]; then
 		run_cmd "Logging out from iSCSI targets" iscsiadm -m node -U all
@@ -51,11 +50,19 @@
 	else
 		msg_not_running "iSCSI Initiator"
 	fi
+}
+
+RETVAL=0
+case "$1" in
+  start)
+  	start
+	;;
+  stop)
+  	stop
 	;;
   restart|force-reload)
-	$0 stop
-	$0 start
-	exit $?
+	stop
+	start
 	;;
   status)
 	status iscsid
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/open-iscsi.init?r1=1.3&r2=1.4&f=u



More information about the pld-cvs-commit mailing list