diff --git a/autofs-5.0.7-fix-nobind-man-page-description.patch b/autofs-5.0.7-fix-nobind-man-page-description.patch new file mode 100644 index 0000000..41328a0 --- /dev/null +++ b/autofs-5.0.7-fix-nobind-man-page-description.patch @@ -0,0 +1,46 @@ +autofs-5.0.7 - fix nobind man page description + +From: Ian Kent + +Update auto.master(5) to better describe the behavior of the "nobind" +option when used with direct mounts maps. +--- + + CHANGELOG | 1 + + man/auto.master.5.in | 10 +++++++--- + 2 files changed, 8 insertions(+), 3 deletions(-) + + +diff --git a/CHANGELOG b/CHANGELOG +index 16ac2a0..7eb7235 100644 +--- a/CHANGELOG ++++ b/CHANGELOG +@@ -17,6 +17,7 @@ + - handle new location of systemd. + - fix map entry duplicate offset detection. + - Allow nsswitch.conf to not contain "automount:" lines. ++- fix nobind man page description. + + 25/07/2012 autofs-5.0.7 + ======================= +diff --git a/man/auto.master.5.in b/man/auto.master.5.in +index 21d7544..8007542 100644 +--- a/man/auto.master.5.in ++++ b/man/auto.master.5.in +@@ -151,9 +151,13 @@ can't be mounted. + This is an autofs specific option that is a pseudo mount option and + so is given without a leading dash. It may be used either in the master + map entry (so it effects all the map entries) or with individual map +-entries to prevent bind mounting of local NFS filesystems. Bind mounting +-of NFS file systems can also be prevented for specific map entrys by +-adding the "port=" mount option to the entries. ++entries to prevent bind mounting of local NFS filesystems. For direct ++mount maps the option is only effective if specified on the first direct ++map entry and is applied to all direct mount maps in the master map. It ++is ignored if given on subsequent direct map entries. It may be used ++on individual map entries of both types. Bind mounting of NFS file ++systems can also be prevented for specific map entrys by adding the ++"port=" mount option to the entries. + .TP + .I "\-r, \-\-random-multimount-selection" + Enables the use of ramdom selection when choosing a host from a diff --git a/autofs.spec b/autofs.spec index 9fbf8c7..719c9d4 100644 --- a/autofs.spec +++ b/autofs.spec @@ -8,7 +8,7 @@ Summary: A tool for automatically mounting and unmounting filesystems Name: autofs Version: 5.0.7 -Release: 8%{?dist} +Release: 9%{?dist} Epoch: 1 License: GPLv2+ Group: System Environment/Daemons @@ -32,6 +32,7 @@ Patch16: autofs-5.0.6-increase-file-map-read-buffer-size.patch Patch17: autofs-5.0.7-handle-new-location-of-systemd.patch Patch18: autofs-5.0.7-fix-map-entry-duplicate-offset-detection.patch Patch19: autofs-5.0.7-allow-nsswitch_conf-to-not-contain-automount-lines.patch +Patch20: autofs-5.0.7-fix-nobind-man-page-description.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %if %{with_systemd} BuildRequires: systemd-units @@ -107,6 +108,7 @@ echo %{version}-%{release} > .version %patch17 -p1 %patch18 -p1 %patch19 -p1 +%patch20 -p1 %build #CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir} @@ -198,6 +200,9 @@ fi %dir /etc/auto.master.d %changelog +* Tue Nov 21 2012 Ian Kent - 1:5.0.7-9 +- fix nobind man page description. + * Tue Nov 20 2012 Ian Kent - 1:5.0.7-8 - fix map entry duplicate offset detection. - Allow nsswitch.conf to not contain "automount:" lines.