Author: nbd Date: 2015-03-22 16:11:20 +0100 (Sun, 22 Mar 2015) New Revision: 44941
Modified: trunk/package/base-files/files/etc/init.d/done trunk/package/base-files/files/lib/preinit/80_mount_root Log: 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 <[email protected]> Modified: trunk/package/base-files/files/etc/init.d/done =================================================================== --- trunk/package/base-files/files/etc/init.d/done 2015-03-22 15:11:14 UTC (rev 44940) +++ trunk/package/base-files/files/etc/init.d/done 2015-03-22 15:11:20 UTC (rev 44941) @@ -4,6 +4,7 @@ START=95 boot() { [ -d /tmp/root ] && mount_root done + rm -f /sysupgrade.tgz # process user commands [ -f /etc/rc.local ] && { Modified: trunk/package/base-files/files/lib/preinit/80_mount_root =================================================================== --- trunk/package/base-files/files/lib/preinit/80_mount_root 2015-03-22 15:11:14 UTC (rev 44940) +++ trunk/package/base-files/files/lib/preinit/80_mount_root 2015-03-22 15:11:20 UTC (rev 44941) @@ -8,10 +8,7 @@ [ -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 } } _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
