git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
scripts
/
kconfig
/
conf.c
diff --git
a/scripts/kconfig/conf.c
b/scripts/kconfig/conf.c
index
52159cf
..
0433cc7
100644
(file)
--- a/
scripts/kconfig/conf.c
+++ b/
scripts/kconfig/conf.c
@@
-558,6
+558,7
@@
int main(int ac, char **av)
name = av[i];
if (!name) {
printf(_("%s: Kconfig file missing\n"), av[0]);
name = av[i];
if (!name) {
printf(_("%s: Kconfig file missing\n"), av[0]);
+ exit(1);
}
conf_parse(name);
//zconfdump(stdout);
}
conf_parse(name);
//zconfdump(stdout);
@@
-593,7
+594,7
@@
int main(int ac, char **av)
case set_random:
name = getenv("KCONFIG_ALLCONFIG");
if (name && !stat(name, &tmpstat)) {
case set_random:
name = getenv("KCONFIG_ALLCONFIG");
if (name && !stat(name, &tmpstat)) {
- conf_read_simple(name);
+ conf_read_simple(name
, S_DEF_USER
);
break;
}
switch (input_mode) {
break;
}
switch (input_mode) {
@@
-604,9
+605,9
@@
int main(int ac, char **av)
default: break;
}
if (!stat(name, &tmpstat))
default: break;
}
if (!stat(name, &tmpstat))
- conf_read_simple(name);
+ conf_read_simple(name
, S_DEF_USER
);
else if (!stat("all.config", &tmpstat))
else if (!stat("all.config", &tmpstat))
- conf_read_simple("all.config");
+ conf_read_simple("all.config"
, S_DEF_USER
);
break;
default:
break;
break;
default:
break;
@@
-619,7
+620,15
@@
int main(int ac, char **av)
input_mode = ask_silent;
valid_stdin = 1;
}
input_mode = ask_silent;
valid_stdin = 1;
}
- }
+ } else if (conf_get_changed()) {
+ name = getenv("KCONFIG_NOSILENTUPDATE");
+ if (name && *name) {
+ fprintf(stderr, _("\n*** Kernel configuration requires explicit update.\n\n"));
+ return 1;
+ }
+ } else
+ goto skip_check;
+
do {
conf_cnt = 0;
check_conf(&rootmenu);
do {
conf_cnt = 0;
check_conf(&rootmenu);
@@
-628,5
+637,11
@@
int main(int ac, char **av)
fprintf(stderr, _("\n*** Error during writing of the kernel configuration.\n\n"));
return 1;
}
fprintf(stderr, _("\n*** Error during writing of the kernel configuration.\n\n"));
return 1;
}
+skip_check:
+ if (input_mode == ask_silent && conf_write_autoconf()) {
+ fprintf(stderr, _("\n*** Error during writing of the kernel configuration.\n\n"));
+ return 1;
+ }
+
return return_value;
}
return return_value;
}