rpms/autofs/F-7 autofs-5.0.1-conf-append-global.patch, 1.1, 1.2 autofs.spec, 1.206, 1.207

[Ian Kent (iankent)]

Author: iankent

Update of /cvs/pkgs/rpms/autofs/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14248

Modified Files:
	autofs-5.0.1-conf-append-global.patch autofs.spec 
Log Message:
* Mon Jul 16 2007 Ian Kent <ikent at redhat.com> - 5.0.1-0.18
- correct man page of patch which added mount options append control.


autofs-5.0.1-conf-append-global.patch:

Index: autofs-5.0.1-conf-append-global.patch
===================================================================
RCS file: /cvs/pkgs/rpms/autofs/F-7/autofs-5.0.1-conf-append-global.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- autofs-5.0.1-conf-append-global.patch	16 Apr 2007 09:14:14 -0000	1.1
+++ autofs-5.0.1-conf-append-global.patch	16 Jul 2007 12:41:24 -0000	1.2
@@ -1,5 +1,3 @@
-diff --git a/include/defaults.h b/include/defaults.h
-index b64735f..ef58467 100644
 --- a/include/defaults.h
 +++ b/include/defaults.h
 @@ -34,6 +34,7 @@
@@ -18,8 +16,6 @@
  const char *defaults_get_auth_conf_file(void);
  
  #endif
-diff --git a/lib/defaults.c b/lib/defaults.c
-index f76478e..4b4acba 100644
 --- a/lib/defaults.c
 +++ b/lib/defaults.c
 @@ -37,6 +37,7 @@
@@ -56,8 +52,6 @@
  const char *defaults_get_auth_conf_file(void)
  {
  	char *cf;
-diff --git a/modules/parse_sun.c b/modules/parse_sun.c
-index 9323e7c..276493a 100644
 --- a/modules/parse_sun.c
 +++ b/modules/parse_sun.c
 @@ -140,7 +140,7 @@ int expandsunent(const char *src, char *dst, const char *key,
@@ -126,8 +120,6 @@
  	}
  
  	debug(ap->logopt, MODPREFIX "gathered options: %s", options);
-diff --git a/redhat/autofs.sysconfig.in b/redhat/autofs.sysconfig.in
-index 84d524b..8299b55 100644
 --- a/redhat/autofs.sysconfig.in
 +++ b/redhat/autofs.sysconfig.in
 @@ -13,6 +13,10 @@ TIMEOUT=300
@@ -141,8 +133,7 @@
  # LOGGING - set default log level "none", "verbose" or "debug"
  #
  #LOGGING="none"
-diff --git a/samples/autofs.conf.default.in b/samples/autofs.conf.default.in
-index 84d524b..8299b55 100644
+unchanged:
 --- a/samples/autofs.conf.default.in
 +++ b/samples/autofs.conf.default.in
 @@ -13,6 +13,10 @@ TIMEOUT=300
@@ -156,3 +147,42 @@
  # LOGGING - set default log level "none", "verbose" or "debug"
  #
  #LOGGING="none"
+--- a/man/auto.master.5.in
++++ b/man/auto.master.5.in
+@@ -133,7 +133,6 @@ Treat errors when mounting file systems as fatal. This is important when
+ multiple file systems should be mounted (`multimounts'). If this option
+ is given, no file system is mounted at all if at least one file system
+ can't be mounted.
+-<<<<<<< master
+ .SH GENERAL SYSTEM DEFAULTS CONFIGURATION
+ .P
+ The default value of several general settings may be changed in the
+@@ -149,24 +148,10 @@ sets the default mount timeout (program default 600).
+ .B BROWSE_MODE
+ Maps are browsable by default (program default "yes").
+ .TP
+-.B LOGGING
+-set default log level "none", "verbose" or "debug" (program default "none").
+-=======
+-.SH GENERAL SYSTEM DEFAULTS CONFIGURATION
+-.P
+-The default value of several general settings may be changed in the
+-configuration file
+-.nh
+-.BR @@autofsconfdir@@/autofs .
+-.hy
+-.P
+-They are:
+-.TP
+-.B TIMEOUT
+-sets the default mount timeout (program default 600).
+-.TP
+-.B BROWSE_MODE
+-Maps are browsable by default (program default "yes").
++.B APPEND_OPTIONS
++Determine whether global options, given on the command line or per mount
++in the master map, are appended to map entry options or if the map entry
++options replace the global options (program default "yes", append options).
+ .TP
+ .B LOGGING
+ set default log level "none", "verbose" or "debug" (program default "none").


Index: autofs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/autofs/F-7/autofs.spec,v
retrieving revision 1.206
retrieving revision 1.207
diff -u -r1.206 -r1.207
--- autofs.spec	16 Jul 2007 06:20:01 -0000	1.206
+++ autofs.spec	16 Jul 2007 12:41:24 -0000	1.207
@@ -4,7 +4,7 @@
 Summary: A tool for automatically mounting and unmounting filesystems
 Name: autofs
 Version: 5.0.1
-Release: 17
+Release: 18
 Epoch: 1
 License: GPL
 Group: System Environment/Daemons
@@ -147,6 +147,9 @@
 %{_libdir}/autofs/
 
 %changelog
+* Mon Jul 16 2007 Ian Kent <ikent at redhat.com> - 5.0.1-0.18
+- correct man page of patch which added mount options append control.
+
 * Mon Jul 16 2007 Ian Kent <ikent at redhat.com> - 5.0.1-0.17
 - fix mount point directory creation for bind mounts.
 - add quoting for exports gathered by hosts map.