Imported Debian patch 1.1.1-8

diff --git a/debian/changelog b/debian/changelog
index 3f268883830e4a7a3b0688119170511eee21c33e..e8a22e2b55f945a2f78a2fe84d1dfc139b05a427 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+nfs-utils (1:1.1.1-8) unstable; urgency=low
+
+  * When starting idmapd or gssd, load the sunrpc module instead of the
+    nfs/nfs4 modules; if the machine is server-only, it might not have
+    nfs/nfs4 (which are client-side modules) available.
+    (Closes: #449137)
+  * Revert NEED_MOUNTD patch; mountd is always needed, also for NFSv4.
+
+ -- Steinar H. Gunderson <sesse@debian.org>  Sun, 04 Nov 2007 13:05:57 +0000
+
 nfs-utils (1:1.1.1-7) unstable; urgency=low
 
   * More init script breakage: Fix default value of NEED_STATD.

diff --git a/debian/nfs-common.init b/debian/nfs-common.init
index 0a018ccafc329e82a506357c739c1199389395c4..6b6599da46ddda25d5f07e88e9227e52a0719f26 100644 (file)
--- a/debian/nfs-common.init
+++ b/debian/nfs-common.init
@@ -147,8 +147,7 @@ case "$1" in
 
        if [ "$NEED_IDMAPD" = yes ] || [ "$NEED_GSSD" = yes ]
        then
-           do_modprobe nfs
-           do_modprobe nfs4
+           do_modprobe sunrpc
            if do_mount rpc_pipefs $PIPEFS_MOUNTPOINT
            then
                if [ "$NEED_IDMAPD" = yes ]

diff --git a/debian/nfs-kernel-server.default b/debian/nfs-kernel-server.default
index 63f5c6c1b8b7f399a368c0b0c0d369df63490b29..365f616ea98de74ee955e19a0cb6a2173bbb5715 100644 (file)
--- a/debian/nfs-kernel-server.default
+++ b/debian/nfs-kernel-server.default
@@ -4,10 +4,6 @@ RPCNFSDCOUNT=8
 # Runtime priority of server (see nice(1))
 RPCNFSDPRIORITY=0
 
-# Do you want to start the mountd daemon? It is not required for NFSv4.
-# Valid alternatives are "yes" and "no"; the default is "yes".
-NEED_MOUNTD=
-
 # Options for rpc.mountd.
 # If you have a port-based firewall, you might want to set up
 # a fixed port here using the --port option. For more information, 

diff --git a/debian/nfs-kernel-server.init b/debian/nfs-kernel-server.init
index 06c40e6da0b8985ffe3f55f498ba00a0a7a0b192..6e352c0f303a5e43eb9cbd455ce6161c5900c7f9 100644 (file)
--- a/debian/nfs-kernel-server.init
+++ b/debian/nfs-kernel-server.init
@@ -27,7 +27,6 @@ DEFAULTFILE=/etc/default/nfs-kernel-server
 RPCNFSDCOUNT=8
 RPCNFSDPRIORITY=0
 RPCMOUNTDOPTS=
-NEED_MOUNTD=yes
 NEED_SVCGSSD=no
 RPCSVCGSSDOPTS=
 PROCNFSD_MOUNTPOINT=/proc/fs/nfsd
@@ -115,14 +114,12 @@ case "$1" in
                        fi
                fi
 
-               if [ "$NEED_MOUNTD" != "no" ]; then
-                       log_progress_msg "mountd"
-                       start-stop-daemon --start --oknodo --quiet \
-                           --exec $PREFIX/sbin/rpc.mountd -- $RPCMOUNTDOPTS
-                       if [ $? != 0 ]; then
-                               log_end_msg $?
-                               exit $?
-                       fi
+               log_progress_msg "mountd"
+               start-stop-daemon --start --oknodo --quiet \
+                   --exec $PREFIX/sbin/rpc.mountd -- $RPCMOUNTDOPTS
+               if [ $? != 0 ]; then
+                       log_end_msg $?
+                       exit $?
                fi
 
                log_end_msg 0
@@ -134,14 +131,12 @@ case "$1" in
   stop)
        log_daemon_msg "Stopping $DESC"
 
-       if [ "$NEED_MOUNTD" != "no" ]; then
-               log_progress_msg "mountd"
-               start-stop-daemon --stop --oknodo --quiet \
-                   --name rpc.mountd --user 0
-               if [ $? != 0 ]; then
-                       log_end_msg $?
-                       exit $?
-               fi
+       log_progress_msg "mountd"
+       start-stop-daemon --stop --oknodo --quiet \
+           --name rpc.mountd --user 0
+       if [ $? != 0 ]; then
+               log_end_msg $?
+               exit $?
        fi
 
        if [ "$NEED_SVCGSSD" = "yes" ]; then