[kernel] r15423 - dists/sid/linux-2.6/debian
Ben Hutchings
benh at alioth.debian.org
Sat Mar 20 04:53:29 UTC 2010
Author: benh
Date: Sat Mar 20 04:53:27 2010
New Revision: 15423
Log:
linux-base.postinst: Move filtering of configs out of scan_config_files()
and remove module variable @matched_configs
Modified:
dists/sid/linux-2.6/debian/linux-base.postinst
Modified: dists/sid/linux-2.6/debian/linux-base.postinst
==============================================================================
--- dists/sid/linux-2.6/debian/linux-base.postinst Thu Mar 18 19:14:12 2010 (r15422)
+++ dists/sid/linux-2.6/debian/linux-base.postinst Sat Mar 20 04:53:27 2010 (r15423)
@@ -995,10 +995,11 @@
);
my %bdev_map;
-my @matched_configs;
my %id_map;
sub scan_config_files {
+ my @configs;
+
# Find all IDE/SCSI disks mentioned in configurations
for my $config (@config_files) {
# Is the file present?
@@ -1042,12 +1043,10 @@
}
}
- if (@matched_bdevs || $id_map_text) {
- push @matched_configs, {config => $config,
- devices => \@matched_bdevs,
- id_map_text => $id_map_text,
- installed => $installed};
- }
+ push @configs, {config => $config,
+ devices => \@matched_bdevs,
+ id_map_text => $id_map_text,
+ installed => $installed};
}
my $fstab = new FileHandle('/etc/fstab', 'r');
@@ -1060,6 +1059,8 @@
}
}
$fstab->close();
+
+ return @configs;
}
sub add_tag {
@@ -1199,7 +1200,7 @@
$map{$bdev} = $bdev_map{$bdev}->{ids}->[0];
}
- for my $match (@matched_configs) {
+ for my $match (@_) {
# Generate a new config
my $path = $match->{config}->{path};
my $old = new FileHandle($path, 'r') or die "$!";
@@ -1232,10 +1233,11 @@
use Debconf::Client::ConfModule ':all';
%bdev_map = ();
- @matched_configs = ();
%id_map = ();
- scan_config_files();
+ my @found_configs = scan_config_files();
+ my @matched_configs =
+ grep({@{$_->{devices}} || $_->{id_map_text}} @found_configs);
if ($#matched_configs < 0) {
return;
@@ -1296,7 +1298,7 @@
if ($answer eq 'true') {
set_new_ids();
- update_config();
+ update_config(@matched_configs);
}
}
More information about the Kernel-svn-changes
mailing list