1 diff -urNp linux-400/Makefile linux-600/Makefile
4 @@ -305,6 +305,9 @@ symlinks:
6 $(CONFIG_SHELL) scripts/Configure -d arch/$(ARCH)/config.in
8 +oldconfig_nonint: symlinks
9 + $(CONFIG_SHELL) scripts/Configure -D arch/$(ARCH)/config.in
12 $(MAKE) -C scripts kconfig.tk
13 wish -f scripts/kconfig.tk
14 diff -urNp linux-400/scripts/Configure linux-600/scripts/Configure
15 --- linux-400/scripts/Configure
16 +++ linux-600/scripts/Configure
17 @@ -122,8 +122,14 @@ function readln () {
20 [ -z "$3" ] && echo -n "(NEW) "
21 - IFS='@' read ans || exit 1
22 - [ -z "$ans" ] && ans=$2
23 + if [ "$NONINTERACTIVE" = "y" ]; then
24 + echo "$1" >> nodefaults
28 + IFS='@' read ans || exit 1
29 + [ -z "$ans" ] && ans=$2
34 @@ -510,6 +516,7 @@ function choice () {
37 trap "rm -f $CONFIG $CONFIG_H ; exit 1" 1 2
38 +trap "rm -f nodefaults ; exit 1" 1 2
41 # Make sure we start out with a clean slate.
42 @@ -524,11 +531,20 @@ echo " */" >> $CONFIG_H
43 echo "#define AUTOCONF_INCLUDED" >> $CONFIG_H
48 if [ "$1" = "-d" ] ; then
53 +if [ "$1" = "-D" ] ; then
54 +# non interactive oldconfig
61 if [ "$1" != "" ] ; then
63 @@ -572,4 +588,9 @@ else
67 +if [ "$broken" = "y" ] ; then
68 + echo "The following defaults are missing:"