debian-packaging
/
linux
8
0
Fork 0
Code Releases Activity

linux-base: Ignore nonexistent devices and properly handle devices of unknown filesystem type (Closes: #572341) 

svn path=/dists/trunk/linux-2.6/; revision=15314
This commit is contained in:
Ben Hutchings 2010-03-04 01:26:02 +00:00
parent 3020096f4a
commit 0d5c2743cc
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debian/changelog vendored
View File

@ -7,6 +7,8 @@ linux-2.6 (2.6.33-1~experimental.3) UNRELEASED; urgency=low
* linux-base: Don't show empty list of devices to be relabelled
* linux-base: Don't update udev CD rules unnecessarily
* linux-base: Show the device paths to be added to udev CD rules
* linux-base: Ignore nonexistent devices and properly handle devices
of unknown filesystem type (Closes: #572341)
-- Ben Hutchings <ben@decadent.org.uk> Sun, 28 Feb 2010 17:01:33 +0000

5
debian/linux-base.postinst vendored
View File

@ -1222,7 +1222,8 @@ sub scan_config_files {
$id_map_text = &{$config->{needs_update}}($file);
} else {
for my $bdev (&{$config->{list}}($file)) {
if ($bdev =~ m{^/dev/(?:[hs]d[a-z]\d*|s(?:cd|r)\d+)$}) {
if ($bdev =~ m{^/dev/(?:[hs]d[a-z]\d*|s(?:cd|r)\d+)$} &&
-b $bdev) {
$bdev_map{$bdev} = {};
push @matched_bdevs, $bdev;
}
@ -1288,7 +1289,7 @@ sub assign_labels {
next if $#{$bdev_map{$bdev}->{ids}} >= 0;
my $type = $bdev_map{$bdev}->{type};
next unless exists($label_types{$type});
next unless defined($type) && exists($label_types{$type});
my $label_len = $label_types{$type}->{len};
my $label;