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

[Ben Hutchings]

Author: benh
Date: Wed Mar  3 01:07:41 2010
New Revision: 15308

Log:
Don't show empty list of devices to be relabelled in linux-base

Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/linux-base.postinst
   dists/trunk/linux-2.6/debian/linux-base.templates

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Wed Mar  3 00:30:24 2010	(r15307)
+++ dists/trunk/linux-2.6/debian/changelog	Wed Mar  3 01:07:41 2010	(r15308)
@@ -4,6 +4,7 @@
   * Fix regexp for binNMU versions in modules/rules.include (Closes: #524632)
   * Fix calls to disk_id_to_path (renamed to id_to_path) in linux-base
     (Closes: #572283)
+  * Don't show empty list of devices to be relabelled in linux-base
 
  -- 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	Wed Mar  3 00:30:24 2010	(r15307)
+++ dists/trunk/linux-2.6/debian/linux-base.postinst	Wed Mar  3 01:07:41 2010	(r15308)
@@ -1392,13 +1392,17 @@
 	scan_devices();
 	assign_labels();
 
-	$question = 'linux-base/disk-id-convert-plan';
-	($ret, $seen) = subst($question, 'relabel',
-			      join("\\n",
-				   map({sprintf("%s: %s", $_, $bdev_map{$_}->{LABEL})}
-				       grep({$bdev_map{$_}->{relabel}}
-					    keys(%bdev_map)))));
-	die "Error setting debconf substitutions in $question: $seen" if $ret;
+	if (grep({$bdev_map{$_}->{relabel}} keys(%bdev_map))) {
+	    $question = 'linux-base/disk-id-convert-plan';
+	    ($ret, $seen) = subst($question, 'relabel',
+				  join("\\n",
+				       map({sprintf("%s: %s", $_, $bdev_map{$_}->{LABEL})}
+					   grep({$bdev_map{$_}->{relabel}}
+						keys(%bdev_map)))));
+	    die "Error setting debconf substitutions in $question: $seen" if $ret;
+	} else {
+	    $question = 'linux-base/disk-id-convert-plan-no-relabel';
+	}
 	($ret, $seen) = subst($question, 'id_map',
 			      join("\\n",
 				   map({sprintf("%s: %s", $_, $bdev_map{$_}->{ids}->[0])}

Modified: dists/trunk/linux-2.6/debian/linux-base.templates
==============================================================================
--- dists/trunk/linux-2.6/debian/linux-base.templates	Wed Mar  3 00:30:24 2010	(r15307)
+++ dists/trunk/linux-2.6/debian/linux-base.templates	Wed Mar  3 01:07:41 2010	(r15308)
@@ -27,6 +27,18 @@
  .
  ${id_map}
 
+Template: linux-base/disk-id-convert-plan-no-relabel
+Type: boolean
+Default: true
+Description: Apply these configuration changes to disk device ids?
+ These configuration files will be updated:
+ .
+ ${files}
+ .
+ The device ids will be changed as follows:
+ .
+ ${id_map}
+
 Template: linux-base/disk-id-manual
 Type: note
 Description: Please check these configuration files before rebooting