aboutsummaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorRoman Zippel <zippel@linux-m68k.org>2004-01-06 03:45:38 -0800
committerLinus Torvalds <torvalds@home.osdl.org>2004-01-06 03:45:38 -0800
commit839e4302dd100cf332be321e4ad71a612981c87a (patch)
treeb6fbb3735b7ab305d01c8e1695031618198d933e /scripts
parentf6fb237ba312292c39dd6a9fb5c6a0fbdc40b2f7 (diff)
downloadhistory-839e4302dd100cf332be321e4ad71a612981c87a.tar.gz
[PATCH] generate an error if writing of kernel config failed
generate an error if writing of kernel config failed
Diffstat (limited to 'scripts')
-rw-r--r--scripts/kconfig/conf.c5
-rw-r--r--scripts/kconfig/mconf.c14
2 files changed, 15 insertions, 4 deletions
diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c
index 7dee8c9810bb0..cdc72014d4338 100644
--- a/scripts/kconfig/conf.c
+++ b/scripts/kconfig/conf.c
@@ -575,6 +575,9 @@ int main(int ac, char **av)
conf_cnt = 0;
check_conf(&rootmenu);
} while (conf_cnt);
- conf_write(NULL);
+ if (conf_write(NULL)) {
+ fprintf(stderr, "\n*** Error during writing of the kernel configuration.\n\n");
+ return 1;
+ }
return 0;
}
diff --git a/scripts/kconfig/mconf.c b/scripts/kconfig/mconf.c
index 9d61557747e1f..ca8b1ce356a66 100644
--- a/scripts/kconfig/mconf.c
+++ b/scripts/kconfig/mconf.c
@@ -785,15 +785,23 @@ int main(int ac, char **av)
} while (stat < 0);
if (stat == 0) {
- conf_write(NULL);
+ if (conf_write(NULL)) {
+ fprintf(stderr, "\n\n"
+ "Error during writing of the kernel configuration.\n"
+ "Your kernel configuration changes were NOT saved."
+ "\n\n");
+ return 1;
+ }
printf("\n\n"
"*** End of Linux kernel configuration.\n"
"*** Execute 'make' to build the kernel or try 'make help'."
"\n\n");
- } else
- printf("\n\n"
+ } else {
+ fprintf(stderr, "\n\n"
"Your kernel configuration changes were NOT saved."
"\n\n");
+ return 1;
+ }
return 0;
}