[src/netbsd-1-5]: src/sys/sys Pull up revision 1.61 (requested by abs):

[he <he%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/ace4bffbd153
branches:  netbsd-1-5
changeset: 490675:ace4bffbd153
user:      he <he%NetBSD.org@localhost>
date:      Mon Feb 26 16:49:48 2001 +0000

description:
Pull up revision 1.61 (requested by abs):
  Add some support code to allow feature addition to mount:
  If both special and node are given (but no type), the disklabel
  is checked for the file system type before falling back to ffs.

diffstat:

 sys/sys/disklabel.h |  31 ++++++++++++++++++++++++++++++-
 1 files changed, 30 insertions(+), 1 deletions(-)

diffs (45 lines):

diff -r 3737cac5b23e -r ace4bffbd153 sys/sys/disklabel.h
--- a/sys/sys/disklabel.h       Mon Feb 26 16:39:37 2001 +0000
+++ b/sys/sys/disklabel.h       Mon Feb 26 16:49:48 2001 +0000
@@ -1,4 +1,3 @@
-/*     $NetBSD: disklabel.h,v 1.60 2000/05/16 04:55:58 perseant Exp $  */
 
 /*
  * Copyright (c) 1987, 1988, 1993
@@ -301,6 +300,36 @@
 
 #endif
 
+#ifdef MOUNTNAMES
+/* These are the names MOUNT_XXX from <sys/mount.h> */
+static const char *const mountnames[] = {
+       NULL,           /* unused */
+       NULL,           /* swap */
+       NULL,           /* Version 6 */
+       NULL,           /* Version 7 */
+       NULL,           /* System V */
+       NULL,           /* 4.1BSD */
+       NULL,           /* Eighth edition */
+       "ffs",          /* 4.2BSD */
+       "msdos",        /* MSDOS */
+       "lfs",          /* 4.4LFS */
+       NULL,           /* unknown */
+       NULL,           /* HPFS */
+       "cd9660",       /* ISO9660 */
+       NULL,           /* boot */
+       "ados",         /* ADOS */
+       NULL,           /* HFS */
+       "filecore",     /* FILECORE */
+       "ext2fs",       /* Linux Ext2 */
+       "ntfs",         /* Windows/NT */
+       NULL,           /* RAID Component */
+       NULL,           /* concatenated disk component */
+       NULL            /* NULL */
+};
+#define FSMAXMOUNTNAMES        (sizeof(mountnames) / sizeof(mountnames[0]) - 1)
+
+#endif
+
 /*
  * flags shared by various drives:
  */