qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-24 03:18:26 +02:00
Code

[x86] Fix sysupgrade for squashfs, jffs2 and ext4 images

Browse Source 
* use 'fsync' with 'dd' for image writing
	* save config to boot partition

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@32465 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
acinonyx 2012-06-19 22:36:53 +00:00
parent 52d8a6d589
commit 9ebe427897
2 changed files with 55 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
target/linux/x86/base-files/lib/preinit/89_move_config Normal file
View File

@ -0,0 +1,22 @@
#!/bin/sh
# Copyright (C) 2012 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
mount -t ext4 -o rw,noatime "${rootfsdev%[0-9]}1" /mnt
mv -f /mnt/sysupgrade.tgz /
umount /mnt
}
boot_hook_add preinit_main move_config

47
target/linux/x86/base-files/lib/upgrade/platform.sh
View File

@ -1,5 +1,20 @@
USE_REFRESH=1 USE_REFRESH=1
x86_get_rootfs() {
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
echo "$rootfstype:$rootfsdev"
}
platform_check_image() { platform_check_image() {
[ "$ARGC" -gt 1 ] && return 1 [ "$ARGC" -gt 1 ] && return 1
@ -12,22 +27,24 @@ platform_check_image() {
esac esac
} }
platform_do_upgrade() { platform_refresh_partitions() {
local ROOTFS return 0
sync
grep -q -e "jffs2" -e "squashfs" /proc/cmdline \
&& ROOTFS="$(awk 'BEGIN { RS=" "; FS="="; } ($1 == "block2mtd.block2mtd") { print substr($2,1,index($2, ",")-1) }' < /proc/cmdline)" \
|| ROOTFS="$(awk 'BEGIN { RS=" "; FS="="; } ($1 == "root") { print $2 }' < /proc/cmdline)"
[ -b ${ROOTFS%[0-9]} ] && get_image "$1" > ${ROOTFS%[0-9]}
} }
x86_prepare_ext2() { platform_copy_config() {
# if we're running from ext2, we need to make sure that we have a mtd local rootfs="$(x86_get_rootfs)"
# partition that points to the active rootfs partition. local rootfsdev="${rootfs##*:}"
# however this only matters if we actually need to preserve the config files
[ "$SAVE_CONFIG" -eq 1 ] || return 0 mount -t ext4 -o rw,noatime "${rootfsdev%[0-9]}1" /mnt
grep rootfs /proc/mtd >/dev/null || { cp -af "$CONF_TAR" /mnt/
echo /dev/hda2,65536,rootfs > /sys/module/block2mtd/parameters/block2mtd umount /mnt
} }
platform_do_upgrade() {
local rootfs="$(x86_get_rootfs)"
local rootfsdev="${rootfs##*:}"
sync
[ -b ${rootfsdev%[0-9]} ] && get_image "$@" | dd of=${rootfsdev%[0-9]} bs=4096 conv=fsync
sleep 1
} }
append sysupgrade_pre_upgrade x86_prepare_ext2