mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-25 00:11:13 +00:00
45 lines
1.1 KiB
Diff
45 lines
1.1 KiB
Diff
|
--- a/kconf/conf.c
|
||
|
|
+++ b/kconf/conf.c
|
||
|
|
@@ -578,40 +578,12 @@ int main(int ac, char **av)
|
||
|
|
case oldconfig:
|
||
|
|
case listnewconfig:
|
||
|
|
case olddefconfig:
|
||
|
|
- conf_read(NULL);
|
||
|
|
- break;
|
||
|
|
case allnoconfig:
|
||
|
|
case allyesconfig:
|
||
|
|
case allmodconfig:
|
||
|
|
case alldefconfig:
|
||
|
|
case randconfig:
|
||
|
|
- name = getenv("KCONFIG_ALLCONFIG");
|
||
|
|
- if (!name)
|
||
|
|
- break;
|
||
|
|
- if ((strcmp(name, "") != 0) && (strcmp(name, "1") != 0)) {
|
||
|
|
- if (conf_read_simple(name, S_DEF_USER)) {
|
||
|
|
- fprintf(stderr,
|
||
|
|
- _("*** Can't read seed configuration \"%s\"!\n"),
|
||
|
|
- name);
|
||
|
|
- exit(1);
|
||
|
|
- }
|
||
|
|
- break;
|
||
|
|
- }
|
||
|
|
- switch (input_mode) {
|
||
|
|
- case allnoconfig: name = "allno.config"; break;
|
||
|
|
- case allyesconfig: name = "allyes.config"; break;
|
||
|
|
- case allmodconfig: name = "allmod.config"; break;
|
||
|
|
- case alldefconfig: name = "alldef.config"; break;
|
||
|
|
- case randconfig: name = "allrandom.config"; break;
|
||
|
|
- default: break;
|
||
|
|
- }
|
||
|
|
- if (conf_read_simple(name, S_DEF_USER) &&
|
||
|
|
- conf_read_simple("all.config", S_DEF_USER)) {
|
||
|
|
- fprintf(stderr,
|
||
|
|
- _("*** KCONFIG_ALLCONFIG set, but no \"%s\" or \"all.config\" file found\n"),
|
||
|
|
- name);
|
||
|
|
- exit(1);
|
||
|
|
- }
|
||
|
|
+ conf_read(NULL);
|
||
|
|
break;
|
||
|
|
default:
|
||
|
|
break;
|