Am 06.06.2014 13:05, schrieb Michael Biebl: > tags 746587 + pending > thanks > > I've uploaded a fix for unstable and experimental to DELAYED/1. > Debdiffs are attached.
Grr, seems I somehow managed to mess up the formatting and turned a tab character into U+21A6. Did a follow-up upload to fix that. Updated debdiffs attached. Michael -- Why is it that all of the instruments seeking intelligent life in the universe are pointed away from Earth?
diff -Nru sysvinit-2.88dsf/debian/changelog sysvinit-2.88dsf/debian/changelog --- sysvinit-2.88dsf/debian/changelog 2014-04-21 10:12:05.000000000 +0200 +++ sysvinit-2.88dsf/debian/changelog 2014-06-08 01:25:01.000000000 +0200 @@ -1,3 +1,22 @@ +sysvinit (2.88dsf-55.2) experimental; urgency=medium + + * Fix a formatting error in mountnfs which turned a tab character into + U+21A6. + + -- Michael Biebl <bi...@debian.org> Sun, 08 Jun 2014 01:22:37 +0200 + +sysvinit (2.88dsf-55.1) experimental; urgency=medium + + * Non-maintainer upload. + * Skip the mountnfs hook when being triggered by the networking SysV init + script and instead use the systemd built-in mechanisms to mount remote + file systems. + This avoids a deadlock caused by the rpcbind SysV init script depending + on $network and the $network LSB facility being provided by the networking + SysV init script. (Closes: #746587) + + -- Michael Biebl <bi...@debian.org> Fri, 06 Jun 2014 12:59:06 +0200 + sysvinit (2.88dsf-55) experimental; urgency=medium [ Gabriele Giacone ] diff -Nru sysvinit-2.88dsf/debian/src/initscripts/etc/network/if-up.d/mountnfs sysvinit-2.88dsf/debian/src/initscripts/etc/network/if-up.d/mountnfs --- sysvinit-2.88dsf/debian/src/initscripts/etc/network/if-up.d/mountnfs 2014-01-27 22:21:13.000000000 +0100 +++ sysvinit-2.88dsf/debian/src/initscripts/etc/network/if-up.d/mountnfs 2014-06-08 01:22:32.000000000 +0200 @@ -7,6 +7,16 @@ # Also mounts SMB filesystems now, so the name of # this script is getting increasingly inaccurate. +# Skip the mountnfs hook when being triggered by the networking SysV init +# script and instead use the systemd built-in mechanisms to mount remote +# file systems. +# This avoids a deadlock caused by the rpcbind SysV init script depending +# on $network and the $network LSB facility being provided by the networking +# SysV init script. +if [ -d /run/systemd/system ]; then + systemctl list-jobs | grep -q network.target && exit 0 +fi + PATH=/sbin:/bin . /lib/init/vars.sh
diff -Nru sysvinit-2.88dsf/debian/changelog sysvinit-2.88dsf/debian/changelog --- sysvinit-2.88dsf/debian/changelog 2014-04-07 11:26:50.000000000 +0200 +++ sysvinit-2.88dsf/debian/changelog 2014-06-08 01:25:19.000000000 +0200 @@ -1,3 +1,22 @@ +sysvinit (2.88dsf-53.2) unstable; urgency=medium + + * Fix a formatting error in mountnfs which turned a tab character into + U+21A6. + + -- Michael Biebl <bi...@debian.org> Sun, 08 Jun 2014 01:13:48 +0200 + +sysvinit (2.88dsf-53.1) unstable; urgency=medium + + * Non-maintainer upload. + * Skip the mountnfs hook when being triggered by the networking SysV init + script and instead use the systemd built-in mechanisms to mount remote + file systems. + This avoids a deadlock caused by the rpcbind SysV init script depending + on $network and the $network LSB facility being provided by the networking + SysV init script. (Closes: #746587) + + -- Michael Biebl <bi...@debian.org> Fri, 06 Jun 2014 12:56:54 +0200 + sysvinit (2.88dsf-53) unstable; urgency=medium [ Gabriele Giacone ] diff -Nru sysvinit-2.88dsf/debian/src/initscripts/etc/network/if-up.d/mountnfs sysvinit-2.88dsf/debian/src/initscripts/etc/network/if-up.d/mountnfs --- sysvinit-2.88dsf/debian/src/initscripts/etc/network/if-up.d/mountnfs 2014-01-27 22:21:13.000000000 +0100 +++ sysvinit-2.88dsf/debian/src/initscripts/etc/network/if-up.d/mountnfs 2014-06-08 01:11:21.000000000 +0200 @@ -7,6 +7,16 @@ # Also mounts SMB filesystems now, so the name of # this script is getting increasingly inaccurate. +# Skip the mountnfs hook when being triggered by the networking SysV init +# script and instead use the systemd built-in mechanisms to mount remote +# file systems. +# This avoids a deadlock caused by the rpcbind SysV init script depending +# on $network and the $network LSB facility being provided by the networking +# SysV init script. +if [ -d /run/systemd/system ]; then + systemctl list-jobs | grep -q network.target && exit 0 +fi + PATH=/sbin:/bin . /lib/init/vars.sh
signature.asc
Description: OpenPGP digital signature
