diff options
Diffstat (limited to 'sbin')
| -rw-r--r-- | sbin/mount/mount.c | 6 | ||||
| -rw-r--r-- | sbin/mount_msdos/mount_msdos.8 | 10 | ||||
| -rw-r--r-- | sbin/mount_msdos/mount_msdos.c | 9 |
3 files changed, 6 insertions, 19 deletions
diff --git a/sbin/mount/mount.c b/sbin/mount/mount.c index 7a9e019a74d..77b95f4f6aa 100644 --- a/sbin/mount/mount.c +++ b/sbin/mount/mount.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mount.c,v 1.43 2006/12/06 17:54:22 thib Exp $ */ +/* $OpenBSD: mount.c,v 1.44 2006/12/15 03:04:24 krw 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.43 2006/12/06 17:54:22 thib Exp $"; +static char rcsid[] = "$OpenBSD: mount.c,v 1.44 2006/12/15 03:04:24 krw Exp $"; #endif #endif /* not lint */ @@ -584,8 +584,6 @@ prmount(struct statfs *sf) (void)printf("%s%s", !f++ ? " (" : ", ", "long"); if (msdosfs_args->flags & MSDOSFSMNT_NOWIN95) (void)printf("%s%s", !f++ ? " (" : ", ", "nowin95"); - if (msdosfs_args->flags & MSDOSFSMNT_GEMDOSFS) - (void)printf("%s%s", !f++ ? " (" : ", ", "gem"); if (msdosfs_args->flags & MSDOSFSMNT_ALLOWDIRX) (void)printf("%s%s", !f++ ? " (" : ", ", "direxec"); } else if (strcmp(sf->f_fstypename, MOUNT_CD9660) == 0) { diff --git a/sbin/mount_msdos/mount_msdos.8 b/sbin/mount_msdos/mount_msdos.8 index 29d610375e8..c0778f0de3f 100644 --- a/sbin/mount_msdos/mount_msdos.8 +++ b/sbin/mount_msdos/mount_msdos.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: mount_msdos.8,v 1.20 2005/02/28 16:00:37 tom Exp $ +.\" $OpenBSD: mount_msdos.8,v 1.21 2006/12/15 03:04:24 krw Exp $ .\" $NetBSD: mount_msdos.8,v 1.10 1996/01/19 21:14:43 leo Exp $ .\" .\" Copyright (c) 1993,1994 Christopher G. Demetriou @@ -44,7 +44,6 @@ .Op Fl s .Op Fl l .Op Fl 9 -.Op Fl G .Op Fl x .Ar special .Ar node @@ -138,13 +137,6 @@ Ignore the special Windows 95/98 directory entries even if deleting or renaming a file. This forces .Fl s . -.It Fl G -This option causes the filesystem to be interpreted as an Atari-Gemdos -filesystem. -The differences to the MS-DOS filesystem are minimal and -limited to the boot block. -This option enforces -.Fl s . .It Fl x If a directory is readable, it inherits the x attribute as well. .El diff --git a/sbin/mount_msdos/mount_msdos.c b/sbin/mount_msdos/mount_msdos.c index 73eacc6e5bf..257cdc26cdf 100644 --- a/sbin/mount_msdos/mount_msdos.c +++ b/sbin/mount_msdos/mount_msdos.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mount_msdos.c,v 1.19 2005/04/08 20:09:37 jaredy Exp $ */ +/* $OpenBSD: mount_msdos.c,v 1.20 2006/12/15 03:04:24 krw Exp $ */ /* $NetBSD: mount_msdos.c,v 1.16 1996/10/24 00:12:50 cgd Exp $ */ /* @@ -32,7 +32,7 @@ */ #ifndef lint -static char rcsid[] = "$OpenBSD: mount_msdos.c,v 1.19 2005/04/08 20:09:37 jaredy Exp $"; +static char rcsid[] = "$OpenBSD: mount_msdos.c,v 1.20 2006/12/15 03:04:24 krw Exp $"; #endif /* not lint */ #include <sys/cdefs.h> @@ -74,11 +74,8 @@ main(int argc, char **argv) mntflags = set_gid = set_uid = set_mask = 0; (void)memset(&args, '\0', sizeof(args)); - while ((c = getopt(argc, argv, "Gsl9xu:g:m:o:")) != -1) { + while ((c = getopt(argc, argv, "sl9xu:g:m:o:")) != -1) { switch (c) { - case 'G': - args.flags |= MSDOSFSMNT_GEMDOSFS; - break; case 's': args.flags |= MSDOSFSMNT_SHORTNAME; break; |