diff options
| author | Rafał Miłecki <rafal@milecki.pl> | 2019-09-04 16:57:40 +0200 |
|---|---|---|
| committer | Rafał Miłecki <rafal@milecki.pl> | 2019-09-12 13:26:39 +0200 |
| commit | 1b9a4f0cb48acb91a8765d1d8715077b9846e39e (patch) | |
| tree | 302284b770e96993b737f10a660244c0a52f0605 /target/linux/mvebu | |
| parent | 37caec2d5e01b907a86969aa1526a6ec3812b511 (diff) | |
| download | upstream-1b9a4f0cb48acb91a8765d1d8715077b9846e39e.tar.gz upstream-1b9a4f0cb48acb91a8765d1d8715077b9846e39e.tar.bz2 upstream-1b9a4f0cb48acb91a8765d1d8715077b9846e39e.zip | |
treewide: when copying a backup file always specify dest name
$CONF_TAR shouldn't be assumed to always point to the sysupgrade.tgz.
This change makes code more generic and allows refactoring $CONF_TAR.
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
(cherry picked from commit 62dbe361a1b1ed1506bc0387bff55eddcb619e49)
Diffstat (limited to 'target/linux/mvebu')
| -rw-r--r-- | target/linux/mvebu/base-files/lib/upgrade/linksys.sh | 2 | ||||
| -rw-r--r-- | target/linux/mvebu/base-files/lib/upgrade/sdcard.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/mvebu/base-files/lib/upgrade/linksys.sh b/target/linux/mvebu/base-files/lib/upgrade/linksys.sh index 857c550c73..5104db31f3 100644 --- a/target/linux/mvebu/base-files/lib/upgrade/linksys.sh +++ b/target/linux/mvebu/base-files/lib/upgrade/linksys.sh @@ -93,6 +93,6 @@ platform_do_upgrade_linksys() { } platform_copy_config_linksys() { - cp -f "$CONF_TAR" /tmp/syscfg/ + cp -f "$CONF_TAR" "/tmp/syscfg/$BACKUP_FILE" sync } diff --git a/target/linux/mvebu/base-files/lib/upgrade/sdcard.sh b/target/linux/mvebu/base-files/lib/upgrade/sdcard.sh index 3bfdce97e8..03f6327657 100644 --- a/target/linux/mvebu/base-files/lib/upgrade/sdcard.sh +++ b/target/linux/mvebu/base-files/lib/upgrade/sdcard.sh @@ -106,7 +106,7 @@ platform_copy_config_sdcard() { if export_partdevice partdev 1; then mkdir -p /boot [ -f /boot/kernel.img ] || mount -o rw,noatime /dev/$partdev /boot - cp -af "$CONF_TAR" /boot/ + cp -af "$CONF_TAR" "/boot/$BACKUP_FILE" sync umount /boot fi |