From: Michael Prokop <mika@grml.org>
Date: Thu, 27 Oct 2011 21:23:40 +0000 (+0200)
Subject: fix kernel version detection in config/scripts/
X-Git-Tag: v0.16.1~4
X-Git-Url: https://git.grml.org/?p=grml-live.git;a=commitdiff_plain;h=e0306d083dbd7787e3588f8214f5b46553208efa

fix kernel version detection in config/scripts/

It's bullshit to use /lib/modules for kernel version
detection. If a module is still present but the according
linux-image has been removed the config/scripts will fail
since they run depmod for non-existing kernel versions.
So use /boot/vmlinuz-* instead.

Related to issue1069
---

diff --git a/etc/grml/fai/config/scripts/GRMLBASE/16-depmod b/etc/grml/fai/config/scripts/GRMLBASE/16-depmod
index 65241f3..fb8578c 100755
--- a/etc/grml/fai/config/scripts/GRMLBASE/16-depmod
+++ b/etc/grml/fai/config/scripts/GRMLBASE/16-depmod
@@ -21,8 +21,8 @@ if [ -n "${depmod_version:-}" ] ; then
   dpkg --compare-versions "$depmod_version" lt "3.13" && NEEDS_CHECK=true
 fi
 
-for kernel in $(find $target/lib/modules/ -maxdepth 1 -type d -name [0-9]*) ; do
-  kernelversion=$(basename $kernel)
+for kernel in ${target}/boot/vmlinuz-* ; do
+  kernelversion=${kernel##/boot/vmlinuz-}
 
   # provide verbose error message regarding the annoying
   # kernel x.y-grml[64] <-> module-init-tools v3.12 situation
diff --git a/etc/grml/fai/config/scripts/GRML_SMALL/98-clean-chroot b/etc/grml/fai/config/scripts/GRML_SMALL/98-clean-chroot
index bfa9db9..223b342 100755
--- a/etc/grml/fai/config/scripts/GRML_SMALL/98-clean-chroot
+++ b/etc/grml/fai/config/scripts/GRML_SMALL/98-clean-chroot
@@ -17,8 +17,8 @@ rm -f $target/usr/share/ssh/blacklist.DSA-1024 $target/usr/share/ssh/blacklist.R
 
 # get rid of large kernel modules:
 echo "Removing some very large kernel drivers:"
-for kernel in $(find $target/lib/modules/ -maxdepth 1 -type d -name [0-9]*) ; do
-  kernelversion=$(basename $kernel)
+for kernel in ${target}/boot/vmlinuz-* ; do
+  kernelversion=${kernel##/boot/vmlinuz-}
   if [ -r "${target}/lib/modules/${kernelversion}/kernel/fs/ocfs2/ocfs2.ko" ] ; then
     echo "Removing /lib/modules/${kernelversion}/kernel/fs/ocfs2/ocfs2.ko"
     rm -f "${target}/lib/modules/${kernelversion}/kernel/fs/ocfs2/ocfs2.ko"