[kernel] r17425 - dists/trunk/linux-2.6/debian/templates/temp.image.plain

[Ben Hutchings]

Author: benh
Date: Mon May 16 04:07:16 2011
New Revision: 17425

Log:
Remove check for do_bootloader

This warning was present in squeeze and should not need to be repeated.

Modified:
   dists/trunk/linux-2.6/debian/templates/temp.image.plain/postinst
   dists/trunk/linux-2.6/debian/templates/temp.image.plain/templates

Modified: dists/trunk/linux-2.6/debian/templates/temp.image.plain/postinst
==============================================================================
--- dists/trunk/linux-2.6/debian/templates/temp.image.plain/postinst	Mon May 16 03:57:43 2011	(r17424)
+++ dists/trunk/linux-2.6/debian/templates/temp.image.plain/postinst	Mon May 16 04:07:16 2011	(r17425)
@@ -69,7 +69,6 @@
       $do_symlink      = "Yes" if /do_symlinks\s*=\s*(yes|true|1)\s*$/i;
       $no_symlink      = "Yes" if /no_symlinks\s*=\s*(yes|true|1)\s*$/i;
       $link_in_boot    = "Yes" if /link_in_boot\s*=\s*(yes|true|1)\s*$/i;
-      $explicit_do_loader = "YES" if /do_bootloader\s*=\s*(yes|true|1)\s*$/i;
       $use_hard_links  = "Yes" if /use_hard_links\s*=\s*(yes|true|1)\s*$/i;
       $minimal_swap    = 'Yes' if /minimal_swap\s*=\s*(yes|true|1)\s*$/i;
       $ignore_depmod_err = 'Yes' if /ignore_depmod_err\s*=\s*(yes|true|1)\s*$/i;
@@ -784,15 +783,6 @@
             die "Failed to process /etc/kernel/postinst.d/$version";
 }
 
-if ($explicit_do_loader) {
-    my ($question, $ret, $seen);
-    $question = "${package_name}/postinst/ignoring-do-bootloader-$version";
-    ($ret,$seen) = input('high', "$question");
-    die "Error setting debconf question $question: $seen" if $ret && $ret != 30;
-    ($ret,$seen) = go();
-    die "Error asking debconf question $question: $seen" if $ret && $ret != 30;
-}
-
 if ($initrd && ! -e "initrd.img-$version") {
   die "Failed to create initrd image.\n";
 }

Modified: dists/trunk/linux-2.6/debian/templates/temp.image.plain/templates
==============================================================================
--- dists/trunk/linux-2.6/debian/templates/temp.image.plain/templates	Mon May 16 03:57:43 2011	(r17424)
+++ dists/trunk/linux-2.6/debian/templates/temp.image.plain/templates	Mon May 16 04:07:16 2011	(r17425)
@@ -53,18 +53,6 @@
  sections of the package archive before you can install these
  firmware files.
 
-Template: linux-image-=V/postinst/ignoring-do-bootloader-=V
-Type: error
-_Description: Boot loader configuration must be updated
- Kernel packages no longer update a default boot loader.  You should
- remove 'do_bootloader = yes' from /etc/kernel-img.conf.
- .
- If the boot loader needs to be updated whenever a new kernel is
- installed, the boot loader package should install a script in
- /etc/kernel/postinst.d.  Alternately, you can specify the command
- to update the boot loader by setting the 'postinst_hook' variable
- in /etc/kernel-img.conf.
-
 # This has not yet been reviewed
 Template: linux-image-=V/postinst/ignoring-ramdisk
 Type: error