2018-07-19 06:55:19 +00:00
|
|
|
#!/bin/sh
|
|
|
|
|
# Copyright (C) 2012-2015 OpenWrt.org
|
|
|
|
|
|
|
|
|
|
move_config() {
|
|
|
|
|
local partdev
|
|
|
|
|
|
|
|
|
|
. /lib/upgrade/common.sh
|
|
|
|
|
|
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_bootdevice && export_partdevice partdev 1; then
|
2018-07-19 06:55:19 +00:00
|
|
|
if mount -t vfat -o rw,noatime "/dev/$partdev" /mnt; then
|
2019-09-04 14:57:39 +00:00
|
|
|
if [ -f "/mnt/$BACKUP_FILE" ]; then
|
|
|
|
|
mv -f "/mnt/$BACKUP_FILE" /
|
2018-07-19 06:55:19 +00:00
|
|
|
fi
|
|
|
|
|
umount /mnt
|
|
|
|
|
fi
|
|
|
|
|
fi
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
boot_hook_add preinit_mount_root move_config
|
|
|
|
|
|
