From 434bfd97d3951560f8ecb8636854490a131c0246 Mon Sep 17 00:00:00 2001
From: Alejandro Mery <amery@opensde.org>
Date: Thu, 27 Nov 2008 12:15:36 +0200
Subject: [PATCH] linux26: changed to run `make oldconfig` after injecting
 linux.cfg in SDECFG_PKG_LINUX_CONFIG_STYLE=none case

---
 base/linux26/linux-conf.in | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/base/linux26/linux-conf.in b/base/linux26/linux-conf.in
index 1266177bb..e8b282b05 100644
--- a/base/linux26/linux-conf.in
+++ b/base/linux26/linux-conf.in
@@ -26,7 +26,7 @@ lx_subarch=`echo $lx_cpu | sed 's/i.86/i386/;s/sun4u/sparc64/;\
 				s/ppc.*/powerpc/;s/mips.*/mips/'`
 lx_extraversion=
 lx_kernelrelease=
-lx_customconf="\$base/config/$config/linux.cfg"
+lx_customconf="$base/config/$config/linux.cfg"
 
 # $lx_mergedarch is 1 if the kernel has x86 and x86_64 arches merged
 lx_mergedarch=
@@ -282,9 +282,9 @@ lx_config() {
 	echo "Generic linux configuration ..."
 	hook_eval preconf
 	if [ "$SDECFG_PKG_LINUX_CONFIG_STYLE" = none ] ; then
-		echo "Using $lx_customconf."
-		echo "Since automatic generation is disabled ..."
-		eval cp -v $lx_customconf .config || true
+		echo "Using only ${lx_customconf#$base/}."
+		cp -vf $lx_customconf .config
+		eval $MAKE $makeopt oldconfig
 	else
 		echo "Automatically creating default configuration ...."
 		auto_config