[kernel] r15509 - in dists/sid/linux-2.6/debian: . templates
Ben Hutchings
benh at alioth.debian.org
Sun Apr 11 00:50:13 UTC 2010
Author: benh
Date: Sun Apr 11 00:50:08 2010
New Revision: 15509
Log:
Use vol_id if available since the version of blkid in lenny does not support the output format we need (Closes: #576608)
Modified:
dists/sid/linux-2.6/debian/changelog
dists/sid/linux-2.6/debian/linux-base.postinst
dists/sid/linux-2.6/debian/templates/control.main.in
Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog Sat Apr 10 23:14:41 2010 (r15508)
+++ dists/sid/linux-2.6/debian/changelog Sun Apr 11 00:50:08 2010 (r15509)
@@ -14,6 +14,8 @@
(Closes: #577047)
- Check device IDs in mdadm.conf rather than assuming it needs manual
conversion
+ - Use vol_id if available since the version of blkid in lenny does not
+ support the output format we need (Closes: #576608)
[ maximilian attems]
* Ignore ABI breakage due to libata switch.
Modified: dists/sid/linux-2.6/debian/linux-base.postinst
==============================================================================
--- dists/sid/linux-2.6/debian/linux-base.postinst Sat Apr 10 23:14:41 2010 (r15508)
+++ dists/sid/linux-2.6/debian/linux-base.postinst Sun Apr 11 00:50:08 2010 (r15509)
@@ -1245,10 +1245,16 @@
}
sub scan_devices {
+ my $id_command;
+ if (-x '/sbin/vol_id') {
+ $id_command = '/sbin/vol_id';
+ } else {
+ $id_command = 'blkid -o udev -s LABEL -s UUID';
+ }
for (`blkid -o device`) {
chomp;
my $bdev = $_;
- for (`blkid -o udev -s LABEL -s UUID '$bdev'`) {
+ for (`$id_command '$bdev'`) {
if (/^ID_FS_(LABEL|UUID)_ENC=(.+)\n$/) {
add_tag($bdev, $1, $2);
}
Modified: dists/sid/linux-2.6/debian/templates/control.main.in
==============================================================================
--- dists/sid/linux-2.6/debian/templates/control.main.in Sat Apr 10 23:14:41 2010 (r15508)
+++ dists/sid/linux-2.6/debian/templates/control.main.in Sun Apr 11 00:50:08 2010 (r15509)
@@ -79,7 +79,8 @@
Package: linux-base
Architecture: all
-Depends: libapt-pkg-perl, libuuid-perl, ${misc:Depends}
+Depends: libapt-pkg-perl, libuuid-perl, ${misc:Depends},
+ util-linux (>= 2.16-1) | udev (<< 146-1)
Description: Linux image base package
This package contains files and support scripts for all Linux
images.
More information about the Kernel-svn-changes
mailing list