The branch main has been updated by emaste:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=176b9e0d724b4c1a24d2c46a1256381784f04edc

commit 176b9e0d724b4c1a24d2c46a1256381784f04edc
Author:     Ed Maste <ema...@freebsd.org>
AuthorDate: 2024-01-25 01:47:36 +0000
Commit:     Ed Maste <ema...@freebsd.org>
CommitDate: 2024-01-26 22:27:57 +0000

    makefs: warn that ffs sectorsize other than 512 may not work
    
    newfs always sets sectorsize to DEV_BSIZE (512) and derives some other
    values based on the number of 512-byte sectors per real sector.  Similar
    logic is required in makefs.  Until that happens, emit a warning that
    the image may be incorrect.
    
    PR:             276571
---
 usr.sbin/makefs/ffs.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/usr.sbin/makefs/ffs.c b/usr.sbin/makefs/ffs.c
index 93dc2e3cd2f5..ebfda7f929e4 100644
--- a/usr.sbin/makefs/ffs.c
+++ b/usr.sbin/makefs/ffs.c
@@ -338,6 +338,9 @@ ffs_validate(const char *dir, fsnode *root, fsinfo_t 
*fsopts)
                /* set FFS defaults */
        if (fsopts->sectorsize == -1)
                fsopts->sectorsize = DFL_SECSIZE;
+       if (fsopts->sectorsize != DFL_SECSIZE)
+               warnx("sectorsize %d may produce nonfunctional image",
+                   fsopts->sectorsize);
        if (ffs_opts->fsize == -1)
                ffs_opts->fsize = MAX(DFL_FRAGSIZE, fsopts->sectorsize);
        if (ffs_opts->bsize == -1)

Reply via email to