[Pkg-iscsi-maintainers] [SCM] Debian Open-iSCSI Packaging branch, master, updated. debian/2.0.871.3-2-5-g187250f

[Ritesh Raj Sarraf]

The following commit has been merged in the master branch:
commit 76526d124c9dd2592bf9b336d1597b569ab972fd
Author: Ritesh Raj Sarraf <rrs at researchut.com>
Date:   Mon Oct 25 03:01:17 2010 +0530

    add support for Intel NICs

diff --git a/debian/README.Debian b/debian/README.Debian
index ae4d2b9..95cdef5 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -53,7 +53,15 @@ Root on iSCSI
 
 The Debian open-iscsi package now supports root filesystem on iSCSI.  Support
 for this is controlled by the existence of the /etc/iscsi/iscsi.initramfs file.
-There are two ways to include iSCSI boot support in your initramfs:
+
+If you are booting from an iSCSI accelerator or NIC that supports iSCSI boot
+natively, you can likely have your iSCSI target mounted without any manual
+configuration. Either place the single line "ISCSI_AUTO=true" into
+/etc/iscsi/iscsi.initramfs, or touch /etc/iscsi/iscsi.initramfs and use the
+kernel boot line option "iscsi_auto".
+
+If manual configuration is necessary, there are two ways to include iSCSI boot 
+options in your initramfs:
 
 1) Touch /etc/iscsi/iscsi.initramfs and provide options on the command line.
    This provides flexibility, but if passwords are used, is not very secure.
diff --git a/debian/changelog b/debian/changelog
index d3bcae7..6f481e1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+open-iscsi (2.0.871.3-2squeeze1) unstable; urgency=low
+
+  * Add patch to support NICs that have native iSCSI support. Thanks to
+    Bjoern Metzdorf for the patch. (Closes: #514924) 
+
+ -- Ritesh Raj Sarraf <rrs at debian.org>  Mon, 25 Oct 2010 02:57:58 +0530
+
 open-iscsi (2.0.871.3-2) unstable; urgency=low
 
   * Break down and add quilt patches
diff --git a/debian/extra/initramfs.local-top b/debian/extra/initramfs.local-top
index 0bafe22..1f66ded 100644
--- a/debian/extra/initramfs.local-top
+++ b/debian/extra/initramfs.local-top
@@ -29,26 +29,30 @@ do_iscsi_login ()
 	modprobe iscsi_tcp
 	modprobe crc32c
 
-	if [ -z $ISCSI_INITIATOR ]; then
-		. /etc/initiatorname.iscsi
-		ISCSI_INITIATOR=$InitiatorName
+	if [ -z $ISCSI_AUTO ]; then
+		if [ -z $ISCSI_INITIATOR ]; then
+			. /etc/initiatorname.iscsi
+			ISCSI_INITIATOR=$InitiatorName
+		fi
+
+		if [ -z $ISCSI_TARGET_PORT ]; then
+			ISCSI_TARGET_PORT=3260
+		fi
+
+		if [ -z $ISCSI_TARGET_GROUP ]; then
+			ISCSI_TARGET_GROUP=1
+		fi
+
+		iscsistart -i $ISCSI_INITIATOR -t $ISCSI_TARGET_NAME	\
+			   -g $ISCSI_TARGET_GROUP -a $ISCSI_TARGET_IP	\
+			   -p $ISCSI_TARGET_PORT \
+			   ${ISCSI_USERNAME:+-u "$ISCSI_USERNAME"}	\
+			   ${ISCSI_PASSWORD:+-w "$ISCSI_PASSWORD"}	\
+			   ${ISCSI_IN_USERNAME:+-U "$ISCSI_IN_USERNAME"}\
+			   ${ISCSI_IN_PASSWORD:+-W "$ISCSI_IN_PASSWORD"}
+	else
+		iscsistart -b
 	fi
-
-	if [ -z $ISCSI_TARGET_PORT ]; then
-		ISCSI_TARGET_PORT=3260
-	fi
-
-	if [ -z $ISCSI_TARGET_GROUP ]; then
-		ISCSI_TARGET_GROUP=1
-	fi
-
-	iscsistart -i $ISCSI_INITIATOR -t $ISCSI_TARGET_NAME	\
-		   -g $ISCSI_TARGET_GROUP -a $ISCSI_TARGET_IP	\
-		   -p $ISCSI_TARGET_PORT \
-		   ${ISCSI_USERNAME:+-u "$ISCSI_USERNAME"}	\
-		   ${ISCSI_PASSWORD:+-w "$ISCSI_PASSWORD"}	\
-		   ${ISCSI_IN_USERNAME:+-U "$ISCSI_IN_USERNAME"}\
-		   ${ISCSI_IN_PASSWORD:+-W "$ISCSI_IN_PASSWORD"}
 }
 
 parse_iscsi_ops ()
@@ -57,6 +61,9 @@ parse_iscsi_ops ()
 
 	for x in $(cat /proc/cmdline); do
 		case ${x} in
+		iscsi_auto)
+			ISCSI_AUTO=true
+			;;
         	iscsi_initiator=*)
                 	ISCSI_INITIATOR="${x#iscsi_initiator=}"
                 	;;
@@ -94,7 +101,7 @@ fi
 
 parse_iscsi_ops
 
-if [ -z $ISCSI_TARGET_NAME ] || [ -z $ISCSI_TARGET_IP ]; then
+if ( [ -z $ISCSI_TARGET_NAME ] || [ -z $ISCSI_TARGET_IP ] ) && [ -z $ISCSI_AUTO ]; then
 	exit 0
 fi
 

-- 
Debian Open-iSCSI Packaging