tags 499508 +pending
thanks

Hi,

attached interdiff for my NMU of open-iscsi fixes booting from iscsi
root filesystem.

        Norbert
diff -u open-iscsi-2.0.870~rc3/debian/changelog open-iscsi-2.0.870~rc3/debian/changelog
--- open-iscsi-2.0.870~rc3/debian/changelog
+++ open-iscsi-2.0.870~rc3/debian/changelog
@@ -1,3 +1,13 @@
+open-iscsi (2.0.870~rc3-0.2) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Drop patch from iscsistart.c which breaks booting from iscsi.
+    (closes: #499508)
+  * Drop patch from version.h which adds an outdated upstream version
+    number.
+
+ -- Norbert Tretkowski <[EMAIL PROTECTED]>  Fri, 10 Oct 2008 10:46:56 +0200
+
 open-iscsi (2.0.870~rc3-0.1) unstable; urgency=low
 
   * Non-maintainer upload.
reverted:
--- open-iscsi-2.0.870~rc3/usr/version.h
+++ open-iscsi-2.0.870~rc3.orig/usr/version.h
@@ -6,7 +6,7 @@
  * This may not be the same value as the kernel versions because
  * some other maintainer could merge a patch without going through us
  */
+#define ISCSI_VERSION_STR	"2.0-870"
-#define ISCSI_VERSION_STR	"2.0-869"
 #define ISCSI_VERSION_FILE	"/sys/module/scsi_transport_iscsi/version"
 
 #endif
diff -u open-iscsi-2.0.870~rc3/usr/iscsistart.c open-iscsi-2.0.870~rc3/usr/iscsistart.c
--- open-iscsi-2.0.870~rc3/usr/iscsistart.c
+++ open-iscsi-2.0.870~rc3/usr/iscsistart.c
@@ -126,10 +126,19 @@
 	iscsiadm_rsp_t rsp;
 	int rc;
 
+	/*
+	 * For root boot we cannot change this so increase to account
+	 * for boot using static setup.
+	 */
+	config_rec.session.initial_login_retry_max = 30;
 	/* we cannot answer so turn off */
 	config_rec.conn[0].timeo.noop_out_interval = 0;
 	config_rec.conn[0].timeo.noop_out_timeout = 0;
 
+	printf("%s: Logging into %s %s:%d,%d\n", program_name, config_rec.name,
+		config_rec.conn[0].address, config_rec.conn[0].port,
+		config_rec.tpgt);
+
 	memset(&req, 0, sizeof(req));
 	req.command = MGMT_IPC_SESSION_LOGIN;
 	memcpy(&req.u.session.rec, &config_rec, sizeof(node_rec_t));

Reply via email to