Module Name: src
Committed By: pooka
Date: Thu Jan 14 21:30:17 UTC 2010
Modified Files:
src/sbin/mount: mount.c
Log Message:
If getargs and vfs has PUFFS_TYPEPREFIX, use mount_puffs to query args.
To generate a diff of this commit:
cvs rdiff -u -r1.89 -r1.90 src/sbin/mount/mount.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/mount/mount.c
diff -u src/sbin/mount/mount.c:1.89 src/sbin/mount/mount.c:1.90
--- src/sbin/mount/mount.c:1.89 Mon May 4 11:41:48 2009
+++ src/sbin/mount/mount.c Thu Jan 14 21:30:17 2010
@@ -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);
