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

[Ben Hutchings]

Author: benh
Date: Fri Mar  5 02:02:43 2010
New Revision: 15324

Log:
linux-base: Don't accept empty filesystem labels as identifiers (Closes: #572438)

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	Fri Mar  5 01:11:36 2010	(r15323)
+++ dists/trunk/linux-2.6/debian/changelog	Fri Mar  5 02:02:43 2010	(r15324)
@@ -9,6 +9,8 @@
   * 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, #572445)
+  * linux-base: Don't accept empty filesystem labels as identifiers
+    (Closes: #572438)
 
  -- 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	Fri Mar  5 01:11:36 2010	(r15323)
+++ dists/trunk/linux-2.6/debian/linux-base.postinst	Fri Mar  5 02:02:43 2010	(r15324)
@@ -1267,7 +1267,7 @@
 	chomp;
 	my $bdev = $_;
 	for (`blkid -o udev -s LABEL -s UUID '$bdev'`) {
-	    if (/^ID_FS_(LABEL|UUID)_ENC=(.*)\n$/) {
+	    if (/^ID_FS_(LABEL|UUID)_ENC=(.+)\n$/) {
 		add_tag($bdev, $1, $2);
 	    }
 	}