aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/x86
diff options
context:
space:
mode:
authorRafał Miłecki <rafal@milecki.pl>2019-09-04 16:57:39 +0200
committerRafał Miłecki <rafal@milecki.pl>2019-09-12 13:25:27 +0200
commit37caec2d5e01b907a86969aa1526a6ec3812b511 (patch)
treed93932477cb100306812e6fcad374e0c3f16e440 /target/linux/x86
parentf54bc3985a2fbc30256d9aee8ea3b60b8aee593a (diff)
downloadupstream-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/x86')
-rw-r--r--target/linux/x86/base-files/lib/preinit/79_move_config4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/x86/base-files/lib/preinit/79_move_config b/target/linux/x86/base-files/lib/preinit/79_move_config
index aff720a52c..702da9e873 100644
--- a/target/linux/x86/base-files/lib/preinit/79_move_config
+++ b/target/linux/x86/base-files/lib/preinit/79_move_config
@@ -9,8 +9,8 @@ move_config() {
if export_bootdevice && export_partdevice partdev 1; then
mkdir -p /boot
mount -t ext4 -o rw,noatime "/dev/$partdev" /boot
- if [ -f /boot/sysupgrade.tgz ]; then
- mv -f /boot/sysupgrade.tgz /
+ if [ -f "/boot/$BACKUP_FILE" ]; then
+ mv -f "/boot/$BACKUP_FILE" /
fi
mount --bind /boot/boot /boot
fi