postinst: Fix failure paths in check for missing firmware (Closes: #560263)
svn path=/dists/trunk/linux-2.6/; revision=14768
This commit is contained in:
parent
dcb78dcf90
commit
8bf9a24285
|
@ -10,6 +10,8 @@ linux-2.6 (2.6.32-2) UNRELEASED; urgency=low
|
||||||
|
|
||||||
[ Ben Hutchings ]
|
[ Ben Hutchings ]
|
||||||
* aufs2: Update to snapshot from 2009-12-05
|
* aufs2: Update to snapshot from 2009-12-05
|
||||||
|
* postinst: Fix failure paths in check for missing firmware
|
||||||
|
(Closes: #560263)
|
||||||
|
|
||||||
-- Bastian Blank <waldi@debian.org> Sun, 06 Dec 2009 20:42:14 +0100
|
-- Bastian Blank <waldi@debian.org> Sun, 06 Dec 2009 20:42:14 +0100
|
||||||
|
|
||||||
|
|
|
@ -625,8 +625,7 @@ sub image_magic {
|
||||||
######################################################################
|
######################################################################
|
||||||
######################################################################
|
######################################################################
|
||||||
|
|
||||||
# We may not have any modules installed
|
sub do_modules {
|
||||||
if ( -d "$modules_base/$version" ) {
|
|
||||||
print STDERR "Running depmod.\n";
|
print STDERR "Running depmod.\n";
|
||||||
my $ret = system("depmod -a -F $realimageloc/System.map-$version $version");
|
my $ret = system("depmod -a -F $realimageloc/System.map-$version $version");
|
||||||
my $exit_value = $? >> 8;
|
my $exit_value = $? >> 8;
|
||||||
|
@ -698,11 +697,10 @@ if ( -d "$modules_base/$version" ) {
|
||||||
my $new_patchlevel = $version;
|
my $new_patchlevel = $version;
|
||||||
$new_patchlevel =~ s/^2\.6\.(\d+).*/$1/;
|
$new_patchlevel =~ s/^2\.6\.(\d+).*/$1/;
|
||||||
|
|
||||||
FIRMWARE_CHECK:
|
|
||||||
if ($new_patchlevel > $running_patchlevel) {
|
if ($new_patchlevel > $running_patchlevel) {
|
||||||
my $missing = '';
|
my $missing = '';
|
||||||
my %module_paths;
|
my %module_paths;
|
||||||
open(DEP, "<$modules_base/$version/modules.dep") or last FIRMWARE_CHECK;
|
open(DEP, "<$modules_base/$version/modules.dep") or return;
|
||||||
while (<DEP>) {
|
while (<DEP>) {
|
||||||
if (m|(.*/([^/]*)\.ko):|) {
|
if (m|(.*/([^/]*)\.ko):|) {
|
||||||
my ($path, $module) = ($1, $2);
|
my ($path, $module) = ($1, $2);
|
||||||
|
@ -711,7 +709,7 @@ if ( -d "$modules_base/$version" ) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
close(DEP);
|
close(DEP);
|
||||||
open(MODULES, '</proc/modules') or last FIRMWARE_CHECK;
|
open(MODULES, '</proc/modules') or return;
|
||||||
while (<MODULES>) {
|
while (<MODULES>) {
|
||||||
s/ .*//s;
|
s/ .*//s;
|
||||||
my $module = $_;
|
my $module = $_;
|
||||||
|
@ -769,6 +767,10 @@ if ( -d "$modules_base/$version" ) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
# We may not have any modules installed
|
||||||
|
if (-d "$modules_base/$version") {
|
||||||
|
&do_modules();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
sub find_initramfs_tool {
|
sub find_initramfs_tool {
|
||||||
|
|
Loading…
Reference in New Issue