diff options
| -rw-r--r-- | package/base-files/Makefile | 2 | ||||
| -rwxr-xr-x | package/base-files/files/lib/functions.sh | 11 |
2 files changed, 9 insertions, 4 deletions
diff --git a/package/base-files/Makefile b/package/base-files/Makefile index 7e0d341705..c3d2aac2bb 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -12,7 +12,7 @@ include $(INCLUDE_DIR)/version.mk include $(INCLUDE_DIR)/feeds.mk PKG_NAME:=base-files -PKG_RELEASE:=225 +PKG_RELEASE:=226 PKG_FLAGS:=nonshared PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/ diff --git a/package/base-files/files/lib/functions.sh b/package/base-files/files/lib/functions.sh index 323e057451..7da0c872fa 100755 --- a/package/base-files/files/lib/functions.sh +++ b/package/base-files/files/lib/functions.sh @@ -107,9 +107,14 @@ config_unset() { # config_get <variable> <section> <option> [<default>] # config_get <section> <option> config_get() { - case "$3" in - "") eval echo "\"\${CONFIG_${1}_${2}:-\${4}}\"";; - *) eval export ${NO_EXPORT:+-n} -- "${1}=\${CONFIG_${2}_${3}:-\${4}}";; + case "$2${3:-$1}" in + *[^A-Za-z0-9_]*) : ;; + *) + case "$3" in + "") eval echo "\"\${CONFIG_${1}_${2}:-\${4}}\"";; + *) eval export ${NO_EXPORT:+-n} -- "${1}=\${CONFIG_${2}_${3}:-\${4}}";; + esac + ;; esac } |