diff -Nru partman-iscsi-40/choose_partition/iscsi/do_option partman-iscsi-40ubuntu3/choose_partition/iscsi/do_option --- partman-iscsi-40/choose_partition/iscsi/do_option 2011-07-25 01:01:40.000000000 +0000 +++ partman-iscsi-40ubuntu3/choose_partition/iscsi/do_option 2016-03-02 17:53:50.000000000 +0000 @@ -4,7 +4,7 @@ . /lib/partman/lib/iscsi-base.sh if ! pidof iscsid >/dev/null; then - iscsi-start + iscsi_start fi while :; do diff -Nru partman-iscsi-40/debian/changelog partman-iscsi-40ubuntu3/debian/changelog --- partman-iscsi-40/debian/changelog 2015-08-23 13:10:10.000000000 +0000 +++ partman-iscsi-40ubuntu3/debian/changelog 2016-03-02 17:55:00.000000000 +0000 @@ -1,3 +1,27 @@ +partman-iscsi (40ubuntu3) xenial; urgency=medium + + * choose_partition/iscsi/do_option: make use of iscsi_start rather than just + calling iscsi-start (script from open-iscsi) to prompt for initiatorName. + + -- Mathieu Trudel-Lapierre Wed, 02 Mar 2016 12:54:59 -0500 + +partman-iscsi (40ubuntu2) xenial; urgency=medium + + * debian/partman-iscsi.template: add partman-iscsi/initiatorname question. + * lib/iscsi-base.sh: add iscsi_start wrapper to get initiatorName from the + user in the medium priority. Ask for the initiatorName at priority + critical. + + -- Mathieu Trudel-Lapierre Tue, 01 Mar 2016 16:46:21 -0500 + +partman-iscsi (40ubuntu1) xenial; urgency=medium + + * Merge from Debian unstable, remaining changes: + - Remove "-o update" from the discover calls. It's not required and is + considered invalid with recent open-iscsi. + + -- Mathieu Trudel-Lapierre Wed, 02 Dec 2015 11:33:11 -0500 + partman-iscsi (40) unstable; urgency=medium [ Updated translations ] @@ -186,6 +210,15 @@ -- Christian Perrier Sat, 06 Sep 2014 09:17:16 +0200 +partman-iscsi (21ubuntu1) saucy; urgency=low + + * Merge from Debian unstable, remaining changes: + - Remove "-o update" from the discover calls. It's not required and is + considered invalid with recent open-iscsi. + - Enable translations. + + -- Stéphane Graber Mon, 19 Aug 2013 16:42:26 +0200 + partman-iscsi (21) unstable; urgency=low [ Dmitrijs Ledkovs ] @@ -198,6 +231,15 @@ -- Christian Perrier Sun, 14 Jul 2013 13:05:16 +0200 +partman-iscsi (20ubuntu1) quantal; urgency=low + + * Merge from Debian unstable, remaining changes: + - Remove "-o update" from the discover calls. It's not required and is + considered invalid with recent open-iscsi. + - Enable translations. + + -- Stéphane Graber Tue, 14 Aug 2012 10:45:55 -0400 + partman-iscsi (20) unstable; urgency=low * Unmark remaining translatable strings @@ -221,6 +263,13 @@ -- Christian Perrier Sat, 07 Jul 2012 21:36:48 +0200 +partman-iscsi (17ubuntu1) quantal; urgency=low + + * Remove "-o update" from the discover calls. It's not required and is + considered invalid with recent open-iscsi. + + -- Stéphane Graber Wed, 11 Jul 2012 13:30:37 -0400 + partman-iscsi (17) oneiric; urgency=low * Don't fail if debconf questions are preseeded (LP: #810068). @@ -346,3 +395,4 @@ * Initial release. -- Colin Watson Fri, 07 Aug 2009 09:19:26 +0100 + diff -Nru partman-iscsi-40/debian/control partman-iscsi-40ubuntu3/debian/control --- partman-iscsi-40/debian/control 2013-07-14 06:50:45.000000000 +0000 +++ partman-iscsi-40ubuntu3/debian/control 2015-12-02 16:26:47.000000000 +0000 @@ -1,11 +1,13 @@ Source: partman-iscsi Section: debian-installer Priority: standard -Maintainer: Debian Install System Team +Maintainer: Ubuntu Installer Team +XSBC-Original-Maintainer: Debian Install System Team Uploaders: Colin Watson , Christian Perrier Build-Depends: debhelper (>= 9), dh-di, po-debconf (>= 0.5.0) -Vcs-Browser: http://anonscm.debian.org/gitweb/?p=d-i/partman-iscsi.git -Vcs-Git: git://anonscm.debian.org/d-i/partman-iscsi.git +XS-Debian-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=d-i/partman-iscsi.git +XS-Debian-Vcs-Git: git://anonscm.debian.org/d-i/partman-iscsi.git +Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-core-dev/partman-iscsi/ubuntu Package: partman-iscsi Package-Type: udeb diff -Nru partman-iscsi-40/debian/partman-iscsi.templates partman-iscsi-40ubuntu3/debian/partman-iscsi.templates --- partman-iscsi-40/debian/partman-iscsi.templates 2014-09-06 07:16:35.000000000 +0000 +++ partman-iscsi-40ubuntu3/debian/partman-iscsi.templates 2016-03-01 20:42:15.000000000 +0000 @@ -3,6 +3,18 @@ # :sl3: _Description: Configure iSCSI volumes +Template: partman-iscsi/initiatorname +Type: string +# :sl3: +_Description: iSCSI initiatorName selection: + iSCSI targets usually require that the initiatorName from the initiator is + registered on the target side or the discovery/login steps will fail. If + that's the case, please enter the initiatorName to be used in this + installation, or leave it blank to use a random generated initiatorName. + . + iSCSI initiatorName is usually of the form: + iqn.1993-08.org.debian:01:deadbeef + Template: partman-iscsi/mainmenu Type: select Choices-C: login, finish diff -Nru partman-iscsi-40/lib/iscsi-base.sh partman-iscsi-40ubuntu3/lib/iscsi-base.sh --- partman-iscsi-40/lib/iscsi-base.sh 2011-07-25 01:01:40.000000000 +0000 +++ partman-iscsi-40ubuntu3/lib/iscsi-base.sh 2016-03-01 20:45:47.000000000 +0000 @@ -1,5 +1,22 @@ . /usr/share/debconf/confmodule +iscsi_start () { + db_input critical partman-iscsi/initiatorname || true + db_go || true + db_get partman-iscsi/initiatorname + if [ -n "$RET" ]; then + echo "## DO NOT EDIT OR REMOVE THIS FILE!" > /etc/iscsi/initiatorname.iscsi + echo "## If you remove this file, the iSCSI daemon will not start." >> /etc/iscsi/initiatorname.iscsi + echo "## If you change the InitiatorName, existing access control lists" >> /etc/iscsi/initiatorname.iscsi + echo "## may reject this initiator. The InitiatorName must be unique">> /etc/iscsi/initiatorname.iscsi + echo "## for each iSCSI initiator. Do NOT duplicate iSCSI InitiatorNames." >> /etc/iscsi/initiatorname.iscsi + printf "InitiatorName=$RET\n" >> /etc/iscsi/initiatorname.iscsi + chmod 600 /etc/iscsi/initiatorname.iscsi + fi + + iscsi-start +} + iscsi_login () { local portal discovery targets target local state=0 @@ -95,20 +112,20 @@ iscsiadm -m discovery --type sendtargets --portal "$portal" >/dev/null 2>&1 || true db_get partman-iscsi/login/username if [ "$RET" ]; then - iscsiadm -m discovery --portal "$portal" -o update -n discovery.sendtargets.auth.authmethod -v CHAP - iscsiadm -m discovery --portal "$portal" -o update -n discovery.sendtargets.auth.username -v "$RET" + iscsiadm -m discovery --portal "$portal" -n discovery.sendtargets.auth.authmethod -v CHAP + iscsiadm -m discovery --portal "$portal" -n discovery.sendtargets.auth.username -v "$RET" db_get partman-iscsi/login/password - iscsiadm -m discovery --portal "$portal" -o update -n discovery.sendtargets.auth.password -v "$RET" + iscsiadm -m discovery --portal "$portal" -n discovery.sendtargets.auth.password -v "$RET" db_get partman-iscsi/login/incoming_username if [ "$RET" ]; then - iscsiadm -m discovery --portal "$portal" -o update -n discovery.sendtargets.auth.username_in -v "$RET" + iscsiadm -m discovery --portal "$portal" -n discovery.sendtargets.auth.username_in -v "$RET" db_get partman-iscsi/login/incoming_password - iscsiadm -m discovery --portal "$portal" -o update -n discovery.sendtargets.auth.password_in -v "$RET" + iscsiadm -m discovery --portal "$portal" -n discovery.sendtargets.auth.password_in -v "$RET" else - iscsiadm -m discovery --portal "$portal" -o update -n discovery.sendtargets.auth.username_in -v '' + iscsiadm -m discovery --portal "$portal" -n discovery.sendtargets.auth.username_in -v '' fi else - iscsiadm -m discovery --portal "$portal" -o update -n discovery.sendtargets.auth.authmethod -v None + iscsiadm -m discovery --portal "$portal" -n discovery.sendtargets.auth.authmethod -v None fi # Discover targets.