r3006 - in trunk/utils/initrd-tools: . debian

[maximilian attems]

Author: maks-guest
Date: 2005-04-28 12:15:45 +0000 (Thu, 28 Apr 2005)
New Revision: 3006

Modified:
   trunk/utils/initrd-tools/debian/changelog
   trunk/utils/initrd-tools/mkinitrd
Log:
find modules also in subdirs.


Modified: trunk/utils/initrd-tools/debian/changelog
===================================================================
--- trunk/utils/initrd-tools/debian/changelog	2005-04-28 11:31:37 UTC (rev 3005)
+++ trunk/utils/initrd-tools/debian/changelog	2005-04-28 12:15:45 UTC (rev 3006)
@@ -10,6 +10,7 @@
       * Error message should refer to mdadm, not raidtools2.
       * Take /etc/mkinitrd/DSDT and put it in the initrd if it exists.
       * Use mktemp, not $$ for creating temporary directories.
+    - Function module_exist recognizes modules in subdirs. Closes: #296894
 
  -- Steve Langasek <vorlon@debian.org>  Sun, 10 Apr 2005 15:38:08 -0700
 

Modified: trunk/utils/initrd-tools/mkinitrd
===================================================================
--- trunk/utils/initrd-tools/mkinitrd	2005-04-28 11:31:37 UTC (rev 3005)
+++ trunk/utils/initrd-tools/mkinitrd	2005-04-28 12:15:45 UTC (rev 3006)
@@ -414,7 +414,7 @@
 }
 
 module_exists() {
-	[ -f "$MODULEDIR/kernel/$1.$o" ]
+	[ -n "$(find "$MODULEDIR/kernel/${1%%/*}" -name "${1##*/}.$o")" ]
 }
 
 print_module() {