Hello Release Team, I have just uploaded open-iscsi to unstable. It adds the feature of iSCSI Boot support for NICs that have native iSCSI support. Please allow this upload to propogate to Squeeze. Debdiff attached. Ritesh -- Ritesh Raj Sarraf | http://people.debian.org/~rrs Debian - The Universal Operating System
diff -Nru open-iscsi-2.0.871.3/debian/changelog open-iscsi-2.0.871.3/debian/changelog
--- open-iscsi-2.0.871.3/debian/changelog 2010-06-11 12:34:11.000000000 +0530
+++ open-iscsi-2.0.871.3/debian/changelog 2010-10-25 03:01:17.000000000 +0530
@@ -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@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 -Nru open-iscsi-2.0.871.3/debian/extra/initramfs.local-top open-iscsi-2.0.871.3/debian/extra/initramfs.local-top
--- open-iscsi-2.0.871.3/debian/extra/initramfs.local-top 2010-06-11 12:34:11.000000000 +0530
+++ open-iscsi-2.0.871.3/debian/extra/initramfs.local-top 2010-10-25 03:01:17.000000000 +0530
@@ -29,26 +29,30 @@
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 @@
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 @@
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
diff -Nru open-iscsi-2.0.871.3/debian/README.Debian open-iscsi-2.0.871.3/debian/README.Debian
--- open-iscsi-2.0.871.3/debian/README.Debian 2010-06-11 12:34:11.000000000 +0530
+++ open-iscsi-2.0.871.3/debian/README.Debian 2010-10-25 03:01:17.000000000 +0530
@@ -53,7 +53,15 @@
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.
--- Begin Message ---
- To: debian-devel-changes@lists.debian.org
- Subject: Accepted open-iscsi 2.0.871.3-2squeeze1 (source amd64)
- From: Ritesh Raj Sarraf <rrs@debian.org>
- Date: Sun, 24 Oct 2010 21:47:34 +0000
- Message-id: <E1PA8Pe-0007ix-RF@franck.debian.org>
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA512 Format: 1.8 Date: Mon, 25 Oct 2010 02:57:58 +0530 Source: open-iscsi Binary: open-iscsi Architecture: source amd64 Version: 2.0.871.3-2squeeze1 Distribution: unstable Urgency: low Maintainer: Debian iSCSI Maintainers <pkg-iscsi-maintainers@lists.alioth.debian.org> Changed-By: Ritesh Raj Sarraf <rrs@debian.org> Description: open-iscsi - High performance, transport independent iSCSI implementation Closes: 514924 Changes: 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) Checksums-Sha1: f6900f9bce3b3efdbbe68299a2d7a7fa2312fefe 2068 open-iscsi_2.0.871.3-2squeeze1.dsc 10549b6066cd5e2b83507f5913b351e65b36fa58 16829 open-iscsi_2.0.871.3-2squeeze1.debian.tar.gz 1a37c34b2427ce03c66e3643f21319ca16a2f509 332258 open-iscsi_2.0.871.3-2squeeze1_amd64.deb Checksums-Sha256: ca81b3c38c801bd8903e9cc4580ef5d0d72800a8046db1799784544bcb287da7 2068 open-iscsi_2.0.871.3-2squeeze1.dsc ebab420a8386bccbd6da97568c3ea426f67a5983a78741474b8fda4e80ef39e8 16829 open-iscsi_2.0.871.3-2squeeze1.debian.tar.gz 82b2b463a90159a7bfee0a326125d2545396161b22c2f29a96fd3d753ed007af 332258 open-iscsi_2.0.871.3-2squeeze1_amd64.deb Files: e73a338a5c5d2c0504ac1a69edcb0d5f 2068 net optional open-iscsi_2.0.871.3-2squeeze1.dsc 139568435d7d0367f104f7a67ecdefa4 16829 net optional open-iscsi_2.0.871.3-2squeeze1.debian.tar.gz a11ca806debd1540ce3bc802cb0bd73c 332258 net optional open-iscsi_2.0.871.3-2squeeze1_amd64.deb -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (GNU/Linux) iQIcBAEBCgAGBQJMxKbPAAoJEKY6WKPy4XVpXY4P/jXxAhHCnoIO+1VP8t6fzz7j J2Zf02FQ248gvVy7+CxrdzRWx2LIacPpvXcEet3yG8J4gwef6MZqxJ5lPDP4zCHQ jPHfKw5Ru5Vl6Hp0CSMY1t689NXzOoMrxTOJT2VYM+Lv3e4dA3KBXxGA1fcb3V+s AfeDbmR+O7AnL++EOxnqOOjA+wOxbo7RLkjmSZYd9uyVHHKEhZB+sr8i/9QzLWiN TQuo6+EhzIEim9XoO4yHT/s79vncC0m1tSr8hfJN535VGBxrSnlLjUaIBjkJvKvT jlZVniVhfmxDOBpQTO9ihw2aoARQqE+eQfM/in++1wT8aR4C8hHHEM0iXcUiWLOH 6Iyw46wZHIXademNzr2gCHdSl1MywARkO92+PmMgcgxup6QJxOlKwworfW3XFJ86 BJcLR5WBTeoqFML2yRnQ65AnV91tjYXcmncTls7OXNwUJAS3jUufKgICnE5JCKeN kTZbWI5aT0E8EbchaJMIM1gP02HI4bzAEACbdwACcAo2TLJ0fcKwun/Uga7TJNgP hoBPXdn+R8FAJ7KO18QFryxhh6b/EJhEuKmH8uUwuN/jPa+eUV1GNTrMf5DPg1x+ elgZ5Lbsh6ZyhTzHqO7vL0/fUSzK9LaK3mv8enb0XBYctc57HvOk1mbQs/Epizgb khEv4qNDutWM0z3Nvc6D =bYcp -----END PGP SIGNATURE----- Accepted: open-iscsi_2.0.871.3-2squeeze1.debian.tar.gz to main/o/open-iscsi/open-iscsi_2.0.871.3-2squeeze1.debian.tar.gz open-iscsi_2.0.871.3-2squeeze1.dsc to main/o/open-iscsi/open-iscsi_2.0.871.3-2squeeze1.dsc open-iscsi_2.0.871.3-2squeeze1_amd64.deb to main/o/open-iscsi/open-iscsi_2.0.871.3-2squeeze1_amd64.deb
--- End Message ---
Attachment:
signature.asc
Description: OpenPGP digital signature