Page MenuHomeFreeBSD
Files F167471250

D58969.id184560.diff
No OneTemporary
Actions

D58969.id184560.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
@@ -112,8 +112,17 @@
# The drive name of the media at runtime
NANO_DRIVE=ada0
-# Target media size in 512 bytes sectors
-NANO_MEDIASIZE=4000000
+#
+# Sector size in bytes.
+# Accepts suffixes and products (4k, 1M, 4x1024)
+#
+NANO_SECTOR_SIZE=512
+
+#
+# Target media size in bytes.
+# Commercial storage capacities are specified using SI decimal units
+#
+NANO_MEDIASIZE="2G"
# Number of code images on media (1 or 2)
NANO_IMAGES=2
@@ -122,24 +131,30 @@
# 1 -> Initialize second image with a copy of the first
NANO_INIT_IMG2=1
-# Size of code file system in 512 bytes sectors
+#
+# Size of code file system in bytes
# If zero, size will be as large as possible.
NANO_CODESIZE=0
-# Size of configuration file system in 512 bytes sectors
+#
+# Size of configuration file system in bytes
# Cannot be zero.
-NANO_CONFSIZE=2048
+#
+NANO_CONFSIZE="1Mi"
-# Size of data file system in 512 bytes sectors
+# Size of data file system in bytes
# If zero: no partition configured.
# If negative: max size possible
NANO_DATASIZE=0
-# Size of the /etc ramdisk in 512 bytes sectors
-NANO_RAM_ETCSIZE=10240
+# Size of the /etc ramdisk in bytes
+NANO_RAM_ETCSIZE="5Mi"
+
+# Size of the /tmp+/var ramdisk in bytes
+NANO_RAM_TMPVARSIZE="40Mi"
-# Size of the /tmp+/var ramdisk in 512 bytes sectors
-NANO_RAM_TMPVARSIZE=10240
+# Size of swap partition in bytes
+NANO_SWAP_SIZE=0
# boot0 flags/options and configuration
NANO_BOOT0CFG="-o packet -s 1 -m 3"
@@ -156,6 +171,9 @@
# for swap type md(4) backing, write out the mbr only
NANO_IMAGE_MBRONLY=true
+# EFI System Partition size in bytes
+NANO_EFI_BOOTPART_SIZE="260Mi"
+
# Progress Print level
PPLEVEL=3
@@ -1315,8 +1333,9 @@
rm -f "${NANO_METALOG}.conf"
fi
- echo "$NANO_RAM_ETCSIZE" > conf/base/etc/md_size
- echo "$NANO_RAM_TMPVARSIZE" > conf/base/var/md_size
+ # Size of the memory disk in 512-byte sectors, per diskless(8)
+ echo "$(( NANO_RAM_ETCSIZE / 512 ))" > conf/base/etc/md_size
+ echo "$(( NANO_RAM_TMPVARSIZE / 512 ))" > conf/base/var/md_size
tgt_touch conf/base/etc/md_size
tgt_touch conf/base/var/md_size
@@ -1438,7 +1457,7 @@
#
# Run makefs to create a UFS filesystem image from a source directory
# using a metalog spec and timestamp
-# Input: $1 = options, $2 = metalog path, $3 = size in sectors,
+# Input: $1 = options, $2 = metalog path, $3 = size in bytes,
# $4 = output image path, $5 = source dir
#
nano_makefs() {
@@ -1449,8 +1468,13 @@
image=$4
dir=$5
- makefs -t ffs ${options} -F "${metalog}" -N "${NANO_WORLDDIR}/etc" \
- -R "${size}b" -T "${NANO_TIMESTAMP}" "${image}" "${dir}"
+ if [ -n "$metalog" ] && [ -f "$metalog" ]; then
+ makefs -t ffs -DxZ ${options} -F "$metalog" -N "${NANO_WORLDDIR}/etc" \
+ -R "$size" -T "$NANO_TIMESTAMP" "$image" "$dir"
+ else
+ makefs -t ffs -Z ${options} -N "${NANO_WORLDDIR}/etc" \
+ -R "$size" -T "$NANO_TIMESTAMP" "$image" "$dir"
+ fi
}
#
@@ -1487,7 +1511,7 @@
#
# Create a UFS filesystem image from a directory
# Input: $1 = type (cfg/data), $2 = output image path, $3 = source dir,
-# $4 = label, $5 = size in sectors, $6 = metalog
+# $4 = label, $5 = size in bytes, $6 = metalog
#
_populate_part() {
local dir fs lbl metalog size type
@@ -1528,13 +1552,14 @@
)
fi
- nano_makefs "-DxZ ${NANO_MAKEFS}" "${metalog}" "${size}" "${fs}" "${dir}"
+ nano_makefs "$NANO_MAKEFS" "$metalog" "$size" "$fs" "$dir"
fi
}
#
-# Thin wrapper around populate_slice for the configuration partition
-# Input: $1 = device, $2 = source dir, $3 = mount point, $4 = label
+# Thin wrapper around populate_part for creating
+# the configuration partition image file
+# Input: $1 = image path, $2 = source dir, $3 = label, $4 = size, $5 = metalog
#
populate_cfg_slice() {
populate_slice "$1" "$2" "$3" "$4"
@@ -1639,12 +1664,12 @@
generic-fdd)
NANO_HEADS=64
NANO_SECTS=32
- NANO_MEDIASIZE=$(( $2 * 1000 * 1000 / 512 ))
+ NANO_MEDIASIZE="${2}m"
;;
generic|generic-hdd)
NANO_HEADS=255
NANO_SECTS=63
- NANO_MEDIASIZE=$(( $2 * 1000 * 1000 / 512 ))
+ NANO_MEDIASIZE="${2}m"
;;
*)
err "Unknown USB flash device"
@@ -1652,25 +1677,60 @@
esac
}
-#######################################################################
-# Setup serial console
+#
+# Convert a human-readable size string with a suffix into bytes.
+# Inspired by NetBSD's strsuftoll(3), humanize_number(3), and
+# newfs_msdos(8) argtooff().
+#
+# Supported suffixes:
+# k,m,g,t,p,e SI units (1000^n)
+# ki,mi,gi,ti,pi,ei IEC units (1024^n)
+# s NANO_SECTOR_SIZE-byte blocks (Default: 512 bytes)
+# w sizeof(int) (4 bytes)
+#
+# Also accepts "x"-delimited products followed by a suffix
+# (e.g., "2x1024k", "4x512ki").
+#
+# Output: byte count
+#
+strtobytes() {
+ local input num result suffix
-# Enable serial console in /etc/ttys and write NANO_BOOT2CFG to /boot.config
-cust_comconsole() {
- # Enable getty on console
- sed -i "" -e '/^tty[du]0/s/off/onifconsole/' ${NANO_WORLDDIR}/etc/ttys
+ case "$1" in
+ *[0-9a-zA-Z][Bb]) input=${1%?} ;;
+ *) input=$1 ;;
+ esac
- # Disable getty on syscons or vt devices
- sed -i "" -E '/^ttyv[0-8]/s/\ton(ifexists)?/\toff/' ${NANO_WORLDDIR}/etc/ttys
+ case "$input" in
+ *[Kk][Ii]) num=${input%??}; suffix=ki ;;
+ *[Mm][Ii]) num=${input%??}; suffix=mi ;;
+ *[Gg][Ii]) num=${input%??}; suffix=gi ;;
+ *[Tt][Ii]) num=${input%??}; suffix=ti ;;
+ *[Pp][Ii]) num=${input%??}; suffix=pi ;;
+ *[Ee][Ii]) num=${input%??}; suffix=ei ;;
+ *) num=${input%?}; suffix=${input#"${num}"} ;;
+ esac
- # Tell loader to use serial console early.
- echo "${NANO_BOOT2CFG}" > ${NANO_WORLDDIR}/boot.config
- tgt_touch boot.config
+ case "$suffix" in
+ [kK]) result="${num}x1000^1" ;;
+ [mM]) result="${num}x1000^2" ;;
+ [gG]) result="${num}x1000^3" ;;
+ [tT]) result="${num}x1000^4" ;;
+ [pP]) result="${num}x1000^5" ;;
+ [eE]) result="${num}x1000^6" ;;
+ ki) result="${num}x1024^1" ;;
+ mi) result="${num}x1024^2" ;;
+ gi) result="${num}x1024^3" ;;
+ ti) result="${num}x1024^4" ;;
+ pi) result="${num}x1024^5" ;;
+ ei) result="${num}x1024^6" ;;
+ [sS]) result="${num}x${NANO_SECTOR_SIZE:-512}" ;;
+ [wW]) result="${num}x4" ;; # sizeof(int)
+ [0-9]) result="$input" ;;
+ *) err "'$1': illegal number" ;;
+ esac
- if $do_precompiled && [ -z "$NANO_NOPKGBASE" ]; then
- tgt_pkg_update_file_sha256 etc/ttys
- tgt_pkg_update_config_files_content etc/ttys
- fi
+ printf "%s" "$(printf 'scale=0; %s\n' "$result" | tr 'x' '*' | bc)"
}
#######################################################################
@@ -1902,43 +1962,80 @@
NANO_METALOG=${NANO_OBJ}/_.metalog
fi
+ #
+ # Keep legacy sizes in 512-byte sectors, except for variables
+ # in this file, which require sizes in bytes
+ #
+ if [ "$NANO_PLAN" = "legacy" ]; then
+ NANO_RAM_ETCSIZE=$(strtobytes "${NANO_RAM_ETCSIZE:-0}s")
+ NANO_RAM_TMPVARSIZE=$(strtobytes "${NANO_RAM_TMPVARSIZE:-0}s")
+ NANO_SWAP_SIZE=0
+ else
+ NANO_MEDIASIZE=$(strtobytes "${NANO_MEDIASIZE:-0}")
+ NANO_CODESIZE=$(strtobytes "${NANO_CODESIZE:-0}")
+ NANO_CONFSIZE=$(strtobytes "${NANO_CONFSIZE:-1Mi}")
+ NANO_DATASIZE=$(strtobytes "${NANO_DATASIZE:-0}")
+ NANO_RAM_ETCSIZE=$(strtobytes "${NANO_RAM_ETCSIZE:-0}")
+ NANO_RAM_TMPVARSIZE=$(strtobytes "${NANO_RAM_TMPVARSIZE:-0}")
+ NANO_SWAP_SIZE=$(strtobytes "${NANO_SWAP_SIZE:-0}")
+ NANO_EFI_BOOTPART_SIZE=$(strtobytes "${NANO_EFI_BOOTPART_SIZE:-0}")
+ fi
+
NANO_STARTTIME=$(date +%s)
- : ${NANO_TIMESTAMP:=${NANO_STARTTIME}}
+ : "${NANO_TIMESTAMP:=${NANO_STARTTIME}}"
+
+ if [ "$NANO_PLAN" = "legacy" ]; then
+ pprint 3 "Exporting Legacy NanoBSD variables"
+ export_var NANO_BOOT0CFG
+ export_var NANO_HEADS
+ export_var NANO_NEWFS
+ export_var NANO_SECTS
+ fi
+
pprint 3 "Exporting NanoBSD variables"
export_var MAKEOBJDIRPREFIX
export_var NANO_ARCH
+ export_var NANO_BOOTLOADER
export_var NANO_CODESIZE
export_var NANO_CONFSIZE
export_var NANO_CUSTOMIZE
export_var NANO_DATASIZE
export_var NANO_DRIVE
- export_var NANO_HEADS
+ export_var NANO_EFI_BOOTPART_SIZE
export_var NANO_IMAGES
- export_var NANO_IMGNAME
export_var NANO_IMG1NAME
+ export_var NANO_IMGNAME
+ export_var NANO_LABEL
+ export_var NANO_LOG
export_var NANO_MAKE
export_var NANO_MAKEFS
export_var NANO_MAKE_CONF_BUILD
export_var NANO_MAKE_CONF_INSTALL
export_var NANO_MEDIASIZE
+ export_var NANO_METALOG
+ export_var NANO_MODULES
export_var NANO_NAME
export_var NANO_NCPU
- export_var NANO_NEWFS
+ export_var NANO_NOPKGBASE
+ export_var NANO_NOPRIV_BUILD
export_var NANO_OBJ
+ export_var NANO_PLAN
export_var NANO_PMAKE
- export_var NANO_SECTS
+ export_var NANO_RAM_ETCSIZE
export_var NANO_SRC
export_var NANO_TIMESTAMP
+ export_var NANO_RAM_TMPVARSIZE
export_var NANO_TOOLS
export_var NANO_WORLDDIR
- export_var NANO_BOOT0CFG
- export_var NANO_BOOTLOADER
- export_var NANO_LABEL
- export_var NANO_MODULES
- export_var NANO_NOPRIV_BUILD
- export_var NANO_METALOG
- export_var NANO_NOPKGBASE
- export_var NANO_LOG
export_var SRCCONF
export_var SRC_ENV_CONF
+
+ if [ -n "$NANO_CUSTOMIZE" ]; then
+ pprint 3 "Exporting NanoBSD customization variables"
+ export_var NANO_BOOT2CFG
+ export_var NANO_CUST_FILESDIR
+ export_var NANO_CUST_FILES_MTREE
+ export_var NANO_PACKAGE_LIST
+ export_var NANO_PKG_META_BASE
+ fi
}
diff --git a/tools/tools/nanobsd/embedded/common b/tools/tools/nanobsd/embedded/common
--- a/tools/tools/nanobsd/embedded/common
+++ b/tools/tools/nanobsd/embedded/common
@@ -69,7 +69,10 @@
echo "NANO_NAME not defined. Use foo.cfg instead."
fi
-NANO_SLICE_FAT_SIZE=32m
+# We define our own imaging plan, so instruct nanobsd not to define its own.
+NANO_PLAN=embedded
+
+NANO_SLICE_FAT_SIZE=32mi
NANO_SLICE_CFG_SIZE=32m
NANO_BOOT2CFG="-h -S115200"
@@ -168,31 +171,6 @@
NANO_PACKAGE_ONLY=1
-# makefs(8)-size compatible
-# See NetBSD's strsuftoll(3)
-strsuftoll() {
- local num result unit
-
- num=${1%?}
- unit=${1#"${num}"}
-
- case "$unit" in
- [bB]) result="${num}x512" ;;
- [kK]) result="${num}x1024" ;;
- [mM]) result="${num}x1024x1024" ;;
- [gG]) result="${num}x1024x1024x1024" ;;
- [tT]) result="${num}x1024x1024x1024x1024" ;;
- [wW]) result="${num}x4" ;; # sizeof(int)
- [0-9]) result="$1" ;;
- *)
- printf "%s\n" "'$1': illegal number"
- exit 1
- ;;
- esac
-
- printf "%s" "$(echo "scale=0; $result" | tr 'x' '*' | bc)"
-}
-
# Creates images for all the formats that use MBR / GPT
# split later if the #ifdef soup gets too bad.
create_diskimage_gpt() {
@@ -233,7 +211,7 @@
FAT16MIN=2150400
FAT32MIN=34091008
- fat_size=$(strsuftoll "$NANO_SLICE_FAT_SIZE")
+ fat_size=$(strtobytes "$NANO_SLICE_FAT_SIZE")
if [ "$fat_size" -ge "$FAT32MIN" ]; then
fat_type=32
fat_scheme=fat32lba
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
@@ -31,6 +31,38 @@
[ -n "$NANO_SECTS" ] || NANO_SECTS=63
[ -n "$NANO_HEADS" ] || NANO_HEADS=16
+#
+# Sector size in bytes.
+# Accepts suffixes and products (4k, 1M, 4x1024)
+#
+NANO_SECTOR_SIZE=512
+
+# Target media size in 512 bytes sectors
+NANO_MEDIASIZE=4000000
+
+#
+# Size of code file system in 512 bytes sectors.
+# If zero, size will be as large as possible
+#
+NANO_CODESIZE=0
+
+#
+# Size of configuration file system in 512 bytes sectors.
+# Cannot be zero
+#
+NANO_CONFSIZE=2048
+
+# Size of data file system in 512 bytes sectors.
+# If zero: no partition configured.
+# If negative: max size possible
+NANO_DATASIZE=0
+
+# Size of the /etc ramdisk in 512 bytes sectors
+NANO_RAM_ETCSIZE=10240
+
+# Size of the /tmp+/var ramdisk in 512 bytes sectors
+NANO_RAM_TMPVARSIZE=81920
+
#
# The first partition should start at offset 16,
# because the first 16 sectors are reserved for metadata
@@ -186,8 +218,9 @@
else
echo "Partition will not be bootable"
fi
- nano_makefs "-DxZ ${NANO_MAKEFS} -o minfree=0,optimization=space" \
- "${NANO_METALOG}" "$(( CODE_SIZE - METADATA_SECTS ))" \
+ nano_makefs "${NANO_MAKEFS} -o minfree=0,optimization=space" \
+ "${NANO_METALOG}" \
+ "$(( (CODE_SIZE - METADATA_SECTS) * NANO_SECTOR_SIZE ))" \
"${NANO_OBJ}/_.disk.part" "${NANO_WORLDDIR}"
mkimg -s bsd -S 512 --capacity $(( CODE_SIZE * 512 )) \
${bootcode} \
@@ -332,8 +365,9 @@
if [ "$NANO_INIT_IMG2" -gt 0 ]; then
echo "Duplicating to second image..."
tgt_switch_root_fstab "${NANO_SLICE_ROOT}" "${NANO_SLICE_ALTROOT}"
- nano_makefs "-DxZ ${NANO_MAKEFS} -o minfree=0,optimization=space" \
- "${NANO_METALOG}" "$(( CODE_SIZE - METADATA_SECTS ))" \
+ nano_makefs "${NANO_MAKEFS} -o minfree=0,optimization=space" \
+ "${NANO_METALOG}" \
+ "$(( (CODE_SIZE - METADATA_SECTS) * NANO_SECTOR_SIZE ))" \
"${NANO_OBJ}/_.altroot.part" "${NANO_WORLDDIR}"
tgt_switch_root_fstab "${NANO_SLICE_ALTROOT}" "${NANO_SLICE_ROOT}"
if [ -f "${NANO_WORLDDIR}/boot/boot" ]; then

File Metadata

Mime Type
text/plain
Expires
Sun, Aug 23, 12:35 AM (14 h, 49 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
37081313
Default Alt Text
D58969.id184560.diff (12 KB)

Event Timeline