Imported Debian patch 1.0.7-7

diff --git a/confdefs.h b/confdefs.h
new file mode 100644 (file)
index 0000000..0010349
--- /dev/null
+++ b/confdefs.h
@@ -0,0 +1,4 @@
+
+#define NFS3_SUPPORTED 1
+#define NFS4_SUPPORTED 1
+#define GSS_SUPPORTED 1

diff --git a/debian/README.Debian.nfsv4 b/debian/README.Debian.nfsv4
new file mode 100644 (file)
index 0000000..70accc4
--- /dev/null
+++ b/debian/README.Debian.nfsv4
@@ -0,0 +1,52 @@
+NFSv4 in Debian
+===============
+
+NFSv4 support in Debian is rather new, and not fully supported yet. If you want
+to experiment, make sure you have:
+
+ - a recent 2.6 kernel on both client and server; newer is better. You might even
+   want to use CITI's patch set from http://www.citi.umich.edu/projects/nfsv4/linux/ .
+ - a recent enough version of nfs-utils on both client and server (you probably
+   have on at least one of them, since you're reading this file!).
+ - a patched mount, which will hopefully enter the archive soon at the time of
+   writing -- otherwise, you'll have to enable the patch in the Debian package
+   yourself and rebuild it. (It is not enabled by default, since the current version
+   of the patch breaks mounting against NFSv2-only servers, such as nfs-user-server.)
+
+The export structure might be a bit confusing if you're already familiar with
+NFSv2 or NFSv3. The biggest difference is that you will need to export an explicit
+root of your pseudofilesystem, like this /etc/exports fragment:
+
+  /nfs4                   hostname(rw,sync,fsid=0,crossmnt)
+
+(It doesn't need to be named "nfs4".) Then you can mount other volumes under that,
+like:
+
+  /nfs4/music             hostname(rw,sync)
+  /nfs4/movies            hostname(rw,sync)
+
+Then your client can mount shares like this:
+
+  mount -t nfs4 server:/music /mnt/music
+
+Since you might not have everything under one root, you might want /nfs4/* on the
+server to be bind mounts, ie.:
+
+  mount --bind /srv/music /nfs4/music
+
+or in /etc/fstab:
+
+  /srv/music /nfs4/music none bind 0 0
+  
+If you do not wish to use host-based authentication, you can specify "gss/krb5"
+instead of a hostname to get Kerberos-based authentication instead. For this, 
+you will need an "nfs/hostname@REALM" entry in /etc/krb5.keytab, as well as
+rpc.gssd running on the client (enable it manually in /etc/default/nfs-common)
+and rpc.svcgssd running on the server (it should be autodetected once you put
+Kerberos mounts in /etc/exports).
+
+If you use "gss/krb5i", you will also get integrity (ie. authentication), and
+with "gss/krb5p", you'll also get privacy (ie.  encryption). Make sure your
+kernel supports this; not all kernels do.
+
+ -- Steinar H. Gunderson <sesse@debian.org>, Wed, 05 Apr 2006 18:09:47 +0200

diff --git a/debian/changelog b/debian/changelog
index 4d0cacf895fa2a59f306e807818e8ea3b7685fba..a36dd98ee659abca9bf8486b618c33e19d83c769 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+nfs-utils (1:1.0.7-7) unstable; urgency=high
+
+  * urgency=high, fixes an RC bug.
+  * Let the init script test for kernel support before trying to start
+    nfs-kernel-server. (Closes: #360420)
+  * Include help on how to activate /etc/exports changes; text from
+    Martin Pool. (Closes: #239286)
+  * Document sync option in exports man page. (Closes: #297135)
+  * Give an example in /etc/exports. (Closes: #345460)
+  * Write a mini-HOWTO on how to get NFSv4 up and running. (Closes: #294468)
+    * Install it in debian/rules.
+
+ -- Steinar H. Gunderson <sesse@debian.org>  Wed,  5 Apr 2006 18:15:20 +0200
+
 nfs-utils (1:1.0.7-6) unstable; urgency=low
 
   * Let the man-page fixup script in debian/rules look for the man pages in

diff --git a/debian/etc.exports b/debian/etc.exports
index 26b16e1a61ab34d4326b6ad754a37f3464ee78af..4bb425bffa24101fbe5e0f0ff03dfb576c88cec3 100644 (file)
--- a/debian/etc.exports
+++ b/debian/etc.exports
@@ -1,2 +1,10 @@
 # /etc/exports: the access control list for filesystems which may be exported
 #              to NFS clients.  See exports(5).
+#
+# Example for NFSv2 and NFSv3:
+# /srv/homes       hostname1(rw,sync) hostname2(ro,sync)
+#
+# Example for NFSv4:
+# /srv/nfs4        gss/krb5i(rw,sync,fsid=0,crossmnt)
+# /srv/nfs4/homes  gss/krb5i(rw,sync)
+#

diff --git a/debian/nfs-kernel-server.init b/debian/nfs-kernel-server.init
index 1818b9edbe1e08ff7e2e79f2fa284b79a920d9b5..922b7349f49481b0c36f34ef2569b726d7574d7f 100755 (executable)
--- a/debian/nfs-kernel-server.init
+++ b/debian/nfs-kernel-server.init
@@ -62,6 +62,13 @@ case "$1" in
        if [ -f /etc/exports ]
        then
                do_modprobe nfsd
+
+               # See if our running kernel supports the NFS kernel server
+               if [ -f /proc/kallsyms ] && ! grep -q nfsd_version /proc/kallsyms; then
+                       echo "Not starting $DESC: no support in current kernel."
+                       exit 0
+               fi
+               
                do_mount nfsd $PROCNFSD_MOUNTPOINT || NEED_SVCGSSD=no
                printf "Exporting directories for $DESC..."
                $PREFIX/sbin/exportfs -r

diff --git a/debian/rules b/debian/rules
index 65117040dd3e2c95f421455dcf144632fb1ef024..8661045ab2094ff7992c1d033136a148355e061b 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -62,6 +62,7 @@ binary-arch: build
          cp --preserve=timestamps gssapi_mech.conf nfs-common/etc/; \
        # Fixups End Here #
        dh_installdocs -A
+       dh_installdocs -pnfs-common debian/README.Debian.nfsv4
        dh_installexamples
        dh_installinit -n
        dh_installman

diff --git a/utils/exportfs/exports.man b/utils/exportfs/exports.man
index 0c78db348de6fb632ea4284979bdaef868a8af6c..65aeefbac5d4bce932f5d3df00391460b42820fb 100644 (file)
--- a/utils/exportfs/exports.man
+++ b/utils/exportfs/exports.man
@@ -29,6 +29,9 @@ double quotes. You can also specify spaces or other unusual character in
 the export name using a backslash followed by the character code as three
 octal digits.
 .PP
+To apply changes to this file, run exportfs -ra or (on Debian)
+/etc/init.d/nfs-kernel-server reload.
+.PP
 .SS Machine Name Formats
 NFS clients may be specified in a number of ways:
 .IP "single host
@@ -109,6 +112,13 @@ Using this option usually improves performance, but at the cost that
 an unclean server restart (i.e. a crash) can cause data to be lost or
 corrupted.
 
+.TP
+.IR sync
+Reply to requests only after the changes have been committed to stable
+storage (see
+.IR async
+above).
+
 In releases of nfs-utils upto and including 1.0.0, this option was the
 default.  In this and future releases,
 .I sync