Page MenuHomeFreeBSD
Files F163161760

D57226.id178680.diff
No OneTemporary
Actions

D57226.id178680.diff
View Options

diff --git a/tools/tools/nanobsd/defaults.sh b/tools/tools/nanobsd/defaults.sh
--- a/tools/tools/nanobsd/defaults.sh
+++ b/tools/tools/nanobsd/defaults.sh
@@ -718,8 +718,8 @@
image=$4
dir=$5
- makefs ${options} -F "${metalog}" -N "${NANO_WORLDDIR}/etc" \
- -R "${size}b" -T "${NANO_TIMESTAMP}" -t ffs "${image}" "${dir}"
+ makefs -t ffs ${options} -F "${metalog}" -N "${NANO_WORLDDIR}/etc" \
+ -R "${size}b" -T "${NANO_TIMESTAMP}" "${image}" "${dir}"
}
# Convenient spot to work around any umount issues that your build environment
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
@@ -96,17 +96,6 @@
' > ${NANO_LOG}/_.partitioning
}
-_xxx_adjust_code_size()
-{
- # XXX adjust the CODE_SIZE value by rounding it up to
- # a bsize of 32768 (DFL_BLKSIZE).
- # Otherwise makefs -s will fail because of the guard
- # introduced in 5ad283b3c60d.
- codesize=$1
- bsize=32768
- echo $(( ((codesize + (bsize - 1)) / bsize) * bsize ))
-}
-
create_code_slice() {
pprint 2 "build code slice"
pprint 3 "log: ${NANO_OBJ}/_.cs"
@@ -166,7 +155,6 @@
(
IMG=${NANO_DISKIMGDIR}/${NANO_IMG1NAME}
CODE_SIZE=$(awk '$3 == 1 {print $2}' "${NANO_LOG}/_.partitioning")
- CODE_SIZE=$(_xxx_adjust_code_size "$CODE_SIZE")
echo "Writing code image..."
if [ -f "${NANO_WORLDDIR}/boot/boot" ]; then
@@ -295,7 +283,6 @@
local altroot bootloader cfgimage dataimage diskimage
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}

File Metadata

Mime Type
text/plain
Expires
Tue, Jul 21, 3:52 PM (10 h, 28 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
35323556
Default Alt Text
D57226.id178680.diff (1 KB)

Event Timeline