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

x86_64: support sysupgrade config restore on PARTUUID mounted disks

Browse source 
Fix the move_config() procedure to properly find the corresponding disk if
the rootfs was mounted by PARTUUID instead of a device node.

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

SVN-Revision: 42946
This commit is contained in:
Jo-Philipp Wich 2014-10-17 22:50:38 +00:00
parent ce405e5757
commit 45d2e6d5a0
1 changed files with 37 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,21 +1,44 @@
#!/bin/sh #!/bin/sh
# Copyright (C) 2012 OpenWrt.org # Copyright (C) 2012-2014 OpenWrt.org
move_config() { move_config() {
local rootfsdev local cmdline uuid disk dev
local rootfstype
rootfstype="$(awk 'BEGIN { RS=" "; FS="="; } ($1 == "rootfstype") { print $2 }' < /proc/cmdline)" if read cmdline < /proc/cmdline; then
case "$rootfstype" in case "$cmdline" in
squashfs|jffs2) *block2mtd=*)
rootfsdev="$(awk 'BEGIN { RS=" "; FS="="; } ($1 == "block2mtd.block2mtd") { print substr($2,1,index($2, ",")-1) }' < /proc/cmdline)";; disk="${cmdline##*block2mtd=}"
ext4) disk="${disk%%,*}"
rootfsdev="$(awk 'BEGIN { RS=" "; FS="="; } ($1 == "root") { print $2 }' < /proc/cmdline)";; ;;
*root=*)
disk="${cmdline##*root=}"
disk="${disk%% *}"
;;
esac esac
mount -t ext4 -o rw,noatime "${rootfsdev%[0-9]}1" /mnt 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/sd[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
} }
boot_hook_add preinit_mount_root move_config boot_hook_add preinit_mount_root move_config