diff options
| author | Linus Torvalds <torvalds@home.transmeta.com> | 2002-04-22 00:11:53 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2002-04-22 00:11:53 -0700 |
| commit | 1dff8157a858d55d1e6ae735dbe434eaa1241ce1 (patch) | |
| tree | 0f4996460bf8b54946d69653abb5c27eb3c5b696 /scripts/Configure | |
| parent | a5f843dd4cd4d211dab7c8bf336ee987a3da5991 (diff) | |
Make "oldconfig" look for old defaults first in .config, then
in /etc/kernel-config, and only if that fails in the architecture-
specific defconfig.
Diffstat (limited to 'scripts/Configure')
| -rw-r--r-- | scripts/Configure | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/scripts/Configure b/scripts/Configure index 9d9574f12b21..12f7fbcae163 100644 --- a/scripts/Configure +++ b/scripts/Configure @@ -537,9 +537,12 @@ if [ "$1" != "" ] ; then CONFIG_IN=$1 fi -DEFAULTS=arch/$ARCH/defconfig -if [ -f .config ]; then - DEFAULTS=.config +DEFAULTS=.config +if [ ! -f .config ]; then + DEFAULTS=/etc/kernel-config + if [ ! -f $DEFAULTS ]; then + DEFAULTS=arch/$ARCH/defconfig + fi fi if [ -f $DEFAULTS ]; then |