diff options
| -rw-r--r-- | sbin/mount/mntopts.h | 6 | ||||
| -rw-r--r-- | sbin/mount/mount.c | 5 |
2 files changed, 4 insertions, 7 deletions
diff --git a/sbin/mount/mntopts.h b/sbin/mount/mntopts.h index 64ab51aca99..5474a0134f7 100644 --- a/sbin/mount/mntopts.h +++ b/sbin/mount/mntopts.h @@ -1,4 +1,4 @@ -/* $OpenBSD: mntopts.h,v 1.14 2004/07/05 18:33:38 otto Exp $ */ +/* $OpenBSD: mntopts.h,v 1.15 2005/05/26 01:37:49 pedro Exp $ */ /* $NetBSD: mntopts.h,v 1.3 1995/03/18 14:56:59 cgd Exp $ */ /*- @@ -60,7 +60,6 @@ union mntval { #define MOPT_NOSUID { "suid", MNT_NOSUID, MFLAG_INVERSE | MFLAG_SET } #define MOPT_RDONLY { "rdonly", MNT_RDONLY, MFLAG_SET } #define MOPT_SYNC { "sync", MNT_SYNCHRONOUS, MFLAG_SET } -#define MOPT_UNION { "union", MNT_UNION, MFLAG_SET } #define MOPT_USERQUOTA { "userquota", 0, MFLAG_SET | MFLAG_STRVAL \ | MFLAG_OPT } #define MOPT_GROUPQUOTA { "groupquota", 0, MFLAG_SET | MFLAG_STRVAL \ @@ -94,8 +93,7 @@ union mntval { MOPT_NODEV, \ MOPT_NOEXEC, \ MOPT_NOSUID, \ - MOPT_RDONLY, \ - MOPT_UNION + MOPT_RDONLY int getmntopts(const char *, const struct mntopt *, int *); int getmntopt(char **, union mntval *, const struct mntopt *, int *); diff --git a/sbin/mount/mount.c b/sbin/mount/mount.c index b6ecf946516..e393ba5cdde 100644 --- a/sbin/mount/mount.c +++ b/sbin/mount/mount.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mount.c,v 1.38 2005/04/08 20:09:36 jaredy Exp $ */ +/* $OpenBSD: mount.c,v 1.39 2005/05/26 01:37:49 pedro Exp $ */ /* $NetBSD: mount.c,v 1.24 1995/11/18 03:34:29 cgd Exp $ */ /* @@ -40,7 +40,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)mount.c 8.19 (Berkeley) 4/19/94"; #else -static char rcsid[] = "$OpenBSD: mount.c,v 1.38 2005/04/08 20:09:36 jaredy Exp $"; +static char rcsid[] = "$OpenBSD: mount.c,v 1.39 2005/05/26 01:37:49 pedro Exp $"; #endif #endif /* not lint */ @@ -109,7 +109,6 @@ static struct opt { { MNT_ROOTFS, 1, "root file system", "" }, { MNT_SYNCHRONOUS, 0, "synchronous", "sync" }, { MNT_SOFTDEP, 0, "softdep", "softdep" }, - { MNT_UNION, 0, "union", "" }, { NULL, 0, "", "" } }; |