Module Name: src Committed By: christos Date: Wed Jan 23 22:47:18 UTC 2013
Modified Files: src/usr.sbin/makefs: Makefile msdos.c src/usr.sbin/makefs/msdos: Makefile.inc Log Message: ok, we can create the filesystem now. To generate a diff of this commit: cvs rdiff -u -r1.32 -r1.33 src/usr.sbin/makefs/Makefile cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/makefs/msdos.c cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/makefs/msdos/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/usr.sbin/makefs/Makefile diff -u src/usr.sbin/makefs/Makefile:1.32 src/usr.sbin/makefs/Makefile:1.33 --- src/usr.sbin/makefs/Makefile:1.32 Wed Jan 23 15:46:39 2013 +++ src/usr.sbin/makefs/Makefile Wed Jan 23 17:47:18 2013 @@ -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 @@ MAN= makefs.8 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" Index: src/usr.sbin/makefs/msdos.c diff -u src/usr.sbin/makefs/msdos.c:1.3 src/usr.sbin/makefs/msdos.c:1.4 --- src/usr.sbin/makefs/msdos.c:1.3 Wed Jan 23 16:42:22 2013 +++ src/usr.sbin/makefs/msdos.c Wed Jan 23 17:47:18 2013 @@ -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 @@ ALLOPTS 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; Index: src/usr.sbin/makefs/msdos/Makefile.inc diff -u src/usr.sbin/makefs/msdos/Makefile.inc:1.2 src/usr.sbin/makefs/msdos/Makefile.inc:1.3 --- src/usr.sbin/makefs/msdos/Makefile.inc:1.2 Wed Jan 23 16:03:15 2013 +++ src/usr.sbin/makefs/msdos/Makefile.inc Wed Jan 23 17:47:18 2013 @@ -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