fix kernel version detection: drop ${target} from kernel version string

This fixes a regression introduced in git commit
e0306d083dbd7787e3588f8214f5b46553208efa.

.oO(Continous Integration ftw!)Oo.

diff --git a/etc/grml/fai/config/scripts/GRMLBASE/16-depmod b/etc/grml/fai/config/scripts/GRMLBASE/16-depmod
index fb8578c..a100c98 100755 (executable)
--- a/etc/grml/fai/config/scripts/GRMLBASE/16-depmod
+++ b/etc/grml/fai/config/scripts/GRMLBASE/16-depmod
@@ -22,7 +22,8 @@ if [ -n "${depmod_version:-}" ] ; then
 fi
 
 for kernel in ${target}/boot/vmlinuz-* ; do
-  kernelversion=${kernel##/boot/vmlinuz-}
+  kernelversion=${kernel##$target}
+  kernelversion=${kernelversion##/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 223b342..027713a 100755 (executable)
--- a/etc/grml/fai/config/scripts/GRML_SMALL/98-clean-chroot
+++ b/etc/grml/fai/config/scripts/GRML_SMALL/98-clean-chroot
@@ -18,7 +18,9 @@ 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 ${target}/boot/vmlinuz-* ; do
-  kernelversion=${kernel##/boot/vmlinuz-}
+  kernelversion=${kernel##$target}
+  kernelversion=${kernelversion##/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"