tag 507003 patch thanks Hi, I have what I think is a patch which will move it to /var/lib/open-iscsi/initiatorname.iscsi (attached). I could NMU it (and I have a source package prepared), but I'd like some confirmation (I don't have appropriate hardware) that it DTRT first.
Matt -- Matthew Johnson
diff -urN open-iscsi-2.0.870~rc3/debian/changelog open-iscsi-debian/changelog
--- open-iscsi-2.0.870~rc3/debian/changelog 2008-11-30 18:06:46.000000000 +0000
+++ open-iscsi-debian/changelog 2008-11-30 18:15:38.000000000 +0000
@@ -1,3 +1,11 @@
+open-iscsi (2.0.870~rc3-0.4) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Use /var/lib/open-iscsi/initiatorname.iscsi rather than
+ /etc/iscsi/initiatorname.iscsi (Closes: #507003)
+
+ -- Matthew Johnson <[EMAIL PROTECTED]> Sun, 30 Nov 2008 18:10:41 +0000
+
open-iscsi (2.0.870~rc3-0.3) unstable; urgency=low
* Non-maintainer upload.
diff -urN open-iscsi-2.0.870~rc3/debian/extra/initramfs.hook open-iscsi-debian/extra/initramfs.hook
--- open-iscsi-2.0.870~rc3/debian/extra/initramfs.hook 2008-11-30 18:06:46.000000000 +0000
+++ open-iscsi-debian/extra/initramfs.hook 2008-11-30 18:15:38.000000000 +0000
@@ -23,7 +23,7 @@
. /usr/share/initramfs-tools/hook-functions
copy_exec /usr/sbin/iscsistart /sbin
-cp /etc/iscsi/initiatorname.iscsi $DESTDIR/etc
+cp /var/lib/open-iscsi/initiatorname.iscsi $DESTDIR/etc
cp /etc/iscsi/iscsi.initramfs $DESTDIR/etc
for x in crc32c libcrc32c iscsi_tcp libiscsi scsi_transport_iscsi; do
diff -urN open-iscsi-2.0.870~rc3/debian/open-iscsi.init open-iscsi-debian/open-iscsi.init
--- open-iscsi-2.0.870~rc3/debian/open-iscsi.init 2008-11-30 18:06:46.000000000 +0000
+++ open-iscsi-debian/open-iscsi.init 2008-11-30 18:15:38.000000000 +0000
@@ -12,7 +12,7 @@
DAEMON=/usr/sbin/iscsid
ADM=/usr/bin/iscsiadm
PIDFILE=/var/run/iscsid.pid
-NAMEFILE=/etc/iscsi/initiatorname.iscsi
+NAMEFILE=/var/lib/open-iscsi/initiatorname.iscsi
[ -x "$DAEMON" ] || exit 0
diff -urN open-iscsi-2.0.870~rc3/debian/open-iscsi.postinst open-iscsi-debian/open-iscsi.postinst
--- open-iscsi-2.0.870~rc3/debian/open-iscsi.postinst 2008-11-30 18:06:46.000000000 +0000
+++ open-iscsi-debian/open-iscsi.postinst 2008-11-30 18:15:38.000000000 +0000
@@ -15,10 +15,15 @@
# But only if configuration in /etc/iscsi is untouched
if [ -f /etc/initiatorname.iscsi ] ; then
- if grep -q "^GenerateName=yes" /etc/iscsi/initiatorname.iscsi ; then
- mv /etc/initiatorname.iscsi /etc/iscsi/initiatorname.iscsi
- chmod 600 /etc/iscsi/initiatorname.iscsi
+ if grep -q "^GenerateName=yes" /var/lib/open-iscsi/initiatorname.iscsi ; then
+ mv /etc/initiatorname.iscsi /var/lib/open-iscsi/initiatorname.iscsi
+ chmod 600 /var/lib/open-iscsi/initiatorname.iscsi
fi
+
+ if [ -f /etc/iscsi/initiatorname.iscsi ] ; then
+ if grep -q "^GenerateName=yes" /var/lib/open-iscsi/initiatorname.iscsi ; then
+ mv /etc/iscsi/initiatorname.iscsi /var/lib/open-iscsi/initiatorname.iscsi
+ chmod 600 /var/lib/open-iscsi/initiatorname.iscsi
fi
if [ -d /var/lib/open-iscsi ]; then
diff -urN open-iscsi-2.0.870~rc3/debian/rules open-iscsi-debian/rules
--- open-iscsi-2.0.870~rc3/debian/rules 2008-11-30 18:06:46.000000000 +0000
+++ open-iscsi-debian/rules 2008-11-30 18:15:38.000000000 +0000
@@ -114,7 +114,7 @@
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 debian/initiatorname.iscsi $(CURDIR)/debian/open-iscsi/var/lib/open-iscsi/initiatorname.iscsi
install -m 644 etc/iscsid.conf $(CURDIR)/debian/open-iscsi/etc/iscsi
# initramfs stuff
signature.asc
Description: Digital signature
