From 85a33caf874e7cccbea0ab49330bc6ac693e7673 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Fri, 5 Mar 2010 02:02:43 +0000 Subject: [PATCH] linux-base: Don't accept empty filesystem labels as identifiers (Closes: #572438) svn path=/dists/trunk/linux-2.6/; revision=15324 --- debian/changelog | 2 ++ debian/linux-base.postinst | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index e327f5da9..2cc59fdcb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 Sun, 28 Feb 2010 17:01:33 +0000 diff --git a/debian/linux-base.postinst b/debian/linux-base.postinst index a64f560ca..c06a45bfa 100644 --- a/debian/linux-base.postinst +++ b/debian/linux-base.postinst @@ -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); } }