aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--debian/changelog4
-rwxr-xr-xdebian/templates/temp.image.plain/postinst6
2 files changed, 8 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index f016d865483d..244243b3b9da 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,10 @@ linux-2.6 (2.6.31-2) UNRELEASED; urgency=low
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@cyrius.com> Tue, 27 Oct 2009 21:18:29 +0800
diff --git a/debian/templates/temp.image.plain/postinst b/debian/templates/temp.image.plain/postinst
index 5e827de4ede2..d06e08908e87 100755
--- a/debian/templates/temp.image.plain/postinst
+++ b/debian/templates/temp.image.plain/postinst
@@ -806,8 +806,10 @@ if ( -d "$modules_base/$version" ) {
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 = $_;