diff options
author | Miod Vallat <miod@cvs.openbsd.org> | 2004-11-13 21:45:51 +0000 |
---|---|---|
committer | Miod Vallat <miod@cvs.openbsd.org> | 2004-11-13 21:45:51 +0000 |
commit | c506d762f545baae0077c59f704cb3e5754b5d10 (patch) | |
tree | 5f06899220a2fd1a5bcbe6e279217839e1ee2cd9 /sbin/mount | |
parent | 38692dbc1a5726dddc4df6fa2927597183bf1a99 (diff) |
Let mount -a mount mfs systems shadowing a disk partition, if disklabel reports
the partition type as ffs. Makes people's life easier on platforms where
disklabel does not record partition types and hardcodes values for them,
such as sparc and sparc64.
ok otto@
Diffstat (limited to 'sbin/mount')
-rw-r--r-- | sbin/mount/mount.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sbin/mount/mount.c b/sbin/mount/mount.c index bc03482c2a7..39355330db6 100644 --- a/sbin/mount/mount.c +++ b/sbin/mount/mount.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mount.c,v 1.36 2004/09/15 15:15:16 otto Exp $ */ +/* $OpenBSD: mount.c,v 1.37 2004/11/13 21:45:50 miod 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.36 2004/09/15 15:15:16 otto Exp $"; +static char rcsid[] = "$OpenBSD: mount.c,v 1.37 2004/11/13 21:45:50 miod Exp $"; #endif #endif /* not lint */ @@ -743,6 +743,9 @@ disklabelcheck(struct fstab *fs) fs->fs_spec); return (0); } + if (strcmp(fs->fs_vfstype, "mfs") == 0 && + strcmp(labelfs, "ffs") == 0) + return (0); warnx("%s: fstab type %s != disklabel type %s", fs->fs_spec, fs->fs_vfstype, labelfs); return (1); |