Page MenuHomeFreeBSD
Files F168391157

D59232.diff
No OneTemporary
Actions

D59232.diff
View Options

diff --git a/tools/tools/nanobsd/gpt.sh b/tools/tools/nanobsd/gpt.sh
--- a/tools/tools/nanobsd/gpt.sh
+++ b/tools/tools/nanobsd/gpt.sh
@@ -75,7 +75,7 @@
printf_fstab "# Device" Mountpoint FStype Options Dump "Pass#"
if [ "$NANO_CIDATA_SIZE" -gt 0 ]; then
- printf_fstab "/dev/msdosfs/CIDATA" /boot/cidata msdosfs rw,noauto 2 2
+ printf_fstab "/dev/msdosfs/CIDATA" /boot/msdos msdosfs rw,noauto 2 2
fi
if is_boot_type UEFI; then
printf_fstab "/dev/gpt/efiboot0" /boot/efi msdosfs rw,noauto 2 2
@@ -177,10 +177,12 @@
cp -p "$bootcode" "${espdir}/EFI/BOOT/${efibootname}.EFI"
+ # XXXJL https://wiki.archlinux.org/title/EFI_system_partition#Firmware_does_not_see_the_EFI_directory
+ # Other FreeBSD tools use EFISYS
makefs -t msdos \
-o fat_type="$fat_type" \
-o sectors_per_cluster=1 \
- -o volume_label="efiboot0" \
+ -o volume_label="EFI" \
-o OEM_string="" \
-s "${esp_sects}b" \
-T "$NANO_TIMESTAMP" \
@@ -208,14 +210,11 @@
cidatadir="${NANO_OBJ}/_.cidata"
rm -rf "$cidatadir"
mkdir -p "$cidatadir"
- # XXX: Where should we mount /boot/msdos?
- # XXX: This mkdir -p operation has to be performed earlier than create_code_partition
- mkdir -p "${NANO_WORLDDIR}/boot/cidata"
makefs -t msdos \
-o fat_type="$fat_type" \
-o sectors_per_cluster=1 \
- -o volume_label="cidata" \
+ -o volume_label="CIDATA" \
-o OEM_string="" \
-s "${cidata_sects}b" \
-T "$NANO_TIMESTAMP" \
@@ -393,6 +392,10 @@
(
local IMG code_sects code_size
+ if [ "$NANO_CIDATA_SIZE" -gt 0 ]; then
+ mkdir -p "${NANO_WORLDDIR}/boot/msdos"
+ fi
+
IMG=${NANO_DISKIMGDIR}/${NANO_IMG1NAME}
code_sects=$(awk -v label="$NANO_ROOT" '$5 == label {print $4}' "${NANO_LOG}/_.partitioning")
code_size=$(( code_sects * NANO_SECTOR_SIZE ))

File Metadata

Mime Type
text/plain
Expires
Fri, Aug 28, 11:28 PM (4 h, 5 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
37484636
Default Alt Text
D59232.diff (1 KB)

Event Timeline