[src/netbsd-1-5]: src/sbin/mount_procfs Pull up revision 1.12 (via patch, req...

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

details:   https://anonhg.NetBSD.org/src/rev/d9208a587249
branches:  netbsd-1-5
changeset: 490971:d9208a587249
user:      he <he%NetBSD.org@localhost>
date:      Fri Mar 30 21:29:32 2001 +0000

description:
Pull up revision 1.12 (via patch, requested by fvdl):
  Add some required Linux emulation bits to support the Linux
  version of VMware.

diffstat:

 sbin/mount_procfs/mount_procfs.c |  19 +++++++++++++------
 1 files changed, 13 insertions(+), 6 deletions(-)

diffs (62 lines):

diff -r 1e268eadb030 -r d9208a587249 sbin/mount_procfs/mount_procfs.c
--- a/sbin/mount_procfs/mount_procfs.c  Thu Mar 29 14:37:05 2001 +0000
+++ b/sbin/mount_procfs/mount_procfs.c  Fri Mar 30 21:29:32 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mount_procfs.c,v 1.10 1999/06/25 19:28:37 perseant Exp $       */
+/*     $NetBSD: mount_procfs.c,v 1.10.8.1 2001/03/30 21:29:32 he Exp $ */
 
 /*
  * Copyright (c) 1990, 1992, 1993 Jan-Simon Pendry
@@ -47,7 +47,7 @@
 #if 0
 static char sccsid[] = "@(#)mount_procfs.c     8.4 (Berkeley) 4/26/95";
 #else
-__RCSID("$NetBSD: mount_procfs.c,v 1.10 1999/06/25 19:28:37 perseant Exp $");
+__RCSID("$NetBSD: mount_procfs.c,v 1.10.8.1 2001/03/30 21:29:32 he Exp $");
 #endif
 #endif /* not lint */
 
@@ -60,10 +60,13 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include <miscfs/procfs/procfs.h>
+
 #include "mntopts.h"
 
 const struct mntopt mopts[] = {
        MOPT_STDOPTS,
+       { "linux", 0, PROCFSMNT_LINUXCOMPAT, 1},
        { NULL }
 };
 
@@ -75,13 +78,14 @@
        int argc;
        char *argv[];
 {
-       int ch, mntflags;
+       int ch, mntflags, altflags;
+       struct procfs_args args;
 
-       mntflags = 0;
+       mntflags = altflags = 0;
        while ((ch = getopt(argc, argv, "o:")) != -1)
                switch (ch) {
                case 'o':
-                       getmntopts(optarg, mopts, &mntflags, 0);
+                       getmntopts(optarg, mopts, &mntflags, &altflags);
                        break;
                case '?':
                default:
@@ -93,7 +97,10 @@
        if (argc != 2)
                usage();
 
-       if (mount(MOUNT_PROCFS, argv[1], mntflags, NULL))
+       args.version = PROCFS_ARGSVERSION;
+       args.flags = altflags;
+
+       if (mount(MOUNT_PROCFS, argv[1], mntflags, &args))
                err(1, "procfs on %s", argv[1]);
        exit(0);
 }