Module Name: src
Committed By: christos
Date: Thu Apr 13 17:20:59 UTC 2017
Modified Files:
src/usr.sbin/makefs: msdos.c
Log Message:
for consistency with ffs, don't count the offset into the size.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/usr.sbin/makefs/msdos.c
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/msdos.c
diff -u src/usr.sbin/makefs/msdos.c:1.18 src/usr.sbin/makefs/msdos.c:1.19
--- src/usr.sbin/makefs/msdos.c:1.18 Thu Feb 16 17:44:06 2017
+++ src/usr.sbin/makefs/msdos.c Thu Apr 13 13:20:59 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: msdos.c,v 1.18 2017/02/16 22:44:06 christos Exp $ */
+/* $NetBSD: msdos.c,v 1.19 2017/04/13 17:20:59 christos Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
#include <sys/cdefs.h>
#if defined(__RCSID) && !defined(__lint)
-__RCSID("$NetBSD: msdos.c,v 1.18 2017/02/16 22:44:06 christos Exp $");
+__RCSID("$NetBSD: msdos.c,v 1.19 2017/04/13 17:20:59 christos Exp $");
#endif /* !__lint */
#include <sys/param.h>
@@ -157,12 +157,9 @@ msdos_makefs(const char *image, const ch
assert(root != NULL);
assert(fsopts != NULL);
- /*
- * XXX: pick up other options from the msdos specific ones?
- * Is minsize right here?
- */
+ fsopts->size = fsopts->offset + fsopts->maxsize;
msdos_opt->options.create_size = MAX(msdos_opt->options.create_size,
- fsopts->minsize);
+ fsopts->size);
msdos_opt->options.offset = fsopts->offset;
if (msdos_opt->options.bytes_per_sector == 0) {
if (fsopts->sectorsize == -1)
