CVS commit: src/sbin/mount_autofs
Module Name:src Committed By: wiz Date: Wed Nov 20 21:56:19 UTC 2019 Modified Files: src/sbin/mount_autofs: mount_autofs.8 Log Message: Sort options and SEE ALSO. Improve a sentence. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sbin/mount_autofs/mount_autofs.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sbin/mount_autofs
Module Name:src Committed By: wiz Date: Wed Nov 20 21:56:19 UTC 2019 Modified Files: src/sbin/mount_autofs: mount_autofs.8 Log Message: Sort options and SEE ALSO. Improve a sentence. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sbin/mount_autofs/mount_autofs.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sbin/mount_autofs/mount_autofs.8 diff -u src/sbin/mount_autofs/mount_autofs.8:1.7 src/sbin/mount_autofs/mount_autofs.8:1.8 --- src/sbin/mount_autofs/mount_autofs.8:1.7 Wed Nov 20 17:29:51 2019 +++ src/sbin/mount_autofs/mount_autofs.8 Wed Nov 20 21:56:19 2019 @@ -1,4 +1,4 @@ -.\" $NetBSD: mount_autofs.8,v 1.7 2019/11/20 17:29:51 tkusumi Exp $ +.\" $NetBSD: mount_autofs.8,v 1.8 2019/11/20 21:56:19 wiz Exp $ .\" .\" Copyright (c) 2018 The DragonFly Project .\" All rights reserved. @@ -33,8 +33,8 @@ .Sh SYNOPSIS .Nm .Op Fl f Ar from -.Op Fl o Ar options .Op Fl O Ar master_options +.Op Fl o Ar options .Op Fl p Ar master_prefix .Ar autofs .Ar mount_point @@ -47,8 +47,8 @@ Use instead. .Xr autofs 5 is mountable using -.Xr automount 8 -which incorporates +.Xr automount 8 , +which incorporates an .Xr auto_master 5 parser, without having to specify .Xr autofs 5 @@ -102,8 +102,8 @@ Set the prefix, below which the file system(s) will be mounted. .El .Sh SEE ALSO -.Xr autofs 5 , .Xr auto_master 5 , +.Xr autofs 5 , .Xr fstab 5 , .Xr automount 8 , .Xr mount 8
CVS commit: src/sbin/mount_autofs
Module Name:src Committed By: tkusumi Date: Wed Nov 20 17:29:51 UTC 2019 Modified Files: src/sbin/mount_autofs: mount_autofs.8 Log Message: mount_autofs: Sync man page with DragonFlyBSD Taken-from: DragonFlyBSD To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sbin/mount_autofs/mount_autofs.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sbin/mount_autofs/mount_autofs.8 diff -u src/sbin/mount_autofs/mount_autofs.8:1.6 src/sbin/mount_autofs/mount_autofs.8:1.7 --- src/sbin/mount_autofs/mount_autofs.8:1.6 Wed Jan 24 12:04:47 2018 +++ src/sbin/mount_autofs/mount_autofs.8 Wed Nov 20 17:29:51 2019 @@ -1,4 +1,4 @@ -.\" $NetBSD: mount_autofs.8,v 1.6 2018/01/24 12:04:47 uwe Exp $ +.\" $NetBSD: mount_autofs.8,v 1.7 2019/11/20 17:29:51 tkusumi Exp $ .\" .\" Copyright (c) 2018 The DragonFly Project .\" All rights reserved. @@ -24,7 +24,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd January 23, 2018 +.Dd November 21, 2019 .Dt MOUNT_AUTOFS 8 .Os .Sh NAME @@ -33,9 +33,9 @@ .Sh SYNOPSIS .Nm .Op Fl f Ar from -.Op Fl O Ar master_options .Op Fl o Ar options -.Op Fl p Ar prefix +.Op Fl O Ar master_options +.Op Fl p Ar master_prefix .Ar autofs .Ar mount_point .Sh DESCRIPTION @@ -45,6 +45,16 @@ command should not usually be called by Use .Xr automount 8 instead. +.Xr autofs 5 +is mountable using +.Xr automount 8 +which incorporates +.Xr auto_master 5 +parser, without having to specify +.Xr autofs 5 +mount options via command line. +.\" and that was the original intention of FreeBSD/autofs. +.\" This is a low level version without auto_master(5) involved. .Pp The .Nm @@ -93,6 +103,7 @@ prefix, below which the file system(s) w .El .Sh SEE ALSO .Xr autofs 5 , +.Xr auto_master 5 , .Xr fstab 5 , .Xr automount 8 , .Xr mount 8
CVS commit: src/sbin/mount_autofs
Module Name:src Committed By: tkusumi Date: Wed Nov 20 17:29:51 UTC 2019 Modified Files: src/sbin/mount_autofs: mount_autofs.8 Log Message: mount_autofs: Sync man page with DragonFlyBSD Taken-from: DragonFlyBSD To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sbin/mount_autofs/mount_autofs.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sbin/mount_autofs
Module Name:src Committed By: tkusumi Date: Wed Nov 20 17:18:35 UTC 2019 Modified Files: src/sbin/mount_autofs: mount_autofs.c Log Message: mount_autofs: Remove blank line with trailing whitespace To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sbin/mount_autofs/mount_autofs.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sbin/mount_autofs
Module Name:src Committed By: tkusumi Date: Wed Nov 20 17:18:35 UTC 2019 Modified Files: src/sbin/mount_autofs: mount_autofs.c Log Message: mount_autofs: Remove blank line with trailing whitespace To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sbin/mount_autofs/mount_autofs.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sbin/mount_autofs/mount_autofs.c diff -u src/sbin/mount_autofs/mount_autofs.c:1.3 src/sbin/mount_autofs/mount_autofs.c:1.4 --- src/sbin/mount_autofs/mount_autofs.c:1.3 Tue Jan 23 15:02:03 2018 +++ src/sbin/mount_autofs/mount_autofs.c Wed Nov 20 17:18:35 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: mount_autofs.c,v 1.3 2018/01/23 15:02:03 wiz Exp $ */ +/* $NetBSD: mount_autofs.c,v 1.4 2019/11/20 17:18:35 tkusumi Exp $ */ /*- * Copyright (c) 2018 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include #ifndef lint -__RCSID("$NetBSD: mount_autofs.c,v 1.3 2018/01/23 15:02:03 wiz Exp $"); +__RCSID("$NetBSD: mount_autofs.c,v 1.4 2019/11/20 17:18:35 tkusumi Exp $"); #endif /* not lint */ #include @@ -91,7 +91,6 @@ mount_autofs_parseargs(int argc, char *a case 'p': strlcpy(am->master_prefix, optarg, MAXPATHLEN); break; - case '?': default: usage();
Re: CVS commit: src/sbin/mount_autofs
Fixed with 'cvs admin'. Not sure why it wasn't ignored though? Thomas On Tue, Jan 23, 2018 at 02:58:46PM +, Thomas Klausner wrote: > Module Name: src > Committed By: wiz > Date: Tue Jan 23 14:58:46 UTC 2018 > > Modified Files: > src/sbin/mount_autofs: mount_autofs.8 > > Log Message: > Improve description of options. Based on comments by Tomohiro Kusumi. > > CVS: -- > CVS: CVSROOT cvs.NetBSD.org:/cvsroot > CVS: please use "PR category/123" to have the commitmsg appended to PR 123 > CVS: > CVS: Please evaluate your changes and consider the following. > CVS: Abort checkin if you answer no. > CVS: => For all changes: > CVS: Do the changed files compile? > CVS: Has the change been tested? > CVS: => If you are not completely familiar with the changed components: > CVS: Has the change been posted for review? > CVS: Have you allowed enough time for feedback? > CVS: => If the change is major: > CVS: => If the change adds files to, or removes files from $DESTDIR: > CVS: => If you are changing a library or kernel interface: > CVS: Have you successfully run "./build.sh release"? > > > To generate a diff of this commit: > cvs rdiff -u -r1.4 -r1.5 src/sbin/mount_autofs/mount_autofs.8 > > Please note that diffs are not public domain; they are subject to the > copyright notices on the relevant files. > > Modified files: > > Index: src/sbin/mount_autofs/mount_autofs.8 > diff -u src/sbin/mount_autofs/mount_autofs.8:1.4 > src/sbin/mount_autofs/mount_autofs.8:1.5 > --- src/sbin/mount_autofs/mount_autofs.8:1.4 Mon Jan 22 10:41:18 2018 > +++ src/sbin/mount_autofs/mount_autofs.8 Tue Jan 23 14:58:46 2018 > @@ -1,4 +1,4 @@ > -.\" $NetBSD: mount_autofs.8,v 1.4 2018/01/22 10:41:18 wiz Exp $ > +.\" $NetBSD: mount_autofs.8,v 1.5 2018/01/23 14:58:46 wiz Exp $ > .\" > .\" Copyright (c) 2018 The DragonFly Project > .\" All rights reserved. > @@ -24,7 +24,7 @@ > .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF > .\" SUCH DAMAGE. > .\" > -.Dd January 22, 2018 > +.Dd January 23, 2018 > .Dt MOUNT_AUTOFS 8 > .Os > .Sh NAME > @@ -41,6 +41,13 @@ > .Sh DESCRIPTION > The > .Nm > +command should not usually be called by admins. > +Use > +.Xr automount 8 > +instead. > +.Pp > +The > +.Nm > command attaches the automounter filesystem on the > .Ar autofs > device on to the file system tree at point > @@ -52,23 +59,37 @@ and > are converted to absolute paths before use. > .Pp > This command is normally executed by > -.Xr mount 8 > -at boot time. > +.Xr automount 8 . > The options are as follows: > .Bl -tag -width Ds > .It Fl f > -Set the automount > +Set the > .Ar from > -parameter. > +location for > +.Xr autofs 5 . > +This argument is usually read from > +.Pa /etc/auto_master > +by > +.Xr automount 8 . > .It Fl o > Set the mount options. > See the > .Xr mount 8 > man page for possible options and their meanings. > .It Fl O > -Set the automounter options. > +Set the > +.Xr autofs 5 > +options. > +See the > +.Op Fl options > +in > +.Sx AUTO_MASTER SYNTAX > +of > +.Xr auto_master 5 . > .It Fl p > -Set the automounter prefix. > +Set the > +.Xr autofs 5 > +prefix, below which the file system(s) will be mounted. > .El > .Sh SEE ALSO > .Xr autofs 5 , >