aboutsummaryrefslogtreecommitdiffstats
path: root/package/base-files/files
diff options
context:
space:
mode:
authorMatthias Schiffer <mschiffer@universe-factory.net>2017-06-01 18:39:12 +0200
committerMatthias Schiffer <mschiffer@universe-factory.net>2017-06-01 20:41:19 +0200
commit5654a037689415eb06a59ec4738ae902217ab363 (patch)
tree5c087c745e90069abd7e075ad5dd45247c1dff10 /package/base-files/files
parent7f9143168faef445effceead08d77ecc7c3e9dc6 (diff)
downloadupstream-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 'package/base-files/files')
-rwxr-xr-xpackage/base-files/files/lib/upgrade/stage22
1 files changed, 1 insertions, 1 deletions
diff --git a/package/base-files/files/lib/upgrade/stage2 b/package/base-files/files/lib/upgrade/stage2
index cc8047d988..bdbb892664 100755
--- a/package/base-files/files/lib/upgrade/stage2
+++ b/package/base-files/files/lib/upgrade/stage2
@@ -48,7 +48,7 @@ switch_to_ramfs() {
/bin/sleep /bin/zcat /usr/bin/bzcat /usr/bin/printf /usr/bin/wc \
/bin/cut /usr/bin/printf /bin/sync /bin/mkdir /bin/rmdir \
/bin/rm /usr/bin/basename /bin/kill /bin/chmod /usr/bin/find \
- /bin/mknod
+ /bin/mknod /bin/touch
install_bin /sbin/mtd
install_bin /sbin/mount_root