Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ok, we can create the filesystem now.

This commit is contained in:
christos 2013-01-23 22:47:18 +00:00
parent 080a1c2724
commit 273b781b8e
3 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
usr.sbin/makefs/Makefile
View File

@ -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"

14
usr.sbin/makefs/msdos.c
View File

@ -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;

6
usr.sbin/makefs/msdos/Makefile.inc
View File

@ -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