summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2004-01-22 14:40:56 +0000
committerPascal Rigaux <pixel@mandriva.com>2004-01-22 14:40:56 +0000
commitc16da0a31f67eb04d39886c713c5932c8d6acbe5 (patch)
tree4c5b5f871cc49f6732d42ae1c7090254c48eb255
parente0946f163c9dd6be06425f82caabc4ce383269c4 (diff)
downloaddrakx-c16da0a31f67eb04d39886c713c5932c8d6acbe5.tar
drakx-c16da0a31f67eb04d39886c713c5932c8d6acbe5.tar.gz
drakx-c16da0a31f67eb04d39886c713c5932c8d6acbe5.tar.bz2
drakx-c16da0a31f67eb04d39886c713c5932c8d6acbe5.tar.xz
drakx-c16da0a31f67eb04d39886c713c5932c8d6acbe5.zip
prefer kernel 2.6
-rwxr-xr-xkernel/update_kernel5
1 files changed, 3 insertions, 2 deletions
diff --git a/kernel/update_kernel b/kernel/update_kernel
index d705a375e..efa2361b0 100755
--- a/kernel/update_kernel
+++ b/kernel/update_kernel
@@ -44,7 +44,7 @@ function create_modules() {
| perl -ne 's/\.o//g; s/[ \t]+/ /g; print if /: /' > modules.dep
else
cp $kernel_path/lib/modules/*/modules.dep .
- perl -ni -e 's|/\S+/([^/]+)\.k?o|$1|g; print if /: /' modules.dep
+ perl -ni -e 's|/\S+/([^/]+)\.k?o(\.gz)|$1|g; print if /: /' modules.dep
fi
perl -pi -e 's/((plip|ppa|imm): parport)/$1 parport_pc/' modules.dep
@@ -126,7 +126,8 @@ fi
[ -n "$main" -a -e $ALL_KERNELS/$main ] || {
cd $ALL_KERNELS
- main=$(echo 2.* | sed 's/.* //')
+ main=$(echo 2.6* | sed 's/.* //')
+ [ -n "$main" ] || main=$(echo 2.4* | sed 's/.* //')
echo "Choosing $main"
echo $main > .main
cd ..