[kernel] r15510 - dists/sid/linux-2.6/debian
Ben Hutchings
benh at alioth.debian.org
Sun Apr 11 00:51:35 UTC 2010
Author: benh
Date: Sun Apr 11 00:51:27 2010
New Revision: 15510
Log:
linux-base: Discard labels containing the # character
Modified:
dists/sid/linux-2.6/debian/linux-base.postinst
Modified: dists/sid/linux-2.6/debian/linux-base.postinst
==============================================================================
--- dists/sid/linux-2.6/debian/linux-base.postinst Sun Apr 11 00:50:08 2010 (r15509)
+++ dists/sid/linux-2.6/debian/linux-base.postinst Sun Apr 11 00:51:27 2010 (r15510)
@@ -1264,12 +1264,13 @@
# Discard all labels and UUIDs(!) that are ambiguous.
# Discard all labels with 'unsafe' characters (escaped by blkid using
# backslashes) as they will not be usable in all configuration files.
+ # Similarly for '#' which blkid surprisingly does not consider unsafe.
# Sort each device's IDs in reverse lexical order so that UUIDs are
# preferred.
for my $bdev (keys(%bdev_map)) {
@{$bdev_map{$bdev}->{ids}} =
sort({$b cmp $a}
- grep({ @{$id_map{$_}} == 1 && $_ !~ /\\/ }
+ grep({ @{$id_map{$_}} == 1 && $_ !~ /[\\#]/ }
@{$bdev_map{$bdev}->{ids}}));
}
More information about the Kernel-svn-changes
mailing list