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 d03d8c40cef1e092596db2700946ed127e8c17cc..468c09a1ff3df0d296ebd07f1d2e0449c354ca99 100644 (file)
--- 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
 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 a12b198cf34270271406785972127ba3a18ab74a..60cf766a77070a12660c97afaf21c25a0465449f 100644 (file)
--- 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.
 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 f47a67fa521a7b82100aa5241e01e3573795e97d..37eba1a4743a0b6034b5741c975f988a7a1e38db 100755 (executable)
--- a/debian/nfs-common.postinst
+++ b/debian/nfs-common.postinst
@@ -4,8 +4,10 @@
 
 case "$1" in
     configure)
 
 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
 
        ;;
 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 4e904174b5370c7a1051efd8417e5960ed250710..ff64e775d226d8839a31fb89ac1d8e80bb92f997 100755 (executable)
--- a/debian/nfs-common.postrm
+++ b/debian/nfs-common.postrm
@@ -4,6 +4,6 @@
 
 case "$1" in
     purge)
 
 case "$1" in
     purge)

-       update-rc.d nfs-common remove >/dev/null 2>&1
+       update-rc.d nfs-common remove >/dev/null

        ;;
 esac
        ;;
 esac

diff --git a/debian/nfs-common.prerm b/debian/nfs-common.prerm
index a3e730f3965e6233ea4e58b2ebae16521c7197ff..b49a2b4d51ffac3e02364d88ffb4545286c1e8c8 100755 (executable)
--- a/debian/nfs-common.prerm
+++ b/debian/nfs-common.prerm
@@ -2,7 +2,12 @@
 
 #DEBHELPER#
 
 
 #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
 
 if [ "$1" != upgrade ]
 then

diff --git a/debian/nfs-kernel-server.init b/debian/nfs-kernel-server.init
index c2ee49bbee1f45b516efce39a6906405d88fa0cd..db04b538a5a2e35e5ffe01ac59418ea5ef1ef208 100755 (executable)
--- 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"
                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
                    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 a523cc781445842eba5472a82cd38df9158cd5de..1f1e03995a603851761db6988c4931a955c2bf44 100755 (executable)
--- 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.
 
        # 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
 
        ;;
 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 bf75d99b7287c0cffcccc9f0a270f97cf41625be..a326cd3e8e54bc53aec8e9007d93a6be04399dd6 100755 (executable)
--- a/debian/nfs-kernel-server.postrm
+++ b/debian/nfs-kernel-server.postrm
@@ -4,7 +4,7 @@
 
 case "$1" in
     purge)
 
 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
 
        ;;
 esac
 

diff --git a/debian/nfs-kernel-server.prerm b/debian/nfs-kernel-server.prerm
index 4e1a2cc4d3973819a256450c00f6b71f4d3c2826..d82bd10b34c71787fff13bc3204145ece00bad65 100755 (executable)
--- a/debian/nfs-kernel-server.prerm
+++ b/debian/nfs-kernel-server.prerm
@@ -2,7 +2,12 @@
 
 #DEBHELPER#
 
 
 #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
 
 if [ "$1" != upgrade ]
 then