From: Luk Claes Date: Fri, 9 Dec 2011 10:27:58 +0000 (+0100) Subject: /run transition: nfs-common migrates /lib/init/rw/sendsigs.omit.d/statd to /run/sends... X-Git-Tag: debian/1%1.2.5-3~2 X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=9ac1a6fef86dcb414a5e90dd89b5a24757042f29;p=nfs-utils.git /run transition: nfs-common migrates /lib/init/rw/sendsigs.omit.d/statd to /run/sendsigs.omit.d on upgrade, and uses /run/sendsigs.omit.d. Depend on initscripts (>= 2.88dsf-13.3) to guarantee the existence of /run/sendsigs.omit.d (Closes: #633034). --- diff --git a/debian/changelog b/debian/changelog index 3f823a9..08407e4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +nfs-utils (1:1.2.5-2.1) unstable; urgency=low + + [ Roger Leigh ] + * /run transition: nfs-common migrates + /lib/init/rw/sendsigs.omit.d/statd to /run/sendsigs.omit.d on upgrade, + and uses /run/sendsigs.omit.d. Depend on initscripts + (>= 2.88dsf-13.3) to guarantee the existence of + /run/sendsigs.omit.d (Closes: #633034). + + -- Luk Claes Fri, 09 Dec 2011 11:26:56 +0100 + nfs-utils (1:1.2.5-2) unstable; urgency=low * debian/patches/18-dont-use-PAGE_SIZE.patch diff --git a/debian/control b/debian/control index 9ee0ed0..4b32c72 100644 --- a/debian/control +++ b/debian/control @@ -32,7 +32,7 @@ Homepage: http://nfs.sourceforge.net/ Package: nfs-common Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, rpcbind, adduser, ucf, lsb-base (>= 1.3-9ubuntu3), initscripts (>= 2.86.ds1-38.1) +Depends: ${shlibs:Depends}, ${misc:Depends}, rpcbind, adduser, ucf, lsb-base (>= 1.3-9ubuntu3), initscripts (>= 2.88dsf-13.3) Recommends: python Provides: nfs-client Conflicts: nfs-client diff --git a/debian/nfs-common.init b/debian/nfs-common.init index 5e30d95..4076e31 100644 --- a/debian/nfs-common.init +++ b/debian/nfs-common.init @@ -156,9 +156,10 @@ case "$1" in log_end_msg $RET exit $RET else - mkdir -p /lib/init/rw/sendsigs.omit.d - rm -f /lib/init/rw/sendsigs.omit.d/statd - ln -s /var/run/rpc.statd.pid /lib/init/rw/sendsigs.omit.d/statd + if [ -d /run/sendsigs.omit.d ]; then + rm -f /run/sendsigs.omit.d/statd + ln -s /var/run/rpc.statd.pid /run/sendsigs.omit.d/statd + fi fi fi diff --git a/debian/nfs-common.postinst b/debian/nfs-common.postinst index 013e3c8..3b3332e 100644 --- a/debian/nfs-common.postinst +++ b/debian/nfs-common.postinst @@ -37,6 +37,11 @@ case "$1" in dpkg-statoverride --remove /sbin/mount.nfs fi fi + + # Migrate /lib/init/rw/sendsigs.omit.statd to /run. + if [ -f /lib/init/rw/sendsigs.omit.d/statd ]; then + mv /lib/init/rw/sendsigs.omit.d/statd /run/sendsigs.omit.d/statd + fi ;; esac