From 66a2581ab9292c221eb29e959c610cf899b2ec16 Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Sat, 26 Nov 2011 17:32:53 +0100 Subject: [PATCH] GRMLBASE/16-depmod: drop the 2-digit check The check actually fails with our new linux-image-3.1.0-1-grml-amd64 packages and we don't use 2-digit versions any longer, so get rid of this code snippet. --- etc/grml/fai/config/scripts/GRMLBASE/16-depmod | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/etc/grml/fai/config/scripts/GRMLBASE/16-depmod b/etc/grml/fai/config/scripts/GRMLBASE/16-depmod index a100c98..15695c5 100755 --- a/etc/grml/fai/config/scripts/GRMLBASE/16-depmod +++ b/etc/grml/fai/config/scripts/GRMLBASE/16-depmod @@ -14,25 +14,10 @@ if ! [ -x $target/sbin/depmod ] ; then exit 0 fi -NEEDS_CHECK=false -depmod_version=$($ROOTCMD depmod --version | awk '/module-init-tools/ {print $2}') -if [ -n "${depmod_version:-}" ] ; then - # depmod of module-init-tools from squeeze or older - dpkg --compare-versions "$depmod_version" lt "3.13" && NEEDS_CHECK=true -fi - for kernel in ${target}/boot/vmlinuz-* ; do 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 - if $NEEDS_CHECK && echo "$kernelversion" | grep -q '[[:digit:]]\.[[:digit:]]-' ; then - echo "Error: module-init-tools version <= 3.12 with two-digit kernel version found." >&2 - echo "This is known to be broken and does not provide a working modules.dep. :(" >&2 - exit 1 - fi - echo "Updating modules.dep for kernel $kernelversion" $ROOTCMD depmod -ae -F /boot/System.map-"$kernelversion" "$kernelversion" done -- 2.1.4