From: Jo-Philipp Wich <jo@mein.io>
Date: Mon, 21 Oct 2019 13:30:22 +0000 (+0200)
Subject: luci-mod-system: flash.sh: gracefully handle missing sysupgrade.conf
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=36b052f8cc4ee142ad5126b5e4781ae1d7b38317;p=oweals%2Fluci.git

luci-mod-system: flash.sh: gracefully handle missing sysupgrade.conf

Fixes: #3228
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
---

diff --git a/modules/luci-mod-system/htdocs/luci-static/resources/view/system/flash.js b/modules/luci-mod-system/htdocs/luci-static/resources/view/system/flash.js
index d18246b6b..612c4a4f9 100644
--- a/modules/luci-mod-system/htdocs/luci-static/resources/view/system/flash.js
+++ b/modules/luci-mod-system/htdocs/luci-static/resources/view/system/flash.js
@@ -517,7 +517,7 @@ return L.view.extend({
 		o.forcewrite = true;
 		o.rows = 30;
 		o.load = function(section_id) {
-			return fs.read('/etc/sysupgrade.conf', '');
+			return L.resolveDefault(fs.read('/etc/sysupgrade.conf'), '');
 		};