diff options
| author | jkh <jkh@FreeBSD.org> | 1995-08-23 12:59:27 +0000 |
|---|---|---|
| committer | jkh <jkh@FreeBSD.org> | 1995-08-23 12:59:27 +0000 |
| commit | fa17d89229c96c1a5fc5e4115fdf5dead35fa426 (patch) | |
| tree | 340d104ae478f6cf31ab003881353caef1608de4 /sbin/mount | |
| parent | 20b06a26bb71495bbb95282b9996e8f14b5b5472 (diff) | |
| download | FreeBSD-src-fa17d89229c96c1a5fc5e4115fdf5dead35fa426.zip FreeBSD-src-fa17d89229c96c1a5fc5e4115fdf5dead35fa426.tar.gz | |
Add a "noauto" flag so that you can do things like prevent your system
from not coming up multiuser just because you have a CD mount in fstab
but no CD in the drive.
Submitted by: "Full Name Not Supplied" <simon@masi.ibp.fr>
Diffstat (limited to 'sbin/mount')
| -rw-r--r-- | sbin/mount/mntopts.h | 2 | ||||
| -rw-r--r-- | sbin/mount/mount.c | 9 |
2 files changed, 8 insertions, 3 deletions
diff --git a/sbin/mount/mntopts.h b/sbin/mount/mntopts.h index 0e7ab24..84e2943 100644 --- a/sbin/mount/mntopts.h +++ b/sbin/mount/mntopts.h @@ -42,6 +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_NODEV { "dev", 1, MNT_NODEV, 0 } #define MOPT_NOEXEC { "exec", 1, MNT_NOEXEC, 0 } #define MOPT_NOSUID { "suid", 1, MNT_NOSUID, 0 } @@ -68,6 +69,7 @@ struct mntopt { /* Standard options which all mounts can understand. */ #define MOPT_STDOPTS \ MOPT_FSTAB_COMPAT, \ + MOPT_NOAUTO, \ MOPT_NODEV, \ MOPT_NOEXEC, \ MOPT_NOSUID, \ diff --git a/sbin/mount/mount.c b/sbin/mount/mount.c index 2121ae1..bcf65a3 100644 --- a/sbin/mount/mount.c +++ b/sbin/mount/mount.c @@ -84,6 +84,7 @@ 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" }, @@ -166,10 +167,12 @@ main(argc, argv) continue; if (badvfsname(fs->fs_vfstype, vfslist)) continue; + if (!strstr(fs->fs_mntops, "noauto")) { if (mountfs(fs->fs_vfstype, fs->fs_spec, - fs->fs_file, init_flags, options, - fs->fs_mntops)) - rval = 1; + fs->fs_file, init_flags, options, + fs->fs_mntops)) + rval = 1; + } } else { if ((mntsize = getmntinfo(&mntbuf, MNT_NOWAIT)) == 0) |
