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

svn path=/dists/trunk/linux-2.6/; revision=15324
This commit is contained in:
Ben Hutchings 2010-03-05 02:02:43 +00:00
parent 08c835c941
commit 85a33caf87
2 changed files with 3 additions and 1 deletions

2
debian/changelog vendored
View File

@ -9,6 +9,8 @@ linux-2.6 (2.6.33-1~experimental.3) UNRELEASED; urgency=low
* 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@decadent.org.uk> Sun, 28 Feb 2010 17:01:33 +0000

View File

@ -1267,7 +1267,7 @@ sub scan_devices {
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);
}
}