[kernel] r15314 - dists/trunk/linux-2.6/debian

[Ben Hutchings]

Author: benh
Date: Thu Mar  4 01:26:02 2010
New Revision: 15314

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

Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/linux-base.postinst

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Thu Mar  4 01:10:07 2010	(r15313)
+++ dists/trunk/linux-2.6/debian/changelog	Thu Mar  4 01:26:02 2010	(r15314)
@@ -7,6 +7,8 @@
   * 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 at decadent.org.uk>  Sun, 28 Feb 2010 17:01:33 +0000
 

Modified: dists/trunk/linux-2.6/debian/linux-base.postinst
==============================================================================
--- dists/trunk/linux-2.6/debian/linux-base.postinst	Thu Mar  4 01:10:07 2010	(r15313)
+++ dists/trunk/linux-2.6/debian/linux-base.postinst	Thu Mar  4 01:26:02 2010	(r15314)
@@ -1222,7 +1222,8 @@
 	    $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 @@
 	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;