2016-07-20 13:44:54 +00:00
|
|
|
. /lib/functions.sh
|
|
|
|
|
2017-12-01 21:41:11 +00:00
|
|
|
# copied from x86's platform.sh
|
2016-07-20 13:44:54 +00:00
|
|
|
|
|
|
|
mbl_do_platform_check() {
|
2017-12-01 21:41:11 +00:00
|
|
|
local diskdev partdev diff
|
2016-07-20 13:44:54 +00:00
|
|
|
|
2017-12-01 21:41:11 +00:00
|
|
|
[ "$#" -gt 1 ] && return 1
|
2016-07-20 13:44:54 +00:00
|
|
|
|
base-files: improve lib/upgrade/common.sh
Recently, upgrade device autodetection has been added to the mvebu target.
This exposes some shortcomings of the generic export_bootdevice function,
e.g. on the Turris Omnia: export_bootdevice silently reports the root
partition to be the boot device. This makes the sysupgrade process fail at
several places.
Fix this by clearly distinguishing between /proc/cmdline arguments which
specify the boot disk, and those which specify the root partition. Only in
the latter case, strip off the partition, and do it consistently.
root=PARTUUID=<pseudo PARTUUID for MBR> (any partition) and root=/dev/*
(any partition) are accepted.
The root of the problem is that the *existing* export_bootdevice in
/lib/upgrade/common.sh behaves differently, if the kernel is booted with
root=/dev/..., or if it is booted with root=PARTUUID=...
In the former case, it reports back major/minor of the root partition,
in the latter case it reports back major/minor of the complete boot disk.
Targets, which boot with root=/dev/... *and* use export_bootdevice /
export_partdevice, have added workarounds to this behaviour, by specifying
*negative* increments to the export_partdevice function.
Consequently, those targets have to be adapted to use positive increments,
otherwise they are broken by the change to export_bootdevice.
Fixes: 4e8345ff68 ("mvebu: base-files: autodetect upgrade device")
Signed-off-by: Klaus Kudielka <klaus.kudielka@gmail.com>
Tested-by: Tomasz Maciej Nowak <tomek_n@o2.pl>
2019-05-08 18:40:50 +00:00
|
|
|
export_bootdevice && export_partdevice diskdev 0 || {
|
2017-12-01 21:41:11 +00:00
|
|
|
echo "Unable to determine upgrade device"
|
2016-07-20 13:44:54 +00:00
|
|
|
return 1
|
|
|
|
}
|
|
|
|
|
2017-12-01 21:41:11 +00:00
|
|
|
get_partitions "/dev/$diskdev" bootdisk
|
|
|
|
|
|
|
|
#extract the boot sector from the image
|
|
|
|
get_image "$@" | dd of=/tmp/image.bs count=1 bs=512b 2>/dev/null
|
|
|
|
|
|
|
|
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
|
|
|
|
echo "Partition layout has changed. Full image will be written."
|
|
|
|
ask_bool 0 "Abort" && exit 1
|
|
|
|
return 0
|
|
|
|
fi
|
|
|
|
|
2016-07-20 13:44:54 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
mbl_do_upgrade() {
|
2017-12-01 21:41:11 +00:00
|
|
|
local diskdev partdev diff
|
|
|
|
|
base-files: improve lib/upgrade/common.sh
Recently, upgrade device autodetection has been added to the mvebu target.
This exposes some shortcomings of the generic export_bootdevice function,
e.g. on the Turris Omnia: export_bootdevice silently reports the root
partition to be the boot device. This makes the sysupgrade process fail at
several places.
Fix this by clearly distinguishing between /proc/cmdline arguments which
specify the boot disk, and those which specify the root partition. Only in
the latter case, strip off the partition, and do it consistently.
root=PARTUUID=<pseudo PARTUUID for MBR> (any partition) and root=/dev/*
(any partition) are accepted.
The root of the problem is that the *existing* export_bootdevice in
/lib/upgrade/common.sh behaves differently, if the kernel is booted with
root=/dev/..., or if it is booted with root=PARTUUID=...
In the former case, it reports back major/minor of the root partition,
in the latter case it reports back major/minor of the complete boot disk.
Targets, which boot with root=/dev/... *and* use export_bootdevice /
export_partdevice, have added workarounds to this behaviour, by specifying
*negative* increments to the export_partdevice function.
Consequently, those targets have to be adapted to use positive increments,
otherwise they are broken by the change to export_bootdevice.
Fixes: 4e8345ff68 ("mvebu: base-files: autodetect upgrade device")
Signed-off-by: Klaus Kudielka <klaus.kudielka@gmail.com>
Tested-by: Tomasz Maciej Nowak <tomek_n@o2.pl>
2019-05-08 18:40:50 +00:00
|
|
|
export_bootdevice && export_partdevice diskdev 0 || {
|
2017-12-01 21:41:11 +00:00
|
|
|
echo "Unable to determine upgrade device"
|
|
|
|
return 1
|
|
|
|
}
|
|
|
|
|
2016-07-20 13:44:54 +00:00
|
|
|
sync
|
2017-12-01 21:41:11 +00:00
|
|
|
|
|
|
|
if [ "$SAVE_PARTITIONS" = "1" ]; then
|
|
|
|
get_partitions "/dev/$diskdev" bootdisk
|
|
|
|
|
|
|
|
#extract the boot sector from the image
|
|
|
|
get_image "$@" | dd 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 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"
|
|
|
|
|
|
|
|
return 0
|
|
|
|
fi
|
|
|
|
|
|
|
|
#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
|
|
|
|
echo "Writing image to /dev/$partdev..."
|
|
|
|
get_image "$@" | dd of="/dev/$partdev" ibs="512" obs=1M skip="$start" count="$size" conv=fsync
|
|
|
|
else
|
|
|
|
echo "Unable to find partition $part device, skipped."
|
|
|
|
fi
|
|
|
|
done < /tmp/partmap.image
|
|
|
|
|
|
|
|
#copy partition uuid
|
|
|
|
echo "Writing new UUID to /dev/$diskdev..."
|
|
|
|
get_image "$@" | dd of="/dev/$diskdev" bs=1 skip=440 count=4 seek=440 conv=fsync
|
2016-07-20 13:44:54 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
mbl_copy_config() {
|
2017-12-01 21:41:11 +00:00
|
|
|
local partdev
|
|
|
|
|
base-files: improve lib/upgrade/common.sh
Recently, upgrade device autodetection has been added to the mvebu target.
This exposes some shortcomings of the generic export_bootdevice function,
e.g. on the Turris Omnia: export_bootdevice silently reports the root
partition to be the boot device. This makes the sysupgrade process fail at
several places.
Fix this by clearly distinguishing between /proc/cmdline arguments which
specify the boot disk, and those which specify the root partition. Only in
the latter case, strip off the partition, and do it consistently.
root=PARTUUID=<pseudo PARTUUID for MBR> (any partition) and root=/dev/*
(any partition) are accepted.
The root of the problem is that the *existing* export_bootdevice in
/lib/upgrade/common.sh behaves differently, if the kernel is booted with
root=/dev/..., or if it is booted with root=PARTUUID=...
In the former case, it reports back major/minor of the root partition,
in the latter case it reports back major/minor of the complete boot disk.
Targets, which boot with root=/dev/... *and* use export_bootdevice /
export_partdevice, have added workarounds to this behaviour, by specifying
*negative* increments to the export_partdevice function.
Consequently, those targets have to be adapted to use positive increments,
otherwise they are broken by the change to export_bootdevice.
Fixes: 4e8345ff68 ("mvebu: base-files: autodetect upgrade device")
Signed-off-by: Klaus Kudielka <klaus.kudielka@gmail.com>
Tested-by: Tomasz Maciej Nowak <tomek_n@o2.pl>
2019-05-08 18:40:50 +00:00
|
|
|
if export_partdevice partdev 1; then
|
2017-12-01 21:41:11 +00:00
|
|
|
mount -t ext4 -o rw,noatime "/dev/$partdev" /mnt
|
|
|
|
cp -af "$CONF_TAR" /mnt/
|
|
|
|
umount /mnt
|
|
|
|
fi
|
2016-07-20 13:44:54 +00:00
|
|
|
}
|