svn commit: r271736 - head/usr.sbin/makefs

[Davide Italiano]

Author: davide
Date: Thu Sep 18 03:11:59 2014
New Revision: 271736
URL: http://svnweb.freebsd.org/changeset/base/271736

Log:
  r258695 introduces a sanity check for makefs in order to verify that
  the minimum image size specified is always less than the maximum
  image size. If makefs(1) is invoked specifying minimum image size,
  but not maximum one, the program exits with an error. Example:
  
  # sudo -E makefs -M 538968064 -B be /home/davide/disk.img $DESTDIR
  makefs: `/home/davide/tftproot/mips' minsize of 538968064 rounded up
  to ffs bsize of 8192 exceeds maxsize 0.  Lower bsize, or round the
  minimum and maximum sizes to bsize.
  
  Assert then that minsize < maxsize iff maxsize is specified.
  This change allows me to build MIPS images using makefs(1) and following
  what specified in the wiki again.
  
  Reviewed by:	jmallett, ngie

Modified:
  head/usr.sbin/makefs/ffs.c

Modified: head/usr.sbin/makefs/ffs.c
==============================================================================
--- head/usr.sbin/makefs/ffs.c	Thu Sep 18 03:09:34 2014	(r271735)
+++ head/usr.sbin/makefs/ffs.c	Thu Sep 18 03:11:59 2014	(r271736)
@@ -361,7 +361,8 @@ ffs_validate(const char *dir, fsnode *ro
 	if (ffs_opts->avgfpdir == -1)
 		ffs_opts->avgfpdir = AFPDIR;
 
-	if (roundup(fsopts->minsize, ffs_opts->bsize) > fsopts->maxsize)
+	if (fsopts->maxsize > 0 &&
+	    roundup(fsopts->minsize, ffs_opts->bsize) > fsopts->maxsize)
 		errx(1, "`%s' minsize of %lld rounded up to ffs bsize of %d "
 		    "exceeds maxsize %lld.  Lower bsize, or round the minimum "
 		    "and maximum sizes to bsize.", dir,