From: Ben Hutchings Date: Sat, 2 Oct 2010 19:06:13 +0000 (+0100) Subject: mount.nfs.man: Update distinction between mount.nfs and mount.nfs4 (Closes: #575503) X-Git-Tag: debian/1%1.2.2-5~13 X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=78dafce6cbd37a9561e296d1aa4df42e98420d68;p=nfs-utils.git mount.nfs.man: Update distinction between mount.nfs and mount.nfs4 (Closes: #575503) --- diff --git a/debian/changelog b/debian/changelog index 96c367c..1ee6ea6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +nfs-utils (1:1.2.2-5) UNRELEASED; urgency=low + + * mount.nfs.man: Update distinction between mount.nfs and mount.nfs4 + (Closes: #575503) + + -- Ben Hutchings Sat, 02 Oct 2010 20:05:53 +0100 + nfs-utils (1:1.2.2-4) unstable; urgency=low * mountd: fix path comparison for v4 crossmnt (Closes: #578317) diff --git a/debian/patches/16-mount-nfs-man-update-distinction-mount.nfs-mount.nfs4.patch b/debian/patches/16-mount-nfs-man-update-distinction-mount.nfs-mount.nfs4.patch new file mode 100644 index 0000000..d180c98 --- /dev/null +++ b/debian/patches/16-mount-nfs-man-update-distinction-mount.nfs-mount.nfs4.patch @@ -0,0 +1,32 @@ +From: Ben Hutchings +Subject: [PATCH] mount.nfs.man: Update distinction between mount.nfs and mount.nfs4 + +This addresses Debian bug #575503. + +--- nfs-utils.orig/utils/mount/mount.nfs.man ++++ nfs-utils/utils/mount/mount.nfs.man +@@ -15,16 +15,20 @@ + .BR mount (8) + command for mounting NFS shares. This subcommand, however, can also be used as a standalone command with limited functionality. + +-.BR mount.nfs4 +-is used for mounting NFSv4 file system, while +-.BR mount.nfs +-is used to mount NFS file systems versions 3 or 2. + .I remotetarget + is a server share usually in the form of + .BR servername:/path/to/share. + .I dir + is the directory on which the file system is to be mounted. + ++Under Linux 2.6.32 and later kernel versions, ++.BR mount.nfs ++can mount all NFS file system versions. Under earlier Linux kernel versions, ++.BR mount.nfs4 ++must be used for mounting NFSv4 file systems while ++.BR mount.nfs ++must be used for NFSv3 and v2. ++ + .SH OPTIONS + .TP + .BI "\-r" diff --git a/debian/patches/series b/debian/patches/series index 95912c3..0dd0792 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -7,3 +7,4 @@ 13-preserve-explicit-port-2049.patch 14-allow-address-without-name.patch 15-mountd-fix-path-comparison-for-v4-crossmnt.patch +16-mount-nfs-man-update-distinction-mount.nfs-mount.nfs4.patch