/run transition: nfs-common migrates /lib/init/rw/sendsigs.omit.d/statd to /run/sends...

diff --git a/debian/changelog b/debian/changelog
index 3f823a9e31eb762eea38580b089d6d272828bc3d..08407e44f24cf2b84f296c4b130e7d15334704c8 100644 (file)
--- 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 <luk@debian.org>  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
 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 9ee0ed0444a16aa3a94b496140c1b38ff0920496..4b32c72e1cec7f30daa885041d4e54ee3a7246bf 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -32,7 +32,7 @@ Homepage: http://nfs.sourceforge.net/
 
 Package: nfs-common
 Architecture: any
 
 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
 Recommends: python
 Provides: nfs-client
 Conflicts: nfs-client

diff --git a/debian/nfs-common.init b/debian/nfs-common.init
index 5e30d95998598f800ed10cb16ba46d43c95e84c5..4076e31c66ecdc98aefe2d10807f76440e6f6304 100644 (file)
--- a/debian/nfs-common.init
+++ b/debian/nfs-common.init
@@ -156,9 +156,10 @@ case "$1" in
                log_end_msg $RET
                exit $RET
            else
                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
 
            fi
        fi
 

diff --git a/debian/nfs-common.postinst b/debian/nfs-common.postinst
index 013e3c818c748d7c49944c039c1e08cc576a55df..3b3332ed49f9f366ec08ad34796593d3f0326d8e 100644 (file)
--- 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
                 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
 
     ;;
 esac