From: Vagrant Cascadian <vagrant@debian.org>
Date: Mon, 12 Jul 2010 20:52:13 +0000 (+0000)
Subject: Imported Debian patch 1.2.2-1.1
X-Git-Tag: debian/1%1.2.2-1.1^0
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=b505d1786a006f6eb90a33f361af01cfdbd9f770;p=nfs-utils.git

Imported Debian patch 1.2.2-1.1
---

diff --git a/debian/changelog b/debian/changelog
index 90fa79e..2333ba1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+nfs-utils (1:1.2.2-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Ensure files under /var/lib/nfs/ are owned by statd user. 
+    Closes: #574510 
+
+ -- Vagrant Cascadian <vagrant@debian.org>  Mon, 12 Jul 2010 20:52:13 +0000
+
 nfs-utils (1:1.2.2-1) unstable; urgency=low
 
   [ Anibal Monsalve Salazar ]
diff --git a/debian/nfs-common.postinst b/debian/nfs-common.postinst
index d39b003..e7d9451 100644
--- a/debian/nfs-common.postinst
+++ b/debian/nfs-common.postinst
@@ -23,15 +23,13 @@ case "$1" in
                 rmdir --ignore-fail-on-non-empty /home/statd
             fi
 	fi
-	if [ "$2" = "" ] || dpkg --compare-versions "$2" lt 1:1.0.7-16; then
-	    chown statd /var/lib/nfs/sm \
+	chown statd /var/lib/nfs/sm \
 		/var/lib/nfs/sm.bak \
 		/var/lib/nfs/rpc_pipefs \
 		/var/lib/nfs
-            if [ -f /var/lib/nfs/state ]; then
+        if [ -f /var/lib/nfs/state ]; then
 	        chown statd /var/lib/nfs/state
-            fi
-	fi
+        fi
 	
 	if [ "$2" != "" ] || dpkg --compare-versions "$2" lt 1:1.1.0-14; then
 	    if dpkg-statoverride --list /sbin/mount.nfs >/dev/null 2>&1; then