fix(updater): mount the boot partition with the kernel's own charset

A vfat mount that names iocharset= or codepage= is refused outright on a
kernel that has no NLS table for it: the Armbian current-sunxi64 kernel of
the Orange Pi Zero 3 has no nls_ascii, so the board mounted its boot
partition at boot - init.sh names no charset - and failed in the updater
with "IO charset ascii not found", i.e. exit code 92.

The names on that partition are ASCII, so the kernel's default is right on
every target. All three mounts that shared the option string are kept in
step, the commented-out fstab line included.

Signed-off-by: Simon Walz <contact@simonwalz.de>

Author: simonwalz

image-factory/mount_image.sh

@@ -84,7 +84,9 @@ mkdir -p "${TARGET_ROOT}"
 mount -t btrfs -o subvol=@os "${TARGET_ROOT_PARTITION}" "${TARGET_ROOT}"
 
 mkdir -p "${TARGET_BOOT}"
-mount -t vfat -o "rw,relatime,fmask=0022,dmask=0022,codepage=437,iocharset=ascii,shortname=mixed,utf8,errors=remount-ro" "${TARGET_BOOT_PARTITION}" "${TARGET_BOOT}"
+# Same charset reasoning as updater/docker_environment.sh: name none, so the
+# mount works on whatever kernel this runs against.
+mount -t vfat -o "rw,relatime,fmask=0022,dmask=0022,shortname=mixed,errors=remount-ro" "${TARGET_BOOT_PARTITION}" "${TARGET_BOOT}"
 
 /bin/bash
 

updater/docker_environment.sh

@@ -46,7 +46,12 @@ mount -t btrfs -o subvol=@os "${TARGET_ROOT_PARTITION}" "${TARGET_ROOT}" \
 mkdir -p "${DOCKER_DIR}"
 
 mkdir -p "${TARGET_BOOT}"
-mount -t vfat -o "rw,relatime,fmask=0022,dmask=0022,codepage=437,iocharset=ascii,shortname=mixed,utf8,errors=remount-ro" "${TARGET_BOOT_PARTITION}" "${TARGET_BOOT}" \
+# The charset is the kernel's own. A vfat mount that names one the running
+# kernel has no NLS table for is refused outright ("IO charset ... not found"),
+# and which tables a kernel carries is not something this script can know: the
+# Armbian sunxi64 kernel of the Orange Pi Zero 3 has no nls_ascii. The boot
+# partition holds ASCII names only, so nothing here depends on the choice.
+mount -t vfat -o "rw,relatime,fmask=0022,dmask=0022,shortname=mixed,errors=remount-ro" "${TARGET_BOOT_PARTITION}" "${TARGET_BOOT}" \
 	|| raise 92 "Could not mount boot partition"
 
 

updater/perform_update.sh

@@ -173,7 +173,7 @@ LABEL=system  /  btrfs  rw,relatime,discard=async,space_cache=v2,subvol=${CONTAI
 LABEL=system  /data  btrfs  rw,relatime,discard=async,space_cache=v2,subvol=@data  0 0
 
 # /dev/sda2
-#LABEL=boot  /boot  vfat  rw,relatime,fmask=0022,dmask=0022,codepage=437,iocharset=ascii,shortname=mixed,utf8,errors=remount-ro  0 2
+#LABEL=boot  /boot  vfat  rw,relatime,fmask=0022,dmask=0022,shortname=mixed,errors=remount-ro  0 2
 EOF
 
 cp /etc/fstab "${CONTAINER_ROOTFS_FS}/etc/fstab" \