Package: open-iscsi Version: 2.0.870~rc3-0.5 Severity: wishlist Tags: patch
Here is the patch used in my NMU. diff -ru ../open-iscsi-2.0.870~rc3/debian/changelog ../open-iscsi-2.0.870~rc3-pere/debian/changelog --- ../open-iscsi-2.0.870~rc3/debian/changelog 2009-09-13 20:05:03.000000000 +0200 +++ ../open-iscsi-2.0.870~rc3-pere/debian/changelog 2009-09-13 21:08:19.000000000 +0200 @@ -1,3 +1,16 @@ +open-iscsi (2.0.870~rc3-0.5) unstable; urgency=low + + * Non-maintainer upload to fix release goal. + * Fix incorrect provides and dependencies in init.d script (Closes: + #541390). + * Add missing package dependency on udev. Rewrite init.d script to use + 'udevadm settle' instead of obsolete 'udevsettle' (Closes: #517225). + * No longer ignore errors in the postinst. Tip from lintian. + * Do not start open-iscsi init.d script during package installation, + to avoid installation problem (Closes: #529280). + + -- Petter Reinholdtsen <[email protected]> Sun, 13 Sep 2009 20:25:49 +0200 + open-iscsi (2.0.870~rc3-0.4) unstable; urgency=medium * Clean up diff.gz, it downgraded the package to 2.0.869.2. diff -ru ../open-iscsi-2.0.870~rc3/debian/control ../open-iscsi-2.0.870~rc3-pere/debian/control --- ../open-iscsi-2.0.870~rc3/debian/control 2009-09-13 20:05:03.000000000 +0200 +++ ../open-iscsi-2.0.870~rc3-pere/debian/control 2009-09-13 20:10:09.000000000 +0200 @@ -9,7 +9,7 @@ Package: open-iscsi Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends}, udev Description: High performance, transport independent iSCSI implementation iSCSI is a network protocol standard that allows the use of the SCSI protocol over TCP/IP networks. This implementation follows RFC3720. diff -ru ../open-iscsi-2.0.870~rc3/debian/open-iscsi.init ../open-iscsi-2.0.870~rc3-pere/debian/open-iscsi.init --- ../open-iscsi-2.0.870~rc3/debian/open-iscsi.init 2009-09-13 20:05:03.000000000 +0200 +++ ../open-iscsi-2.0.870~rc3-pere/debian/open-iscsi.init 2009-09-13 21:02:46.000000000 +0200 @@ -1,8 +1,8 @@ #! /bin/sh ### BEGIN INIT INFO -# Provides: iscsi -# Required-Start: $local_fs -# Required-Stop: $remote_fs sendsigs networking +# Provides: open-iscsi iscsi +# Required-Start: $network $remote_fs +# Required-Stop: $network $remote_fs sendsigs # Default-Start: S # Default-Stop: 0 6 # Short-Description: Starts and stops the iSCSI initiator services and logs in to default targets @@ -95,7 +95,9 @@ starttargets - udevsettle + if [ -d /dev/.udev ] ; then # Only wait for udev when it is active + udevadm settle + fi log_daemon_msg "Mounting network filesystems" MOUNT_RESULT=1 diff -ru ../open-iscsi-2.0.870~rc3/debian/open-iscsi.postinst ../open-iscsi-2.0.870~rc3-pere/debian/open-iscsi.postinst --- ../open-iscsi-2.0.870~rc3/debian/open-iscsi.postinst 2009-09-13 20:05:03.000000000 +0200 +++ ../open-iscsi-2.0.870~rc3-pere/debian/open-iscsi.postinst 2009-09-13 20:30:38.000000000 +0200 @@ -1,5 +1,7 @@ #!/bin/sh +set -e + update_initramfs() { if [ -x /usr/sbin/update-initramfs ] && \ diff -ru ../open-iscsi-2.0.870~rc3/debian/rules ../open-iscsi-2.0.870~rc3-pere/debian/rules --- ../open-iscsi-2.0.870~rc3/debian/rules 2009-09-13 20:05:03.000000000 +0200 +++ ../open-iscsi-2.0.870~rc3-pere/debian/rules 2009-09-13 21:05:09.000000000 +0200 @@ -134,7 +134,7 @@ dh_installchangelogs dh_installdocs dh_installexamples - dh_installinit -u 'start 45 S . stop 81 0 6 .' + dh_installinit -u 'start 45 S . stop 81 0 6 .' --no-start dh_installinit -u 'stop 80 0 6 .' --no-start --name=umountiscsi.sh dh_installman dh_link diff -ru ../open-iscsi-2.0.870~rc3/debian/umountiscsi.sh.init ../open-iscsi-2.0.870~rc3-pere/debian/umountiscsi.sh.init --- ../open-iscsi-2.0.870~rc3/debian/umountiscsi.sh.init 2009-09-13 20:05:03.000000000 +0200 +++ ../open-iscsi-2.0.870~rc3-pere/debian/umountiscsi.sh.init 2009-09-13 20:09:40.000000000 +0200 @@ -2,7 +2,7 @@ ### BEGIN INIT INFO # Provides: stop-open-iscsi.sh # Required-Start: -# Required-Stop: $remote_fs sendsigs open-iscsi +# Required-Stop: $network $remote_fs sendsigs open-iscsi # Default-Start: # Default-Stop: 0 6 # Short-Description: Unmounts iSCSI filesystems and stops iSCSI services Happy hacking, -- Petter Reinholdtsen -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected]
