From: chip <chip>
Date: Fri, 14 Dec 2001 02:32:46 +0000 (+0000)
Subject: nfs-utils (1:0.3.3-5) unstable; urgency=high
X-Git-Tag: nfs-utils-1-0~8
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=9c612925efdfecc400e17bba4797b813c7bd4052;p=nfs-utils.git

nfs-utils (1:0.3.3-5) unstable; urgency=high

  * Keep NFS fully operational during upgrade.  (closes: #76544)
  * When calling update-rc.d, send stdout to /dev/null, but not stderr.

 -- Chip Salzenberg <chip@debian.org>  Thu, 13 Dec 2001 18:30:36 -0800
---

diff --git a/ChangeLog b/ChangeLog
index d03d8c4..468c09a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2001-12-13  Chip Salzenberg  <chip@pobox.com>
+
+	* debian/changelog: Version 0.3.3-5.
+
 2001-11-26  TAKAI Kousuke <takai@vlsi.kuee.kyoto-u.ac.jp>
 
 	* support/nfs/xio.c (xskip): Call `xungetc' instead of
diff --git a/debian/changelog b/debian/changelog
index a12b198..60cf766 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+nfs-utils (1:0.3.3-5) unstable; urgency=high
+
+  * Keep NFS fully operational during upgrade.  (closes: #76544)
+  * When calling update-rc.d, send stdout to /dev/null, but not stderr.
+
+ -- Chip Salzenberg <chip@debian.org>  Thu, 13 Dec 2001 18:30:36 -0800
+
 nfs-utils (1:0.3.3-4) unstable; urgency=high
 
   * High priority due to changes in previous version.
diff --git a/debian/nfs-common.postinst b/debian/nfs-common.postinst
index f47a67f..37eba1a 100755
--- a/debian/nfs-common.postinst
+++ b/debian/nfs-common.postinst
@@ -4,8 +4,10 @@
 
 case "$1" in
     configure)
-	update-rc.d nfs-common defaults 19 81 >/dev/null 2>&1
+	update-rc.d nfs-common defaults 19 81 >/dev/null
 	;;
 esac
 
-/etc/init.d/nfs-common start
+act="restart"
+[ "$1:$2" = "configure:" ] && act="start"
+/etc/init.d/nfs-common $act
diff --git a/debian/nfs-common.postrm b/debian/nfs-common.postrm
index 4e90417..ff64e77 100755
--- a/debian/nfs-common.postrm
+++ b/debian/nfs-common.postrm
@@ -4,6 +4,6 @@
 
 case "$1" in
     purge)
-	update-rc.d nfs-common remove >/dev/null 2>&1
+	update-rc.d nfs-common remove >/dev/null
 	;;
 esac
diff --git a/debian/nfs-common.prerm b/debian/nfs-common.prerm
index a3e730f..b49a2b4 100755
--- a/debian/nfs-common.prerm
+++ b/debian/nfs-common.prerm
@@ -2,7 +2,12 @@
 
 #DEBHELPER#
 
-[ -x /etc/init.d/nfs-common ] && /etc/init.d/nfs-common stop
+case "$1" in
+    remove|purge)
+	[ -x /etc/init.d/nfs-common ] &&
+	   /etc/init.d/nfs-common stop
+	;;
+esac
 
 if [ "$1" != upgrade ]
 then
diff --git a/debian/nfs-kernel-server.init b/debian/nfs-kernel-server.init
index c2ee49b..db04b53 100755
--- a/debian/nfs-kernel-server.init
+++ b/debian/nfs-kernel-server.init
@@ -36,7 +36,7 @@ case "$1" in
 		start-stop-daemon --start --quiet \
 		    --exec $PREFIX/sbin/rpc.nfsd -- $RPCNFSDCOUNT
 		printf " mountd"
-		$PREFIX/bin/rpcinfo -u localhost nfs 3 > /dev/null 2>&1 ||
+		$PREFIX/bin/rpcinfo -u localhost nfs 3 >/dev/null 2>&1 ||
 		    RPCMOUNTDOPTS="$RPCMOUNTDOPTS --no-nfs-version 3"
 		start-stop-daemon --start --quiet \
 		    --exec $PREFIX/sbin/rpc.mountd -- $RPCMOUNTDOPTS
diff --git a/debian/nfs-kernel-server.postinst b/debian/nfs-kernel-server.postinst
index a523cc7..1f1e039 100755
--- a/debian/nfs-kernel-server.postinst
+++ b/debian/nfs-kernel-server.postinst
@@ -24,12 +24,14 @@ EOF
 
 	# The old nfs-server's init script can't tell that it's been
 	# removed, so we have to kill the symlinks to it.
-	update-rc.d -f nfs-server remove
+	update-rc.d -f nfs-server remove >/dev/null
 
-	update-rc.d nfs-kernel-server defaults 20 80 >/dev/null 2>&1
+	update-rc.d nfs-kernel-server defaults 20 80 >/dev/null
 	;;
 esac
 
 db_stop
 
-/etc/init.d/nfs-kernel-server start
+act="restart"
+[ "$1:$2" = "configure:" ] && act="start"
+/etc/init.d/nfs-kernel-server $act
diff --git a/debian/nfs-kernel-server.postrm b/debian/nfs-kernel-server.postrm
index bf75d99..a326cd3 100755
--- a/debian/nfs-kernel-server.postrm
+++ b/debian/nfs-kernel-server.postrm
@@ -4,7 +4,7 @@
 
 case "$1" in
     purge)
-	update-rc.d nfs-kernel-server remove >/dev/null 2>&1
+	update-rc.d nfs-kernel-server remove >/dev/null
 	;;
 esac
 
diff --git a/debian/nfs-kernel-server.prerm b/debian/nfs-kernel-server.prerm
index 4e1a2cc..d82bd10 100755
--- a/debian/nfs-kernel-server.prerm
+++ b/debian/nfs-kernel-server.prerm
@@ -2,7 +2,12 @@
 
 #DEBHELPER#
 
-[ -x /etc/init.d/nfs-kernel-server ] && /etc/init.d/nfs-kernel-server stop
+case "$1" in
+    remove|purge)
+	[ -x /etc/init.d/nfs-kernel-server ] &&
+	   /etc/init.d/nfs-kernel-server stop
+	;;
+esac
 
 if [ "$1" != upgrade ]
 then