[src/trunk]: src/sbin/sysctl List vfs.generic.usermount in manpage. Don't try...

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

details:   https://anonhg.NetBSD.org/src/rev/914d0255069c
branches:  trunk
changeset: 482614:914d0255069c
user:      fvdl <fvdl%NetBSD.org@localhost>
date:      Thu Feb 17 08:54:16 2000 +0000

description:
List vfs.generic.usermount in manpage. Don't try to handle machdep.diskinfo
for the i386, thus avoiding a warning message in 'sysctl -a'.

diffstat:

 sbin/sysctl/sysctl.8 |   3 ++-
 sbin/sysctl/sysctl.c |  14 ++++++++++++--
 2 files changed, 14 insertions(+), 3 deletions(-)

diffs (66 lines):

diff -r dcd9a947bfbe -r 914d0255069c sbin/sysctl/sysctl.8
--- a/sbin/sysctl/sysctl.8      Thu Feb 17 05:41:41 2000 +0000
+++ b/sbin/sysctl/sysctl.8      Thu Feb 17 08:54:16 2000 +0000
@@ -1,4 +1,4 @@
-.\"    $NetBSD: sysctl.8,v 1.41 2000/02/15 19:59:02 thorpej Exp $
+.\"    $NetBSD: sysctl.8,v 1.42 2000/02/17 08:54:16 fvdl Exp $
 .\"
 .\" Copyright (c) 1993
 .\"    The Regents of the University of California.  All rights reserved.
@@ -312,6 +312,7 @@
 .It user.posix2_upe    integer no
 .It user.posix2_version        integer no
 .It user.re_dup_max    integer no
+.It vfs.generic.usermount      integer yes
 .It vm.loadavg struct  no
 .El
 .Sh EXAMPLES
diff -r dcd9a947bfbe -r 914d0255069c sbin/sysctl/sysctl.c
--- a/sbin/sysctl/sysctl.c      Thu Feb 17 05:41:41 2000 +0000
+++ b/sbin/sysctl/sysctl.c      Thu Feb 17 08:54:16 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sysctl.c,v 1.25 2000/02/12 18:00:58 thorpej Exp $      */
+/*     $NetBSD: sysctl.c,v 1.26 2000/02/17 08:54:16 fvdl Exp $ */
 
 /*
  * Copyright (c) 1993
@@ -44,7 +44,7 @@
 #if 0
 static char sccsid[] = "@(#)sysctl.c   8.1 (Berkeley) 6/6/93";
 #else
-__RCSID("$NetBSD: sysctl.c,v 1.25 2000/02/12 18:00:58 thorpej Exp $");
+__RCSID("$NetBSD: sysctl.c,v 1.26 2000/02/17 08:54:16 fvdl Exp $");
 #endif
 #endif /* not lint */
 
@@ -156,6 +156,7 @@
 #define        CLOCK           0x00000001
 #define        BOOTTIME        0x00000002
 #define        CONSDEV         0x00000004
+#define DISKINFO       0x00000008
 
 /*
  * A dummy type for limits, which requires special parsing
@@ -432,6 +433,10 @@
                if (mib[1] == CPU_CONSDEV)
                        special |= CONSDEV;
 #endif
+#ifdef CPU_DISKINFO
+               if (mib[1] == CPU_DISKINFO)
+                       special |= DISKINFO;
+#endif
                break;
 
        case CTL_VFS:
@@ -543,6 +548,11 @@
                        fprintf(stdout, "0x%x\n", dev);
                return;
        }
+       if (special & DISKINFO) {
+               /* Don't know a good way to deal with this i386 specific one */
+               return;
+       }
+               
        switch (type) {
        case CTLTYPE_INT:
                if (newsize == 0) {