[Pkg-iscsi-maintainers] [SCM] Debian Open-iSCSI Packaging branch, master, updated. debian/2.0.871.3-2-5-g187250f
Ritesh Raj Sarraf
rrs at researchut.com
Mon Oct 25 18:13:43 UTC 2010
The following commit has been merged in the master branch:
commit 187250f3843c93a845f91050a445bf9511f44acc
Merge: 058e87866d2e0e6d945e4ac0ad77a9aa0df2df67 76526d124c9dd2592bf9b336d1597b569ab972fd
Author: Ritesh Raj Sarraf <rrs at researchut.com>
Date: Mon Oct 25 17:22:03 2010 +0530
Merge branch 'squeeze'
* squeeze:
add support for Intel NICs
Conflicts:
debian/changelog
debian/extra/initramfs.local-top
diff --combined debian/README.Debian
index 9c034e2,95cdef5..62a7a3e
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@@ -53,7 -53,15 +53,15 @@@ Root on iSCS
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.
@@@ -71,15 -79,8 +79,15 @@@
Example Syntax:
+ ISCSI_INITIATOR="iqn.1993-08.org.debian:01:9b3e5634fdb9"
ISCSI_TARGET_NAME=iqn.2008-01.com.example:storage.foo
ISCSI_TARGET_IP=192.168.1.1
+ ISCSI_TARGET_PORT=3160
+ ISCSI_USERNAME="username"
+ ISCSI_PASSWORD="password"
+ ISCSI_IN_USERNAME="in_username"
+ ISCSI_IN_PASSWORD="in_password"
+ ISCSI_TARGET_GROUP=1
Remember to set proper permissions if username/passwords are used.
@@@ -90,8 -91,3 +98,8 @@@ You also won't want to restart the devi
mode in /etc/networking/interfaces. Leave BOOT=local set in
/etc/initramfs-tools/initramfs.conf and provide a root=/dev/sd* device as
the iSCSI disk will look like a local disk.
+
+Note: If you need multiple sessions in the initramfs, you can provide multiple IPs
+to the ISCSI_TARGET_IP variable.
+Eg: ISCSI_TARGET_IP="192.168.1.1 192.168.2.1 192.168.3.1"
+This will allow login into all the Target IPs in the initrafs.
diff --combined debian/changelog
index 1f81606,6f481e1..c93037f
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,9 +1,15 @@@
-open-iscsi (2.0.871.3-2squeeze1) unstable; urgency=low
+open-iscsi (2.0.871.3-3) UNRELEASED; urgency=low
+ * Install iscsid.conf with 0600 permission as it can contain passwords
+ (Closes: #472965)
+ * Provide an example for iSCSI root installation (Closes: #492358)
+ * Add support to enable multiple session to the iSCSI Target in the
+ initramfs. Thanks to Norbert Tretkowski for the patch.
+ (Closes: #598773)
+ * 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> Sat, 02 Oct 2010 12:29:29 +0530
+ -- 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
diff --combined debian/extra/initramfs.local-top
index 890ff8f,1f66ded..f7a5cda
--- a/debian/extra/initramfs.local-top
+++ b/debian/extra/initramfs.local-top
@@@ -29,28 -29,30 +29,48 @@@ 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
+
+ for i in $ISCSI_TARGET_IP; do
+ iscsistart -i $ISCSI_INITIATOR -t $ISCSI_TARGET_NAME \
+ -g $ISCSI_TARGET_GROUP -a $i \
+ -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"}
+ done
}
parse_iscsi_ops ()
@@@ -59,6 -61,9 +79,9 @@@
for x in $(cat /proc/cmdline); do
case ${x} in
+ iscsi_auto)
+ ISCSI_AUTO=true
+ ;;
iscsi_initiator=*)
ISCSI_INITIATOR="${x#iscsi_initiator=}"
;;
@@@ -96,7 -101,7 +119,7 @@@ f
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
More information about the Pkg-iscsi-maintainers
mailing list