base-files: rename 'sdcard' to 'legacy-sdcard'
While an image layout based on MBR and 'bootfs' partition may be easy
to understand for users who are very used to the IBM PC and always have
the option to access the SD card outside of the device (and hence don't
really depend on other recovery methods or dual-boot), in my opinion
it's a dead end for many desirable features on embedded systems,
especially when managed remotely (and hence without an easy option to
access the SD card using another device in case things go wrong, for
example).
Let me explain:
* using a MSDOS/VFAT filesystem to store kernel(s) is problematic, as a
single corruption of the bootfs can render the system into a state
that it no longer boots at all. This makes dual-boot useless, or at
least very tedious to setup with then 2 independent boot partitions
to avoid the single point of failure on a "hot" block (the FAT index
of the boot partition, written every time a file is changed in
bootfs). And well: most targets even store the bootloader environment
in a file in that very same FAT filesystem, hence it cannot be used
to script a reliable dual-boot method (as loading the environment
itself will already fail if the filesystem is corrupted).
* loading the kernel uImage from bootfs and using rootfs inside an
additional partition means the bootloader can only validate the
kernel -- if rootfs is broken or corrupted, this can lead to a reboot
loop, which is often a quite costly thing to happen in terms of
hardware lifetime.
* imitating MBR-boot behavior with a FAT-formatted bootfs partition
(like IBM PC in the 80s and 90s) is just one of many choices on
embedded targets. There are much better options with modern U-Boot
(which is what we use and build from source for all targets booting
off SD cards), see examples in mediatek/mt7622 and mediatek/mt7623.
Hence rename the 'sdcard' feature to 'legacy-sdcard', and prefix
functions with 'legacy_sdcard_' instead of 'sdcard_'.
Tested-by: Stijn Tintel <stijn@linux-ipv6.be>
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
2021-08-07 13:30:53 +00:00
|
|
|
legacy_sdcard_check_image() {
|
2021-07-29 22:11:37 +00:00
|
|
|
local file="$1"
|
|
|
|
|
local diskdev partdev diff
|
|
|
|
|
|
|
|
|
|
export_bootdevice && export_partdevice diskdev 0 || {
|
|
|
|
|
v "Unable to determine upgrade device"
|
|
|
|
|
return 1
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
get_partitions "/dev/$diskdev" bootdisk
|
|
|
|
|
|
|
|
|
|
v "Extract boot sector from the image"
|
|
|
|
|
get_image_dd "$1" of=/tmp/image.bs count=1 bs=512b
|
|
|
|
|
|
|
|
|
|
get_partitions /tmp/image.bs image
|
|
|
|
|
|
|
|
|
|
#compare tables
|
|
|
|
|
diff="$(grep -F -x -v -f /tmp/partmap.bootdisk /tmp/partmap.image)"
|
|
|
|
|
|
|
|
|
|
rm -f /tmp/image.bs /tmp/partmap.bootdisk /tmp/partmap.image
|
|
|
|
|
|
|
|
|
|
if [ -n "$diff" ]; then
|
|
|
|
|
v "Partition layout has changed. Full image will be written."
|
|
|
|
|
ask_bool 0 "Abort" && exit 1
|
|
|
|
|
return 0
|
|
|
|
|
fi
|
|
|
|
|
}
|
|
|
|
|
|
base-files: rename 'sdcard' to 'legacy-sdcard'
While an image layout based on MBR and 'bootfs' partition may be easy
to understand for users who are very used to the IBM PC and always have
the option to access the SD card outside of the device (and hence don't
really depend on other recovery methods or dual-boot), in my opinion
it's a dead end for many desirable features on embedded systems,
especially when managed remotely (and hence without an easy option to
access the SD card using another device in case things go wrong, for
example).
Let me explain:
* using a MSDOS/VFAT filesystem to store kernel(s) is problematic, as a
single corruption of the bootfs can render the system into a state
that it no longer boots at all. This makes dual-boot useless, or at
least very tedious to setup with then 2 independent boot partitions
to avoid the single point of failure on a "hot" block (the FAT index
of the boot partition, written every time a file is changed in
bootfs). And well: most targets even store the bootloader environment
in a file in that very same FAT filesystem, hence it cannot be used
to script a reliable dual-boot method (as loading the environment
itself will already fail if the filesystem is corrupted).
* loading the kernel uImage from bootfs and using rootfs inside an
additional partition means the bootloader can only validate the
kernel -- if rootfs is broken or corrupted, this can lead to a reboot
loop, which is often a quite costly thing to happen in terms of
hardware lifetime.
* imitating MBR-boot behavior with a FAT-formatted bootfs partition
(like IBM PC in the 80s and 90s) is just one of many choices on
embedded targets. There are much better options with modern U-Boot
(which is what we use and build from source for all targets booting
off SD cards), see examples in mediatek/mt7622 and mediatek/mt7623.
Hence rename the 'sdcard' feature to 'legacy-sdcard', and prefix
functions with 'legacy_sdcard_' instead of 'sdcard_'.
Tested-by: Stijn Tintel <stijn@linux-ipv6.be>
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
2021-08-07 13:30:53 +00:00
|
|
|
legacy_sdcard_do_upgrade() {
|
2021-07-29 22:11:37 +00:00
|
|
|
local board=$(board_name)
|
|
|
|
|
local diskdev partdev diff
|
|
|
|
|
|
|
|
|
|
export_bootdevice && export_partdevice diskdev 0 || {
|
|
|
|
|
v "Unable to determine upgrade device"
|
|
|
|
|
return 1
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
sync
|
|
|
|
|
|
|
|
|
|
if [ "$UPGRADE_OPT_SAVE_PARTITIONS" = "1" ]; then
|
|
|
|
|
get_partitions "/dev/$diskdev" bootdisk
|
|
|
|
|
|
|
|
|
|
v "Extract boot sector from the image"
|
|
|
|
|
get_image_dd "$1" of=/tmp/image.bs count=1 bs=512b
|
|
|
|
|
|
|
|
|
|
get_partitions /tmp/image.bs image
|
|
|
|
|
|
|
|
|
|
#compare tables
|
|
|
|
|
diff="$(grep -F -x -v -f /tmp/partmap.bootdisk /tmp/partmap.image)"
|
|
|
|
|
else
|
|
|
|
|
diff=1
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
if [ -n "$diff" ]; then
|
|
|
|
|
get_image_dd "$1" of="/dev/$diskdev" bs=4096 conv=fsync
|
|
|
|
|
|
|
|
|
|
# Separate removal and addtion is necessary; otherwise, partition 1
|
|
|
|
|
# will be missing if it overlaps with the old partition 2
|
|
|
|
|
partx -d - "/dev/$diskdev"
|
|
|
|
|
partx -a - "/dev/$diskdev"
|
|
|
|
|
else
|
|
|
|
|
v "Writing bootloader to /dev/$diskdev"
|
|
|
|
|
get_image_dd "$1" of="$diskdev" bs=512 skip=1 seek=1 count=2048 conv=fsync
|
|
|
|
|
#iterate over each partition from the image and write it to the boot disk
|
|
|
|
|
while read part start size; do
|
|
|
|
|
if export_partdevice partdev $part; then
|
|
|
|
|
v "Writing image to /dev/$partdev..."
|
|
|
|
|
get_image_dd "$1" of="/dev/$partdev" ibs="512" obs=1M skip="$start" count="$size" conv=fsync
|
|
|
|
|
else
|
|
|
|
|
v "Unable to find partition $part device, skipped."
|
|
|
|
|
fi
|
|
|
|
|
done < /tmp/partmap.image
|
|
|
|
|
|
|
|
|
|
v "Writing new UUID to /dev/$diskdev..."
|
|
|
|
|
get_image_dd "$1" of="/dev/$diskdev" bs=1 skip=440 count=4 seek=440 conv=fsync
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
sleep 1
|
|
|
|
|
}
|
|
|
|
|
|
base-files: rename 'sdcard' to 'legacy-sdcard'
While an image layout based on MBR and 'bootfs' partition may be easy
to understand for users who are very used to the IBM PC and always have
the option to access the SD card outside of the device (and hence don't
really depend on other recovery methods or dual-boot), in my opinion
it's a dead end for many desirable features on embedded systems,
especially when managed remotely (and hence without an easy option to
access the SD card using another device in case things go wrong, for
example).
Let me explain:
* using a MSDOS/VFAT filesystem to store kernel(s) is problematic, as a
single corruption of the bootfs can render the system into a state
that it no longer boots at all. This makes dual-boot useless, or at
least very tedious to setup with then 2 independent boot partitions
to avoid the single point of failure on a "hot" block (the FAT index
of the boot partition, written every time a file is changed in
bootfs). And well: most targets even store the bootloader environment
in a file in that very same FAT filesystem, hence it cannot be used
to script a reliable dual-boot method (as loading the environment
itself will already fail if the filesystem is corrupted).
* loading the kernel uImage from bootfs and using rootfs inside an
additional partition means the bootloader can only validate the
kernel -- if rootfs is broken or corrupted, this can lead to a reboot
loop, which is often a quite costly thing to happen in terms of
hardware lifetime.
* imitating MBR-boot behavior with a FAT-formatted bootfs partition
(like IBM PC in the 80s and 90s) is just one of many choices on
embedded targets. There are much better options with modern U-Boot
(which is what we use and build from source for all targets booting
off SD cards), see examples in mediatek/mt7622 and mediatek/mt7623.
Hence rename the 'sdcard' feature to 'legacy-sdcard', and prefix
functions with 'legacy_sdcard_' instead of 'sdcard_'.
Tested-by: Stijn Tintel <stijn@linux-ipv6.be>
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
2021-08-07 13:30:53 +00:00
|
|
|
legacy_sdcard_copy_config() {
|
2021-07-29 22:11:37 +00:00
|
|
|
local partdev
|
|
|
|
|
|
|
|
|
|
if export_partdevice partdev 1; then
|
|
|
|
|
mkdir -p /boot
|
|
|
|
|
[ -f /boot/kernel.img ] || mount -o rw,noatime /dev/$partdev /boot
|
|
|
|
|
cp -af "$UPGRADE_BACKUP" "/boot/$BACKUP_FILE"
|
|
|
|
|
sync
|
|
|
|
|
umount /boot
|
|
|
|
|
fi
|
|
|
|
|
}
|
