image:vfat fs creation and mount tweaks

AB: use device sector size when creating filesystems.
AB: panic on errors for the boot critical partition.
Don't specify sectors-per-custer as it can conflict with sizing.
Use default options as the base when mounting.

Refs:
https://www.kernel.org/doc/Documentation/filesystems/vfat.txt

Author: learmj

image/gpt/ab_userdata/genimage.cfg.in

@@ -91,15 +91,15 @@ image config.vfat {
    vfat {
       label = "BOOTFS"
       file "autoboot.txt" { image = "autoboot.txt" }
-      extraargs = "-s 1"
+      extraargs = "-s 1 -S <SECTOR_SIZE>"
    }
    size = 32M
 }
 
 image bootA.vfat {
    vfat {
       label = "BOOTA"
-      extraargs = "-i <BOOTA_UUID>"
+      extraargs = "-S <SECTOR_SIZE> -i <BOOTA_UUID>"
    }
    size = <FW_SIZE>
    mountpoint = "/boot/firmware"
@@ -121,7 +121,7 @@ image systemA.ext4 {
 image bootB.vfat {
    vfat {
       label = "BOOTB"
-      extraargs = "-i <BOOTB_UUID>"
+      extraargs = "-S <SECTOR_SIZE> -i <BOOTB_UUID>"
    }
    size = <FW_SIZE>
    mountpoint = "/boot/firmware"

image/gpt/ab_userdata/pre-image.sh

@@ -30,6 +30,7 @@ cat genimage.cfg.in | sed \
    -e "s|<IMAGE_SUFFIX>|$IGconf_image_suffix|g" \
    -e "s|<FW_SIZE>|$IGconf_image_boot_part_size|g" \
    -e "s|<SYSTEM_SIZE>|$IGconf_image_system_part_size|g" \
+   -e "s|<SECTOR_SIZE>|$IGconf_device_sector_size|g" \
    -e "s|<SLOTP>|'$(readlink -ef slot-post-process.sh)'|g" \
    -e "s|<MKE2FSCONF>|'$(readlink -ef mke2fs.conf)'|g" \
    -e "s|<BOOTA_UUID>|$BOOTA_UUID|g" \

image/gpt/ab_userdata/slot-post-process.sh

@@ -10,9 +10,9 @@ case $COMP in
    SYSTEM)
       cat << EOF > $IMAGEMOUNTPATH/etc/fstab
 /dev/disk/by-slot/active/system /              ext4 rw,relatime,errors=remount-ro,commit=30 0 1
-/dev/disk/by-slot/active/boot   /boot/firmware vfat defaults,rw,nofail  0 2
+/dev/disk/by-slot/active/boot   /boot/firmware vfat defaults,rw,noatime,nofail  0 2
 LABEL=USERDATA                  /data          ext4 rw,relatime,nofail,commit=30 0 2
-LABEL=BOOTFS                    /bootfs        vfat defaults,rw 0 2
+LABEL=BOOTFS                    /bootfs        vfat defaults,rw,noatime,errors=panic 0 2
 EOF
       ;;
    BOOT)

image/mbr/simple_dual/genimage.cfg.in.btrfs

@@ -39,7 +39,7 @@ image <IMAGE_NAME>.<IMAGE_SUFFIX> {
 image boot.vfat {
    vfat {
       label = "BOOT"
-      extraargs = "-s 4 -S <SECTOR_SIZE> -i <BOOT_UUID>"
+      extraargs = "-S <SECTOR_SIZE> -i <BOOT_UUID>"
    }
    size = <FW_SIZE>
    mountpoint = "/boot/firmware"

image/mbr/simple_dual/genimage.cfg.in.ext4

@@ -39,7 +39,7 @@ image <IMAGE_NAME>.<IMAGE_SUFFIX> {
 image boot.vfat {
    vfat {
       label = "BOOT"
-      extraargs = "-s 4 -S <SECTOR_SIZE> -i <BOOT_UUID>"
+      extraargs = "-S <SECTOR_SIZE> -i <BOOT_UUID>"
    }
    size = <FW_SIZE>
    mountpoint = "/boot/firmware"

image/mbr/simple_dual/setup-clear.sh

@@ -24,7 +24,7 @@ EOF
       esac
 
       cat << EOF >> $IMAGEMOUNTPATH/etc/fstab
-UUID=${BOOTUUID^^} /boot/firmware  vfat rw,noatime,fmask=0022,dmask=0022,codepage=437,iocharset=ascii,shortname=mixed,errors=remount-ro 0 2
+UUID=${BOOTUUID^^} /boot/firmware  vfat defaults,rw,noatime,errors=remount-ro 0 2
 EOF
       ;;
    BOOT)

image/mbr/simple_dual/setup-crypt.sh

@@ -23,7 +23,7 @@ EOF
       esac
 
       cat << EOF >> $IMAGEMOUNTPATH/etc/fstab
-UUID=${BOOTUUID^^} /boot/firmware  vfat rw,noatime,fmask=0022,dmask=0022,codepage=437,iocharset=ascii,shortname=mixed,errors=remount-ro 0 2
+UUID=${BOOTUUID^^} /boot/firmware  vfat defaults,rw,noatime,errors=remount-ro 0 2
 EOF
       ;;
    BOOT)