Tags: patch User: [EMAIL PROTECTED] Usertags: origin-ubuntu jaunty ubuntu-patch
Hi, I've attached a patch that moves the initiation name generation from the init script to the postinst script. That way /etc/iscsi/initiatorname.iscsi is not marked as a conffile but stays in /etc/ (where it should be IMO). -- Mathias Gug Ubuntu Developer http://www.ubuntu.com
--- open-iscsi-2.0.870~rc3/debian/open-iscsi.postinst
+++ open-iscsi-2.0.870.1/debian/open-iscsi.postinst
@@ -20,6 +20,30 @@
chmod 600 /etc/iscsi/initiatorname.iscsi
fi
fi
+
+ # generate a unique iSCSI InitiatorName
+ NAMEFILE=/etc/iscsi/initiatorname.iscsi
+ if [ ! -e $NAMEFILE ] && [ -z "$2" ] ; then
+ if [ ! -x /sbin/iscsi-iname ] ; then
+ echo "Error: /sbin/iscsi-iname does not exist, driver was not successfully installed"
+ exit 1;
+ fi
+ # Generate a unique InitiatorName and save it
+ INAME=`/sbin/iscsi-iname -p iqn.1993-08.org.debian:01`
+ if [ "$INAME" != "" ] ; then
+ echo "## DO NOT EDIT OR REMOVE THIS FILE!" > $NAMEFILE
+ echo "## If you remove this file, the iSCSI daemon will not start." >> $NAMEFILE
+ echo "## If you change the InitiatorName, existing access control lists" >> $NAMEFILE
+ echo "## may reject this initiator. The InitiatorName must be unique">> $NAMEFILE
+ echo "## for each iSCSI initiator. Do NOT duplicate iSCSI InitiatorNames." >> $NAMEFILE
+ printf "InitiatorName=$INAME\n" >> $NAMEFILE
+ chmod 600 $NAMEFILE
+ else
+ echo "Error: failed to generate an iSCSI InitiatorName, driver cannot start."
+ echo
+ exit 1;
+ fi
+ fi
if [ -d /var/lib/open-iscsi ]; then
chmod 700 /var/lib/open-iscsi
--- open-iscsi-2.0.870~rc3/debian/initiatorname.iscsi
+++ open-iscsi-2.0.870.1/debian/initiatorname.iscsi
@@ -1 +0,0 @@
-GenerateName=yes
--- open-iscsi-2.0.870~rc3/debian/open-iscsi.init 2008-12-01 12:04:26.000000000 -0500
+++ open-iscsi-2.0.870.1/debian/open-iscsi.init 2008-12-01 12:04:49.000000000 -0500
@@ -50,30 +50,6 @@
exit 1
fi
- # see if we need to generate a unique iSCSI InitiatorName
- # this should only happen if the
- if grep -q "^GenerateName=yes" $NAMEFILE ; then
- if [ ! -x /usr/sbin/iscsi-iname ] ; then
- echo "Error: /usr/sbin/iscsi-iname does not exist, driver was not successfully installed"
- exit 1;
- fi
- # Generate a unique InitiatorName and save it
- INAME=`/usr/sbin/iscsi-iname -p iqn.1993-08.org.debian:01`
- if [ "$INAME" != "" ] ; then
- echo "## DO NOT EDIT OR REMOVE THIS FILE!" > $NAMEFILE
- echo "## If you remove this file, the iSCSI daemon will not start." >> $NAMEFILE
- echo "## If you change the InitiatorName, existing access control lists" >> $NAMEFILE
- echo "## may reject this initiator. The InitiatorName must be unique">> $NAMEFILE
- echo "## for each iSCSI initiator. Do NOT duplicate iSCSI InitiatorNames." >> $NAMEFILE
- printf "InitiatorName=$INAME\n" >> $NAMEFILE
- chmod 600 $NAMEFILE
- else
- echo "Error: failed to generate an iSCSI InitiatorName, driver cannot start."
- echo
- exit 1;
- fi
- fi
-
# make sure there is a valid InitiatorName for the driver
if ! grep -q "^InitiatorName=[^ \t\n]" $NAMEFILE ; then
echo
--- open-iscsi-2.0.870~rc3/debian/rules 2008-12-01 12:05:32.000000000 -0500
+++ open-iscsi-2.0.870.1/debian/rules 2008-12-01 12:05:42.000000000 -0500
@@ -114,7 +114,6 @@
install -m 755 usr/iscsistart $(CURDIR)/debian/open-iscsi/usr/sbin
install -m 755 utils/iscsi_discovery $(CURDIR)/debian/open-iscsi/usr/sbin
install -m 755 utils/iscsi-iname $(CURDIR)/debian/open-iscsi/usr/sbin
- install -m 644 debian/initiatorname.iscsi $(CURDIR)/debian/open-iscsi/etc/iscsi/initiatorname.iscsi
install -m 644 etc/iscsid.conf $(CURDIR)/debian/open-iscsi/etc/iscsi
# initramfs stuff
signature.asc
Description: Digital signature
