[src/trunk]: src/usr.sbin/makefs ok, we can create the filesystem now.

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

details:   https://anonhg.NetBSD.org/src/rev/8a4161967575
branches:  trunk
changeset: 784282:8a4161967575
user:      christos <christos%NetBSD.org@localhost>
date:      Wed Jan 23 22:47:18 2013 +0000

description:
ok, we can create the filesystem now.

diffstat:

 usr.sbin/makefs/Makefile           |   4 ++--
 usr.sbin/makefs/msdos.c            |  14 ++++++++++++--
 usr.sbin/makefs/msdos/Makefile.inc |   6 ++++--
 3 files changed, 18 insertions(+), 6 deletions(-)

diffs (70 lines):

diff -r 56a52ff06d0e -r 8a4161967575 usr.sbin/makefs/Makefile
--- a/usr.sbin/makefs/Makefile  Wed Jan 23 22:34:37 2013 +0000
+++ b/usr.sbin/makefs/Makefile  Wed Jan 23 22:47:18 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.32 2013/01/23 20:46:39 christos Exp $
+#      $NetBSD: Makefile,v 1.33 2013/01/23 22:47:18 christos Exp $
 #
 
 WARNS?=        5
@@ -17,7 +17,7 @@
 MKNODSRC=      ${NETBSDSRCDIR}/sbin/mknod
 MTREESRC=      ${NETBSDSRCDIR}/usr.sbin/mtree
 
-CPPFLAGS+=     -I${.CURDIR} -I${MKNODSRC} -I${MTREESRC}
+CPPFLAGS+=     -I${.CURDIR} -I${MKNODSRC} -I${MTREESRC} -DMAKEFS
 .PATH:         ${MKNODSRC} ${MTREESRC}
 
 .include "${.CURDIR}/cd9660/Makefile.inc"
diff -r 56a52ff06d0e -r 8a4161967575 usr.sbin/makefs/msdos.c
--- a/usr.sbin/makefs/msdos.c   Wed Jan 23 22:34:37 2013 +0000
+++ b/usr.sbin/makefs/msdos.c   Wed Jan 23 22:47:18 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: msdos.c,v 1.3 2013/01/23 21:42:22 christos Exp $       */
+/*     $NetBSD: msdos.c,v 1.4 2013/01/23 22:47:18 christos Exp $       */
 
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
 
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(__lint)
-__RCSID("$NetBSD: msdos.c,v 1.3 2013/01/23 21:42:22 christos Exp $");
+__RCSID("$NetBSD: msdos.c,v 1.4 2013/01/23 22:47:18 christos Exp $");
 #endif /* !__lint */
 
 #include <sys/param.h>
@@ -132,6 +132,16 @@
 void
 msdos_makefs(const char *image, const char *dir, fsnode *root, fsinfo_t *fsopts)
 {
+       struct msdos_options *msdos_opt = fsopts->fs_specific;
+
+       /*
+        * XXX: pick up other options from the msdos specific ones?
+        * Is minsize right here?
+        */
+       msdos_opt->create_size = MAX(msdos_opt->create_size, fsopts->minsize);
+
+       if (mkfs_msdos(image, NULL, msdos_opt) == -1)
+               return;
 #ifdef notyet
        struct fs       *superblock;
        struct timeval  start;
diff -r 56a52ff06d0e -r 8a4161967575 usr.sbin/makefs/msdos/Makefile.inc
--- a/usr.sbin/makefs/msdos/Makefile.inc        Wed Jan 23 22:34:37 2013 +0000
+++ b/usr.sbin/makefs/msdos/Makefile.inc        Wed Jan 23 22:47:18 2013 +0000
@@ -1,9 +1,11 @@
-#      $NetBSD: Makefile.inc,v 1.2 2013/01/23 21:03:15 christos Exp $
+#      $NetBSD: Makefile.inc,v 1.3 2013/01/23 22:47:18 christos Exp $
 #
 
 MSDOS= ${NETBSDSRCDIR}/sys/fs/msdosfs
 MSDOS_NEWFS=   ${NETBSDSRCDIR}/sbin/newfs_msdos
 
-.PATH: ${.CURDIR}/v7fs ${MSDOS} ${MSDOS_NEWFS}
+.PATH: ${.CURDIR}/msdos ${MSDOS} ${MSDOS_NEWFS}
 
 CPPFLAGS+= -DMSDOS_EI -I${MSDOS} -I${MSDOS_NEWFS}
+
+SRCS+= mkfs_msdos.c