aboutsummaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorRosen Penev <rosenp@gmail.com>2020-09-19 16:52:58 -0700
committerRosen Penev <rosenp@gmail.com>2020-09-19 16:52:58 -0700
commit4d39346fb4ca38e7c4b2f20735efb09b9eccb587 (patch)
tree21afb931be536bc5505206521da4e38b02dd208d /net
parentb9373509fef64898683c93b57c31fb8c17f6efb1 (diff)
nut: fix _ handling
Taken from https://github.com/openwrt/packages/issues/13359 Signed-off-by: Rosen Penev <rosenp@gmail.com>
Diffstat (limited to 'net')
-rw-r--r--net/nut/Makefile2
-rwxr-xr-xnet/nut/files/nut-server.init6
2 files changed, 4 insertions, 4 deletions
diff --git a/net/nut/Makefile b/net/nut/Makefile
index f62ec8519..c699fe260 100644
--- a/net/nut/Makefile
+++ b/net/nut/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=nut
PKG_VERSION:=2.7.4
-PKG_RELEASE:=20
+PKG_RELEASE:=21
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://www.networkupstools.org/source/2.7/
diff --git a/net/nut/files/nut-server.init b/net/nut/files/nut-server.init
index a03d6b9cf..7d550bda0 100755
--- a/net/nut/files/nut-server.init
+++ b/net/nut/files/nut-server.init
@@ -179,11 +179,11 @@ build_driver_config() {
defoverride() {
local overvar="$1"
local defover="$2"
- local overtype="$(echo "$overvar" | tr '.' '_')"
+ local overtype="$(echo "$overvar" | tr '_' '.')"
local overval
- config_get overval "${defover}_${overtype}" value
- [ -n "$overval" ] && echo "${defover}.${overvar} = $overval" >>"$UPS_C"
+ config_get overval "${defover}_${overvar}" value
+ [ -n "$overval" ] && echo "${defover}.${overtype} = $overval" >>"$UPS_C"
}
config_list_foreach "$cfg" override defoverride override