[kernel] r14531 - in dists/sid/linux-2.6/debian: . templates/temp.image.plain

[Ben Hutchings]

Author: benh
Date: Sun Nov  1 00:59:02 2009
New Revision: 14531

Log:
postinst: Accept absolute paths in modules.dep generated by the lenny version of module-init-tools (Closes: #552610)

Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/templates/temp.image.plain/postinst

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	Fri Oct 30 21:14:39 2009	(r14530)
+++ dists/sid/linux-2.6/debian/changelog	Sun Nov  1 00:59:02 2009	(r14531)
@@ -8,6 +8,10 @@
     name of the config variable changed).
   * Add OpenRD-Client support again.
   * mips: fix build of vmlinux.lds (Closes: #552422).
+  
+  [ Ben Hutchings ]
+  * postinst: Accept absolute paths in modules.dep generated by the
+    lenny version of module-init-tools (Closes: #552610)
 
  -- Martin Michlmayr <tbm at cyrius.com>  Tue, 27 Oct 2009 21:18:29 +0800
 

Modified: dists/sid/linux-2.6/debian/templates/temp.image.plain/postinst
==============================================================================
--- dists/sid/linux-2.6/debian/templates/temp.image.plain/postinst	Fri Oct 30 21:14:39 2009	(r14530)
+++ dists/sid/linux-2.6/debian/templates/temp.image.plain/postinst	Sun Nov  1 00:59:02 2009	(r14531)
@@ -806,8 +806,10 @@
 	my $module_path = $module_paths{$module};
 	if (defined($module_path)) {
 	  my $first = 1;
-	  open(MODINFO,
-	       "modinfo -F firmware '$modules_base/$version/$module_path' |");
+	  if ($module_path !~ m|^/|) {
+	    $module_path = "$modules_base/$version/$module_path";
+	  }
+	  open(MODINFO, "modinfo -F firmware '$module_path' |");
 	  while (<MODINFO>) {
 	    chomp;
 	    my $firmware = $_;