Remove check for do_bootloader

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

svn path=/dists/trunk/linux-2.6/; revision=17425
This commit is contained in:
Ben Hutchings 2011-05-16 04:07:16 +00:00
parent 5f375916e4
commit efa8ec1d0c
2 changed files with 0 additions and 22 deletions

View File

@ -69,7 +69,6 @@ if (-r "$CONF_LOC" && -f "$CONF_LOC" ) {
$do_symlink = "Yes" if /do_symlinks\s*=\s*(yes|true|1)\s*$/i; $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; $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; $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; $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; $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; $ignore_depmod_err = 'Yes' if /ignore_depmod_err\s*=\s*(yes|true|1)\s*$/i;
@ -784,15 +783,6 @@ if (-d "/etc/kernel/postinst.d/$version") {
die "Failed to process /etc/kernel/postinst.d/$version"; 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") { if ($initrd && ! -e "initrd.img-$version") {
die "Failed to create initrd image.\n"; die "Failed to create initrd image.\n";
} }

View File

@ -53,18 +53,6 @@ _Description: Required firmware files may be missing
sections of the package archive before you can install these sections of the package archive before you can install these
firmware files. 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 # This has not yet been reviewed
Template: linux-image-=V/postinst/ignoring-ramdisk Template: linux-image-=V/postinst/ignoring-ramdisk
Type: error Type: error