diff options
| author | Matthias Schiffer <mschiffer@universe-factory.net> | 2017-06-01 18:39:12 +0200 |
|---|---|---|
| committer | Matthias Schiffer <mschiffer@universe-factory.net> | 2017-06-01 20:41:19 +0200 |
| commit | 5654a037689415eb06a59ec4738ae902217ab363 (patch) | |
| tree | 5c087c745e90069abd7e075ad5dd45247c1dff10 /target/linux/mvebu/base-files/lib | |
| parent | 7f9143168faef445effceead08d77ecc7c3e9dc6 (diff) | |
| download | upstream-5654a037689415eb06a59ec4738ae902217ab363.tar.gz upstream-5654a037689415eb06a59ec4738ae902217ab363.tar.bz2 upstream-5654a037689415eb06a59ec4738ae902217ab363.zip | |
mvebu: fix sysupgrade
mvebu was modifying RAMFS_COPY_BIN and RAMFS_COPY_DATA from a
sysupgrade_pre_upgrade hook. As the ramfs is created from stage2, this
did not have an effect anymore after the staged sysupgrade changes.
As it doesn't really hurt to copy fw_printenv and fw_setenv
unconditionally, simply add them in /lib/upgrade/platform.sh, so stage2
will see them.
Config copying is moved to a function called by platform_copy_config, where
it belongs.
Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
Fixes: FS#821
Fixes: 30f61a34b4cf "base-files: always use staged sysupgrade"
Diffstat (limited to 'target/linux/mvebu/base-files/lib')
| -rw-r--r-- | target/linux/mvebu/base-files/lib/upgrade/linksys.sh | 20 | ||||
| -rwxr-xr-x | target/linux/mvebu/base-files/lib/upgrade/platform.sh | 6 |
2 files changed, 8 insertions, 18 deletions
diff --git a/target/linux/mvebu/base-files/lib/upgrade/linksys.sh b/target/linux/mvebu/base-files/lib/upgrade/linksys.sh index d06a1b8ed0..63d1cd14a4 100644 --- a/target/linux/mvebu/base-files/lib/upgrade/linksys.sh +++ b/target/linux/mvebu/base-files/lib/upgrade/linksys.sh @@ -73,21 +73,7 @@ platform_do_upgrade_linksys() { } } -linksys_preupgrade() { - local board=$(mvebu_board_name) - - case "$board" in - armada-385-linksys-caiman|armada-385-linksys-cobra|armada-385-linksys-shelby|armada-xp-linksys-mamba|armada-385-linksys-rango) - export RAMFS_COPY_BIN="${RAMFS_COPY_BIN} /usr/sbin/fw_printenv /usr/sbin/fw_setenv" - export RAMFS_COPY_BIN="${RAMFS_COPY_BIN} /bin/mkdir /bin/touch" - export RAMFS_COPY_DATA="${RAMFS_COPY_DATA} /etc/fw_env.config /var/lock/fw_printenv.lock" - - [ -f /tmp/sysupgrade.tgz ] && { - cp /tmp/sysupgrade.tgz /tmp/syscfg/sysupgrade.tgz - } - ;; - esac +platform_copy_config_linksys() { + cp -f /tmp/sysupgrade.tgz /tmp/syscfg/sysupgrade.tgz + sync } - -append sysupgrade_pre_upgrade linksys_preupgrade - diff --git a/target/linux/mvebu/base-files/lib/upgrade/platform.sh b/target/linux/mvebu/base-files/lib/upgrade/platform.sh index 12e5bdcf7c..8085634dca 100755 --- a/target/linux/mvebu/base-files/lib/upgrade/platform.sh +++ b/target/linux/mvebu/base-files/lib/upgrade/platform.sh @@ -5,7 +5,8 @@ . /lib/mvebu.sh -RAMFS_COPY_DATA=/lib/mvebu.sh +RAMFS_COPY_BIN='/usr/sbin/fw_printenv /usr/sbin/fw_setenv' +RAMFS_COPY_DATA='/lib/mvebu.sh /etc/fw_env.config /var/lock/fw_printenv.lock' REQUIRE_IMAGE_METADATA=1 platform_check_image() { @@ -34,6 +35,9 @@ platform_copy_config() { local board=$(mvebu_board_name) case "$board" in + armada-385-linksys-caiman|armada-385-linksys-cobra|armada-385-linksys-rango|armada-385-linksys-shelby|armada-xp-linksys-mamba) + platform_copy_config_linksys + ;; armada-388-clearfog) platform_copy_config_clearfog "$ARGV" ;; |