aboutsummaryrefslogtreecommitdiff
path: root/sbin
diff options
context:
space:
mode:
authorDavid Greenman <dg@FreeBSD.org>1995-05-12 23:39:15 +0000
committerDavid Greenman <dg@FreeBSD.org>1995-05-12 23:39:15 +0000
commite83d87f1fc98e1b71bfda89ff73ed3df134bdf0d (patch)
tree844ccdf7ba058709be8b5f5a60b694aaaa09e760 /sbin
parent404abd2138bfaadbf2fb9a8270a5b4d9019fde86 (diff)
downloadsrc-e83d87f1fc98e1b71bfda89ff73ed3df134bdf0d.tar.gz
src-e83d87f1fc98e1b71bfda89ff73ed3df134bdf0d.zip
Fix force flag: It is not a "negative" flag. Add MNT_FORCE to the acceptable
options for UFS (which fixes another bug).
Notes
Notes: svn path=/head/; revision=8487
Diffstat (limited to 'sbin')
-rw-r--r--sbin/mount/mntopts.h2
-rw-r--r--sbin/mount/mount_ufs.c1
-rw-r--r--sbin/mount_ifs/mntopts.h2
-rw-r--r--sbin/mount_ifs/mount_ufs.c1
4 files changed, 4 insertions, 2 deletions
diff --git a/sbin/mount/mntopts.h b/sbin/mount/mntopts.h
index ba792fa691b8..0e7ab2482995 100644
--- a/sbin/mount/mntopts.h
+++ b/sbin/mount/mntopts.h
@@ -54,7 +54,7 @@ struct mntopt {
#define MOPT_GQUOTA { "groupquota", 0, 0, 0 }
/* Control flags. */
-#define MOPT_FORCE { "force", 1, MNT_FORCE, 0 }
+#define MOPT_FORCE { "force", 0, MNT_FORCE, 0 }
#define MOPT_UPDATE { "update", 0, MNT_UPDATE, 0 }
/* Support for old-style "ro", "rw" flags. */
diff --git a/sbin/mount/mount_ufs.c b/sbin/mount/mount_ufs.c
index 48be22220d1e..500a9777cc3f 100644
--- a/sbin/mount/mount_ufs.c
+++ b/sbin/mount/mount_ufs.c
@@ -59,6 +59,7 @@ static struct mntopt mopts[] = {
MOPT_STDOPTS,
MOPT_ASYNC,
MOPT_SYNC,
+ MOPT_FORCE,
MOPT_UPDATE,
MOPT_UQUOTA,
MOPT_GQUOTA,
diff --git a/sbin/mount_ifs/mntopts.h b/sbin/mount_ifs/mntopts.h
index ba792fa691b8..0e7ab2482995 100644
--- a/sbin/mount_ifs/mntopts.h
+++ b/sbin/mount_ifs/mntopts.h
@@ -54,7 +54,7 @@ struct mntopt {
#define MOPT_GQUOTA { "groupquota", 0, 0, 0 }
/* Control flags. */
-#define MOPT_FORCE { "force", 1, MNT_FORCE, 0 }
+#define MOPT_FORCE { "force", 0, MNT_FORCE, 0 }
#define MOPT_UPDATE { "update", 0, MNT_UPDATE, 0 }
/* Support for old-style "ro", "rw" flags. */
diff --git a/sbin/mount_ifs/mount_ufs.c b/sbin/mount_ifs/mount_ufs.c
index 48be22220d1e..500a9777cc3f 100644
--- a/sbin/mount_ifs/mount_ufs.c
+++ b/sbin/mount_ifs/mount_ufs.c
@@ -59,6 +59,7 @@ static struct mntopt mopts[] = {
MOPT_STDOPTS,
MOPT_ASYNC,
MOPT_SYNC,
+ MOPT_FORCE,
MOPT_UPDATE,
MOPT_UQUOTA,
MOPT_GQUOTA,