From abf69501ab48032b34b8e1d8cf5449a98d8ce8bb Mon Sep 17 00:00:00 2001 From: Raymond Date: Tue, 25 Feb 2020 23:14:14 +0300 Subject: [PATCH] luci-app-aria2: fix incorrect "Extra Settings" section option name The "Extra Settings" section `extra_setting` option name does not match what the `net/aria2` package expects. See: - https://github.com/openwrt/packages/blob/openwrt-19.07/net/aria2/files/aria2.init#L311 - https://github.com/openwrt/packages/blob/openwrt-19.07/net/aria2/files/aria2.conf#L31 Causing the luci UI "Extra Settings" option to have no effect. This fix renames `extra_setting` => `extra_settings`. Signed-off-by: Raymond Wanyoike (cherry picked from commit 6709d3a355e6723b8a2ae4f5354c3e917d1b7ac8) --- applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua | 2 +- applications/luci-app-aria2/root/etc/uci-defaults/40_luci-aria2 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua b/applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua index 17fdc566ce..8ef1953169 100644 --- a/applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua +++ b/applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua @@ -484,7 +484,7 @@ s = m:section(NamedSection, "main", "aria2", translate("Extra Settings"), s.addremove = false s.anonymous = true -o = s:option(DynamicList, "extra_setting", translate("Settings list"), +o = s:option(DynamicList, "extra_settings", translate("Settings list"), translate("List of extra settings. Format: option=value, eg. netrc-path=/tmp/.netrc.")) o.placeholder = "option=value" diff --git a/applications/luci-app-aria2/root/etc/uci-defaults/40_luci-aria2 b/applications/luci-app-aria2/root/etc/uci-defaults/40_luci-aria2 index fc6190d5ac..b9fe683591 100755 --- a/applications/luci-app-aria2/root/etc/uci-defaults/40_luci-aria2 +++ b/applications/luci-app-aria2/root/etc/uci-defaults/40_luci-aria2 @@ -16,7 +16,7 @@ if [ ."$(uci -q get aria2.main)" != ."aria2" ]; then set aria2.main.config_dir="/var/etc/aria2" add_list aria2.main.header="" add_list aria2.main.bt_tracker="" - add_list aria2.main.extra_setting="" + add_list aria2.main.extra_settings="" commit aria2 EOF fi -- 2.30.2