From: Michael Prokop <mika@grml.org>
Date: Mon, 7 Sep 2009 14:00:36 +0000 (+0200)
Subject: Completely remove /lib/modules/${KERNEL}/kernel/drivers/isdn/hisax on grml-small
X-Git-Tag: v0.9.22~1
X-Git-Url: https://git.grml.org/?p=grml-live.git;a=commitdiff_plain;h=31918d2b0a17b361e0d2c537d2aad0aa243814ef;ds=sidebyside

Completely remove /lib/modules/${KERNEL}/kernel/drivers/isdn/hisax on grml-small
---

diff --git a/debian/changelog b/debian/changelog
index 0854ebb..48d4825 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -39,8 +39,10 @@ grml-live (0.9.22) UNRELEASED; urgency=low
   * Fix grml2usb bootoption in templates/boot/isolinux/grml.cfg.
   * Display "Finished execution of stage 'WINDOWS_BINARIES'" only if the
     according code has been executed (and do not display if skipping).
+  * Completely remove /lib/modules/${KERNEL}/kernel/drivers/isdn/hisax on
+    grml-small as there will be unresolved symbols without hisax.ko.
 
- -- Michael Prokop <mika@grml.org>  Mon, 07 Sep 2009 14:43:28 +0200
+ -- Michael Prokop <mika@grml.org>  Mon, 07 Sep 2009 15:59:47 +0200
 
 grml-live (0.9.21) unstable; urgency=low
 
diff --git a/etc/grml/fai/grml/grml_cleanup_chroot b/etc/grml/fai/grml/grml_cleanup_chroot
index 1e01e40..d774289 100755
--- a/etc/grml/fai/grml/grml_cleanup_chroot
+++ b/etc/grml/fai/grml/grml_cleanup_chroot
@@ -147,14 +147,15 @@ fi
 
 # get rid of large kernel modules:
 if ifclass GRML_SMALL ; then
+  einfo "Identified grml-small, removing some very large kernel drivers:"
   if [ -r "/lib/modules/${KERNEL}/kernel/fs/ocfs2/ocfs2.ko" ] ; then
     einfo "Removing /lib/modules/${KERNEL}/kernel/fs/ocfs2/ocfs2.ko"
     rm -f "/lib/modules/${KERNEL}/kernel/fs/ocfs2/ocfs2.ko"
     eend $?
   fi
-  if [ -r "/lib/modules/${KERNEL}/kernel/drivers/isdn/hisax/hisax.ko" ] ; then
-    einfo "Removing /lib/modules/${KERNEL}/kernel/drivers/isdn/hisax/hisax.ko"
-    rm -f "/lib/modules/${KERNEL}/kernel/drivers/isdn/hisax/hisax.ko"
+  if [ -d "/lib/modules/${KERNEL}/kernel/drivers/isdn/hisax/" ] ; then
+    einfo "Removing /lib/modules/${KERNEL}/kernel/drivers/isdn/hisax"
+    rm -rf "/lib/modules/${KERNEL}/kernel/drivers/isdn/hisax"
     eend $?
   fi
 fi