Difuse/difos
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

x86_64: fix invoking sysupgrade on PARTUUID mounted system

Browse source 
Fix sysupgrade to determine the correct boot block device to use if
/proc/cmdline contains a PARTUUID root.

Change the preinit move_config() hook to use the UUID scanning code
from sysupgrade in order to avoid code duplication.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

SVN-Revision: 42968
This commit is contained in:
Jo-Philipp Wich 2014-10-19 20:28:43 +00:00
parent e2e2e54bfe
commit 05abf01ac0
2 changed files with 49 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
target/linux/x86_64/base-files/lib/preinit/79_move_config
View file

@ -2,40 +2,10 @@
# Copyright (C) 2012-2014 OpenWrt.org # Copyright (C) 2012-2014 OpenWrt.org
move_config() { move_config() {
local cmdline uuid disk dev . /lib/upgrade/platform.sh
if read cmdline < /proc/cmdline; then if platform_export_bootpart; then
case "$cmdline" in mount -t ext4 -o rw,noatime "$BOOTPART" /mnt
*block2mtd=*)
disk="${cmdline##*block2mtd=}"
disk="${disk%%,*}"
;;
*root=*)
disk="${cmdline##*root=}"
disk="${disk%% *}"
;;
esac
case "$disk" in
PARTUUID=[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]-02)
uuid="${cmdline#PARTUUID=}"
uuid="${uuid%-02}"
for disk in /dev/[hsv]d[a-z]; do
set -- $(dd if=$disk bs=1 skip=440 count=4 2>/dev/null | hexdump -v -e '4/1 "%02x "')
if [ "$4$3$2$1" = "$uuid" ]; then
dev="${disk}1"
break
fi
done
;;
/dev/*)
dev="${disk%[0-9]}1"
;;
esac
fi
if [ -n "$dev" ]; then
mount -t ext4 -o rw,noatime "$dev" /mnt
mv -f /mnt/sysupgrade.tgz / mv -f /mnt/sysupgrade.tgz /
umount /mnt umount /mnt
fi fi

70
target/linux/x86_64/base-files/lib/upgrade/platform.sh
View file

@ -1,16 +1,38 @@
x86_get_rootfs() { platform_export_bootpart() {
local rootfsdev local cmdline uuid disk
local rootfstype
if read cmdline < /proc/cmdline; then
rootfstype="$(awk 'BEGIN { RS=" "; FS="="; } ($1 == "rootfstype") { print $2 }' < /proc/cmdline)" case "$cmdline" in
case "$rootfstype" in *block2mtd=*)
squashfs|jffs2) disk="${cmdline##*block2mtd=}"
rootfsdev="$(awk 'BEGIN { RS=" "; FS="="; } ($1 == "block2mtd.block2mtd") { print substr($2,1,index($2, ",")-1) }' < /proc/cmdline)";; disk="${disk%%,*}"
ext4) ;;
rootfsdev="$(awk 'BEGIN { RS=" "; FS="="; } ($1 == "root") { print $2 }' < /proc/cmdline)";; *root=*)
esac disk="${cmdline##*root=}"
disk="${disk%% *}"
echo "$rootfstype:$rootfsdev" ;;
esac
case "$disk" in
PARTUUID=[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]-02)
uuid="${disk#PARTUUID=}"
uuid="${uuid%-02}"
for disk in /dev/[hsv]d[a-z]; do
set -- $(dd if=$disk bs=1 skip=440 count=4 2>/dev/null | hexdump -v -e '4/1 "%02x "')
if [ "$4$3$2$1" = "$uuid" ]; then
export BOOTPART="${disk}1"
return 0
fi
done
;;
/dev/*)
export BOOTPART="${disk%[0-9]}1"
return 0
;;
esac
fi
return 1
} }
platform_check_image() { platform_check_image() {
@ -26,19 +48,19 @@ platform_check_image() {
} }
platform_copy_config() { platform_copy_config() {
local rootfs="$(x86_get_rootfs)" if [ -b "$BOOTPART" ]; then
local rootfsdev="${rootfs##*:}" mount -t ext4 -o rw,noatime "$BOOTPART" /mnt
cp -af "$CONF_TAR" /mnt/
mount -t ext4 -o rw,noatime "${rootfsdev%[0-9]}1" /mnt umount /mnt
cp -af "$CONF_TAR" /mnt/ fi
umount /mnt
} }
platform_do_upgrade() { platform_do_upgrade() {
local rootfs="$(x86_get_rootfs)" platform_export_bootpart
local rootfsdev="${rootfs##*:}"
sync if [ -b "${BOOTPART%[0-9]}" ]; then
[ -b ${rootfsdev%[0-9]} ] && get_image "$@" | dd of=${rootfsdev%[0-9]} bs=4096 conv=fsync sync
sleep 1 get_image "$@" | dd of="${BOOTPART%[0-9]}" bs=4096 conv=fsync
sleep 1
fi
} }