From: Daniel F. Dickinson Date: Thu, 20 Dec 2018 06:55:15 +0000 (-0500) Subject: nut: Fix additional (other) variable handling X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=23c4235554654c590b58fa4829cb87222f8ad058;p=feed%2Fpackages.git nut: Fix additional (other) variable handling There was a cut & paste error in the handling of 'other' variables (i.e. driver variables not specifically known to the package but which some users may require to be add). There was also a logic error from not switching sufficient after cut & paste. Signed-off-by: Daniel F. Dickinson --- diff --git a/net/nut/files/nut-server.init b/net/nut/files/nut-server.init index f40b7bfb70..2cdeb96cf0 100755 --- a/net/nut/files/nut-server.init +++ b/net/nut/files/nut-server.init @@ -192,16 +192,16 @@ build_driver_config() { local othervarflag="$2" if [ "$othervarflag" = "otherflag" ]; then - config_get_bool otherval "${othervarflag}_${overtype}" value - [ "$otherval" = "1" ] && echo "${othervarflag}_${othervar}" >>"$UPS_C" + config_get_bool otherval "${othervarflag}_${othervar}" value + [ "$otherval" = "1" ] && echo "${othervar}" >>"$UPS_C" else - config_get otherval "${othervarflag}_${overtype}" value - [ -n "$otherval" ] && echo "${othervarflag}_${othervar} = $otherval" >>"$UPS_C" + config_get otherval "${othervarflag}_${othervar}" value + [ -n "$otherval" ] && echo "${othervar} = $otherval" >>"$UPS_C" fi } - config_list_foreach "$cfg" default other other - config_list_foreach "$cfg" default other otherflag + config_list_foreach "$cfg" other other + config_list_foreach "$cfg" other otherflag echo "" >>$UPS_C havedriver=1 }