d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

The changes for adding the "noauto" option were mostly wrong. MNT_NOAUTO

Browse Source 
is a kernel flag, and the kernel definately doesn't need to know about
it.
This commit is contained in:
David Greenman 1995-08-26 05:39:53 +00:00
parent bdc3c66075
commit 89beb278f7
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=10288
6 changed files with 10 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sbin/mount/mntopts.h
View File

@ -42,7 +42,7 @@ struct mntopt {
/* User-visible MNT_ flags. */
#define MOPT_ASYNC { "async", 0, MNT_ASYNC, 0 }
#define MOPT_NOAUTO { "auto", 1, MNT_NOAUTO, 0 }
#define MOPT_NOAUTO { "auto", 1, 0, 0 }
#define MOPT_NODEV { "dev", 1, MNT_NODEV, 0 }
#define MOPT_NOEXEC { "exec", 1, MNT_NOEXEC, 0 }
#define MOPT_NOSUID { "suid", 1, MNT_NOSUID, 0 }

5
sbin/mount/mount.8
View File

@ -108,11 +108,6 @@ The same as
forces the revocation of write access when trying to downgrade
a filesystem mount status from read-write to read-only. Also
forces the R/W mount of an unclean filesystem (dangerous; use with caution).
.It noauto
Do not attempt to mount this filesystem when the
.Fl a
flag is specified. This allows you to have mount entries that can
be invoked manually when needed, but not before.
.It nodev
Do not interpret character or block special devices on the file system.
This option is useful for a server that has file systems containing

9
sbin/mount/mount.c
View File

@ -84,7 +84,6 @@ static struct opt {
{ MNT_ASYNC, "asynchronous" },
{ MNT_EXPORTED, "NFS exported" },
{ MNT_LOCAL, "local" },
{ MNT_NOAUTO, "noauto" },
{ MNT_NODEV, "nodev" },
{ MNT_NOEXEC, "noexec" },
{ MNT_NOSUID, "nosuid" },
@ -167,12 +166,12 @@ main(argc, argv)
continue;
if (badvfsname(fs->fs_vfstype, vfslist))
continue;
if (!strstr(fs->fs_mntops, "noauto")) {
if (strstr(fs->fs_mntops, "noauto"))
continue;
if (mountfs(fs->fs_vfstype, fs->fs_spec,
fs->fs_file, init_flags, options,
fs->fs_mntops))
fs->fs_file, init_flags, options,
fs->fs_mntops))
rval = 1;
}
}
else {
if ((mntsize = getmntinfo(&mntbuf, MNT_NOWAIT)) == 0)

2
sbin/mount_ifs/mntopts.h
View File

@ -42,7 +42,7 @@ struct mntopt {
/* User-visible MNT_ flags. */
#define MOPT_ASYNC { "async", 0, MNT_ASYNC, 0 }
#define MOPT_NOAUTO { "auto", 1, MNT_NOAUTO, 0 }
#define MOPT_NOAUTO { "auto", 1, 0, 0 }
#define MOPT_NODEV { "dev", 1, MNT_NODEV, 0 }
#define MOPT_NOEXEC { "exec", 1, MNT_NOEXEC, 0 }
#define MOPT_NOSUID { "suid", 1, MNT_NOSUID, 0 }

5
sbin/mount_ifs/mount.8
View File

@ -108,11 +108,6 @@ The same as
forces the revocation of write access when trying to downgrade
a filesystem mount status from read-write to read-only. Also
forces the R/W mount of an unclean filesystem (dangerous; use with caution).
.It noauto
Do not attempt to mount this filesystem when the
.Fl a
flag is specified. This allows you to have mount entries that can
be invoked manually when needed, but not before.
.It nodev
Do not interpret character or block special devices on the file system.
This option is useful for a server that has file systems containing

9
sbin/mount_ifs/mount.c
View File

@ -84,7 +84,6 @@ static struct opt {
{ MNT_ASYNC, "asynchronous" },
{ MNT_EXPORTED, "NFS exported" },
{ MNT_LOCAL, "local" },
{ MNT_NOAUTO, "noauto" },
{ MNT_NODEV, "nodev" },
{ MNT_NOEXEC, "noexec" },
{ MNT_NOSUID, "nosuid" },
@ -167,12 +166,12 @@ main(argc, argv)
continue;
if (badvfsname(fs->fs_vfstype, vfslist))
continue;
if (!strstr(fs->fs_mntops, "noauto")) {
if (strstr(fs->fs_mntops, "noauto"))
continue;
if (mountfs(fs->fs_vfstype, fs->fs_spec,
fs->fs_file, init_flags, options,
fs->fs_mntops))
fs->fs_file, init_flags, options,
fs->fs_mntops))
rval = 1;
}
}
else {
if ((mntsize = getmntinfo(&mntbuf, MNT_NOWAIT)) == 0)