Module Name: src
Committed By: christos
Date: Fri Apr 14 15:40:35 UTC 2017
Modified Files:
src/usr.sbin/makefs: msdos.c
Log Message:
leave the size alone and set the create_size to include the offset. It
does not matter anyway, but it makes more sense this way.
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 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.19 src/usr.sbin/makefs/msdos.c:1.20
--- src/usr.sbin/makefs/msdos.c:1.19 Thu Apr 13 13:20:59 2017
+++ src/usr.sbin/makefs/msdos.c Fri Apr 14 11:40:35 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: msdos.c,v 1.19 2017/04/13 17:20:59 christos Exp $ */
+/* $NetBSD: msdos.c,v 1.20 2017/04/14 15:40:35 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.19 2017/04/13 17:20:59 christos Exp $");
+__RCSID("$NetBSD: msdos.c,v 1.20 2017/04/14 15:40:35 christos Exp $");
#endif /* !__lint */
#include <sys/param.h>
@@ -157,9 +157,9 @@ msdos_makefs(const char *image, const ch
assert(root != NULL);
assert(fsopts != NULL);
- fsopts->size = fsopts->offset + fsopts->maxsize;
+ fsopts->size = fsopts->maxsize;
msdos_opt->options.create_size = MAX(msdos_opt->options.create_size,
- fsopts->size);
+ fsopts->offset + fsopts->size);
msdos_opt->options.offset = fsopts->offset;
if (msdos_opt->options.bytes_per_sector == 0) {
if (fsopts->sectorsize == -1)
