Module Name: src
Committed By: jmcneill
Date: Fri Jan 17 12:11:53 UTC 2025
Modified Files:
src/distrib/utils/embedded: mkimage
Log Message:
mkimage: Allow configs to override fsize/bsize/ffs version
To generate a diff of this commit:
cvs rdiff -u -r1.88 -r1.89 src/distrib/utils/embedded/mkimage
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/embedded/mkimage
diff -u src/distrib/utils/embedded/mkimage:1.88 src/distrib/utils/embedded/mkimage:1.89
--- src/distrib/utils/embedded/mkimage:1.88 Sat Jan 11 14:33:31 2025
+++ src/distrib/utils/embedded/mkimage Fri Jan 17 12:11:53 2025
@@ -1,5 +1,5 @@
#!/bin/sh
-# $NetBSD: mkimage,v 1.88 2025/01/11 14:33:31 jmmv Exp $
+# $NetBSD: mkimage,v 1.89 2025/01/17 12:11:53 jmcneill Exp $
#
# Copyright (c) 2013, 2014 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -225,6 +225,9 @@ fi
resize=false
gpt=false
gpt_hybrid=false
+fsize=8192
+bsize=65536
+ffsversion=1
. "${DIR}/conf/${h}.conf"
release="/usr/obj/${MACHINE}/release"
@@ -334,7 +337,7 @@ if [ -z "${bootonly}" ]; then
echo ${bar} Populating ffs filesystem ${bar}
${MAKEFS} -rx ${endian} -N ${release}/etc -t ffs \
-O ${ffsoffset} ${timestamp_opt} \
- -o d=4096,f=8192,b=65536 -b $((${extra}))m \
+ -o d=4096,f=${fsize},b=${bsize},v=${ffsversion} -b $((${extra}))m \
-F "$tmp/selected_sets" ${image} "${release}" "${mnt}"
fi
