Hi,
I'd like to suggest the attached patch for autofs-4.1.2 fixing various
minor bugs, typos, and inconsistencies.
Some comments:
man/autofs.8.in: Since "autofs status" is mentioned in the text it should
as well appear in the synopsis.
man/automount.8: Tell the truth about creation and removal of mount points;
various formating bugs and typos; consistent punctuation ("A, B, and C" like
"A, B, or C").
modules/Makefile: "make install" shouldn't fail if the symlink
mount_ext3.so->mount_ext2.so exists (e.g. when re-installing).
samples/Makefile: Consistently use $(INSTALLROOT)$(initdir) instead of
$(INSTALLROOT)/$(initdir).
samples/auto.master.ldap: nisMapNmae=>nisMapName.
regards
Peter Breitenlohner <[EMAIL PROTECTED]>diff -ur autofs-4.1.2.orig/man/autofs.8.in autofs-4.1.2/man/autofs.8.in
--- autofs-4.1.2.orig/man/autofs.8.in 2003-09-29 10:22:35.000000000 +0200
+++ autofs-4.1.2/man/autofs.8.in 2004-06-11 13:31:10.000000000 +0200
@@ -4,7 +4,7 @@
@@INIT.D@@/autofs \- Control Script for automounter
.SH SYNOPSIS
.B @@INIT.D@@/autofs
-.I start|stop|reload
+.I start|stop|reload|status
.SH "DESCRIPTION"
.B autofs
control the operation of the
diff -ur autofs-4.1.2.orig/man/automount.8 autofs-4.1.2/man/automount.8
--- autofs-4.1.2.orig/man/automount.8 2004-01-29 17:01:22.000000000 +0100
+++ autofs-4.1.2/man/automount.8 2004-06-11 16:02:04.000000000 +0200
@@ -45,12 +45,13 @@
Display the version number, then exit.
.SH ARGUMENTS
\fBautomount\fP takes at least three arguments. Mandatory arguments
-include \fImount-point\fP, \fImap-type\fP and \fImap\fP. Both mandatory
+include \fImount-point\fP, \fImap-type\fP, and \fImap\fP. Both mandatory
and optional arguments are described below.
.TP
\fBmount-point\fP
Base location for autofs-mounted filesystems to be attached. This is a
-directory name which must already exist.
+directory name that will be created (as with \fBmkdir \-p\fP) and later
+when \fBautomount\fP terminates will be removed (as with \fBrmdir \-p\fP).
.TP
\fBmap-type\fP
Type of map used for this invocation of \fBautomount\fP. The following are
@@ -78,7 +79,7 @@
.B ldap
map names are of the form \fB[//servername/]basedn\fP, where the optional
\fBservername\fP is the name of the LDAP server to query, and \fBbasedn\fP is
-the DN to do a subtree search under. Two LDAP schema are supported. The i
+the DN to do a subtree search under. Two LDAP schema are supported. The
automountMap and the nisMap (RFC 2307) object classes.
.P
Entries in the automountMap schema are \fBautomount\fP objects in
@@ -88,12 +89,13 @@
used by this module is available online at
\fIhttp://docs.sun.com/source/806-4251-10/mapping.htm\fP.
.P
-RFC 2307 schema entries are \fBnisObject\fB objects and use the \fBcn\fB
-attribute as the key and the \fBnisMapEntry\fB contains information used
+RFC 2307 schema entries are \fBnisObject\fP objects and use the \fBcn\fP
+attribute as the key and the \fBnisMapEntry\fP contains information used
by the automounter.
.RE
.TP
-\fBformat\fP Format of the map data; currently the only formats
+\fBformat\fP
+Format of the map data; currently the only formats
recognized are \fBsun\fP, which is a subset of the Sun automounter map
format, and \fBhesiod\fP, for hesiod filesys entries. If the format is
left unspecified, it defaults to \fBsun\fP for all map types except
diff -ur autofs-4.1.2.orig/modules/Makefile autofs-4.1.2/modules/Makefile
--- autofs-4.1.2.orig/modules/Makefile 2004-04-03 09:14:33.000000000 +0200
+++ autofs-4.1.2/modules/Makefile 2004-06-11 13:47:55.000000000 +0200
@@ -57,7 +57,7 @@
-rm -f $(INSTALLROOT)$(autofslibdir)/mount_smbfs.so
ifeq ($(EXT2FS), 1)
ifeq ($(EXT3FS), 1)
- ln -s mount_ext2.so $(INSTALLROOT)$(autofslibdir)/mount_ext3.so
+ ln -fs mount_ext2.so $(INSTALLROOT)$(autofslibdir)/mount_ext3.so
endif
else
ifeq ($(EXT3FS), 1)
diff -ur autofs-4.1.2.orig/samples/Makefile autofs-4.1.2/samples/Makefile
--- autofs-4.1.2.orig/samples/Makefile 2004-01-29 17:01:22.000000000 +0100
+++ autofs-4.1.2/samples/Makefile 2004-06-11 14:22:46.000000000 +0200
@@ -31,7 +31,7 @@
-mv -f $(INSTALLROOT)/etc/auto.misc $(INSTALLROOT)/etc/auto.misc.old
install -c auto.misc -m 644 $(INSTALLROOT)/etc
install -c auto.net -m 755 $(INSTALLROOT)/etc
- install -d -m 755 $(INSTALLROOT)/$(initdir)
+ install -d -m 755 $(INSTALLROOT)$(initdir)
install -c rc.autofs -m 755 $(INSTALLROOT)$(initdir)/autofs
install -d -m 755 $(INSTALLROOT)$(autofslibdir)
ifeq ($(LDAP), 1)
diff -ur autofs-4.1.2.orig/samples/auto.master.ldap
autofs-4.1.2/samples/auto.master.ldap
--- autofs-4.1.2.orig/samples/auto.master.ldap 2004-04-03 09:14:33.000000000 +0200
+++ autofs-4.1.2/samples/auto.master.ldap 2004-06-11 13:25:07.000000000 +0200
@@ -14,9 +14,9 @@
#
# When using the nisMap schema use an entry like
#
-#/other ldap://budgie/nisMapNmae=auto.indirect,dc=themaw,dc=net
+#/other ldap://budgie/nisMapName=auto.indirect,dc=themaw,dc=net
#
# or if the default LDAP server is set in your LDAP config
# you can use this
#
-/other ldap:nisMapNmae=auto.indirect,dc=themaw,dc=net
+/other ldap:nisMapName=auto.indirect,dc=themaw,dc=net
_______________________________________________
autofs mailing list
[EMAIL PROTECTED]
http://linux.kernel.org/mailman/listinfo/autofs
