summaryrefslogtreecommitdiff
path: root/updater-ng
diff options
context:
space:
mode:
authorKarel Kočí <karel.koci@nic.cz>2019-01-31 09:55:00 +0100
committerKarel Kočí <karel.koci@nic.cz>2019-01-31 09:55:00 +0100
commit896430931c3a1aa9607b0709163f085de3a16064 (patch)
treec4f8ab064334260effb446303c6bb1a1d34434c1 /updater-ng
parentee4bc85083daf4c83787b33c1094c4014ce2159e (diff)
downloadopenwrt-personal-pkgs-896430931c3a1aa9607b0709163f085de3a16064.tar.gz
openwrt-personal-pkgs-896430931c3a1aa9607b0709163f085de3a16064.tar.bz2
openwrt-personal-pkgs-896430931c3a1aa9607b0709163f085de3a16064.zip
updater-ng: pull upstream changes to turris.lua
Diffstat (limited to 'updater-ng')
-rw-r--r--updater-ng/files/turris.lua7
1 files changed, 4 insertions, 3 deletions
diff --git a/updater-ng/files/turris.lua b/updater-ng/files/turris.lua
index e3dc02b..7071461 100644
--- a/updater-ng/files/turris.lua
+++ b/updater-ng/files/turris.lua
@@ -4,7 +4,7 @@ This file is part of updater-ng. Don't edit it.
local uci_cursor = nil
if uci then
- uci_cursor = uci.cursor()
+ uci_cursor = uci.cursor(root_dir .. "/etc/config")
else
ERROR("UCI library is not available. Configuration not used.")
end
@@ -21,6 +21,8 @@ local mode = uci_cnf("mode", "branch") -- should we follow branch or version?
local branch = uci_cnf("branch", "hbs") -- which branch to follow
local version = uci_cnf("version", nil) -- which version to follow
local lists = uci_cnf("lists", {}) -- what additional lists should we use
+minimal_builds = uci_cnf("use_minimal", false) -- if packages-minimal should be used
+Export('minimal_builds')
-- Verify that we have sensible configuration
if type(lists) == "string" then -- if there is single list then uci returns just a string
@@ -32,7 +34,6 @@ if mode == "version" and not version then
end
-- Common URL base to Turris OS repository
-local repo_base_uri
if mode == "branch" then
repo_base_uri = "https://repo.turris.cz/" .. branch
elseif mode == "version" then
@@ -54,7 +55,7 @@ local script_options = {
}
}
-local base_uri = repo_base_uri .. "/lists/"
+local base_url = repo_base_uri .. "/lists/"
-- The distribution base script. It contains the repository and bunch of basic packages
Script(base_url .. "base.lua", script_options)