aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Crispin <blogic@openwrt.org>2014-12-05 08:58:25 +0000
committerJohn Crispin <blogic@openwrt.org>2014-12-05 08:58:25 +0000
commit6c36c279686887edd6027e3f06e8960255fefb2b (patch)
tree0a672f97b3c1205c0784c3951fd66267f5f52f61
parent10f8bcadcd7f4e985194fce1abc3bd99cbd803bb (diff)
downloadupstream-6c36c279686887edd6027e3f06e8960255fefb2b.tar.gz
upstream-6c36c279686887edd6027e3f06e8960255fefb2b.tar.bz2
upstream-6c36c279686887edd6027e3f06e8960255fefb2b.zip
octeon: sysupgrade: support config restore on ERL
Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43524 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--target/linux/octeon/base-files/lib/preinit/79_move_config18
-rwxr-xr-xtarget/linux/octeon/base-files/lib/upgrade/platform.sh11
2 files changed, 25 insertions, 4 deletions
diff --git a/target/linux/octeon/base-files/lib/preinit/79_move_config b/target/linux/octeon/base-files/lib/preinit/79_move_config
new file mode 100644
index 0000000000..39cefd53db
--- /dev/null
+++ b/target/linux/octeon/base-files/lib/preinit/79_move_config
@@ -0,0 +1,18 @@
+#!/bin/sh
+# Copyright (C) 2014 OpenWrt.org
+
+move_config() {
+ . /lib/functions/octeon.sh
+
+ local board="$(octeon_board_name)"
+
+ case "$board" in
+ erlite)
+ mount -t vfat /dev/sda1 /mnt
+ mv -f /mnt/sysupgrade.tgz /
+ umount /mnt
+ ;;
+ esac
+}
+
+boot_hook_add preinit_mount_root move_config
diff --git a/target/linux/octeon/base-files/lib/upgrade/platform.sh b/target/linux/octeon/base-files/lib/upgrade/platform.sh
index 8d6f9a1cf4..ad075d5652 100755
--- a/target/linux/octeon/base-files/lib/upgrade/platform.sh
+++ b/target/linux/octeon/base-files/lib/upgrade/platform.sh
@@ -25,11 +25,14 @@ platform_get_rootfs() {
platform_copy_config() {
local board="$(octeon_board_name)"
- local rootfs="$(platform_get_rootfs)"
- mount -t ext4 -o rw,noatime "${rootfs}" /mnt
- cp -af "$CONF_TAR" /mnt/
- umount /mnt
+ case "$board" in
+ erlite)
+ mount -t vfat /dev/sda1 /mnt
+ cp -af "$CONF_TAR" /mnt/
+ umount /mnt
+ ;;
+ esac
}
platform_do_upgrade() {