aboutsummaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2016-02-29 16:06:19 +0000
committerFelix Fietkau <nbd@openwrt.org>2016-02-29 16:06:19 +0000
commit47e9e3c71ff5614cc2ea275ba854b78d3daadff9 (patch)
tree92544fd6b391a124588ebb4688b7cd5e4862db73 /scripts
parent0186b0e50eeda8ba55001a78e1ff552800ac291e (diff)
downloadupstream-47e9e3c71ff5614cc2ea275ba854b78d3daadff9.tar.gz
upstream-47e9e3c71ff5614cc2ea275ba854b78d3daadff9.tar.bz2
upstream-47e9e3c71ff5614cc2ea275ba854b78d3daadff9.zip
scripts/config: fix handling of CONFDEFAULT on oldconfig
Signed-off-by: Felix Fietkau <nbd@openwrt.org> Backport of r47372 git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@48816 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'scripts')
-rw-r--r--scripts/config/confdata.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/config/confdata.c b/scripts/config/confdata.c
index d9e1b5c4c5..052347ce06 100644
--- a/scripts/config/confdata.c
+++ b/scripts/config/confdata.c
@@ -1166,6 +1166,8 @@ bool conf_set_all_new_symbols(enum conf_def_mode mode)
}
bool has_changed = false;
+ sym_clear_all_valid();
+
for_all_symbols(i, sym) {
if (sym_has_value(sym) || (sym->flags & SYMBOL_VALID))
continue;
@@ -1209,8 +1211,6 @@ bool conf_set_all_new_symbols(enum conf_def_mode mode)
}
- sym_clear_all_valid();
-
/*
* We have different type of choice blocks.
* If curr.tri equals to mod then we can select several