SOURCES: open-iscsi.init, open-iscsi.sysconfig - fixed

[kosmo]

Author: kosmo                        Date: Mon Mar  3 16:11:30 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- fixed

---- Files affected:
SOURCES:
   open-iscsi.init (1.2 -> 1.3) , open-iscsi.sysconfig (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/open-iscsi.init
diff -u SOURCES/open-iscsi.init:1.2 SOURCES/open-iscsi.init:1.3
--- SOURCES/open-iscsi.init:1.2	Thu Dec  8 02:02:49 2005
+++ SOURCES/open-iscsi.init	Mon Mar  3 17:11:24 2008
@@ -5,7 +5,6 @@
 # chkconfig:	2345 11 20
 # description:	Start iSCSI to allow access to remote SCSI devices
 #
-# pidfile:	/var/run/iscsid.pid
 
 # Source function library.
 . /etc/rc.d/init.d/functions
@@ -28,18 +27,16 @@
 	exit 0
 fi
 
-[ -z "$ISCSI_CONNFAILTIMEOUT" ] && ISCSI_CONNFAILTIMEOUT=30
-
 RETVAL=0
-# See how we were called.
 case "$1" in
   start)
 	# Start daemons.
 	if [ ! -f /var/lock/subsys/iscsid ]; then
 		msg_starting "iSCSI Initiator"
-		daemon iscsid
+		daemon iscsid -u iscsi -g iscsi
 		RETVAL=$?
 		[ $RETVAL -eq 0 ] && touch /var/lock/subsys/iscsid
+		run_cmd "Logging into iSCSI targets" iscsiadm -m node -L automatic
 	else
 		msg_already_running "iSCSI Initiator"
 	fi
@@ -47,6 +44,7 @@
   stop)
 	# Stop daemons.
 	if [ -f /var/lock/subsys/iscsid ]; then
+		run_cmd "Logging out from iSCSI targets" iscsiadm -m node -U all
 		msg_stopping "iSCSI Initiator"
 		killproc iscsid
 		rm -f /var/lock/subsys/iscsid >/dev/null 2>&1
@@ -63,13 +61,8 @@
 	status iscsid
 	exit $?
 	;;
-#  reload)
-#	msg_reloading iscsi
-#	killproc iscsi -HUP
-#	;;
   *)
 	msg_usage "$0 {start|stop|restart|force-reload|status}"
 	exit 3
 esac
-
 exit $RETVAL

================================================================
Index: SOURCES/open-iscsi.sysconfig
diff -u SOURCES/open-iscsi.sysconfig:1.1 SOURCES/open-iscsi.sysconfig:1.2
--- SOURCES/open-iscsi.sysconfig:1.1	Tue Aug  9 21:42:46 2005
+++ SOURCES/open-iscsi.sysconfig	Mon Mar  3 17:11:25 2008
@@ -1,2 +1 @@
-# iscsi options
-
+# Open-iSCSI Options:
================================================================

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