summaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorJohn Crispin <john@openwrt.org>2014-12-05 08:58:25 +0000
committerJohn Crispin <john@openwrt.org>2014-12-05 08:58:25 +0000
commitc79ddb37738ff54908d4d79ddddcc7cd6d8e0647 (patch)
treeec469423982bfd2290c18cbbc0bf7b9900d9163b /target/linux
parent1731d5520e12485a81f8aa9a645b713763a47870 (diff)
downloadmaster-31e0f0ae-c79ddb37738ff54908d4d79ddddcc7cd6d8e0647.tar.gz
master-31e0f0ae-c79ddb37738ff54908d4d79ddddcc7cd6d8e0647.tar.bz2
master-31e0f0ae-c79ddb37738ff54908d4d79ddddcc7cd6d8e0647.zip
octeon: sysupgrade: support config restore on ERL
Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be> SVN-Revision: 43524
Diffstat (limited to 'target/linux')
-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() {