rpms/iscsi-initiator-utils/devel iscsi-initiator-utils-start-iscsid.patch, 1.1, 1.2 iscsi-initiator-utils.spec, 1.33, 1.34 iscsid.init, 1.6, 1.7

[Hans de Goede]

Author: jwrdegoede

Update of /cvs/pkgs/rpms/iscsi-initiator-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv738

Modified Files:
	iscsi-initiator-utils-start-iscsid.patch 
	iscsi-initiator-utils.spec iscsid.init 
Log Message:
* Thu Nov  6 2008 Hans de Goede <hdegoede at redhat.com> 6.2.0.870-0.2.rc1
- Add force-start iscsid initscript option and use that in "patch to make
  iscsiadm start iscsid when needed" so that iscsid will actual be started
  even if there are no iscsi disks configured yet (rh 470437)
- Do not start iscsid when not running when iscsiadm -k 0 gets executed
  (rh 470438)


iscsi-initiator-utils-start-iscsid.patch:

Index: iscsi-initiator-utils-start-iscsid.patch
===================================================================
RCS file: /cvs/pkgs/rpms/iscsi-initiator-utils/devel/iscsi-initiator-utils-start-iscsid.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- iscsi-initiator-utils-start-iscsid.patch	13 Oct 2008 18:12:29 -0000	1.1
+++ iscsi-initiator-utils-start-iscsid.patch	8 Nov 2008 12:44:13 -0000	1.2
@@ -36,7 +36,7 @@
  	memset(&req, 0, sizeof(req));
  	req.command = MGMT_IPC_IMMEDIATE_STOP;
 -	rc = do_iscsid(&req, &rsp);
-+	rc = do_iscsid(&req, &rsp, 1);
++	rc = do_iscsid(&req, &rsp, 0);
  	if (rc) {
  		iscsid_handle_error(rc);
  		log_error("Could not stop iscsid. Trying sending iscsid "
@@ -129,7 +129,7 @@
 -			break;
 +		if (errno == ECONNREFUSED) {
 +			if (iscsid_start && nsec == 1)
-+				system("/etc/rc.d/init.d/iscsid start");
++				system("/etc/rc.d/init.d/iscsid force-start");
 +			else
 +				break;
 +		}


Index: iscsi-initiator-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iscsi-initiator-utils/devel/iscsi-initiator-utils.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- iscsi-initiator-utils.spec	30 Sep 2008 12:21:47 -0000	1.33
+++ iscsi-initiator-utils.spec	8 Nov 2008 12:44:13 -0000	1.34
@@ -1,7 +1,7 @@
 Summary: iSCSI daemon and utility programs
 Name: iscsi-initiator-utils
 Version: 6.2.0.870
-Release: 0.1.rc1%{?dist}
+Release: 0.2.rc1%{?dist}
 Source0: http://www.open-iscsi.org/bits/open-iscsi-2.0-870-rc1.tar.gz
 Source1: iscsid.init
 Source2: iscsidevs.init
@@ -117,6 +117,13 @@
 
 
 %changelog
+* Thu Nov  6 2008 Hans de Goede <hdegoede at redhat.com> 6.2.0.870-0.2.rc1
+- Add force-start iscsid initscript option and use that in "patch to make
+  iscsiadm start iscsid when needed" so that iscsid will actual be started
+  even if there are no iscsi disks configured yet (rh 470437)
+- Do not start iscsid when not running when iscsiadm -k 0 gets executed
+  (rh 470438)
+
 * Tue Sep 30 2008 Hans de Goede <hdegoede at redhat.com> 6.2.0.870-0.1.rc1
 - Rewrite SysV initscripts, fixes rh 441290, 246960, 282001, 436175, 430791
 - Add patch to make iscsiadm complain and exit when run as user instead


Index: iscsid.init
===================================================================
RCS file: /cvs/pkgs/rpms/iscsi-initiator-utils/devel/iscsid.init,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- iscsid.init	30 Sep 2008 12:21:47 -0000	1.6
+++ iscsid.init	8 Nov 2008 12:44:13 -0000	1.7
@@ -33,6 +33,17 @@
     [[ "$rootopts" =~ "_netdev" ]]
 }
 
+force_start() {
+    echo -n $"Starting $prog: "
+    modprobe -q iscsi_tcp
+    modprobe -q ib_iser
+    daemon $prog
+    retval=$?
+    echo
+    [ $retval -eq 0 ] && touch $lockfile
+    return $retval
+}
+
 start() {
     [ -x $exec ] || exit 5
     [ -f $config ] || exit 6
@@ -40,14 +51,8 @@
     # only start if nodes are setup to startup automatically or root is iscsi
     grep -qrs "node.startup = automatic" /var/lib/iscsi/nodes
     if [ $? -eq 0 ] || root_is_iscsi; then
-        echo -n $"Starting $prog: "
-	modprobe -q iscsi_tcp
-	modprobe -q ib_iser
-	daemon $prog
-        retval=$?
-        echo
-        [ $retval -eq 0 ] || return 1 
-        touch $lockfile
+        force_start
+        return $?
     fi
 
     return 0
@@ -102,6 +107,9 @@
         rh_status_q && exit 0
         $1
         ;;
+    force-start)
+        force_start
+        ;;
     stop)
         rh_status_q || exit 0
         $1