From: Steinar H. Gunderson <sesse@debian.org>
Date: Wed, 3 May 2006 17:51:17 +0000 (+0200)
Subject: Imported Debian patch 1.0.7-11
X-Git-Tag: debian/1%1.0.7-11
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;ds=inline;h=4e1c4311f8d4e55de4d9aac8b50efbc8a04672b9;p=nfs-utils.git

Imported Debian patch 1.0.7-11
---

diff --git a/confdefs.h b/confdefs.h
deleted file mode 100644
index 0010349..0000000
--- a/confdefs.h
+++ /dev/null
@@ -1,4 +0,0 @@
-
-#define NFS3_SUPPORTED 1
-#define NFS4_SUPPORTED 1
-#define GSS_SUPPORTED 1
diff --git a/debian/changelog b/debian/changelog
index 57ad8c2..a1868db 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+nfs-utils (1:1.0.7-11) unstable; urgency=low
+
+  * When creating statd user, create it with a home directory of /nonexistant;
+    it doesn't really require a home directory. (Closes: #365514, #365721)
+  * Fix the signal number for USR1 (actually, use the name instead) in
+    nhfsrun. (Closes: #365657)
+
+ -- Steinar H. Gunderson <sesse@debian.org>  Wed,  3 May 2006 19:51:17 +0200
+
 nfs-utils (1:1.0.7-10) unstable; urgency=low
 
   * Intermediate 1.0.7 release, waiting for librpcsecgss to be uploaded into
diff --git a/debian/nfs-common.postinst b/debian/nfs-common.postinst
index 8648d03..62a0ac2 100755
--- a/debian/nfs-common.postinst
+++ b/debian/nfs-common.postinst
@@ -7,7 +7,7 @@ case "$1" in
 	update-rc.d nfs-common defaults 21 79 >/dev/null
 
 	if ! getent passwd statd >/dev/null; then
-	    adduser --system statd
+	    adduser --system --home /nonexistent --no-create-home statd
 	fi
 	if [ "$2" = "" ] || dpkg --compare-versions "$2" lt 1.0.7-10; then
 	    chown statd /var/lib/nfs/sm \
diff --git a/utils/nhfsstone/nhfsrun b/utils/nhfsstone/nhfsrun
index dfc24eb..a91c6af 100755
--- a/utils/nhfsstone/nhfsrun
+++ b/utils/nhfsstone/nhfsrun
@@ -46,7 +46,7 @@ INCR=10
 # SIGUSR1 is used by nhfsstone to synchronize child processes.
 #
 nothing() { echo -n ""; }
-trap nothing 30
+trap nothing USR1
 
 rm -f $OUTFILE