[src/trunk]: src/sbin/mount If getargs and vfs has PUFFS_TYPEPREFIX, use moun...

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

details:   https://anonhg.NetBSD.org/src/rev/2f13ceed858b
branches:  trunk
changeset: 750800:2f13ceed858b
user:      pooka <pooka%NetBSD.org@localhost>
date:      Thu Jan 14 21:30:17 2010 +0000

description:
If getargs and vfs has PUFFS_TYPEPREFIX, use mount_puffs to query args.

diffstat:

 sbin/mount/mount.c |  11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diffs (39 lines):

diff -r 27a9fa4111e0 -r 2f13ceed858b sbin/mount/mount.c
--- a/sbin/mount/mount.c        Thu Jan 14 21:29:26 2010 +0000
+++ b/sbin/mount/mount.c        Thu Jan 14 21:30:17 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mount.c,v 1.89 2009/05/04 11:41:48 yamt Exp $  */
+/*     $NetBSD: mount.c,v 1.90 2010/01/14 21:30:17 pooka Exp $ */
 
 /*
  * Copyright (c) 1980, 1989, 1993, 1994
@@ -39,7 +39,7 @@
 #if 0
 static char sccsid[] = "@(#)mount.c    8.25 (Berkeley) 5/8/95";
 #else
-__RCSID("$NetBSD: mount.c,v 1.89 2009/05/04 11:41:48 yamt Exp $");
+__RCSID("$NetBSD: mount.c,v 1.90 2010/01/14 21:30:17 pooka Exp $");
 #endif
 #endif /* not lint */
 
@@ -47,6 +47,8 @@
 #include <sys/mount.h>
 #include <sys/wait.h>
 
+#include <fs/puffs/puffs_msgif.h>
+
 #include <err.h>
 #include <errno.h>
 #include <fstab.h>
@@ -434,7 +436,10 @@
        if (argv == NULL)
                err(1, "malloc");
 
-       if (hasopt(optbuf, "rump"))
+       if (getargs &&
+           strncmp(vfstype, PUFFS_TYPEPREFIX, sizeof(PUFFS_TYPEPREFIX)-1) == 0)
+               (void)snprintf(execbase, sizeof(execbase), "mount_puffs");
+       else if (hasopt(optbuf, "rump"))
                (void)snprintf(execbase, sizeof(execbase), "rump_%s", vfstype);
        else
                (void)snprintf(execbase, sizeof(execbase), "mount_%s", vfstype);