Bug#776276: unblock: open-iscsi/2.0.873+git0.3b4b4500-4
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package open-iscsi
open-iscsi currently using SysV init scripts for operation. The current
init scripts, when run under an active systemd box, leads to a delay of
90 seconds. Please see the listed bug for more details.
With this patch applied, there is no delay.
Please give me an ACK, and then I'll go do the upload.
unblock open-iscsi/2.0.873+git0.3b4b4500-4
-- System Information:
Debian Release: 8.0
APT prefers testing
APT policy: (990, 'testing'), (500, 'unstable'), (101, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 3.16.0-4-amd64 (SMP w/8 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: sysvinit (via /sbin/init)
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 14:33:23.000000000 +0530
+++ open-iscsi-2.0.873+git0.3b4b4500/debian/changelog 2015-01-26 13:05:14.000000000 +0530
@@ -1,3 +1,24 @@
+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 <rrs@debian.org> 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/control open-iscsi-2.0.873+git0.3b4b4500/debian/control
--- open-iscsi-2.0.873+git0.3b4b4500/debian/control 2014-09-01 14:32:01.000000000 +0530
+++ open-iscsi-2.0.873+git0.3b4b4500/debian/control 2015-01-25 21:25:27.000000000 +0530
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian iSCSI Maintainers <pkg-iscsi-maintainers@lists.alioth.debian.org>
Uploaders: Andrew Moise <chops@demiurgestudios.com>, Philipp Hug <debian@hug.cx>, Guido Günther <agx@sigxcpu.org>, Ritesh Raj Sarraf <rrs@debian.org>
-Build-Depends: debhelper (>= 7.0.0), bzip2, bison, flex, autotools-dev, dh-autoreconf, dpkg-dev (>= 1.16.1~)
+Build-Depends: debhelper (>= 7.0.0), bzip2, bison, flex, autotools-dev, dh-autoreconf, dpkg-dev (>= 1.16.1~), dh-systemd
Standards-Version: 3.9.2
Vcs-Git: git://anonscm.debian.org/pkg-iscsi/open-iscsi.git
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-iscsi/open-iscsi.git
diff -Nru open-iscsi-2.0.873+git0.3b4b4500/debian/gbp.conf open-iscsi-2.0.873+git0.3b4b4500/debian/gbp.conf
--- open-iscsi-2.0.873+git0.3b4b4500/debian/gbp.conf 1970-01-01 05:30:00.000000000 +0530
+++ open-iscsi-2.0.873+git0.3b4b4500/debian/gbp.conf 2015-01-25 21:30:33.000000000 +0530
@@ -0,0 +1,9 @@
+[DEFAULT]
+pristine-tar = True
+color = auto
+
+[git-import-orig]
+dch = True
+
+[git-dch]
+id-length = 7
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 19:23:55.000000000 +0530
+++ open-iscsi-2.0.873+git0.3b4b4500/debian/open-iscsi.init 2015-01-25 21:25:27.000000000 +0530
@@ -107,6 +107,16 @@
udevadm settle || true;
+ # If we are under systemd, make sure we start umountiscsi.sh.
+ # This is a no-op, but systemd tracks each unit's status, so
+ # we unless we start it here, the invoke-rc.d during stop()
+ # doesn't do anything.
+ if [ -d /run/systemd/system ] ; then
+ # we don't want to deadlock here, so ignore deps,
+ # the start of the service is a no-op anyway
+ systemctl --job-mode=ignore-dependencies start umountiscsi.service
+ fi
+
# Handle iSCSI LVM devices
if [ ! -x "/sbin/vgchange" -a -n "$LVMGROUPS" ]; then
diff -Nru open-iscsi-2.0.873+git0.3b4b4500/debian/open-iscsi.postinst open-iscsi-2.0.873+git0.3b4b4500/debian/open-iscsi.postinst
--- open-iscsi-2.0.873+git0.3b4b4500/debian/open-iscsi.postinst 2014-08-20 19:23:55.000000000 +0530
+++ open-iscsi-2.0.873+git0.3b4b4500/debian/open-iscsi.postinst 2015-01-25 21:25:27.000000000 +0530
@@ -11,6 +11,8 @@
fi
}
+#DEBHELPER#
+
case "$1" in
configure)
# Move old configuration from /etc/ into /etc/iscsi/
@@ -43,6 +45,4 @@
;;
esac
-#DEBHELPER#
-
exit 0
diff -Nru open-iscsi-2.0.873+git0.3b4b4500/debian/open-iscsi.service open-iscsi-2.0.873+git0.3b4b4500/debian/open-iscsi.service
--- open-iscsi-2.0.873+git0.3b4b4500/debian/open-iscsi.service 1970-01-01 05:30:00.000000000 +0530
+++ open-iscsi-2.0.873+git0.3b4b4500/debian/open-iscsi.service 2015-01-26 13:02:32.000000000 +0530
@@ -0,0 +1,23 @@
+[Unit]
+Description=iSCSI initiator
+DefaultDependencies=no
+Before=sysinit.target shutdown.target remote-fs-pre.target
+After=network-online.target
+Wants=network-online.target
+Conflicts=shutdown.target
+
+[Service]
+Type=forking
+Restart=no
+TimeoutSec=0
+IgnoreSIGPIPE=no
+KillMode=process
+GuessMainPID=no
+RemainAfterExit=yes
+SysVStartPriority=20
+ExecStart=/etc/init.d/open-iscsi start
+ExecStop=/etc/init.d/open-iscsi stop
+
+[Install]
+WantedBy=multi-user.target
+Alias=iscsi.service
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 19:23:55.000000000 +0530
+++ open-iscsi-2.0.873+git0.3b4b4500/debian/rules 2015-01-25 21:25:27.000000000 +0530
@@ -105,7 +105,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
@@ -127,8 +127,10 @@
dh_installchangelogs
dh_installdocs
dh_installexamples
+ dh_systemd_enable
dh_installinit -u 'start 45 S . stop 81 0 1 6 .' --no-start
dh_installinit -u 'stop 80 0 1 6 .' --no-start --name=umountiscsi.sh
+ dh_systemd_start --no-start
dh_installman
dh_link
dh_strip
Reply to: