Bug#776276: unblock: open-iscsi/2.0.873+git0.3b4b4500-8
Control: retitle -1 unblock: open-iscsi/2.0.873+git0.3b4b4500-8
Control: tags -1 - moreinfo
Dear release team,
please consider unblocking open-iscsi/2.0.873+git0.3b4b4500-8. The
upload fixes two bugs: #735773, where open-iscsi now makes sure that
the file the CHAP credentials (if any) are stored in (iscsid.conf) is
now not world-readable. It also fixes #775778 and repairs boot and
shutdown ordering on systemd systems, removing a 1.5min delay at boot
and a potential race that might cause data loss (although I have not
been able to trigger the latter so far) at shutdown.
The package has successfully been built on all release archs in
unstable.
Notes for #775778:
- Ritesh and I now follow Michael Biebl's suggestion for how to handle
this (which is much simpler than what we originally had, so thanks
there!)
- but we do keep Should-Start: mountnfs-bootclean, because we don't
think it's a good idea to break potential users' configurations,
in this case using iSCSI when /usr is on NFS and sysvinit is used,
even if we don't know (of) any such users ourselves
- if you disagree and think this type of configuration should not
be supported, please tell us, we could then provide -9 without
that init dep and add a note to the docs about that
- however: /usr on NFS under sysvinit is currently broken irrespective
of iSCSI, I reported #777547; might be of interest to you
- working around that problem, I could successfully test the new
open-iscsi package and confirm it does in fact work with /usr
on NFS under sysvinit
Notes for #735773:
- this change affects the udeb in a trivial way: permissions of
iscsid.conf are also changed in the udeb (everything else stays the
same). I've checked by manually changing the permissions on a
running RC1 installer that this is indeed harmless (but also
required unless you want #735773 to occur if / is on iSCSI).
Source debdiff against the version in testing (-4) is attached.
It would be great if you could accept both changes into Jessie.
Thanks for considering!
unblock open-iscsi/2.0.873+git0.3b4b4500-8
Christian
diff -Nru open-iscsi-2.0.873+git0.3b4b4500/debian/changelog open-iscsi-2.0.873+git0.3b4b4500/debian/changelog
--- open-iscsi-2.0.873+git0.3b4b4500/debian/changelog 2014-09-01 11:03:23.000000000 +0200
+++ open-iscsi-2.0.873+git0.3b4b4500/debian/changelog 2015-02-10 20:10:11.000000000 +0100
@@ -1,3 +1,53 @@
+open-iscsi (2.0.873+git0.3b4b4500-8) unstable; urgency=medium
+
+ * [e707e75] Exclude iscsid.conf from dh_fixperms. (Closes: #735773)
+
+ -- Christian Seiler <[email protected]> Tue, 10 Feb 2015 18:00:54 +0100
+
+open-iscsi (2.0.873+git0.3b4b4500-7) unstable; urgency=medium
+
+ [ Ritesh Raj Sarraf ]
+ * [8ed5fd2] Revert changes introduced in 2.0.873+git0.3b4b4500-5
+
+ [ Christian Seiler ]
+ * [cea864b] Clean up sysvinit ordering w.r.t. NFS.
+ * [9097d07] Remove debian/gbp.conf again (change doesn't fit release
+ criteria).
+
+ -- Christian Seiler <[email protected]> Mon, 09 Feb 2015 16:32:52 +0100
+
+open-iscsi (2.0.873+git0.3b4b4500-6) unstable; urgency=medium
+
+ [ Christian Seiler ]
+ * Replace $remote_fs from Should-Start/Stop in init script with
+ $local_fs and mountnfs-bootclean. (Breaks ordering cycle on
+ systemd systems.)
+ * Create systemd drop-in to create Before-dependency on
+ remote-fs-pre.target and run umountiscsi.sh on stop.
+
+ -- Ritesh Raj Sarraf <[email protected]> Sat, 31 Jan 2015 11:47:18 +0530
+
+open-iscsi (2.0.873+git0.3b4b4500-5) unstable; urgency=medium
+
+ [ Christian Seiler ]
+ * Create systemd unit, make it order before remote-fs-pre.target to
+ fix hang at boot. Unit currently only starts init script.
+ * Manually start umountiscsi.sh in open-iscsi init script to make
+ the stop action on shutdown not be a noop. (systemd tracks service
+ state)
+ * Add dh-systemd to build-deps.
+ * Reorder #DEBHELPER# in postinst to not break upgrades (dh-systemd's
+ code has to be there before invoke-rc.d is called).
+
+ [ Ritesh Raj Sarraf ]
+ * [fa0ce1c] Install iscsid.conf with permission 600 (Closes: #735773)
+ * [eeb3e90] Don't wait in detecting disks when run under systemd.
+ Thanks to Christian Seiler (Closes: #775778)
+ * [641f3ee] Add gbp.conf
+ * [cff497b] Add iscsi.service as an Alias
+
+ -- Ritesh Raj Sarraf <[email protected]> Mon, 26 Jan 2015 13:04:33 +0530
+
open-iscsi (2.0.873+git0.3b4b4500-4) unstable; urgency=medium
* [41c7eca] Introduce new architectures based on current build
diff -Nru open-iscsi-2.0.873+git0.3b4b4500/debian/dirs open-iscsi-2.0.873+git0.3b4b4500/debian/dirs
--- open-iscsi-2.0.873+git0.3b4b4500/debian/dirs 2014-08-20 15:53:55.000000000 +0200
+++ open-iscsi-2.0.873+git0.3b4b4500/debian/dirs 2015-01-31 07:17:13.000000000 +0100
@@ -8,3 +8,4 @@
etc/network/if-up.d
usr/share/initramfs-tools/hooks/
usr/share/initramfs-tools/scripts/local-top/
+lib/systemd/system/open-iscsi.service.d
diff -Nru open-iscsi-2.0.873+git0.3b4b4500/debian/open-iscsi.init open-iscsi-2.0.873+git0.3b4b4500/debian/open-iscsi.init
--- open-iscsi-2.0.873+git0.3b4b4500/debian/open-iscsi.init 2014-08-20 15:53:55.000000000 +0200
+++ open-iscsi-2.0.873+git0.3b4b4500/debian/open-iscsi.init 2015-02-10 14:34:58.000000000 +0100
@@ -1,8 +1,10 @@
#! /bin/sh
### BEGIN INIT INFO
# Provides: open-iscsi iscsi
-# Required-Start: $network $remote_fs
-# Required-Stop: $network $remote_fs sendsigs
+# Required-Start: $network $local_fs
+# Required-Stop: $network $local_fs sendsigs
+# Should-Start: mountnfs-bootclean
+# Should-Stop: umountnfs
# Default-Start: S
# Default-Stop: 0 1 6
# Short-Description: Starts and stops the iSCSI initiator services and logs in to default targets
diff -Nru open-iscsi-2.0.873+git0.3b4b4500/debian/open-iscsi.systemd-drop-in open-iscsi-2.0.873+git0.3b4b4500/debian/open-iscsi.systemd-drop-in
--- open-iscsi-2.0.873+git0.3b4b4500/debian/open-iscsi.systemd-drop-in 1970-01-01 01:00:00.000000000 +0100
+++ open-iscsi-2.0.873+git0.3b4b4500/debian/open-iscsi.systemd-drop-in 2015-01-31 07:17:13.000000000 +0100
@@ -0,0 +1,13 @@
+[Unit]
+# Make sure we have the proper ordering w.r.t. remote-fs-pre.target.
+# Not required for boot, but for shutdown.
+Wants=remote-fs-pre.target
+Before=remote-fs-pre.target
+
+[Service]
+# Replace stop actions, because calling umountiscsi.sh from
+# within open-iscsi script won't work due to systemctl
+# redirection (and umountiscsi.sh is never started)
+ExecStop=
+ExecStop=-/etc/init.d/umountiscsi.sh stop
+ExecStop=/etc/init.d/open-iscsi stop
diff -Nru open-iscsi-2.0.873+git0.3b4b4500/debian/rules open-iscsi-2.0.873+git0.3b4b4500/debian/rules
--- open-iscsi-2.0.873+git0.3b4b4500/debian/rules 2014-08-20 15:53:55.000000000 +0200
+++ open-iscsi-2.0.873+git0.3b4b4500/debian/rules 2015-02-10 20:10:11.000000000 +0100
@@ -97,6 +97,7 @@
install -m 644 debian/initiatorname.iscsi $(CURDIR)/debian/open-iscsi/etc/iscsi/initiatorname.iscsi
install -m 600 etc/iscsid.conf $(CURDIR)/debian/open-iscsi/etc/iscsi
install -m 644 debian/open-iscsi.default $(CURDIR)/debian/open-iscsi/etc/default/open-iscsi
+ install -m 644 debian/open-iscsi.systemd-drop-in $(CURDIR)/debian/open-iscsi/lib/systemd/system/open-iscsi.service.d/fix-systemd-deps.conf
ifneq (,$(findstring $(DEB_HOST_ARCH),$(SUPPORTED_ARCH_UDEB)))
# udeb stuff
@@ -105,7 +106,7 @@
install -m 755 utils/iscsi_discovery $(CURDIR)/debian/open-iscsi-udeb/sbin
install -m 755 usr/iscsid $(CURDIR)/debian/open-iscsi-udeb/sbin
install -m 755 usr/iscsistart $(CURDIR)/debian/open-iscsi-udeb/sbin
- install -m 644 etc/iscsid.conf $(CURDIR)/debian/open-iscsi-udeb/etc/iscsi
+ install -m 600 etc/iscsid.conf $(CURDIR)/debian/open-iscsi-udeb/etc/iscsi
install -m 644 debian/open-iscsi-udeb.start $(CURDIR)/debian/open-iscsi-udeb/sbin/iscsi-start
install -m 755 debian/open-iscsi-udeb.finish-install $(CURDIR)/debian/open-iscsi-udeb/usr/lib/finish-install.d/10open-iscsi
endif
@@ -133,7 +134,7 @@
dh_link
dh_strip
dh_compress
- dh_fixperms
+ dh_fixperms -Xetc/iscsi/iscsid.conf
dh_makeshlibs
dh_installdeb
dh_shlibdeps
Reply to: