aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2014-10-17 22:50:38 +0000
committerJo-Philipp Wich <jow@openwrt.org>2014-10-17 22:50:38 +0000
commit93e7f9f6113474ac98ef37ba2fefea6bafb5ff3f (patch)
tree956b2487dd4d809e76610b2cfe1fc7b0b2c714e3
parent882e83a275f36a8687d6b65930d64fda8f93b64f (diff)
downloadmaster-187ad058-93e7f9f6113474ac98ef37ba2fefea6bafb5ff3f.tar.gz
master-187ad058-93e7f9f6113474ac98ef37ba2fefea6bafb5ff3f.tar.bz2
master-187ad058-93e7f9f6113474ac98ef37ba2fefea6bafb5ff3f.zip
x86_64: support sysupgrade config restore on PARTUUID mounted disks
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> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42946 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--target/linux/x86_64/base-files/lib/preinit/79_move_config51
1 files changed, 37 insertions, 14 deletions
diff --git a/target/linux/x86_64/base-files/lib/preinit/79_move_config b/target/linux/x86_64/base-files/lib/preinit/79_move_config
index 0bffbab994..ca9c2a9b5e 100644
--- a/target/linux/x86_64/base-files/lib/preinit/79_move_config
+++ b/target/linux/x86_64/base-files/lib/preinit/79_move_config
@@ -1,21 +1,44 @@
#!/bin/sh
-# Copyright (C) 2012 OpenWrt.org
+# Copyright (C) 2012-2014 OpenWrt.org
move_config() {
- local rootfsdev
- local rootfstype
-
- rootfstype="$(awk 'BEGIN { RS=" "; FS="="; } ($1 == "rootfstype") { print $2 }' < /proc/cmdline)"
- case "$rootfstype" in
- squashfs|jffs2)
- rootfsdev="$(awk 'BEGIN { RS=" "; FS="="; } ($1 == "block2mtd.block2mtd") { print substr($2,1,index($2, ",")-1) }' < /proc/cmdline)";;
- ext4)
- rootfsdev="$(awk 'BEGIN { RS=" "; FS="="; } ($1 == "root") { print $2 }' < /proc/cmdline)";;
- esac
+ local cmdline uuid disk dev
- mount -t ext4 -o rw,noatime "${rootfsdev%[0-9]}1" /mnt
- mv -f /mnt/sysupgrade.tgz /
- umount /mnt
+ if read cmdline < /proc/cmdline; then
+ case "$cmdline" in
+ *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/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 /
+ umount /mnt
+ fi
}
boot_hook_add preinit_mount_root move_config