A number of callers of config_load() which define a config_cb() (for instance
in /lib/network/config.sh) assume that CONFIG_SECTION is the name of the
current section, while actually it is not the case.  This patch fixes that.

Signed-off-by: Dominique Quatravaux <[email protected]>

---
 package/base-files/files/etc/functions.sh |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/package/base-files/files/etc/functions.sh 
b/package/base-files/files/etc/functions.sh
index fa0ba04..e8477bd 100755
--- a/package/base-files/files/etc/functions.sh
+++ b/package/base-files/files/etc/functions.sh
@@ -78,9 +78,9 @@ config () {
        export ${NO_EXPORT:+-n} CONFIG_NUM_SECTIONS=$(($CONFIG_NUM_SECTIONS + 
1))
        name="${name:-cfg$CONFIG_NUM_SECTIONS}"
        append CONFIG_SECTIONS "$name"
-       [ -n "$NO_CALLBACK" ] || config_cb "$cfgtype" "$name"
        export ${NO_EXPORT:+-n} CONFIG_SECTION="$name"
        export ${NO_EXPORT:+-n} "CONFIG_${CONFIG_SECTION}_TYPE=$cfgtype"
+       [ -n "$NO_CALLBACK" ] || config_cb "$cfgtype" "$name"
 }
 
 option () {
-- 
tg: (d0ba466..) fix-config-walk (depends on: )
_______________________________________________
openwrt-devel mailing list
[email protected]
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

Reply via email to