Page Menu
Home
FreeBSD
Search
Configure Global Search
Log In
Files
F167539371
D57219.id178674.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Flag For Later
Award Token
Size
1 KB
Referenced Files
None
Subscribers
None
D57219.id178674.diff
View Options
diff --git a/tools/tools/nanobsd/legacy.sh b/tools/tools/nanobsd/legacy.sh
--- a/tools/tools/nanobsd/legacy.sh
+++ b/tools/tools/nanobsd/legacy.sh
@@ -292,6 +292,8 @@
CODE_SIZE=$(awk '$3 == 1 {print $2}' "${NANO_LOG}/_.partitioning")
CODE_SIZE=$(_xxx_adjust_code_size "$CODE_SIZE")
+ CONF_SIZE=$(awk '$3 == 3 {print $2}' "${NANO_LOG}/_.partitioning")
+ DATA_SIZE=$(awk '$3 == 4 {print $2}' "${NANO_LOG}/_.partitioning")
IMG=${NANO_DISKIMGDIR}/${NANO_IMGNAME}
if [ -f "${NANO_WORLDDIR}/${NANO_BOOTLOADER}" ]; then
@@ -327,7 +329,7 @@
# Create Config slice
_populate_cfg_part "${NANO_OBJ}/_.cfg.part" "${NANO_CFGDIR}" \
- "${NANO_SLICE_CFG}" "${NANO_CONFSIZE}" "${NANO_METALOG_CFG}"
+ "${NANO_SLICE_CFG}" "${CONF_SIZE}" "${NANO_METALOG_CFG}"
cfgimage="-p freebsd:=${NANO_OBJ}/_.cfg.part"
# Create Data slice, if any.
@@ -339,7 +341,7 @@
fi
if [ "${NANO_DATASIZE}" -ne 0 ] && [ -n "${NANO_SLICE_DATA}" ] ; then
_populate_data_part "${NANO_OBJ}/_.data.part" "${NANO_DATADIR}" \
- "${NANO_SLICE_DATA}" "${NANO_DATASIZE}" "${NANO_METALOG_DATA}"
+ "${NANO_SLICE_DATA}" "${DATA_SIZE}" "${NANO_METALOG_DATA}"
dataimage="-p freebsd:=${NANO_OBJ}/_.data.part"
fi
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Sun, Aug 23, 2:04 PM (12 h, 15 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
33507945
Default Alt Text
D57219.id178674.diff (1 KB)
Attached To
Mode
D57219: nanobsd: Use rounded sizes for cfg and data slices
Attached
Detach File
Event Timeline
Log In to Comment