X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=scripts%2Fconfig%2Fconf.c;h=6589aee4515d86cfba4e339b0942979a174b61fc;hb=baeea7e3b71e42698e9b27864c4b48b18aa7c8c1;hp=cb2093691e341db2be6149650a281d419cba8d9f;hpb=451518eba5be299ae1ef004112a6ecdc3b2e26c0;p=openwrt-10.03%2F.git diff --git a/scripts/config/conf.c b/scripts/config/conf.c index cb2093691..6589aee45 100644 --- a/scripts/config/conf.c +++ b/scripts/config/conf.c @@ -579,28 +579,11 @@ int main(int ac, char **av) } case ask_all: case ask_new: - conf_read(NULL); - break; case set_no: case set_mod: case set_yes: case set_random: - name = getenv("KCONFIG_ALLCONFIG"); - if (name && !stat(name, &tmpstat)) { - conf_read_simple(name); - break; - } - switch (input_mode) { - case set_no: name = "allno.config"; break; - case set_mod: name = "allmod.config"; break; - case set_yes: name = "allyes.config"; break; - case set_random: name = "allrandom.config"; break; - default: break; - } - if (!stat(name, &tmpstat)) - conf_read_simple(name); - else if (!stat("all.config", &tmpstat)) - conf_read_simple("all.config"); + conf_read(NULL); break; default: break;