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
This commit is contained in:
parent
397bdf7cd5
commit
9d5a327fb5
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=271736
@ -361,7 +361,8 @@ ffs_validate(const char *dir, fsnode *root, fsinfo_t *fsopts)
|
||||
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,
|
||||
|
Loading…
Reference in New Issue
Block a user