summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2015-03-22 15:11:20 +0000
committerFelix Fietkau <nbd@openwrt.org>2015-03-22 15:11:20 +0000
commitbc1fc688afcc974ac4deb417a51061975fd0aef5 (patch)
tree43b027a7a038208bd1f2db16edb19ecf2e70b07d
parente890a3bc9a2bc8713be6719796724c4e24ecdfb9 (diff)
base-files: keep sysupgrade.tgz until /etc/init.d/done has been called
This makes interrupted boots after sysupgrade more reliable Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 44941
Diffstat
2 files changed, 2 insertions, 4 deletions
diff --git a/package/base-files/files/etc/init.d/done b/package/base-files/files/etc/init.d/done
index b254aff315..ed75e4022f 100755
--- a/package/base-files/files/etc/init.d/done
+++ b/package/base-files/files/etc/init.d/done
@@ -4,6 +4,7 @@
START=95
boot() {
[ -d /tmp/root ] && mount_root done
+ rm -f /sysupgrade.tgz
# process user commands
[ -f /etc/rc.local ] && {
diff --git a/package/base-files/files/lib/preinit/80_mount_root b/package/base-files/files/lib/preinit/80_mount_root
index 0292d82d4a..f3fe788e19 100644
--- a/package/base-files/files/lib/preinit/80_mount_root
+++ b/package/base-files/files/lib/preinit/80_mount_root
@@ -8,10 +8,7 @@ do_mount_root() {
[ -f /sysupgrade.tgz ] && {
echo "- config restore -"
cd /
- mv sysupgrade.tgz /tmp
- tar xzf /tmp/sysupgrade.tgz
- rm -f /tmp/sysupgrade.tgz
- sync
+ tar xzf /sysupgrade.tgz
}
}
Powered by cgit, Themed by Ted Yin.