diff options
| author | Rafał Miłecki <rafal@milecki.pl> | 2019-09-04 16:57:39 +0200 |
|---|---|---|
| committer | Rafał Miłecki <rafal@milecki.pl> | 2019-09-12 13:25:27 +0200 |
| commit | 37caec2d5e01b907a86969aa1526a6ec3812b511 (patch) | |
| tree | d93932477cb100306812e6fcad374e0c3f16e440 /target/linux/mvebu/base-files/lib/preinit/81_linksys_syscfg | |
| parent | f54bc3985a2fbc30256d9aee8ea3b60b8aee593a (diff) | |
| download | upstream-37caec2d5e01b907a86969aa1526a6ec3812b511.tar.gz upstream-37caec2d5e01b907a86969aa1526a6ec3812b511.tar.bz2 upstream-37caec2d5e01b907a86969aa1526a6ec3812b511.zip | |
treewide: don't hardcode "sysupgrade.tgz" file name
1) Add BACKUP_FILE and use it when copying an archive to be restored
after sysupgrade (on the next preinit).
2) Use CONF_TAR for copying backup prepared by the /sbin/sysupgrade
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
(cherry picked from commit bf390478727ac5f4f9d6fb684de48b8150bcec67)
Diffstat (limited to 'target/linux/mvebu/base-files/lib/preinit/81_linksys_syscfg')
| -rw-r--r-- | target/linux/mvebu/base-files/lib/preinit/81_linksys_syscfg | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/mvebu/base-files/lib/preinit/81_linksys_syscfg b/target/linux/mvebu/base-files/lib/preinit/81_linksys_syscfg index b107eacb11..83448e5ace 100644 --- a/target/linux/mvebu/base-files/lib/preinit/81_linksys_syscfg +++ b/target/linux/mvebu/base-files/lib/preinit/81_linksys_syscfg @@ -4,8 +4,8 @@ # preinit_mount_syscfg() { - . /lib/functions.sh + . /lib/upgrade/common.sh case $(board_name) in linksys,caiman|linksys,cobra|linksys,mamba|linksys,rango|linksys,shelby|linksys,venom) @@ -22,12 +22,12 @@ preinit_mount_syscfg() { fi mkdir /tmp/syscfg mount -t ubifs ubi1:syscfg /tmp/syscfg - [ -f /tmp/syscfg/sysupgrade.tgz ] && { + [ -f "/tmp/syscfg/$BACKUP_FILE" ] && { echo "- config restore -" cd / - mv /tmp/syscfg/sysupgrade.tgz /tmp - tar xzf /tmp/sysupgrade.tgz - rm -f /tmp/sysupgrade.tgz + mv "/tmp/syscfg/$BACKUP_FILE" /tmp + tar xzf "/tmp/$BACKUP_FILE" + rm -f "/tmp/$BACKUP_FILE" sync } ;; |