[kernel] r16226 - in dists/sid/linux-2.6/debian: . templates/temp.image.plain

[Ben Hutchings]

Author: benh
Date: Mon Aug 30 03:20:24 2010
New Revision: 16226

Log:
Fix the conditions for warning about removal of do_bootloader

The postinst for image packages was checking the wrong variable name.
The postinst for linux-base was not ignoring commented-out lines.

Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/linux-base.postinst
   dists/sid/linux-2.6/debian/templates/temp.image.plain/postinst

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	Mon Aug 30 01:36:41 2010	(r16225)
+++ dists/sid/linux-2.6/debian/changelog	Mon Aug 30 03:20:24 2010	(r16226)
@@ -20,6 +20,8 @@
   * SCSI/mptsas: fix hangs caused by ATA pass-through (Closes: #594690)
   * sky2: Apply fixes and new hardware support from 2.6.33-2.6.35
     (Closes: #571526)
+  * postinst: Really warn users on upgrade if the current configuration may
+    rely on running a default boot loader.
 
   [ Bastian Blank ]
   * Use Breaks instead of Conflicts.

Modified: dists/sid/linux-2.6/debian/linux-base.postinst
==============================================================================
--- dists/sid/linux-2.6/debian/linux-base.postinst	Mon Aug 30 01:36:41 2010	(r16225)
+++ dists/sid/linux-2.6/debian/linux-base.postinst	Mon Aug 30 03:20:24 2010	(r16226)
@@ -1620,8 +1620,8 @@
     my $do_bootloader;
     if (my $conf = new FileHandle('/etc/kernel-img.conf', 'r')) {
 	while (<$conf>) {
-	    $do_bootloader = 0 if /do_bootloader\s*=\s*(no|false|0)\s*$/i;
-	    $do_bootloader = 1 if /do_bootloader\s*=\s*(yes|true|1)\s*$/i;
+	    $do_bootloader = 0 if /^\s*do_bootloader\s*=\s*(no|false|0)\s*$/i;
+	    $do_bootloader = 1 if /^\s*do_bootloader\s*=\s*(yes|true|1)\s*$/i;
 	}
 	$conf->close();
     }

Modified: dists/sid/linux-2.6/debian/templates/temp.image.plain/postinst
==============================================================================
--- dists/sid/linux-2.6/debian/templates/temp.image.plain/postinst	Mon Aug 30 01:36:41 2010	(r16225)
+++ dists/sid/linux-2.6/debian/templates/temp.image.plain/postinst	Mon Aug 30 03:20:24 2010	(r16226)
@@ -810,7 +810,7 @@
             die "Failed to process /etc/kernel/postinst.d/$version";
 }
 
-if ($explicit_do_bootloader) {
+if ($explicit_do_loader) {
     my ($question, $ret, $seen);
     $question = "${package_name}/postinst/ignoring-do-bootloader-$version";
     ($ret,$seen) = input('high', "$question");