X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/5c472fc895c32a189d574b338057164e95430825..6ad8779764274df042b2a3ab03bc990c1066c476:/scripts/config/conf.c

diff --git a/scripts/config/conf.c b/scripts/config/conf.c
index 10eeae53d..6589aee45 100644
--- a/scripts/config/conf.c
+++ b/scripts/config/conf.c
@@ -570,7 +570,7 @@ int main(int ac, char **av)
 	case ask_silent:
 		if (stat(".config", &tmpstat)) {
 			printf(_("***\n"
-				"*** You have not yet configured your kernel!\n"
+				"*** You have not yet configured your build!\n"
 				"***\n"
 				"*** Please run some configurator (e.g. \"make oldconfig\" or\n"
 				"*** \"make menuconfig\" or \"make xconfig\").\n"
@@ -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;
@@ -619,7 +602,7 @@ int main(int ac, char **av)
 		check_conf(&rootmenu);
 	} while (conf_cnt);
 	if (conf_write(NULL)) {
-		fprintf(stderr, _("\n*** Error during writing of the kernel configuration.\n\n"));
+		fprintf(stderr, _("\n*** Error during writing of the build configuration.\n\n"));
 		return 1;
 	}
 	return 0;