diff --git a/package/base-files/files/lib/upgrade/common.sh b/package/base-files/files/lib/upgrade/common.sh index b44a5998f4..e8a28f4138 100644 --- a/package/base-files/files/lib/upgrade/common.sh +++ b/package/base-files/files/lib/upgrade/common.sh @@ -133,6 +133,10 @@ get_magic_vfat() { (get_image "$@" | dd bs=1 count=3 skip=54) 2>/dev/null } +get_magic_fat32() { + (get_image "$@" | dd bs=1 count=5 skip=82) 2>/dev/null +} + part_magic_efi() { local magic=$(get_magic_gpt "$@") [ "$magic" = "EFI PART" ] @@ -140,7 +144,8 @@ part_magic_efi() { part_magic_fat() { local magic=$(get_magic_vfat "$@") - [ "$magic" = "FAT" ] + local magic_fat32=$(get_magic_fat32 "$@") + [ "$magic" = "FAT" ] || [ "$magic_fat32" = "FAT32" ] } export_bootdevice() {