diff --git a/debian/changelog b/debian/changelog
index 983283cf8..4af36102b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+linux-2.6 (2.6.38~rc8-1~experimental.1) UNRELEASED; urgency=low
+
+  [ Ben Hutchings ]
+  * Move firmware-linux-free to separate source package (firmware-free)
+  * Move linux-base to separate source package
+
+ -- Ben Hutchings <ben@decadent.org.uk>  Sat, 12 Mar 2011 08:57:58 +0000
+
 linux-2.6 (2.6.38~rc8-1~experimental.1) experimental; urgency=low
 
   * New upstream release candidate
diff --git a/debian/linux-base.postinst b/debian/linux-base.postinst
deleted file mode 100644
index b9fb9a02c..000000000
--- a/debian/linux-base.postinst
+++ /dev/null
@@ -1,1699 +0,0 @@
-#!/usr/bin/perl
-
-# Copyright 2009-2010 Ben Hutchings
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-use strict;
-use warnings;
-use Debconf::Client::ConfModule ':all';
-use FileHandle;
-use POSIX ();
-use UUID;
-
-package DebianKernel::DiskId;
-
-### utility
-
-sub id_to_path {
-    my ($id) = @_;
-    $id =~ m|^/|
-	or $id =~ s{^(LABEL|UUID)=}{'/dev/disk/by-' . lc($1) . '/'}e
-	or die "Could not map id $id to path";
-    return $id;
-}
-
-### /etc/fstab
-
-sub fstab_next {
-    # Based on my_getmntent() in mount_mntent.c
-
-    my ($file) = @_;
-    my $text = <$file>;
-    unless (defined($text)) {
-	return ();
-    }
-
-    my $line = $text;
-    $line =~ s/\r?\n$//;
-    $line =~ s/^[ \t]*//;
-    if ($line =~ /^(#|$)/) {
-	return ($text);
-    } else {
-	return ($text,
-		map({ s/\\([0-7][0-7][0-7])/chr(oct($1) & 0xff)/eg; $_; }
-		    split(/[ \t]+/, $line)));
-    }
-}
-
-sub fstab_list {
-    my ($file) = @_;
-    my @bdevs;
-    while (1) {
-	my ($text, $bdev) = fstab_next($file);
-	last unless defined($text);
-	if (defined($bdev)) {
-	    push @bdevs, $bdev;
-	}
-    }
-    return @bdevs;
-}
-
-sub fstab_update {
-    my ($old, $new, $map) = @_;
-    while (1) {
-	my ($text, $bdev) = fstab_next($old);
-	last unless defined($text);
-	if (defined($bdev) && defined(my $id = $map->{$bdev})) {
-	    $text =~ s/^(\s*\S+)(.*)/# $1$2\n$id$2/;
-	}
-	$new->print("$text");
-    }
-}
-
-### Kernel parameters
-
-sub kernel_list {
-    my ($cmd_line) = @_;
-    return ($cmd_line =~ /\broot=(\S+)/) ? ($1) : ();
-}
-
-sub kernel_update {
-    my ($cmd_line, $map) = @_;
-    if ($cmd_line =~ /\broot=(\S+)/ && defined(my $id = $map->{$1})) {
-	$cmd_line =~ s/\broot=(\S+)/root=$id/;
-	return $cmd_line;
-    } else {
-	return undef;
-    }
-}
-
-### shell script variable assignment
-
-# Maintains enough context to find statement boundaries, and can parse
-# variable definitions that do not include substitutions.  I think.
-
-sub shellvars_next {
-    my ($file) = @_;
-    my $text = '';
-    my @context = ('');
-    my $first = 1;
-    my $in_value = 0;
-    my ($name, $value);
-    my $unhandled = 0;
-
-  LINE:
-    while (<$file>) {
-	$text .= $_;
-
-	# variable assignment
-	if ($first && m/^\s*([A-Za-z_][A-Za-z0-9_]*)=/g) {
-	    $name = $1;
-	    $value = '';
-	    $in_value = 1;
-	}
-
-	while (/\G(.*?)([#`'"(){}\s]|\\.|\$[({]?)/gs) {
-	    my $end_pos = pos;
-	    my $special = $2;
-
-	    if ($in_value) {
-		# add non-special characters to the value verbatim
-		$value .= $1;
-	    }
-
-	    if ($context[$#context] eq '') {
-		# space outside quotes or brackets ends the value
-		if ($special =~ /^\s/) {
-		    $in_value = 0;
-		    if ($special eq "\n") {
-			last LINE;
-		    }
-		}
-		# something else after the value means this is a command
-		# with an environment override, not a variable definition
-		elsif (defined($name) && !$in_value) {
-		    $unhandled = 1;
-		}
-	    }
-
-	    # in single-quoted string
-	    if ($context[$#context] eq "'") {
-		# only the terminating single-quote is special
-		if ($special eq "'") {
-		    pop @context;
-		} else {
-		    $value .= $special;
-		}
-	    }
-	    # backslash escape
-	    elsif ($special =~ /^\\/) {
-		if ($in_value && $special ne "\\\n") {
-		    $value .= substr($special, 1, 1);
-		}
-	    }
-	    # in backtick substitution
-	    elsif ($context[$#context] eq '`') {
-		# backtick does not participate in nesting, so only the
-		# terminating backtick should be considered special
-		if ($special eq '`') {
-		    pop @context;
-		}
-	    }
-	    # comment
-	    elsif ($context[$#context] !~ /^['"]/ && $special eq '#') {
-		# ignore rest of the physical line, except the new-line
-		pos = $end_pos;
-		/\G.*/g;
-		next;
-	    }
-	    # start of backtick substitution
-	    elsif ($special eq '`') {
-		push @context, '`';
-		$unhandled = 1;
-	    }
-	    # start of single/double-quoted string
-	    elsif ($special =~ /^['"]/ && $context[$#context] !~ /^['"]/) {
-		push @context, $special;
-	    }
-	    # end of double-quoted string
-	    elsif ($special eq '"' && $context[$#context] eq '"') {
-		pop @context;
-	    }
-	    # open bracket
-	    elsif ($special =~ /^\$?\(/) {
-		push @context, ')';
-		$unhandled = 1;
-	    } elsif ($special =~ /^\$\{/) {
-		push @context, '}';
-		$unhandled = 1;
-	    }
-	    # close bracket
-	    elsif ($special =~ /^[)}]/ && $special eq $context[$#context]) {
-		pop @context;
-	    }
-	    # variable substitution
-	    elsif ($special eq '$') {
-		$unhandled = 1;
-	    }
-	    # not a special character in this context (or a syntax error)
-	    else {
-		if ($in_value) {
-		    $value .= $special;
-		}
-	    }
-
-	    pos = $end_pos;
-	}
-
-	$first = 0;
-    }
-
-    if ($text eq '') {
-	return ();
-    } elsif ($unhandled) {
-	return ($text);
-    } else {
-	return ($text, $name, $value);
-    }
-}
-
-sub shellvars_quote {
-    my ($value) = @_;
-    $value =~ s/'/'\''/g;
-    return "'$value'";
-}
-
-### GRUB 1 (grub-legacy) config
-
-sub grub1_path {
-    for ('/boot/grub', '/boot/boot/grub') {
-	if (-d) {
-	    return "$_/menu.lst";
-	}
-    }
-    return undef;
-}
-
-sub grub1_parse {
-    my ($file) = @_;
-    my @results = ();
-    my $text = '';
-    my $in_auto = 0;
-    my $in_opts = 0;
-
-    while (<$file>) {
-	if ($in_opts && /^\# (\w+)=(.*)/) {
-	    push @results, [$text];
-	    $text = '';
-	    push @results, [$_, $1, $2];
-	} else {
-	    $text .= $_;
-	    if ($_ eq "### BEGIN AUTOMAGIC KERNELS LIST\n") {
-		$in_auto = 1;
-	    } elsif ($_ eq "### END DEBIAN AUTOMAGIC KERNELS LIST\n") {
-		$in_auto = 0;
-	    } elsif ($_ eq "## ## Start Default Options ##\n") {
-		$in_opts = $in_auto;
-	    } elsif ($_ eq "## ## End Default Options ##\n") {
-		$in_opts = 0;
-	    }
-	}
-    }
-
-    if ($text ne '') {
-	push @results, [$text];
-    }
-
-    return @results;
-}
-
-sub grub1_list {
-    my ($file) = @_;
-    my %options;
-    for (grub1_parse($file)) {
-	my ($text, $name, $value) = @$_;
-	next unless defined($name);
-	$options{$name} = $value;
-    }
-
-    my @bdevs;
-    if (exists($options{kopt_2_6})) {
-	push @bdevs, kernel_list($options{kopt_2_6});
-    } elsif (exists($options{kopt})) {
-	push @bdevs, kernel_list($options{kopt});
-    }
-    if (exists($options{xenkopt})) {
-	push @bdevs, kernel_list($options{xenkopt});
-    }
-    return @bdevs;
-}
-
-sub grub1_update {
-    my ($old, $new, $map) = @_;
-
-    my %options;
-    for (grub1_parse($old)) {
-	my ($text, $name, $value) = @$_;
-	next unless defined($name);
-	$options{$name} = $value;
-    }
-
-    $old->seek(0, 0);
-    for (grub1_parse($old)) {
-	my ($text, $name, $value) = @$_;
-	if (defined($name) && 
-	    ($name eq 'kopt_2_6' ||
-	     ($name eq 'kopt' && !exists($options{kopt_2_6})) ||
-	     $name eq 'xenkopt')) {
-	    if (defined(my $new_value = kernel_update($value, $map))) {
-		$text = "## $name=$value\n# $name=$new_value\n";
-	    }
-	}
-	$new->print($text);
-    }
-}
-
-sub grub1_post {
-    system('update-grub');
-}
-
-### GRUB 2 config
-
-sub grub2_list {
-    my ($file) = @_;
-    my @bdevs;
-
-    while (1) {
-	my ($text, $name, $value) = shellvars_next($file);
-	last unless defined($text);
-	if (defined($name) && $name =~ /^GRUB_CMDLINE_LINUX(?:_DEFAULT)?$/) {
-	    push @bdevs, kernel_list($value);
-	}
-    }
-
-    return @bdevs;
-}
-
-sub grub2_update {
-    my ($old, $new, $map) = @_;
-    my @bdevs;
-
-    while (1) {
-	my ($text, $name, $value) = shellvars_next($old);
-	last unless defined($text);
-	if (defined($name) && $name =~ /^GRUB_CMDLINE_LINUX(?:_DEFAULT)?$/ &&
-	    defined(my $new_value = kernel_update($value, $map))) {
-	    $text =~ s/^/# /gm;
-	    $text .= sprintf("%s=%s\n", $name, shellvars_quote($new_value));
-	}
-	$new->print($text);
-    }
-}
-
-sub grub2_post {
-    system('grub-mkconfig', '-o', '/boot/grub/grub.cfg');
-}
-
-### LILO
-
-sub lilo_tokenize {
-    # Based on cfg_get_token() and next() in cfg.c.
-    # Line boundaries are *not* significant (except as white space) so
-    # we tokenize the whole file at once.
-
-    my ($file) = @_;
-    my @tokens = ();
-    my $text = '';
-    my $token;
-    my $in_quote = 0;
-
-    while (<$file>) {
-	# If this is the continuation of a multi-line quote, skip
-	# leading space and push back the necessary context.
-	if ($in_quote) {
-	    s/^[ \t]*/"/;
-	    $text .= $&;
-	}
-
-	pos = 0;
-	while (/\G \s* (?:\#.*)?
-                (?: (=) |
-                    " ((?:[^"] | \\[\\"n])*) (" | \\\r?\n) |
-                    ((?:[^\s\#="\\] | \\[^\r\n])+) (\\\r?\n)?)?
-               /gsx) {
-	    my $cont;
-	    my $new_text = $&;
-
-	    if (defined($1)) {
-		# equals sign
-		$text = $new_text;
-		$token = $1;
-		$cont = 0;
-	    } elsif (defined($2)) {
-		# quoted text
-		if (!$in_quote) {
-		    $text = $new_text;
-		    $token = $2;
-		} else {
-		    $text .= substr($new_text, 1); # remove the quote again; ick
-		    $token .= ' ' . $2;
-		}
-		$cont = $3 ne '"';
-	    } elsif (defined($4)) {
-		# unquoted word
-		if (!defined($token)) {
-		    $token = '';
-		}
-		$text .= $new_text;
-		$token .= $4;
-		$cont = defined($5);
-	    } else {
-		$text .= $new_text;
-		$cont = $new_text eq '';
-	    }
-
-	    if (!$cont) {
-		if ($text =~ /(?:^|[^\\])\$/) {
-		    # unhandled expansion
-		    $token = undef;
-		} elsif (defined($token)) {
-		    if ($in_quote) {
-			$token =~ s/\\(.)/$1 eq 'n' ? "\n" : $1/eg;
-		    } else {
-			$token =~ s/\\(.)/$1/g;
-		    }
-		}
-		push @tokens, [$text, $token];
-		$text = '';
-		$token = undef;
-		$in_quote = 0;
-	    }
-	}
-    }
-
-    return @tokens;
-}
-
-sub lilo_list {
-    my ($file) = @_;
-    my @bdevs = ();
-    my @tokens = lilo_tokenize($file);
-    my $i = 0;
-    my $in_generic = 1; # global or image=/vmlinuz or image=/vmlinuz.old
-
-    while ($i <= $#tokens) {
-	# Configuration items are either <name> "=" <value> or <name> alone.
-	if ($#tokens - $i >= 2 &&
-	    defined($tokens[$i + 1][1]) && $tokens[$i + 1][1] eq '=') {
-	    my ($name, $value) = ($tokens[$i][1], $tokens[$i + 2][1]);
-	    if (defined($name) && defined($value)) {
-		if ($name eq 'image') {
-		    $in_generic = ($value =~ m|^/vmlinuz(?:\.old)?$|);
-		} elsif ($in_generic) {
-		    if ($name =~ /^(?:boot|root)$/) {
-			push @bdevs, $value;
-		    } elsif ($name =~ /^(?:addappend|append|literal)$/) {
-			push @bdevs, kernel_list($value);
-		    }
-		}
-	    }
-	    $i += 3;
-	} else {
-	    $i += 1;
-	}
-    }
-
-    return @bdevs;
-}
-
-sub _lilo_update {
-    my ($old, $new, $map, $replace) = @_;
-    my @tokens = lilo_tokenize($old);
-    my $i = 0;
-    my $in_generic = 1; # global or image=/vmlinuz or image=/vmlinuz.old
-
-    while ($i <= $#tokens) {
-	my $text = $tokens[$i][0];
-
-	if ($#tokens - $i >= 2 &&
-	    defined($tokens[$i + 1][1]) && $tokens[$i + 1][1] eq '=') {
-	    my ($name, $value) = ($tokens[$i][1], $tokens[$i + 2][1]);
-	    my $new_value;
-	    if (defined($name) && defined($value)) {
-		if ($name eq 'image') {
-		    $in_generic = ($value =~ m|^/vmlinuz(?:\.old)?$|);
-		} elsif ($in_generic) {
-		    if ($name eq 'boot') {
-			# 'boot' is used directly by the lilo command, which
-			# doesn't use libblkid
-			$new_value = $map->{$value} && id_to_path($map->{$value});
-		    } elsif ($name eq 'root') {
-			# 'root' adds a root parameter to the kernel command
-			# line
-			$new_value = $map->{$value};
-		    } elsif ($name =~ /^(?:addappend|append|literal)$/) {
-			# These are all destined for the kernel command line
-			# in some way
-			$new_value = kernel_update($value, $map);
-		    }
-		}
-	    }
-	    if (defined($new_value)) {
-		$new_value =~ s/\\/\\\\/g;
-		$text = &{$replace}($name, $value, $new_value) ||
-		    "\n# $name = $value\n$name = \"$new_value\"\n";
-	    } else {
-		$text .= $tokens[$i + 1][0] . $tokens[$i + 2][0];
-	    }
-	    $i += 3;
-	} else {
-	    $i += 1;
-	}
-
-	$new->print($text);
-    }
-}
-
-sub lilo_update {
-    my ($old, $new, $map) = @_;
-    _lilo_update($old, $new, $map, sub { return undef });
-}
-
-sub lilo_post {
-    system('lilo');
-}
-
-### SILO
-
-sub silo_post {
-    system('silo');
-}
-
-### Yaboot
-
-sub yaboot_post {
-    system('ybin');
-}
-
-### ELILO
-
-sub elilo_update {
-    my ($old, $new, $map) = @_;
-    # Work around bug #581173 - boot value must have no space before
-    # and no quotes around it.
-    sub replace {
-	my ($name, $value, $new_value) = @_;
-	return ($name eq 'boot') ? "# boot=$value\nboot=$new_value\n" : undef;
-    }
-    _lilo_update($old, $new, $map, \&replace);
-}
-
-sub elilo_post {
-    system('elilo');
-}
-
-### extlinux
-
-sub extlinux_old_path {
-    for ('/boot/extlinux', '/boot/boot/exlinux', '/extlinux') {
-	if (-e) {
-	    return "$_/options.cfg";
-	}
-    }
-    return undef;
-}
-
-sub extlinux_old_list {
-    my ($file) = @_;
-    while (<$file>) {
-	if (/^## ROOT=(.*)/) {
-	    return kernel_list($1);
-	}
-    }
-    return ();
-}
-
-sub extlinux_old_update {
-    my ($old, $new, $map) = @_;
-    while (<$old>) {
-	my $text = $_;
-	if (/^## ROOT=(.*)/) {
-	    my $new_params = kernel_update($1, $map);
-	    if (defined($new_params)) {
-		$text = "## $text" . "## ROOT=$new_params\n";
-	    }
-	}
-	$new->print($text);
-    }
-}
-
-sub extlinux_new_list {
-    my ($file) = @_;
-    while (<$file>) {
-	if (/^# ROOT=(.*)/) {
-	    return kernel_list($1);
-	}
-    }
-    return ();
-}
-
-sub extlinux_new_update {
-    my ($old, $new, $map) = @_;
-    while (<$old>) {
-	my $text = $_;
-	if (/^# ROOT=(.*)/) {
-	    my $new_params = kernel_update($1, $map);
-	    if (defined($new_params)) {
-		$text = "## $text" . "# ROOT=$new_params\n";
-	    }
-	}
-	$new->print($text);
-    }
-}
-
-sub extlinux_post {
-    system('update-extlinux');
-}
-
-# udev persistent-cd
-
-sub udev_next {
-    my ($file) = @_;
-    my @results = ();
-
-    # Based on parse_file() and get_key() in udev-rules.c
-    while (1) {
-	my $text = <$file>;
-	last if !defined($text) || $text eq '';
-
-	if ($text =~ /^\s*(?:#|$)/) {
-	    push @results, [$text];
-	} else {
-	    my $end_pos = 0;
-	    while ($text =~ /\G [\s,]* ((?:[^\s=+!:]|[+!:](?!=))+)
-                         \s* ([=+!:]?=) "([^"]*)"/gx) {
-		push @results, [$&, $1, $2, $3];
-		$end_pos = pos($text);
-	    }
-	    push @results, [substr($text, $end_pos)];
-	    last if $text !~ /\\\n$/;
-	}
-    }
-
-    return @results;
-}
-
-sub udev_parse_symlink_rule {
-    my ($path, $symlink);
-    for (@_) {
-	my ($text, $key, $op, $value) = @$_;
-	next if !defined($key);
-	if ($key eq 'ENV{ID_PATH}' && $op eq '==') {
-	    $path = $value;
-	} elsif ($key eq 'SYMLINK' && $op eq '+=') {
-	    $symlink = $value;
-	}
-    }
-    return ($path, $symlink);
-}
-
-# Find symlink rules using IDE device paths that aren't matched by rules
-# using the corresponding SCSI device path.  Return an array containing
-# the corresponding path for each rule where this is the case and undef
-# for all other rules.
-sub udev_cd_find_unmatched_ide_rules {
-    my ($file) = @_;
-    my %wanted_rule;
-    my @unmatched;
-    my $i = 0;
-
-    while (1) {
-	my @keys = udev_next($file);
-	last if $#keys < 0;
-
-	my ($path, $symlink) = udev_parse_symlink_rule(@keys);
-	if (defined($path) && defined($symlink)) {
-	    if ($path =~ /-ide-\d+:\d+$/) {
-		# libata uses the PATA controller and device numbers
-		# as SCSI host number and bus id.  Channel number and
-		# LUN are always 0.  The parent device path should
-		# stay the same.
-		$path =~ s/-ide-(\d+):(\d+)$/-scsi-$1:0:$2:0/;
-		my $rule_key =  $path . ' ' . $symlink;
-		if (!exists($wanted_rule{$rule_key})) {
-		    $wanted_rule{$rule_key} = $i;
-		    $unmatched[$i] = $path;
-		}
-	    } elsif ($path =~ /-scsi-\d+:\d+:\d+:\d+$/) {
-		my $rule_key =  $path . ' ' . $symlink;
-		my $j = $wanted_rule{$rule_key};
-		if (defined($j) && $j >= 0) {
-		    $unmatched[$j] = undef;
-		}
-		$wanted_rule{$rule_key} = -1;
-	    }
-	}
-
-	++$i;
-    }
-
-    return @unmatched;
-}
-
-sub udev_cd_needs_update {
-    my ($file) = @_;
-    my %paths;
-    for (udev_cd_find_unmatched_ide_rules($file)) {
-	if (defined($_)) {
-	    $paths{$_} = 1;
-	}
-    }
-    return join('\n', map({"+ PATH=$_"} keys(%paths)));
-}
-
-sub udev_cd_update {
-    my ($old, $new) = @_; # ignore map
-
-    # Find which rules we will need to copy and edit, then rewind
-    my @unmatched = udev_cd_find_unmatched_ide_rules($old);
-    $old->seek(0, 0);
-
-    my $i = 0;
-    while (1) {
-	my @keys = udev_next($old);
-	last if $#keys < 0;
-
-	my $old_text = '';
-	my $new_text = '';
-
-	for (@keys) {
-	    my ($text, $key, $op, $value) = @$_;
-	    $old_text .= $text;
-	    next unless defined($unmatched[$i]) && defined($key);
-
-	    if ($key eq 'ENV{ID_PATH}' && $op eq '==') {
-		my $value = $unmatched[$i];
-		$new_text .= ", $key$op\"$value\"";
-	    } else {
-		$new_text .= $text;
-	    }
-	}
-
-	$new->print($old_text);
-	if ($unmatched[$i]) {
-	    $new->print($new_text . "\n");
-	}
-
-	++$i;
-    }
-}
-
-# initramfs-tools resume
-
-sub initramfs_resume_list {
-    my ($file) = @_;
-    my @results = ();
-
-    while (1) {
-	my ($text, $name, $value) = shellvars_next($file);
-	last unless defined($text);
-	if (defined($name) && $name eq 'RESUME') {
-	    $results[0] = $value;
-	}
-    }
-
-    return @results;
-}
-
-sub initramfs_resume_update {
-    my ($old, $new, $map) = @_;
-
-    while (1) {
-	my ($text, $name, $value) = shellvars_next($old);
-	last unless defined($text);
-	if (defined($name) && $name eq 'RESUME' &&
-	    defined(my $new_value = $map->{$value})) {
-	    $text =~ s/^/# /gm;
-	    $text .= sprintf("%s=%s\n", $name, shellvars_quote($new_value));
-	}
-	$new->print($text);
-    }
-}
-
-# uswsusp resume
-
-sub uswsusp_next {
-    # Based on parse_line() in config_parser.c
-
-    my ($file) = @_;
-    my $text = <$file>;
-
-    if (!defined($text) || $text eq '') {
-	return ();
-    }
-
-    local $_ = $text;
-    s/^\s*(?:#.*)?//;
-    s/\s*$//;
-
-    if ($text =~ /^([\w ]*\w)[ \t]*[:=][ \t]*(.+)$/) {
-	return ($text, $1, $2);
-    } else {
-	return ($text);
-    }
-}
-
-sub uswsusp_resume_list {
-    my ($file) = @_;
-    my @results = ();
-
-    while (1) {
-	my ($text, $name, $value) = uswsusp_next($file);
-	last unless defined($text);
-	if (defined($name) && $name eq 'resume device') {
-	    $results[0] = $value;
-	}
-    }
-
-    return @results;
-}
-
-sub uswsusp_resume_update {
-    my ($old, $new, $map) = @_;
-
-    while (1) {
-	my ($text, $name, $value) = uswsusp_next($old);
-	last unless defined($text);
-	if (defined($name) && $name eq 'resume device' &&
-	    defined(my $new_value = $map->{$value})) {
-	    $text =~ s/^/# /gm;
-	    $text .= sprintf("%s = %s\n", $name, id_to_path($new_value));
-	}
-	$new->print($text);
-    }
-}
-
-# cryptsetup
-
-sub cryptsetup_next {
-    my ($file) = @_;
-    my $text = <$file>;
-    unless (defined($text)) {
-	return ();
-    }
-
-    my $line = $text;
-    if ($line =~ /^\s*(#|$)/) {
-	return ($text);
-    } else {
-	$line =~ s/\s*$//;
-	$line =~ s/^\s*//;
-	return ($text, split(/\s+/, $line, 4));
-    }
-}
-
-sub cryptsetup_list {
-    my ($file) = @_;
-    my (@results) = ();
-
-    while (1) {
-	my ($text, undef, $src) = cryptsetup_next($file);
-	last unless defined($text);
-	if (defined($src)) {
-	    push @results, $src;
-	}
-    }
-
-    return @results;
-}
-
-sub cryptsetup_update {
-    my ($old, $new, $map) = @_;
-
-    while (1) {
-	my ($text, $dst, $src, $key, $opts) = cryptsetup_next($old);
-	last unless defined($text);
-	if (defined($src) && defined($map->{$src})) {
-	    $text = "# $text" .
-		join(' ', $dst, $map->{$src}, $key, $opts) . "\n";
-	}
-	$new->print($text);
-    }
-}
-
-# hdparm
-
-sub hdparm_list {
-    my ($file) = @_;
-    my (@results) = ();
-
-    # I really can't be bothered to parse this mess.  Just see if
-    # there's anything like a device name on a non-comment line.
-    while (<$file>) {
-	if (!/^\s*#/) {
-	    push @results, grep({m|^/dev/|} split(/\s+/));
-	}
-    }
-
-    return @results;
-}
-
-### mdadm
-
-sub mdadm_list {
-    my ($file) = @_;
-    my (@results) = ();
-
-    while (<$file>) {
-	# Look for DEVICE (case-insensitive, may be abbreviated to as
-	# little as 3 letters) followed by a whitespace-separated list
-	# of devices (or wildcards, or keywords!).  Ignore comments
-	# (hash preceded by whitespace).
-	if (/^DEV(?:I(?:C(?:E)?)?)?[ \t]*((?:[^ \t]|[ \t][^#])*)/i) {
-	    push @results, split(/[ \t]+/, $1);
-	}
-    }
-
-    return @results;
-}
-
-### list of all configuration files and functions
-
-my @config_files = ({packages => 'mount',
-		     path => '/etc/fstab',
-		     list => \&fstab_list,
-		     update => \&fstab_update},
-		    {packages => 'grub grub-legacy',
-		     path => grub1_path(),
-		     list => \&grub1_list,
-		     update => \&grub1_update,
-		     post_update => \&grub1_post,
-		     is_boot_loader => 1},
-		    {packages => 'grub-common',
-		     path => '/etc/default/grub',
-		     list => \&grub2_list,
-		     update => \&grub2_update,
-		     post_update => \&grub2_post,
-		     is_boot_loader => 1},
-		    {packages => 'lilo',
-		     path => '/etc/lilo.conf',
-		     list => \&lilo_list,
-		     update => \&lilo_update,
-		     post_update => \&lilo_post,
-		     is_boot_loader => 1},
-		    {packages => 'silo',
-		     path => '/etc/silo.conf',
-		     list => \&lilo_list,
-		     update => \&lilo_update,
-		     post_update => \&silo_post,
-		     is_boot_loader => 1},
-		    {packages => 'quik',
-		     path => '/etc/quik.conf',
-		     list => \&lilo_list,
-		     update => \&lilo_update,
-		     is_boot_loader => 1},
-		    {packages => 'yaboot',
-		     path => '/etc/yaboot.conf',
-		     list => \&lilo_list,
-		     update => \&lilo_update,
-		     post_update => \&yaboot_post,
-		     is_boot_loader => 1},
-		    {packages => 'elilo',
-		     path => '/etc/elilo.conf',
-		     list => \&lilo_list,
-		     update => \&elilo_update,
-		     post_update => \&elilo_post,
-		     is_boot_loader => 1},
-		    {packages => 'extlinux',
-		     path => extlinux_old_path(),
-		     list => \&extlinux_old_list,
-		     update => \&extlinux_old_update,
-		     post_update => \&extlinux_post,
-		     is_boot_loader => 1},
-		    {packages => 'extlinux',
-		     path => '/etc/default/extlinux',
-		     list => \&extlinux_new_list,
-		     update => \&extlinux_new_update,
-		     post_update => \&extlinux_post,
-		     is_boot_loader => 1},
-		    {packages => 'udev',
-		     path => '/etc/udev/rules.d/70-persistent-cd.rules',
-		     needs_update => \&udev_cd_needs_update,
-		     update => \&udev_cd_update},
-		    {packages => 'initramfs-tools',
-		     path => '/etc/initramfs-tools/conf.d/resume',
-		     list => \&initramfs_resume_list,
-		     update => \&initramfs_resume_update,
-		     # udev will source all files in this directory,
-		     # with few exceptions.  Such as including a '^'.
-		     suffix => '^old'},
-		    {packages => 'uswsusp',
-		     path => '/etc/uswsusp.conf',
-		     list => \&uswsusp_resume_list,
-		     update => \&uswsusp_resume_update},
-		    {packages => 'cryptsetup',
-		     path => '/etc/crypttab',
-		     list => \&cryptsetup_list,
-		     update => \&cryptsetup_update},
-		    # mdadm.conf requires manual update because it may
-		    # contain wildcards.
-		    {packages => 'mdadm',
-		     path => '/etc/mdadm/mdadm.conf',
-		     list => \&mdadm_list},
-		    # hdparm.conf requires manual update because it
-		    # (1) refers to whole disks (2) might not work
-		    # properly with the new drivers (3) is in a very
-		    # special format.
-		    {packages => 'hdparm',
-		     path => '/etc/hdparm.conf',
-		     list => \&hdparm_list});
-
-### Filesystem labels and UUIDs
-
-sub ext2_set_label {
-    my ($bdev, $label) = @_;
-    system('tune2fs', '-L', $label, $bdev) == 0 or die "tune2fs failed: $?";
-}
-sub ext2_set_uuid {
-    my ($bdev, $uuid) = @_;
-    system('tune2fs', '-U', $uuid, $bdev) == 0 or die "tune2fs failed: $?";
-}
-
-sub jfs_set_label {
-    my ($bdev, $label) = @_;
-    system('jfs_tune', '-L', $label, $bdev) == 0 or die "jfs_tune failed: $?";
-}
-sub jfs_set_uuid {
-    my ($bdev, $uuid) = @_;
-    system('jfs_tune', '-U', $uuid, $bdev) == 0 or die "jfs_tune failed: $?";
-}
-
-sub fat_set_label {
-    my ($bdev, $label) = @_;
-    system('dosfslabel', $bdev, $label) == 0 or die "dosfslabel failed: $?";
-}
-
-sub ntfs_set_label {
-    my ($bdev, $label) = @_;
-    system('ntfslabel', $bdev, $label) == 0 or die "ntfslabel failed: $?";
-}
-
-sub reiserfs_set_label {
-    my ($bdev, $label) = @_;
-    system('reiserfstune', '--label', $label, $bdev)
-	or die "reiserfstune failed: $?";
-}
-sub reiserfs_set_uuid {
-    my ($bdev, $uuid) = @_;
-    system('reiserfstune', '--uuid', $uuid, $bdev)
-	or die "reiserfstune failed: $?";
-}
-
-# There is no command to relabel swap, and we mustn't run mkswap if
-# the partition is already in use.  Thankfully the header format is
-# pretty simple; it starts with this structure:
-# struct swap_header_v1_2 {
-# 	char	      bootbits[1024];    /* Space for disklabel etc. */
-# 	unsigned int  version;
-# 	unsigned int  last_page;
-# 	unsigned int  nr_badpages;
-# 	unsigned char uuid[16];
-# 	char	      volume_name[16];
-# 	unsigned int  padding[117];
-# 	unsigned int  badpages[1];
-# };
-# and has the signature 'SWAPSPACE2' at the end of the first page.
-use constant { SWAP_SIGNATURE => 'SWAPSPACE2',
-	       SWAP_UUID_OFFSET => 1036, SWAP_UUID_LEN => 16,
-	       SWAP_LABEL_OFFSET => 1052, SWAP_LABEL_LEN => 16 };
-sub _swap_set_field {
-    my ($bdev, $offset, $value) = @_;
-    my $pagesize = POSIX::sysconf(POSIX::_SC_PAGESIZE) or die "$!";
-    my ($length, $signature);
-
-    my $fd = POSIX::open($bdev, POSIX::O_RDWR);
-    defined($fd) or die "$!";
-
-    # Check the signature
-    POSIX::lseek($fd, $pagesize - length(SWAP_SIGNATURE), POSIX::SEEK_SET);
-    $length = POSIX::read($fd, $signature, length(SWAP_SIGNATURE));
-    if (!defined($length) || $signature ne SWAP_SIGNATURE) {
-	POSIX::close($fd);
-	die "swap signature not found on $bdev";
-    }
-
-    # Set the field
-    POSIX::lseek($fd, $offset, POSIX::SEEK_SET);
-    $length = POSIX::write($fd, $value, length($value));
-    if (!defined($length) || $length != length($value)) {
-	my $error = "$!";
-	POSIX::close($fd);
-	die $error;
-    }
-
-    POSIX::close($fd);
-}
-sub swap_set_label {
-    my ($bdev, $label) = @_;
-    _swap_set_field($bdev, SWAP_LABEL_OFFSET, pack('Z' . SWAP_LABEL_LEN, $label));
-}
-sub swap_set_uuid {
-    my ($bdev, $uuid) = @_;
-    my $uuid_bin;
-    if (UUID::parse($uuid, $uuid_bin) != 0 ||
-	length($uuid_bin) != SWAP_UUID_LEN) {
-	die "internal error: invalid UUID string";
-    }
-    _swap_set_field($bdev, SWAP_UUID_OFFSET, $uuid_bin);
-}
-
-sub ufs_set_label {
-    my ($bdev, $label) = @_;
-    system('tunefs.ufs', '-L', $label, $bdev) or die "tunefs.ufs failed: $?";
-}
-
-sub xfs_set_label {
-    my ($bdev, $label) = @_;
-    system('xfs_admin', '-L', $label, $bdev) or die "xfs_admin failed: $?";
-}
-sub xfs_set_uuid {
-    my ($bdev, $uuid) = @_;
-    system('xfs_admin', '-U', $uuid, $bdev) or die "xfs_admin failed: $?";
-}
-
-my %filesystem_types = (
-    ext2     => { label_len => 16,             set_label => \&ext2_set_label,
-		  set_uuid  => \&ext2_set_uuid },
-    ext3     => { label_len => 16,             set_label => \&ext2_set_label,
-		  set_uuid  => \&ext2_set_uuid },
-    ext4     => { label_len => 16,             set_label => \&ext2_set_label,
-		  set_uuid  => \&ext2_set_uuid },
-    jfs      => { label_len => 16,             set_label => \&jfs_set_label,
-		  set_uuid  => \&jfs_set_uuid },
-    msdos    => { label_len => 11,             set_label => \&fat_set_label },
-    ntfs     => { label_len => 128,            set_label => \&ntfs_set_label },
-    reiserfs => { label_len => 16,             set_label => \&reiserfs_set_label,
-		  set_uuid  => \&reiserfs_set_uuid },
-    swap     => { label_len => SWAP_LABEL_LEN, set_label => \&swap_set_label,
-		  set_uuid  => \&swap_set_uuid },
-    ufs      => { label_len => 32,             set_label => \&ufs_set_label },
-    vfat     => { label_len => 11,             set_label => \&fat_set_label },
-    xfs      => { label_len => 12,             set_label => \&xfs_set_label,
-		  set_uuid  => \&xfs_set_uuid }
-    );
-
-my %bdev_map;
-my %id_map;
-
-sub scan_config_files {
-    my @configs;
-
-    # Find all IDE/SCSI disks mentioned in configurations
-    for my $config (@config_files) {
-	# Is the file present?
-	my $path = $config->{path};
-	if (!defined($path)) {
-	    next;
-	}
-	my $file = new FileHandle($path, 'r');
-	if (!defined($file)) {
-	    if ($! == POSIX::ENOENT) {
-		next;
-	    }
-	    die "$!";
-	}
-
-	# Are any of the related packages wanted or installed?
-	my $wanted = 0;
-	my $installed = 0;
-	my $packages = $config->{packages};
-	for (`dpkg-query 2>/dev/null --showformat '\${status}\\n' -W $packages`)
-	{
-	    $wanted = 1 if /^install /;
-	    $installed = 1 if / installed\n$/;
-	}
-	if (!$wanted && !$installed) {
-	    next;
-	}
-
-	my @matched_bdevs = ();
-	my $id_map_text;
-	my $needs_update;
-
-	if (exists($config->{needs_update})) {
-	    $id_map_text = &{$config->{needs_update}}($file);
-	    $needs_update = defined($id_map_text) && $id_map_text ne '';
-	} elsif (exists($config->{list})) {
-	    for my $bdev (&{$config->{list}}($file)) {
-		# Match standard IDE and SCSI device names, plus wildcards
-		# in disk device names to allow for mdadm insanity.
-		if ($bdev =~ m{^/dev/(?:[hs]d[a-z\?\*][\d\?\*]*|
-                                        s(?:cd|r)\d+)$}x &&
-		    ($bdev =~ m/[\?\*]/ || -b $bdev)) {
-		    $bdev_map{$bdev} = {};
-		    push @matched_bdevs, $bdev;
-		}
-	    }
-	    $needs_update = @matched_bdevs > 0;
-	} else {
-	    # Needs manual update
-	    $needs_update = 1;
-	}
-
-	push @configs, {config => $config,
-			devices => \@matched_bdevs,
-			id_map_text => $id_map_text,
-			installed => $installed,
-			needs_update => $needs_update};
-    }
-
-    my $fstab = new FileHandle('/etc/fstab', 'r') or die "$!";
-    while (1) {
-	my ($text, $bdev, $path, $type) = fstab_next($fstab);
-	last unless defined($text);
-	if (defined($type) && exists($bdev_map{$bdev})) {
-	    $bdev_map{$bdev}->{path} = $path;
-	    $bdev_map{$bdev}->{type} = $type;
-	}
-    }
-    $fstab->close();
-
-    return @configs;
-}
-
-sub add_tag {
-    # Map disks to labels/UUIDs and vice versa.  Include all disks in
-    # the reverse mapping so we can detect ambiguity.
-    my ($bdev, $name, $value, $new) = @_;
-    my $id = "$name=$value";
-    push @{$id_map{$id}}, $bdev;
-    if (exists($bdev_map{$bdev})) {
-	$bdev_map{$bdev}->{$name} = $value;
-	push @{$bdev_map{$bdev}->{ids}}, $id;
-    }
-    if ($new) {
-	$bdev_map{$bdev}->{new_id} = $id;
-    }
-}
-
-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 -s TYPE';
-    }
-    for (`blkid -o device`) {
-	chomp;
-	my $bdev = $_;
-	for (`$id_command '$bdev'`) {
-	    if (/^ID_FS_(LABEL|UUID)_ENC=(.+)\n$/) {
-		add_tag($bdev, $1, $2);
-	    } elsif (/^ID_FS_TYPE=(.+)\n$/ && exists($bdev_map{$bdev})) {
-		$bdev_map{$bdev}->{type} //= $1;
-	    }
-	}
-    }
-
-    # Discard UUIDs for LVM2 PVs, as we assume there are symlinks for all
-    # UUIDs under /dev/disk/by-uuid and this is not true for PVs.
-    # Discard all labels and UUIDs(!) that are ambiguous.
-    # Discard all labels with 'unsafe' characters (escaped by blkid using
-    # backslashes) as they will not be usable in all configuration files.
-    # Similarly for '#' which blkid surprisingly does not consider unsafe.
-    # Sort each device's IDs in reverse lexical order so that UUIDs are
-    # preferred.
-    for my $bdev (keys(%bdev_map)) {
-	if ($bdev_map{$bdev}->{type} eq 'LVM2_member') {
-	    @{$bdev_map{$bdev}->{ids}} = ();
-	} else {
-	    @{$bdev_map{$bdev}->{ids}} =
-		sort({$b cmp $a}
-		     grep({ @{$id_map{$_}} == 1 && $_ !~ /[\\#]/ }
-			  @{$bdev_map{$bdev}->{ids}}));
-	}
-    }
-
-    # Add persistent aliases for CD/DVD/BD drives
-    my $cd_rules =
-	new FileHandle('/etc/udev/rules.d/70-persistent-cd.rules', 'r');
-    while (defined($cd_rules)) {
-	my @keys = udev_next($cd_rules);
-	last if $#keys < 0;
-
-	my ($path, $symlink) = udev_parse_symlink_rule(@keys);
-	if (defined($path) && defined($symlink)) {
-	    $symlink =~ s{^(?!/)}{/dev/};
-	    my $bdev = readlink($symlink) or next;
-	    $bdev =~ s{^(?!/)}{/dev/};
-	    if (exists($bdev_map{$bdev})) {
-		push @{$bdev_map{$bdev}->{ids}}, $symlink;
-	    }
-	}
-    }
-}
-
-sub assign_new_ids {
-    my $hostname = (POSIX::uname())[1];
-
-    # For all devices that have no alternate device ids, suggest setting
-    # UUIDs, labelling them based on fstab or just using a generic label.
-    for my $bdev (keys(%bdev_map)) {
-	next if $#{$bdev_map{$bdev}->{ids}} >= 0;
-
-	my $type = $bdev_map{$bdev}->{type};
-	next unless defined($type) && exists($filesystem_types{$type});
-
-	if (defined($filesystem_types{$type}->{set_uuid})) {
-	    my ($uuid_bin, $uuid);
-	    UUID::generate($uuid_bin);
-	    UUID::unparse($uuid_bin, $uuid);
-	    add_tag($bdev, 'UUID', $uuid, 1);
-	    next;
-	}
-
-	my $label_len = $filesystem_types{$type}->{label_len};
-	my $label;
-	use bytes; # string lengths are in bytes
-
-	if (defined($bdev_map{$bdev}->{path})) {
-	    # Convert path/type to label; prepend hostname if possible;
-	    # append numeric suffix if necessary.
-
-	    my $base;
-	    if ($bdev_map{$bdev}->{path} =~ m|^/|) {
-		$base = $bdev_map{$bdev}->{path};
-	    } else {
-		$base = $bdev_map{$bdev}->{type};
-	    }
-	    $base =~ s/[^\w]+/-/g;
-	    $base =~ s/^-//g;
-	    $base =~ s/-$//g;
-
-	    my $n = 0;
-	    my $suffix = '';
-	    do {
-		$label = "$hostname-$base$suffix";
-		if (length($label) > $label_len) {
-		    $label = substr($base, 0, $label_len - length($suffix))
-			. $suffix;
-		}
-		$n++;
-		$suffix = "-$n";
-	    } while (exists($id_map{"LABEL=$label"}));
-	} else {
-	    my $n = 0;
-	    my $suffix;
-	    do {
-		$n++;
-		$suffix = "-$n";
-		$label = substr($hostname, 0, $label_len - length($suffix))
-		    . $suffix;
-	    } while (exists($id_map{"LABEL=$label"}));
-	}
-
-	add_tag($bdev, 'LABEL', $label, 1);
-    }
-}
-
-sub set_new_ids {
-    for my $bdev (keys(%bdev_map)) {
-	my $bdev_info = $bdev_map{$bdev};
-	if ($bdev_info->{new_id}) {
-	    my ($name, $value) = split(/=/, $bdev_info->{new_id}, 2);
-	    my $setter;
-	    if ($name eq 'UUID') {
-		$setter = $filesystem_types{$bdev_info->{type}}->{set_uuid};
-	    } elsif ($name eq 'LABEL') {
-		$setter = $filesystem_types{$bdev_info->{type}}->{set_label};
-	    }
-	    defined($setter) or die "internal error: invalid new_id type";
-	    &{$setter}($bdev, $value);
-	}
-    }
-}
-
-sub update_config {
-    my $map = shift;
-
-    for my $match (@_) {
-	# Generate a new config
-	my $path = $match->{config}->{path};
-	my $old = new FileHandle($path, 'r') or die "$!";
-	my $new = new FileHandle("$path.new", POSIX::O_WRONLY | POSIX::O_CREAT,
-				 0600)
-	    or die "$!";
-	&{$match->{config}->{update}}($old, $new, $map);
-	$old->close();
-	$new->close();
-
-	# New config should have same permissions as the old
-	my (undef, undef, $mode, undef, $uid, $gid) = stat($path) or die "$!";
-	chown($uid, $gid, "$path.new") or die "$!";
-	chmod($mode & 07777, "$path.new") or die "$!";
-
-	# Back up the old config and replace with the new
-	my $old_path = $path . ($match->{config}->{suffix} || '.old');
-	unlink($old_path);
-	link($path, $old_path) or die "$!";
-	rename("$path.new", $path) or die "$!";
-
-	# If the package is installed, run the post-update function
-	if ($match->{installed} && $match->{config}->{post_update}) {
-	    &{$match->{config}->{post_update}}();
-	}
-    }
-}
-
-sub update_all {
-    # The update process may be aborted if a command fails, but we now
-    # want to recover and ask the user what to do.  We can use 'do' to
-    # prevent 'die' from exiting the process, but we also need to
-    # capture and present error messages using debconf as they may
-    # otherwise be hidden.  Therefore, we fork and capture stdout and
-    # stderr from the update process in the main process.
-    my $pid = open(PIPE, '-|');
-    return (-1, '') unless defined $pid;
-
-    if ($pid == 0) {
-	# Complete redirection
-	# </dev/null
-	POSIX::close(0);
-	POSIX::open('/dev/null', POSIX::O_RDONLY) or die "$!";
-	# 2>&1
-	POSIX::dup2(1, 2) or die "$!";
-
-	# Do the update
-	set_new_ids();
-	update_config(@_);
-	exit;
-    } else {
-	my @output = ();
-	while (<PIPE>) {
-	    push @output, $_;
-	}
-	close(PIPE);
-	return ($?, join('', @output));
-    }
-}
-
-sub transition {
-    use Debconf::Client::ConfModule ':all';
-
-retry:
-    %bdev_map = ();
-    %id_map = ();
-
-    my @found_configs = scan_config_files();
-    my @matched_configs = grep({$_->{needs_update}} @found_configs);
-    my @auto_configs = grep({defined($_->{config}->{update})} @matched_configs);
-    my $found_boot_loader =
-	grep({$_->{config}->{is_boot_loader} && $_->{installed}} @found_configs);
-    my %update_map = ();
-
-    # We can skip all of this if we didn't find any configuration
-    # files that need conversion and we found the configuration file
-    # for an installed boot loader.
-    if (!@matched_configs && $found_boot_loader) {
-	return;
-    }
-
-    my ($question, $answer, $ret, $seen);
-
-    $question = 'linux-base/disk-id-convert-auto';
-    ($ret, $seen) = input('high', $question);
-    if ($ret && $ret != 30) {
-	die "Error setting debconf question $question: $seen";
-    }
-    ($ret, $seen) = go();
-    if ($ret && $ret != 30) {
-	die "Error asking debconf question $question: $seen";
-    }
-    ($ret, $answer) = get($question);
-    die "Error retrieving answer for $question: $answer" if $ret;
-
-    if (@auto_configs && $answer eq 'true') {
-	scan_devices();
-	assign_new_ids();
-
-	# Construct the device ID update map
-	for my $bdev (keys(%bdev_map)) {
-	    if (@{$bdev_map{$bdev}->{ids}}) {
-		$update_map{$bdev} = $bdev_map{$bdev}->{ids}->[0];
-	    }
-	}
-
-	# Weed out configurations which will be unaffected by this
-	# mapping or by a custom mapping described in id_map_text.
-	@auto_configs = grep({ defined($_->{id_map_text}) ||
-				   grep({exists($update_map{$_})}
-					@{$_->{devices}}) }
-			     @auto_configs);
-    }
-
-    if (@auto_configs && $answer eq 'true') {
-	if (grep({$bdev_map{$_}->{new_id}} keys(%bdev_map))) {
-	    $question = 'linux-base/disk-id-convert-plan';
-	    ($ret, $seen) = subst($question, 'relabel',
-				  join("\\n",
-				       map({sprintf("%s: %s",
-						    $_, $bdev_map{$_}->{new_id})}
-					   grep({$bdev_map{$_}->{new_id}}
-						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", $_, $update_map{$_})}
-				       keys(%update_map)),
-				   grep({defined}
-					map({$_->{id_map_text}} @auto_configs))));
-	die "Error setting debconf substitutions in $question: $seen" if $ret;
-	($ret, $seen) = subst($question, 'files',
-			      join(', ',
-				   map({$_->{config}->{path}} @auto_configs)));
-	die "Error setting debconf substitutions in $question: $seen" if $ret;
-	($ret, $seen) = input('high', $question);
-	if ($ret && $ret != 30) {
-	    die "Error setting debconf question $question: $seen";
-	}
-	($ret, $seen) = go();
-	if ($ret && $ret != 30) {
-	    die "Error asking debconf question $question: $seen";
-	}
-	($ret, $answer) = get($question);
-	die "Error retrieving answer for $question: $answer" if $ret;
-    
-	if ($answer eq 'true') {
-	    my ($rc, $output) = update_all(\%update_map, @auto_configs);
-	    if ($rc != 0) {
-		# Display output of update commands
-		$question = 'linux-base/disk-id-update-failed';
-		$output =~ s/\n/\\n/g;
-		($ret, $seen) = subst($question, 'output', $output);
-		die "Error setting debconf substitutions in $question: $seen"
-		    if $ret;
-		($ret, $seen) = input('high', $question);
-		if ($ret && $ret != 30) {
-		    die "Error setting debconf question $question: $seen";
-		}
-		($ret, $seen) = go();
-		if ($ret && $ret != 30) {
-		    die "Error asking debconf question $question: $seen";
-		}
-
-		# Mark previous questions as unseen
-		fset('linux-base/disk-id-convert-auto', 'seen', 'false');
-		fset('linux-base/disk-id-convert-plan', 'seen', 'false');
-		fset('linux-base/disk-id-convert-plan-no-relabel', 'seen',
-		     'false');
-		goto retry;
-	    }
-	}
-    }
-
-    my @unconv_files = ();
-    for my $match (@matched_configs) {
-	if (!defined($match->{config}->{update})) {
-	    push @unconv_files, $match->{config}->{path};
-	} else {
-	    my @unconv_bdevs = grep({!exists($update_map{$_})}
-				    @{$match->{devices}});
-	    if (@unconv_bdevs) {
-		push @unconv_files, sprintf('%s: %s', $match->{config}->{path},
-					    join(', ',@unconv_bdevs));
-	    }
-	}
-    }
-    if (@unconv_files) {
-	$question = 'linux-base/disk-id-manual';
-	($ret, $seen) = subst($question, 'unconverted',
-			      join("\\n", @unconv_files));
-	die "Error setting debconf substitutions in $question: $seen" if $ret;
-	($ret, $seen) = input('high', $question);
-	if ($ret && $ret != 30) {
-	    die "Error setting debconf note $question: $seen";
-	}
-	($ret, $seen) = go();
-	if ($ret && $ret != 30) {
-	    die "Error showing debconf note $question: $seen";
-	}
-    }
-
-    # Also note whether some (unknown) boot loader configuration file
-    # must be manually converted.
-    if (!$found_boot_loader) {
-	$question = 'linux-base/disk-id-manual-boot-loader';
-	($ret, $seen) = input('high', $question);
-	if ($ret && $ret != 30) {
-	    die "Error setting debconf note $question: $seen";
-	}
-	($ret, $seen) = go();
-	if ($ret && $ret != 30) {
-	    die "Error showing debconf note $question: $seen";
-	}
-    }
-}
-
-package DebianKernel::BootloaderConfig;
-
-my %default_bootloader = (amd64 => 'lilo',
-			  i386  => 'lilo',
-			  ia64  => 'elilo',
-			  s390  => 'zipl');
-
-sub check {
-    use Debconf::Client::ConfModule ':all';
-
-    my ($deb_arch) = @_;
-
-    # Is there an historical 'default' boot loader for this architecture?
-    my $loader_exec = $default_bootloader{$deb_arch};
-    return unless defined($loader_exec);
-
-    # Is the boot loader installed?
-    my ($loaderloc) = grep(-x, map("$_/$loader_exec",
-				   map({ length($_) ? $_ : "." }
-				       split(/:/, $ENV{PATH}))));
-    return unless defined($loaderloc);
-
-    # Is do_bootloader explicitly set one way or the other?
-    my $do_bootloader;
-    if (my $conf = new FileHandle('/etc/kernel-img.conf', 'r')) {
-	while (<$conf>) {
-	    $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();
-    }
-    return if defined($do_bootloader);
-
-    # Warn the user that do_bootloader is disabled by default.
-    my ($question, $ret, $seen);
-    $question = "linux-base/do-bootloader-default-changed";
-    ($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;
-}
-
-package main;
-
-capb('escape');
-
-sub version_lessthan {
-    my ($left, $right) = @_;
-    return system('dpkg', '--compare-versions', $left, 'lt', $right) == 0;
-}
-
-# No upgrade work is necessary during a fresh system installation.
-# But since linux-base is a new dependency of linux-image-* and did
-# not exist until needed for the libata transition, we cannot simply
-# test whether this is a fresh installation of linux-base.  Instead,
-# we test:
-# - does /etc/fstab exist yet (this won't even work without it), and
-# - are any linux-image-* packages installed yet?
-sub is_fresh_installation {
-    if (-f '/etc/fstab') {
-	for (`dpkg-query 2>/dev/null --showformat '\${status}\\n' -W 'linux-image-*'`) {
-	    return 0 if / installed\n$/;
-	}
-    }
-    return 1;
-}
-
-my $deb_arch = `dpkg --print-architecture`;
-chomp $deb_arch;
-
-if ($deb_arch ne 's390') {
-    my $libata_transition_ver =
-	($deb_arch eq 'i386' || $deb_arch eq 'amd64') ? '2.6.32-10' : '2.6.32-11';
-    if ($ARGV[0] eq 'reconfigure' || defined($ENV{DEBCONF_RECONFIGURE}) ||
-	(!is_fresh_installation() &&
-	 version_lessthan($ARGV[1], $libata_transition_ver))) {
-	DebianKernel::DiskId::transition();
-    }
-}
-
-if (!is_fresh_installation() && version_lessthan($ARGV[1], '2.6.32-18')) {
-    DebianKernel::BootloaderConfig::check($deb_arch);
-}
-
-exec("set -e\nset -- @ARGV\n" . << 'EOF');
-#DEBHELPER#
-EOF
diff --git a/debian/linux-base.templates b/debian/linux-base.templates
deleted file mode 100644
index 7fb502489..000000000
--- a/debian/linux-base.templates
+++ /dev/null
@@ -1,98 +0,0 @@
-# These templates have been reviewed by the debian-l10n-english
-# team
-#
-# If modifications/additions/rewording are needed, please ask
-# debian-l10n-english@lists.debian.org for advice.
-#
-# Even minor modifications require translation updates and such
-# changes should be coordinated with translators and reviewers.
-
-Template: linux-base/disk-id-convert-auto
-Type: boolean
-Default: true
-_Description: Update disk device IDs in system configuration?
- The new Linux kernel version provides different drivers for some PATA
- (IDE) controllers. The names of some hard disk, CD-ROM, and tape
- devices may change.
- .
- It is now recommended to identify disk devices in configuration files
- by label or UUID (unique identifier) rather than by device name,
- which will work with both old and new kernel versions.
- .
- If you choose to not update the system configuration automatically,
- you must update device IDs yourself before the next system reboot or
- the system may become unbootable.
-
-Template: linux-base/disk-id-convert-plan
-Type: boolean
-Default: true
-#flag:translate!:3,5,7
-_Description: Apply configuration changes to disk device IDs?
- These devices will be assigned UUIDs or labels:
- .
- ${relabel}
- .
- These configuration files will be updated:
- .
- ${files}
- .
- The device IDs will be changed as follows:
- .
- ${id_map}
-
-Template: linux-base/disk-id-convert-plan-no-relabel
-Type: boolean
-Default: true
-#flag:translate!:3,5
-_Description: Apply 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: error
-#flag:translate!:3
-_Description: Configuration files still contain deprecated device names
- The following configuration files still use some device names that may
- change when using the new kernel:
- .
- ${unconverted}
-
-Template: linux-base/disk-id-manual-boot-loader
-Type: error
-_Description: Boot loader configuration check needed
- The boot loader configuration for this system was not recognized. These
- settings in the configuration may need to be updated:
- .
-  * The root device ID passed as a kernel parameter;
-  * The boot device ID used to install and update the boot loader.
- .
- You should generally identify these devices by UUID or
- label. However, on MIPS systems the root device must be identified by
- name.
-
-Template: linux-base/disk-id-update-failed
-Type: error
-# Not yet translated
-Description: Failed to update disk device IDs
- An error occurred while attempting to update the system configuration:
- .
- ${output}
- .
- You can either correct this error and retry the automatic update,
- or choose to update the system configuration yourself.
-
-Template: linux-base/do-bootloader-default-changed
-Type: error
-_Description: Boot loader may need to be upgraded
- Kernel packages no longer update a default boot loader.
- .
- 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.
diff --git a/debian/po/POTFILES.in b/debian/po/POTFILES.in
index 0953af326..cff14fdf9 100644
--- a/debian/po/POTFILES.in
+++ b/debian/po/POTFILES.in
@@ -1,2 +1 @@
-[type: gettext/rfc822deb] linux-base.templates
 [type: gettext/rfc822deb] templates/temp.image.plain/templates
diff --git a/debian/po/ca.po b/debian/po/ca.po
index fe569893b..38469ec3f 100644
--- a/debian/po/ca.po
+++ b/debian/po/ca.po
@@ -16,127 +16,6 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#. Type: boolean
-#. Description
-#: ../linux-base.templates:2001
-msgid "Update disk device IDs in system configuration?"
-msgstr "Voleu actualitzar els ID dels dispositius de discs a la configuració?"
-
-#. Type: boolean
-#. Description
-#: ../linux-base.templates:2001
-msgid ""
-"The new Linux kernel version provides different drivers for some PATA (IDE) "
-"controllers. The names of some hard disk, CD-ROM, and tape devices may "
-"change."
-msgstr "La versió nova del nucli Linux proporciona diferents controladors per a alguns dispositius PATA (IDE). Els noms d'alguns discs durs, CD-ROM i dispositius de cinta poden canviar."
-
-#. Type: boolean
-#. Description
-#: ../linux-base.templates:2001
-msgid ""
-"It is now recommended to identify disk devices in configuration files by "
-"label or UUID (unique identifier) rather than by device name, which will "
-"work with both old and new kernel versions."
-msgstr "És recomanable que identifiqueu els dispositius de disc als fitxers de configuració per etiqueta o UUID (identificador únic) en lloc de pel seu nom de dispositiu, perquè així funcionaran amb les versions de nucli antiga i nova."
-
-#. Type: boolean
-#. Description
-#: ../linux-base.templates:2001
-msgid ""
-"If you choose to not update the system configuration automatically, you must "
-"update device IDs yourself before the next system reboot or the system may "
-"become unbootable."
-msgstr "Si trieu no actualitzar la configuració del sistema automàticament, heu d'actualitzar els ID dels dispositius manualment abans del pròxim reinici del sistema, o el sistema pot deixar d'arrencar."
-
-#. Type: boolean
-#. Description
-#. Type: boolean
-#. Description
-#: ../linux-base.templates:3001 ../linux-base.templates:4001
-msgid "Apply configuration changes to disk device IDs?"
-msgstr "Voleu aplicar els canvis de configuració als ID de dispositius de disc?"
-
-#. Type: boolean
-#. Description
-#: ../linux-base.templates:3001
-msgid "These devices will be assigned UUIDs or labels:"
-msgstr "S'assignaran UUID o etiquetes a aquests dispositius:"
-
-#. Type: boolean
-#. Description
-#. Type: boolean
-#. Description
-#: ../linux-base.templates:3001 ../linux-base.templates:4001
-msgid "These configuration files will be updated:"
-msgstr "S'actualitzaran aquests fitxers de configuració:"
-
-#. Type: boolean
-#. Description
-#. Type: boolean
-#. Description
-#: ../linux-base.templates:3001 ../linux-base.templates:4001
-msgid "The device IDs will be changed as follows:"
-msgstr "Els ID dels dispositius canviaran de la manera següent:"
-
-#. Type: error
-#. Description
-#: ../linux-base.templates:5001
-msgid "Configuration files still contain deprecated device names"
-msgstr "Alguns fitxers de configuració encara contenen noms desaconsellats"
-
-#. Type: error
-#. Description
-#: ../linux-base.templates:5001
-msgid ""
-"The following configuration files still use some device names that may "
-"change when using the new kernel:"
-msgstr "Els fitxers de configuració següents encara empren alguns noms de dispositiu que poden canviar quan s'empre el nucli nou:"
-
-#. Type: error
-#. Description
-#: ../linux-base.templates:6001
-msgid "Boot loader configuration check needed"
-msgstr "Es requereix una comprovació de la configuració del carregador"
-
-#. Type: error
-#. Description
-#: ../linux-base.templates:6001
-msgid ""
-"The boot loader configuration for this system was not recognized. These "
-"settings in the configuration may need to be updated:"
-msgstr "No s'ha reconegut la configuració del carregador d'aquest sistema. És possible que calga actualitzar aquests paràmetres de la configuració:"
-
-#. Type: error
-#. Description
-#: ../linux-base.templates:6001
-msgid ""
-" * The root device ID passed as a kernel parameter;\n"
-" * The boot device ID used to install and update the boot loader."
-msgstr ""
-" * L'ID del dispositiu arrel que es passa com a paràmetre del nucli,\n"
-" * L'ID del dispositiu d'arrencada emprat per a instaŀlar i actualitzar el carregador."
-
-#. Type: error
-#. Description
-#: ../linux-base.templates:6001
-msgid ""
-"You should generally identify these devices by UUID or label. However, on "
-"MIPS systems the root device must be identified by name."
-msgstr "En general, hauríeu d'identificar aquests dispositius per UUID o etiqueta. Als sistemes MIPS, però, el dispositiu arrel s'ha d'identificar pel seu nom."
-
-#. Type: error
-#. Description
-#: ../linux-base.templates:8001
-msgid "Boot loader may need to be upgraded"
-msgstr "És possible que calga actualitzar el carregador"
-
-#. Type: error
-#. Description
-#: ../linux-base.templates:8001
-msgid "Kernel packages no longer update a default boot loader."
-msgstr "Els paquets del nucli ja no actualitzen el carregador per defecte."
-
 #. Type: error
 #. Description
 #: ../linux-base.templates:8001 ../templates/temp.image.plain/templates:5001
diff --git a/debian/po/cs.po b/debian/po/cs.po
index 90ea6db68..98bc7c9a3 100644
--- a/debian/po/cs.po
+++ b/debian/po/cs.po
@@ -16,142 +16,6 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#. Type: boolean
-#. Description
-#: ../linux-base.templates:2001
-msgid "Update disk device IDs in system configuration?"
-msgstr "Aktualizovat v nastavení systému ID diskových zařízení?"
-
-#. Type: boolean
-#. Description
-#: ../linux-base.templates:2001
-msgid ""
-"The new Linux kernel version provides different drivers for some PATA (IDE) "
-"controllers. The names of some hard disk, CD-ROM, and tape devices may "
-"change."
-msgstr ""
-"Nová verze Linuxového jádra přináší pro některé PATA (IDE) řadiče jiné "
-"ovladače. Názvy u některých pevných disků, CD-ROM a páskových mechanik se "
-"mohly změnit."
-
-#. Type: boolean
-#. Description
-#: ../linux-base.templates:2001
-msgid ""
-"It is now recommended to identify disk devices in configuration files by "
-"label or UUID (unique identifier) rather than by device name, which will "
-"work with both old and new kernel versions."
-msgstr ""
-"Nyní je doporučeno v konfiguračních souborech označovat disková zařízení "
-"spíše než názvem zařízení raději popiskem či UUID (unikátním "
-"identifikátorem), což funguje jak se starou, tak i s novou verzí jádra."
-
-#. Type: boolean
-#. Description
-#: ../linux-base.templates:2001
-msgid ""
-"If you choose to not update the system configuration automatically, you must "
-"update device IDs yourself before the next system reboot or the system may "
-"become unbootable."
-msgstr ""
-"Pokud se rozhodnete, že nechcete aktualizovat nastavení systému automaticky, "
-"musíte před příštím restartem systému ručně aktualizovat ID zařízení, jinak "
-"se systém může stát nezaveditelným."
-
-#. Type: boolean
-#. Description
-#. Type: boolean
-#. Description
-#: ../linux-base.templates:3001 ../linux-base.templates:4001
-msgid "Apply configuration changes to disk device IDs?"
-msgstr "Použít změny v nastavení ID diskových zařízení?"
-
-#. Type: boolean
-#. Description
-#: ../linux-base.templates:3001
-msgid "These devices will be assigned UUIDs or labels:"
-msgstr "Těmto zařízením bude přiřazeno UUID či popisek:"
-
-#. Type: boolean
-#. Description
-#. Type: boolean
-#. Description
-#: ../linux-base.templates:3001 ../linux-base.templates:4001
-msgid "These configuration files will be updated:"
-msgstr "Tyto konfigurační soubory budou aktualizovány:"
-
-#. Type: boolean
-#. Description
-#. Type: boolean
-#. Description
-#: ../linux-base.templates:3001 ../linux-base.templates:4001
-msgid "The device IDs will be changed as follows:"
-msgstr "ID diskových zařízení se změní následovně:"
-
-#. Type: error
-#. Description
-#: ../linux-base.templates:5001
-msgid "Configuration files still contain deprecated device names"
-msgstr "Konfigurační soubory stále obsahují zastaralé názvy zařízení"
-
-#. Type: error
-#. Description
-#: ../linux-base.templates:5001
-msgid ""
-"The following configuration files still use some device names that may "
-"change when using the new kernel:"
-msgstr ""
-"Následující konfigurační soubory stále používají názvy zařízení, které je "
-"při používání nového jádra třeba změnit:"
-
-#. Type: error
-#. Description
-#: ../linux-base.templates:6001
-msgid "Boot loader configuration check needed"
-msgstr "Je vyžadováno ověření nastavení zavaděče"
-
-#. Type: error
-#. Description
-#: ../linux-base.templates:6001
-msgid ""
-"The boot loader configuration for this system was not recognized. These "
-"settings in the configuration may need to be updated:"
-msgstr ""
-"Nastavení zavaděče v tomto systému nebylo rozpoznáno. Tato nastavení může "
-"být nutné aktualizovat:"
-
-#. Type: error
-#. Description
-#: ../linux-base.templates:6001
-msgid ""
-" * The root device ID passed as a kernel parameter;\n"
-" * The boot device ID used to install and update the boot loader."
-msgstr ""
-" * ID kořenového zařízení předané jako parametr jádra;\n"
-" * ID zaváděcího zařízení k instalaci a aktualizaci zavaděče."
-
-#. Type: error
-#. Description
-#: ../linux-base.templates:6001
-msgid ""
-"You should generally identify these devices by UUID or label. However, on "
-"MIPS systems the root device must be identified by name."
-msgstr ""
-"Tato zařízení bysta běžně měli označovat jejich UUID či popiskem. Na "
-"systémech MIPS však musí být kořenové zařízení označeno názvem."
-
-#. Type: error
-#. Description
-#: ../linux-base.templates:8001
-msgid "Boot loader may need to be upgraded"
-msgstr "Zavaděč může být nutné aktualizovat"
-
-#. Type: error
-#. Description
-#: ../linux-base.templates:8001
-msgid "Kernel packages no longer update a default boot loader."
-msgstr "Jaderný balíček již neaktualizuje výchozí zavaděč."
-
 #. Type: error
 #. Description
 #: ../linux-base.templates:8001 ../templates/temp.image.plain/templates:5001
diff --git a/debian/po/da.po b/debian/po/da.po
index 3dd06b81d..27db2dddb 100644
--- a/debian/po/da.po
+++ b/debian/po/da.po
@@ -16,143 +16,6 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#. Type: boolean
-#. Description
-#: ../linux-base.templates:2001
-msgid "Update disk device IDs in system configuration?"
-msgstr "Opdater diskenheds-id'er i systemkonfigurationen?"
-
-#. Type: boolean
-#. Description
-#: ../linux-base.templates:2001
-msgid ""
-"The new Linux kernel version provides different drivers for some PATA (IDE) "
-"controllers. The names of some hard disk, CD-ROM, and tape devices may "
-"change."
-msgstr ""
-"Den nye version af Linuxkernen har forskellige drivere for nogle PATA-"
-"kontrollere (IDE). Navnene på nogle harddiske, cd-rom og båndenheder kan "
-"skifte."
-
-#. Type: boolean
-#. Description
-#: ../linux-base.templates:2001
-msgid ""
-"It is now recommended to identify disk devices in configuration files by "
-"label or UUID (unique identifier) rather than by device name, which will "
-"work with both old and new kernel versions."
-msgstr ""
-"Det anbefales, at du identificerer diskenheder i konfigurationsfiler med "
-"etiket eller UUID (unik identifikation) fremfor via enhedsnavn, som vil "
-"virke med både gamle og nye kerneversioner."
-
-#. Type: boolean
-#. Description
-#: ../linux-base.templates:2001
-msgid ""
-"If you choose to not update the system configuration automatically, you must "
-"update device IDs yourself before the next system reboot or the system may "
-"become unbootable."
-msgstr ""
-"Hvis du vælger at opdatere systemkonfigurationen automatisk, skal du selv "
-"opdatere enheds-id'er før systemets næste genstart eller også kan systemet "
-"måske ikke startes."
-
-#. Type: boolean
-#. Description
-#. Type: boolean
-#. Description
-#: ../linux-base.templates:3001 ../linux-base.templates:4001
-msgid "Apply configuration changes to disk device IDs?"
-msgstr "Anvend disse konfigurationsændringer til diskenheds-id'er?"
-
-#. Type: boolean
-#. Description
-#: ../linux-base.templates:3001
-msgid "These devices will be assigned UUIDs or labels:"
-msgstr "Disse enheder vil få tildelt UUID'er eller etiketter:"
-
-#. Type: boolean
-#. Description
-#. Type: boolean
-#. Description
-#: ../linux-base.templates:3001 ../linux-base.templates:4001
-msgid "These configuration files will be updated:"
-msgstr "Disse konfigurationsfiler vil blive opdateret:"
-
-#. Type: boolean
-#. Description
-#. Type: boolean
-#. Description
-#: ../linux-base.templates:3001 ../linux-base.templates:4001
-msgid "The device IDs will be changed as follows:"
-msgstr "Enheds-id'erne vil blive ændret som vist i det følgende:"
-
-#. Type: error
-#. Description
-#: ../linux-base.templates:5001
-msgid "Configuration files still contain deprecated device names"
-msgstr "Konfigurationsfiler inderholder stadig forældede enhedsnavne"
-
-#. Type: error
-#. Description
-#: ../linux-base.templates:5001
-msgid ""
-"The following configuration files still use some device names that may "
-"change when using the new kernel:"
-msgstr ""
-"De følgende konfigurationsfiler bruger stadig nogle enhedsnavne som måske "
-"vil ændre sig, når den nye kerne bruges:"
-
-#. Type: error
-#. Description
-#: ../linux-base.templates:6001
-msgid "Boot loader configuration check needed"
-msgstr "Behov for tjek af opstartsindlæseren (boot loader)"
-
-#. Type: error
-#. Description
-#: ../linux-base.templates:6001
-msgid ""
-"The boot loader configuration for this system was not recognized. These "
-"settings in the configuration may need to be updated:"
-msgstr ""
-"Opstartslæserens (boot loader) konfiguration på dette system blev ikke "
-"genkendt. Disse indstillinger i konfigurationen skal måske opdateres:"
-
-#. Type: error
-#. Description
-#: ../linux-base.templates:6001
-msgid ""
-" * The root device ID passed as a kernel parameter;\n"
-" * The boot device ID used to install and update the boot loader."
-msgstr ""
-" * Rootenheds-id'et passeret som en kerneparameter;\n"
-" * Rootenheds-id'et brugt til at installere og opdatere opstartsindlæseren "
-"(boot loader)."
-
-#. Type: error
-#. Description
-#: ../linux-base.templates:6001
-msgid ""
-"You should generally identify these devices by UUID or label. However, on "
-"MIPS systems the root device must be identified by name."
-msgstr ""
-"Vi anbefaler, at du identificerer disse enheder efter UUID eller etiket. På "
-"MIPS-systemer skal rootenheden dog være identificeret med navn."
-
-#. Type: error
-#. Description
-#: ../linux-base.templates:8001
-msgid "Boot loader may need to be upgraded"
-msgstr "Opstartsindlæseren (boot loader) skal måske opgraderes"
-
-#. Type: error
-#. Description
-#: ../linux-base.templates:8001
-msgid "Kernel packages no longer update a default boot loader."
-msgstr "Kernepakker opdaterer ikke længere en opstartsindlæser som standard."
-
 #. Type: error
 #. Description
 #: ../linux-base.templates:8001 ../templates/temp.image.plain/templates:5001
diff --git a/debian/po/de.po b/debian/po/de.po
index caa853961..c1636e815 100644
--- a/debian/po/de.po
+++ b/debian/po/de.po
@@ -16,148 +16,6 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#. Type: boolean
-#. Description
-#: ../linux-base.templates:2001
-msgid "Update disk device IDs in system configuration?"
-msgstr "Laufwerk-Geräte-IDs in der Systemkonfiguration aktualisieren?"
-
-#. Type: boolean
-#. Description
-#: ../linux-base.templates:2001
-msgid ""
-"The new Linux kernel version provides different drivers for some PATA (IDE) "
-"controllers. The names of some hard disk, CD-ROM, and tape devices may "
-"change."
-msgstr ""
-"Die neue Version des Linux-Kernels stellt andere Treiber für einige PATA-"
-"(IDE-)Controller zur Verfügung. Die Namen einiger Festplatten-, CD-ROM- und "
-"Bandspeichergeräte könnten sich ändern."
-
-#. Type: boolean
-#. Description
-#: ../linux-base.templates:2001
-msgid ""
-"It is now recommended to identify disk devices in configuration files by "
-"label or UUID (unique identifier) rather than by device name, which will "
-"work with both old and new kernel versions."
-msgstr ""
-"Es wird jetzt empfohlen, solche Geräte in Konfigurationsdateien über die "
-"Kennung (Label) oder die UUID (Unique Identifier) zu identifizieren statt "
-"über den Gerätenamen, was sowohl mit alten wie auch neuen Kernel-Versionen "
-"funktionieren wird."
-
-#. Type: boolean
-#. Description
-#: ../linux-base.templates:2001
-msgid ""
-"If you choose to not update the system configuration automatically, you must "
-"update device IDs yourself before the next system reboot or the system may "
-"become unbootable."
-msgstr ""
-"Falls Sie sich entscheiden, die Systemkonfiguration nicht automatisch "
-"aktualisieren zu lassen, müssen Sie die Geräte-IDs selbst aktualisieren, "
-"bevor Sie das System das nächste Mal neu starten; andernfalls könnte es "
-"sein, dass Ihr System nicht mehr startfähig ist."
-
-#. Type: boolean
-#. Description
-#. Type: boolean
-#. Description
-#: ../linux-base.templates:3001 ../linux-base.templates:4001
-msgid "Apply configuration changes to disk device IDs?"
-msgstr "Konfigurationsänderungen für Laufwerk-Geräte-IDs anwenden?"
-
-#. Type: boolean
-#. Description
-#: ../linux-base.templates:3001
-msgid "These devices will be assigned UUIDs or labels:"
-msgstr "Diese Geräte werden über UUIDs oder Kennungen identifiziert:"
-
-#. Type: boolean
-#. Description
-#. Type: boolean
-#. Description
-#: ../linux-base.templates:3001 ../linux-base.templates:4001
-msgid "These configuration files will be updated:"
-msgstr "Diese Konfigurationsdateien werden aktualisiert:"
-
-#. Type: boolean
-#. Description
-#. Type: boolean
-#. Description
-#: ../linux-base.templates:3001 ../linux-base.templates:4001
-msgid "The device IDs will be changed as follows:"
-msgstr "Die Geräte-IDs werden wie folgt geändert:"
-
-#. Type: error
-#. Description
-#: ../linux-base.templates:5001
-msgid "Configuration files still contain deprecated device names"
-msgstr "Konfigurationsdateien enthalten noch veraltete Gerätenamen"
-
-#. Type: error
-#. Description
-#: ../linux-base.templates:5001
-msgid ""
-"The following configuration files still use some device names that may "
-"change when using the new kernel:"
-msgstr ""
-"Die folgenden Konfigurationsdateien enthalten noch einige Gerätenamen, die "
-"sich ändern könnten, wenn der neue Kernel verwendet wird:"
-
-#. Type: error
-#. Description
-#: ../linux-base.templates:6001
-msgid "Boot loader configuration check needed"
-msgstr "Überprüfung der Bootloader-Konfiguration erforderlich"
-
-#. Type: error
-#. Description
-#: ../linux-base.templates:6001
-msgid ""
-"The boot loader configuration for this system was not recognized. These "
-"settings in the configuration may need to be updated:"
-msgstr ""
-"Die Bootloader-Konfiguration für dieses System konnte nicht erkannt werden. "
-"Folgende Einstellungen in der Konfiguration müssen aktualisiert werden:"
-
-#. Type: error
-#. Description
-#: ../linux-base.templates:6001
-msgid ""
-" * The root device ID passed as a kernel parameter;\n"
-" * The boot device ID used to install and update the boot loader."
-msgstr ""
-" * Die Geräte-ID der Root-Partition, die als Kernel-Parameter angegeben\n"
-"   wird;\n"
-" * Die Geräte-ID der Boot-Partition, die für die Installation und\n"
-"   Aktualisierung des Bootloaders verwendet wird."
-
-#. Type: error
-#. Description
-#: ../linux-base.templates:6001
-msgid ""
-"You should generally identify these devices by UUID or label. However, on "
-"MIPS systems the root device must be identified by name."
-msgstr ""
-"Sie sollten diese Geräte grundsätzlich per UUID oder Kennung identifizieren. "
-"Auf MIPS-Systemen muss das Root-Gerät jedoch über den Namen identifiziert "
-"werden."
-
-#. Type: error
-#. Description
-#: ../linux-base.templates:8001
-msgid "Boot loader may need to be upgraded"
-msgstr "Bootloader muss unter Umständen aktualisiert werden"
-
-#. Type: error
-#. Description
-#: ../linux-base.templates:8001
-msgid "Kernel packages no longer update a default boot loader."
-msgstr "Kernel-Pakete werden nicht mehr länger den Standard-Bootloader "
-"aktualisieren."
-
 #. Type: error
 #. Description
 #: ../linux-base.templates:8001 ../templates/temp.image.plain/templates:5001
diff --git a/debian/po/es.po b/debian/po/es.po
index adfbb28cb..30c2e7e62 100644
--- a/debian/po/es.po
+++ b/debian/po/es.po
@@ -45,152 +45,6 @@ msgstr ""
 "X-POFile-SpellExtra: Debian CORE free running dobootloader UUID dep SIGNAL\n"
 "X-POFile-SpellExtra: Guidelines modulesbase vmlinuz postinst\n"
 
-#. Type: boolean
-#. Description
-#: ../linux-base.templates:2001
-msgid "Update disk device IDs in system configuration?"
-msgstr ""
-"¿Desea actualizar los identificadores de los dispositivos de disco en la "
-"configuración del sistema?"
-
-#. Type: boolean
-#. Description
-#: ../linux-base.templates:2001
-msgid ""
-"The new Linux kernel version provides different drivers for some PATA (IDE) "
-"controllers. The names of some hard disk, CD-ROM, and tape devices may "
-"change."
-msgstr ""
-"La nueva versión del núcleo Linux proporciona controladores diferentes para "
-"algunos controladores PATA (IDE). Puede que cambien los nombres de algunos "
-"dispositivos de disco duro, disco óptico y de cinta."
-
-#. Type: boolean
-#. Description
-#: ../linux-base.templates:2001
-msgid ""
-"It is now recommended to identify disk devices in configuration files by "
-"label or UUID (unique identifier) rather than by device name, which will "
-"work with both old and new kernel versions."
-msgstr ""
-"Se recomienda identificar los dispositivos de disco en los ficheros de "
-"configuración mediante la etiqueta o el UUID (identificador único), en lugar "
-"del nombre de dispositivo, lo cual funcionará con las versiones antiguas y "
-"recientes del núcleo."
-
-#. Type: boolean
-#. Description
-#: ../linux-base.templates:2001
-msgid ""
-"If you choose to not update the system configuration automatically, you must "
-"update device IDs yourself before the next system reboot or the system may "
-"become unbootable."
-msgstr ""
-"Si selecciona no actualizar la configuración del sistema automáticamente, "
-"tendrá que actualizar los identificadores de dispositivo manualmente antes "
-"del siguiente arranque del sistema, o puede que el sistema no pueda arrancar."
-
-#. Type: boolean
-#. Description
-#. Type: boolean
-#. Description
-#: ../linux-base.templates:3001 ../linux-base.templates:4001
-msgid "Apply configuration changes to disk device IDs?"
-msgstr ""
-"¿Desea realizar estos cambios en la configuración de los identificadores de "
-"dispositivos de disco?"
-
-#. Type: boolean
-#. Description
-#: ../linux-base.templates:3001
-msgid "These devices will be assigned UUIDs or labels:"
-msgstr "Se van a asignar etiquetas o UUID a los siguientes dispositivos:"
-
-#. Type: boolean
-#. Description
-#. Type: boolean
-#. Description
-#: ../linux-base.templates:3001 ../linux-base.templates:4001
-msgid "These configuration files will be updated:"
-msgstr "Se van a actualizar los siguientes ficheros de configuración:"
-
-#. Type: boolean
-#. Description
-#. Type: boolean
-#. Description
-#: ../linux-base.templates:3001 ../linux-base.templates:4001
-msgid "The device IDs will be changed as follows:"
-msgstr ""
-"Se van a modificar los identificadores de dispositivo de la siguiente forma:"
-
-#. Type: error
-#. Description
-#: ../linux-base.templates:5001
-msgid "Configuration files still contain deprecated device names"
-msgstr ""
-"Los ficheros de configuración aún contienen nombres obsoletos de dispositivo"
-
-#. Type: error
-#. Description
-#: ../linux-base.templates:5001
-msgid ""
-"The following configuration files still use some device names that may "
-"change when using the new kernel:"
-msgstr ""
-"Los siguientes ficheros de configuración aún usan algunos nombres de "
-"dispositivo que pueden cambiar al usar el núcleo nuevo:"
-
-#. Type: error
-#. Description
-#: ../linux-base.templates:6001
-msgid "Boot loader configuration check needed"
-msgstr "Se necesita comprobar la configuración del gestor de arranque"
-
-#. Type: error
-#. Description
-#: ../linux-base.templates:6001
-msgid ""
-"The boot loader configuration for this system was not recognized. These "
-"settings in the configuration may need to be updated:"
-msgstr ""
-"No se reconoció la configuración del gestor de arranque en este sistema. "
-"Puede que se tengan que actualizar estas opciones de configuración:"
-
-#. Type: error
-#. Description
-#: ../linux-base.templates:6001
-msgid ""
-" * The root device ID passed as a kernel parameter;\n"
-" * The boot device ID used to install and update the boot loader."
-msgstr ""
-" * El identificador del dispositivo raíz introducido como un parámetro del "
-"núcleo\n"
-" * El identificador del dispositivo de arranque usado para instalar y "
-"actualizar el gestor de arranque."
-
-#. Type: error
-#. Description
-#: ../linux-base.templates:6001
-msgid ""
-"You should generally identify these devices by UUID or label. However, on "
-"MIPS systems the root device must be identified by name."
-msgstr ""
-"Se recomienda identificar estos dispositivos mediante la etiqueta o el UUID. "
-"Por otra parte, en los sistemas MIPS tiene que identificar el dispositivo "
-"raíz por su nombre."
-
-#. Type: error
-#. Description
-#: ../linux-base.templates:8001
-msgid "Boot loader may need to be upgraded"
-msgstr "Puede ser necesario actualizar el gestor de arranque"
-
-#. Type: error
-#. Description
-#: ../linux-base.templates:8001
-msgid "Kernel packages no longer update a default boot loader."
-msgstr "Los paquetes del núcleo ya no actualizan el gestor de arranque por omisión."
-
 #. Type: error
 #. Description
 #: ../linux-base.templates:8001 ../templates/temp.image.plain/templates:5001
diff --git a/debian/po/et.po b/debian/po/et.po
index 5b3aa64ff..8a4997558 100644
--- a/debian/po/et.po
+++ b/debian/po/et.po
@@ -20,142 +20,6 @@ msgstr ""
 "X-Generator: Emacs\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. Type: boolean
-#. Description
-#: ../linux-base.templates:2001
-msgid "Update disk device IDs in system configuration?"
-msgstr "Värskenda süsteemi seadetes ketta seadmete ID-d?"
-
-#. Type: boolean
-#. Description
-#: ../linux-base.templates:2001
-msgid ""
-"The new Linux kernel version provides different drivers for some PATA (IDE) "
-"controllers. The names of some hard disk, CD-ROM, and tape devices may "
-"change."
-msgstr ""
-"Uus Linuxi tuuma versioon pakub teistsuguseid nimesid mõnedele PATA (IDE) "
-"kontrolleritele. Osade kõvaketaste, CD-ROM-de ja lindiseadete nimed võivad "
-"muutuda."
-
-#. Type: boolean
-#. Description
-#: ../linux-base.templates:2001
-msgid ""
-"It is now recommended to identify disk devices in configuration files by "
-"label or UUID (unique identifier) rather than by device name, which will "
-"work with both old and new kernel versions."
-msgstr ""
-"Nüüdsest on soovituslik konfiguratsioonifailides identifitseerida kettaid "
-"siltide või UUID (unikaalne idendifikaator) järgi, mitte seadme nime järgi. "
-"Nii töötavad nad nii vanade kui ka uute tuumadega."
-
-#. Type: boolean
-#. Description
-#: ../linux-base.templates:2001
-msgid ""
-"If you choose to not update the system configuration automatically, you must "
-"update device IDs yourself before the next system reboot or the system may "
-"become unbootable."
-msgstr ""
-"Kui valid mitte automaatselt uuendada süsteemi konfiguratsiooni, siis pead "
-"ise käsitsi muutma seadmete ID-d enne järgmist taaskäivitust või süsteem ei "
-"käivitu enam."
-
-#. Type: boolean
-#. Description
-#. Type: boolean
-#. Description
-#: ../linux-base.templates:3001 ../linux-base.templates:4001
-msgid "Apply configuration changes to disk device IDs?"
-msgstr "Rakenda ketta seadmete ID-de konfiratsiooni muudatused?"
-
-#. Type: boolean
-#. Description
-#: ../linux-base.templates:3001
-msgid "These devices will be assigned UUIDs or labels:"
-msgstr "Nendele seadmetele määratakse UUID-d või sildid:"
-
-#. Type: boolean
-#. Description
-#. Type: boolean
-#. Description
-#: ../linux-base.templates:3001 ../linux-base.templates:4001
-msgid "These configuration files will be updated:"
-msgstr "Need konfiguratsioonifailid uuendatakse:"
-
-#. Type: boolean
-#. Description
-#. Type: boolean
-#. Description
-#: ../linux-base.templates:3001 ../linux-base.templates:4001
-msgid "The device IDs will be changed as follows:"
-msgstr "Seadme ID-d muudetakse järgnevalt:"
-
-#. Type: error
-#. Description
-#: ../linux-base.templates:5001
-msgid "Configuration files still contain deprecated device names"
-msgstr "Konfiguratsioonifailid sisaldavad ikka iganenud seadmete nimesid"
-
-#. Type: error
-#. Description
-#: ../linux-base.templates:5001
-msgid ""
-"The following configuration files still use some device names that may "
-"change when using the new kernel:"
-msgstr ""
-"Järgnevad konfiguratsioonifailid sisaldavad ikka seadmete nimesid, mis "
-"võivad uue tuumaga muutuda:"
-
-#. Type: error
-#. Description
-#: ../linux-base.templates:6001
-msgid "Boot loader configuration check needed"
-msgstr "Vajalik alglaaduri konfiguratsiooni kontroll"
-
-#. Type: error
-#. Description
-#: ../linux-base.templates:6001
-msgid ""
-"The boot loader configuration for this system was not recognized. These "
-"settings in the configuration may need to be updated:"
-msgstr ""
-"Selle süsteemi alglaaduri konfiguratsiooni ei tuntud ära. Need "
-"konfiguratsiooniseaded võivad vajada uuendamist:"
-
-#. Type: error
-#. Description
-#: ../linux-base.templates:6001
-msgid ""
-" * The root device ID passed as a kernel parameter;\n"
-" * The boot device ID used to install and update the boot loader."
-msgstr ""
-" * Root seadme ID edastatud kui tuuma parameeter;\n"
-" * Boot seadme ID, mida kasutati alglaaduri paigaldamisel ja uuendamisel. "
-
-#. Type: error
-#. Description
-#: ../linux-base.templates:6001
-msgid ""
-"You should generally identify these devices by UUID or label. However, on "
-"MIPS systems the root device must be identified by name."
-msgstr ""
-"Üldjuhul peaks need seadmed identifitseerima UUID või sildi järgi. Kuid MIPS "
-"süsteemidel peab root seade olema idendifitseeritud nime järgi."
-
-#. Type: error
-#. Description
-#: ../linux-base.templates:8001
-msgid "Boot loader may need to be upgraded"
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../linux-base.templates:8001
-msgid "Kernel packages no longer update a default boot loader."
-msgstr ""
-
 #. Type: error
 #. Description
 #: ../linux-base.templates:8001 ../templates/temp.image.plain/templates:5001
diff --git a/debian/po/fr.po b/debian/po/fr.po
index f4e360b11..78355b338 100644
--- a/debian/po/fr.po
+++ b/debian/po/fr.po
@@ -18,156 +18,6 @@ msgstr ""
 "X-Generator: Lokalize 1.0\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#. Type: boolean
-#. Description
-#: ../linux-base.templates:2001
-msgid "Update disk device IDs in system configuration?"
-msgstr ""
-"Faut-il mettre à jour les identifiants des partitions dans la configuration "
-"du système ?"
-
-#. Type: boolean
-#. Description
-#: ../linux-base.templates:2001
-msgid ""
-"The new Linux kernel version provides different drivers for some PATA (IDE) "
-"controllers. The names of some hard disk, CD-ROM, and tape devices may "
-"change."
-msgstr ""
-"La nouvelle version du noyau Linux fournit des pilotes différents pour "
-"certains contrôleurs PATA (IDE). Les noms de certains disques durs, lecteurs "
-"de CD-ROM et de bandes peuvent être modifiés."
-
-#. Type: boolean
-#. Description
-#: ../linux-base.templates:2001
-msgid ""
-"It is now recommended to identify disk devices in configuration files by "
-"label or UUID (unique identifier) rather than by device name, which will "
-"work with both old and new kernel versions."
-msgstr ""
-"Il est conseillé d'identifier, dans les fichiers de configuration, les "
-"partitions par leur étiquette (« label ») ou leur UUID (identifiant unique "
-"universel) plutôt que par leur nom. Ainsi le système fonctionnera à la fois "
-"avec les anciennes et les nouvelles versions du noyau."
-
-#. Type: boolean
-#. Description
-#: ../linux-base.templates:2001
-msgid ""
-"If you choose to not update the system configuration automatically, you must "
-"update device IDs yourself before the next system reboot or the system may "
-"become unbootable."
-msgstr ""
-"Si vous choisissez de ne pas mettre à jour automatiquement la configuration "
-"du système, vous devez mettre à jour vous-même les identifiants des "
-"périphériques avant de redémarrer le système. Dans le cas contraire, le "
-"système risque de ne pas pouvoir redémarrer correctement."
-
-#. Type: boolean
-#. Description
-#. Type: boolean
-#. Description
-#: ../linux-base.templates:3001 ../linux-base.templates:4001
-msgid "Apply configuration changes to disk device IDs?"
-msgstr ""
-"Appliquer les changements de configuration aux identifiants des partitions ?"
-
-#. Type: boolean
-#. Description
-#: ../linux-base.templates:3001
-msgid "These devices will be assigned UUIDs or labels:"
-msgstr ""
-"Les périphériques suivants seront identifiés par une étiquette (« label ») "
-"ou un UUID :"
-
-#. Type: boolean
-#. Description
-#. Type: boolean
-#. Description
-#: ../linux-base.templates:3001 ../linux-base.templates:4001
-msgid "These configuration files will be updated:"
-msgstr "Les fichiers de configuration suivants seront mis à jour :"
-
-#. Type: boolean
-#. Description
-#. Type: boolean
-#. Description
-#: ../linux-base.templates:3001 ../linux-base.templates:4001
-msgid "The device IDs will be changed as follows:"
-msgstr "Les identifiants des périphériques seront modifiés comme suit :"
-
-#. Type: error
-#. Description
-#: ../linux-base.templates:5001
-msgid "Configuration files still contain deprecated device names"
-msgstr ""
-"Les noms des périphériques utilisés dans certains fichiers de configuration "
-"sont déconseillés."
-
-#. Type: error
-#. Description
-#: ../linux-base.templates:5001
-msgid ""
-"The following configuration files still use some device names that may "
-"change when using the new kernel:"
-msgstr ""
-"Les noms des périphériques utilisés dans les fichiers de configuration "
-"suivants peuvent changer lors de l'utilisation du nouveau noyau : "
-
-#. Type: error
-#. Description
-#: ../linux-base.templates:6001
-msgid "Boot loader configuration check needed"
-msgstr "Vérification indispensable de la configuration du programme d'amorçage"
-
-#. Type: error
-#. Description
-#: ../linux-base.templates:6001
-msgid ""
-"The boot loader configuration for this system was not recognized. These "
-"settings in the configuration may need to be updated:"
-msgstr ""
-"La configuration du programme d'amorçage de ce système n'a pas été reconnue. "
-"Les paramètres de configuration suivants peuvent nécessiter une mise à jour :"
-
-#. Type: error
-#. Description
-#: ../linux-base.templates:6001
-msgid ""
-" * The root device ID passed as a kernel parameter;\n"
-" * The boot device ID used to install and update the boot loader."
-msgstr ""
-" - identifiant de la partition racine (« root »), passé en tant\n"
-"   que paramètre du noyau ;\n"
-" - identifiant de la partition de démarrage (« boot »), utilisé\n"
-"   pour installer et mettre à jour le programme d'amorçage."
-
-#. Type: error
-#. Description
-#: ../linux-base.templates:6001
-msgid ""
-"You should generally identify these devices by UUID or label. However, on "
-"MIPS systems the root device must be identified by name."
-msgstr ""
-"Normalement, vous devriez identifier ces partitions par leur UUID ou leur "
-"étiquette (« label »). Toutefois, pour l'architecture MIPS, la partition "
-"racine (« root ») doit être identifiée par son nom."
-
-#. Type: error
-#. Description
-#: ../linux-base.templates:8001
-msgid "Boot loader may need to be upgraded"
-msgstr "Le programme d'amorçage peut nécessiter une mise à niveau"
-
-#. Type: error
-#. Description
-#: ../linux-base.templates:8001
-msgid "Kernel packages no longer update a default boot loader."
-msgstr ""
-"Les paquets du noyau ne s'occupent plus de la mise à jour d'un programme "
-"d'amorçage par défaut."
-
 #. Type: error
 #. Description
 #: ../linux-base.templates:8001 ../templates/temp.image.plain/templates:5001
diff --git a/debian/po/it.po b/debian/po/it.po
index 3ee33ea72..44978e5f9 100644
--- a/debian/po/it.po
+++ b/debian/po/it.po
@@ -15,149 +15,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. Type: boolean
-#. Description
-#: ../linux-base.templates:2001
-msgid "Update disk device IDs in system configuration?"
-msgstr "Aggiornare gli ID dei dischi nella configurazione di sistema?"
-
-#. Type: boolean
-#. Description
-#: ../linux-base.templates:2001
-msgid ""
-"The new Linux kernel version provides different drivers for some PATA (IDE) "
-"controllers. The names of some hard disk, CD-ROM, and tape devices may "
-"change."
-msgstr ""
-"La nuova versione del kernel Linux fornisce diversi driver per alcuni "
-"controller PATA (IDE). I nomi di alcuni dischi fissi, CD-ROM e dispositivi a "
-"nastro potrebbero cambiare."
-
-#. Type: boolean
-#. Description
-#: ../linux-base.templates:2001
-msgid ""
-"It is now recommended to identify disk devices in configuration files by "
-"label or UUID (unique identifier) rather than by device name, which will "
-"work with both old and new kernel versions."
-msgstr ""
-"Per identificare i dischi nei file di configurazione, è consigliabile "
-"utilizzare delle etichette o degli UUID (identificatori univoci) piuttosto "
-"che i nomi dei dispositivi, poiché tale metodo funziona sia con nuove che "
-"con vecchie versioni di kernel."
-
-#. Type: boolean
-#. Description
-#: ../linux-base.templates:2001
-msgid ""
-"If you choose to not update the system configuration automatically, you must "
-"update device IDs yourself before the next system reboot or the system may "
-"become unbootable."
-msgstr ""
-"Se si sceglie di non aggiornare automaticamente la configurazione di sistema "
-"occorre aggiornare manualmente gli ID dei dispositivi prima del prossimo "
-"riavvio, altrimenti il sistema potrebbe diventare non avviabile."
-
-#. Type: boolean
-#. Description
-#. Type: boolean
-#. Description
-#: ../linux-base.templates:3001 ../linux-base.templates:4001
-msgid "Apply configuration changes to disk device IDs?"
-msgstr "Applicare le modifiche alla configurazione degli ID dei dischi?"
-
-#. Type: boolean
-#. Description
-#: ../linux-base.templates:3001
-msgid "These devices will be assigned UUIDs or labels:"
-msgstr "I seguenti dispositivi verranno identificati tramite UUID o etichette:"
-
-#. Type: boolean
-#. Description
-#. Type: boolean
-#. Description
-#: ../linux-base.templates:3001 ../linux-base.templates:4001
-msgid "These configuration files will be updated:"
-msgstr "I seguenti file di configurazione verranno aggiornati:"
-
-#. Type: boolean
-#. Description
-#. Type: boolean
-#. Description
-#: ../linux-base.templates:3001 ../linux-base.templates:4001
-msgid "The device IDs will be changed as follows:"
-msgstr "Gli ID dei dispositivi verranno cambiati come segue:"
-
-#. Type: error
-#. Description
-#: ../linux-base.templates:5001
-msgid "Configuration files still contain deprecated device names"
-msgstr ""
-"I file di configurazione contengono ancora i nomi obsoleti dei dispositivi"
-
-#. Type: error
-#. Description
-#: ../linux-base.templates:5001
-msgid ""
-"The following configuration files still use some device names that may "
-"change when using the new kernel:"
-msgstr ""
-"I seguenti file di configurazione usano ancora alcuni nomi di dispositivi "
-"che potrebbero cambiare utilizzando il nuovo kernel:"
-
-#. Type: error
-#. Description
-#: ../linux-base.templates:6001
-msgid "Boot loader configuration check needed"
-msgstr "È necessario controllare la configurazione del boot loader"
-
-#. Type: error
-#. Description
-#: ../linux-base.templates:6001
-msgid ""
-"The boot loader configuration for this system was not recognized. These "
-"settings in the configuration may need to be updated:"
-msgstr ""
-"La configurazione del boot loader per questo sistema non è stata "
-"riconosciuta. I seguenti parametri di configurazione potrebbero aver bisogno "
-"di essere aggiornati:"
-
-#. Type: error
-#. Description
-#: ../linux-base.templates:6001
-msgid ""
-" * The root device ID passed as a kernel parameter;\n"
-" * The boot device ID used to install and update the boot loader."
-msgstr ""
-" * L'ID del dispositivo di root passato come parametro del kernel;\n"
-" * L'ID del dispositivo di boot utilizzato per installare e aggiornare il "
-"boot loader."
-
-#. Type: error
-#. Description
-#: ../linux-base.templates:6001
-msgid ""
-"You should generally identify these devices by UUID or label. However, on "
-"MIPS systems the root device must be identified by name."
-msgstr ""
-"Generalmente questi dispositivi dovrebbero venire identificati tramite UUID "
-"o etichette. Tuttavia, nei sistemi MIPS il dispositivo di root deve essere "
-"identificato dal nome."
-
-#. Type: error
-#. Description
-#: ../linux-base.templates:8001
-msgid "Boot loader may need to be upgraded"
-msgstr "Potrebbe essere necessario aggiornare il boot loader"
-
-#. Type: error
-#. Description
-#: ../linux-base.templates:8001
-msgid "Kernel packages no longer update a default boot loader."
-msgstr ""
-"I pacchetti del kernel non provvedono più all'aggiornamento del boot loader "
-"predefinito."
-
 #. Type: error
 #. Description
 #: ../linux-base.templates:8001 ../templates/temp.image.plain/templates:5001
diff --git a/debian/po/ja.po b/debian/po/ja.po
index 73b4235e8..274ad7582 100644
--- a/debian/po/ja.po
+++ b/debian/po/ja.po
@@ -19,115 +19,6 @@ msgstr ""
 "X-Poedit-Language: Japanese\n"
 "X-Poedit-Country: JAPAN\n"
 
-#. Type: boolean
-#. Description
-#: ../linux-base.templates:2001
-msgid "Update disk device IDs in system configuration?"
-msgstr "システム設定のディスクデバイス ID を更新しますか?"
-
-#. Type: boolean
-#. Description
-#: ../linux-base.templates:2001
-msgid "The new Linux kernel version provides different drivers for some PATA (IDE) controllers. The names of some hard disk, CD-ROM, and tape devices may change."
-msgstr "新しい Linux カーネルバージョンでは、いくつかの PATA (IDE) コントローラについて別のドライバを提供します。ハードディスク、CD-ROM、テープデバイスの名前のいくつかは変更される可能性があります。"
-
-#. Type: boolean
-#. Description
-#: ../linux-base.templates:2001
-msgid "It is now recommended to identify disk devices in configuration files by label or UUID (unique identifier) rather than by device name, which will work with both old and new kernel versions."
-msgstr "新旧両方のカーネルバージョンで動作させつつ、設定ファイル中でディスクデバイスを識別するために、デバイス名よりもラベルまたは UUID (固有識別子) を使うことが、現在推奨されます。"
-
-#. Type: boolean
-#. Description
-#: ../linux-base.templates:2001
-msgid "If you choose to not update the system configuration automatically, you must update device IDs yourself before the next system reboot or the system may become unbootable."
-msgstr "システムの設定を自動更新することを選ばない場合は、次のシステム再起動の前にあなた自身でデバイス ID を更新する必要があります。さもないと、システムは起動不能になってしまうかもしれません。"
-
-#. Type: boolean
-#. Description
-#. Type: boolean
-#. Description
-#: ../linux-base.templates:3001
-#: ../linux-base.templates:4001
-msgid "Apply configuration changes to disk device IDs?"
-msgstr "ディスクデバイス ID の設定変更を適用しますか?"
-
-#. Type: boolean
-#. Description
-#: ../linux-base.templates:3001
-msgid "These devices will be assigned UUIDs or labels:"
-msgstr "次のデバイスは UUID またはラベルに割り当てられます:"
-
-#. Type: boolean
-#. Description
-#. Type: boolean
-#. Description
-#: ../linux-base.templates:3001
-#: ../linux-base.templates:4001
-msgid "These configuration files will be updated:"
-msgstr "次の設定ファイルは更新されます:"
-
-#. Type: boolean
-#. Description
-#. Type: boolean
-#. Description
-#: ../linux-base.templates:3001
-#: ../linux-base.templates:4001
-msgid "The device IDs will be changed as follows:"
-msgstr "デバイス ID は次のように変更されます:"
-
-#. Type: error
-#. Description
-#: ../linux-base.templates:5001
-msgid "Configuration files still contain deprecated device names"
-msgstr "設定ファイルはまだ問題のあるデバイス名を含んでいます"
-
-#. Type: error
-#. Description
-#: ../linux-base.templates:5001
-msgid "The following configuration files still use some device names that may change when using the new kernel:"
-msgstr "次の設定ファイルは依然として、新しいカーネルの使用時に変更され得るいくつかのデバイス名を使っています:"
-
-#. Type: error
-#. Description
-#: ../linux-base.templates:6001
-msgid "Boot loader configuration check needed"
-msgstr "ブートローダ設定の確認が必要です"
-
-#. Type: error
-#. Description
-#: ../linux-base.templates:6001
-msgid "The boot loader configuration for this system was not recognized. These settings in the configuration may need to be updated:"
-msgstr "このシステムのブートローダ設定を認識できませんでした。設定中の次の定義は、更新する必要があるかもしれません:"
-
-#. Type: error
-#. Description
-#: ../linux-base.templates:6001
-msgid ""
-" * The root device ID passed as a kernel parameter;\n"
-" * The boot device ID used to install and update the boot loader."
-msgstr ""
-" * ルートデバイス ID はカーネルパラメータとして渡されます;\n"
-" * ブートデバイス ID はブートローダのインストールおよび更新に使われます。"
-
-#. Type: error
-#. Description
-#: ../linux-base.templates:6001
-msgid "You should generally identify these devices by UUID or label. However, on MIPS systems the root device must be identified by name."
-msgstr "一般にこれらのデバイスは、UUID またはラベルで識別すべきです。ただし、MIPS システムではルートデバイスは名前で識別しなければなりません。"
-
-#. Type: error
-#. Description
-#: ../linux-base.templates:8001
-msgid "Boot loader may need to be upgraded"
-msgstr "ブートローダは、アップグレードする必要があるかもしれません"
-
-#. Type: error
-#. Description
-#: ../linux-base.templates:8001
-msgid "Kernel packages no longer update a default boot loader."
-msgstr "カーネルパッケージは、デフォルトブートローダをもはやアップデートしません。"
-
 #. Type: error
 #. Description
 #: ../linux-base.templates:8001
diff --git a/debian/po/pt.po b/debian/po/pt.po
index 774d3cf78..23a831c31 100644
--- a/debian/po/pt.po
+++ b/debian/po/pt.po
@@ -18,148 +18,6 @@ msgstr ""
 "X-Generator: Lokalize 1.0\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. Type: boolean
-#. Description
-#: ../linux-base.templates:2001
-msgid "Update disk device IDs in system configuration?"
-msgstr ""
-"Actualizar os IDs dos dispositivos de disco na configuração do sistema?"
-
-#. Type: boolean
-#. Description
-#: ../linux-base.templates:2001
-msgid ""
-"The new Linux kernel version provides different drivers for some PATA (IDE) "
-"controllers. The names of some hard disk, CD-ROM, and tape devices may "
-"change."
-msgstr ""
-"A nova versão de kernel Linux disponibiliza drivers diferentes para alguns "
-"controladores PATA (IDE). Os nomes de alguns discos rígidos, CD-ROM e "
-"dispositivos de fita magnética poderão mudar."
-
-#. Type: boolean
-#. Description
-#: ../linux-base.templates:2001
-msgid ""
-"It is now recommended to identify disk devices in configuration files by "
-"label or UUID (unique identifier) rather than by device name, which will "
-"work with both old and new kernel versions."
-msgstr ""
-"Agora é recomendado identificar os dispositivos de discos nos ficheiros de "
-"configuração pela etiqueta ou UUID (identificador único) em vez do nome de "
-"dispositivo, o qual irá funcionar com ambas versões de kernel antiga e nova."
-
-#. Type: boolean
-#. Description
-#: ../linux-base.templates:2001
-msgid ""
-"If you choose to not update the system configuration automatically, you must "
-"update device IDs yourself before the next system reboot or the system may "
-"become unbootable."
-msgstr ""
-"Se escolher não actualizar a configuração do sistema automaticamente, você "
-"tem de actualizar os IDs dos dispositivos antes de reiniciar o sistema ou o "
-"sistema pode não arrancar."
-
-#. Type: boolean
-#. Description
-#. Type: boolean
-#. Description
-#: ../linux-base.templates:3001 ../linux-base.templates:4001
-msgid "Apply configuration changes to disk device IDs?"
-msgstr ""
-"Aplicar estas alterações de configuração aos IDs de dispositivos de discos?"
-
-#. Type: boolean
-#. Description
-#: ../linux-base.templates:3001
-msgid "These devices will be assigned UUIDs or labels:"
-msgstr "A estes dispositivos serão atribuídos UUIDs ou etiquetas:"
-
-#. Type: boolean
-#. Description
-#. Type: boolean
-#. Description
-#: ../linux-base.templates:3001 ../linux-base.templates:4001
-msgid "These configuration files will be updated:"
-msgstr "Estes ficheiros de configuração irão ser actualizados:"
-
-#. Type: boolean
-#. Description
-#. Type: boolean
-#. Description
-#: ../linux-base.templates:3001 ../linux-base.templates:4001
-msgid "The device IDs will be changed as follows:"
-msgstr "Os IDs de dispositivos irão ser alterados de acordo com o seguinte:"
-
-#. Type: error
-#. Description
-#: ../linux-base.templates:5001
-msgid "Configuration files still contain deprecated device names"
-msgstr ""
-"Os ficheiros de configuração ainda contêm nomes obsoletos de dispositivos"
-
-#. Type: error
-#. Description
-#: ../linux-base.templates:5001
-msgid ""
-"The following configuration files still use some device names that may "
-"change when using the new kernel:"
-msgstr ""
-"Os seguintes ficheiros de configuração ainda usam alguns nomes de "
-"dispositivos que podem ser alterados quando usar o novo kernel:"
-
-#. Type: error
-#. Description
-#: ../linux-base.templates:6001
-msgid "Boot loader configuration check needed"
-msgstr "Necessária verificação da configuração do gestor de arranque"
-
-#. Type: error
-#. Description
-#: ../linux-base.templates:6001
-msgid ""
-"The boot loader configuration for this system was not recognized. These "
-"settings in the configuration may need to be updated:"
-msgstr ""
-"A configuração do gestor de arranque para este sistema não foi reconhecida. "
-"Estas definições na configuração podem precisar de ser actualizadas:"
-
-#. Type: error
-#. Description
-#: ../linux-base.templates:6001
-msgid ""
-" * The root device ID passed as a kernel parameter;\n"
-" * The boot device ID used to install and update the boot loader."
-msgstr ""
-" * O ID do dispositivo root passado como parâmetro do kernel\n"
-" * O ID do dispositivo boot usado para instalar e actualizar o gestor de "
-"arranque"
-
-#. Type: error
-#. Description
-#: ../linux-base.templates:6001
-msgid ""
-"You should generally identify these devices by UUID or label. However, on "
-"MIPS systems the root device must be identified by name."
-msgstr ""
-"Geralmente deve-se identificar estes dispositivos pelo UUID ou etiqueta. No "
-"entanto, em sistemas MIPS, o dispositivo root tem de ser identificado pelo "
-"nome."
-
-#. Type: error
-#. Description
-#: ../linux-base.templates:8001
-msgid "Boot loader may need to be upgraded"
-msgstr "O gestor de arranque pode precisar de ser actualizado"
-
-#. Type: error
-#. Description
-#: ../linux-base.templates:8001
-msgid "Kernel packages no longer update a default boot loader."
-msgstr ""
-"Os pacotes do kernel já não actualizam um gestor de arranque predefinido."
-
 #. Type: error
 #. Description
 #: ../linux-base.templates:8001 ../templates/temp.image.plain/templates:5001
diff --git a/debian/po/pt_BR.po b/debian/po/pt_BR.po
index 47a5e076e..59f6bbe9e 100644
--- a/debian/po/pt_BR.po
+++ b/debian/po/pt_BR.po
@@ -18,152 +18,6 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "pt_BR utf-8\n"
 
-#. Type: boolean
-#. Description
-#: ../linux-base.templates:2001
-msgid "Update disk device IDs in system configuration?"
-msgstr "Atualizar os IDs de dispositivos de disco na configuração do sistema?"
-
-#. Type: boolean
-#. Description
-#: ../linux-base.templates:2001
-msgid ""
-"The new Linux kernel version provides different drivers for some PATA (IDE) "
-"controllers. The names of some hard disk, CD-ROM, and tape devices may "
-"change."
-msgstr ""
-"A nova versão do kernel Linux fornece drivers diferentes para alguns "
-"controladores PATA (IDE). Os nomes de alguns dispositivos de disco rígido, "
-"CD-ROM e fita podem mudar."
-
-#. Type: boolean
-#. Description
-#: ../linux-base.templates:2001
-msgid ""
-"It is now recommended to identify disk devices in configuration files by "
-"label or UUID (unique identifier) rather than by device name, which will "
-"work with both old and new kernel versions."
-msgstr ""
-"Agora é recomendado identificar dispositivos de disco nos arquivos de "
-"configuração por rótulo (\"label\") ou UUID (identificador único) em vez de "
-"por nome de dispositivo, o que funcionará tanto em antigas como em novas "
-"versões do kernel."
-
-#. Type: boolean
-#. Description
-#: ../linux-base.templates:2001
-msgid ""
-"If you choose to not update the system configuration automatically, you must "
-"update device IDs yourself before the next system reboot or the system may "
-"become unbootable."
-msgstr ""
-"Se você escolher não atualizar a configuração do sistema automaticamente, "
-"você deverá atualizar os identificadores de dispositivo (\"IDs\") por sua "
-"conta antes da próxima reinicialização do sistema, ou talvez o sistema se "
-"torne não inicializável."
-
-#. Type: boolean
-#. Description
-#. Type: boolean
-#. Description
-#: ../linux-base.templates:3001 ../linux-base.templates:4001
-msgid "Apply configuration changes to disk device IDs?"
-msgstr ""
-"Aplicar mudanças nas configurações para identificadores de discos (\"IDs\")?"
-
-#. Type: boolean
-#. Description
-#: ../linux-base.templates:3001
-msgid "These devices will be assigned UUIDs or labels:"
-msgstr "Estes dispositivos serão associados a UUIDs ou rótulos (\"labels\"):"
-
-#. Type: boolean
-#. Description
-#. Type: boolean
-#. Description
-#: ../linux-base.templates:3001 ../linux-base.templates:4001
-msgid "These configuration files will be updated:"
-msgstr "Estes arquivos de configuração serão atualizados:"
-
-#. Type: boolean
-#. Description
-#. Type: boolean
-#. Description
-#: ../linux-base.templates:3001 ../linux-base.templates:4001
-msgid "The device IDs will be changed as follows:"
-msgstr ""
-"Os identificadores de dispositivo (\"IDs\") serão modificados como segue:"
-
-#. Type: error
-#. Description
-#: ../linux-base.templates:5001
-msgid "Configuration files still contain deprecated device names"
-msgstr "Arquivos de configuração ainda contêm nomes de dispositivos obsoletos"
-
-#. Type: error
-#. Description
-#: ../linux-base.templates:5001
-msgid ""
-"The following configuration files still use some device names that may "
-"change when using the new kernel:"
-msgstr ""
-"O seguintes arquivos de configuração ainda usam alguns nomes de dispositivo "
-"que podem mudar ao usar o novo kernel:"
-
-#. Type: error
-#. Description
-#: ../linux-base.templates:6001
-msgid "Boot loader configuration check needed"
-msgstr ""
-"É necessário verificar a configuração do carregador de inicialização (\"boot "
-"loader\")"
-
-#. Type: error
-#. Description
-#: ../linux-base.templates:6001
-msgid ""
-"The boot loader configuration for this system was not recognized. These "
-"settings in the configuration may need to be updated:"
-msgstr ""
-"A configuração do carregador de inicialização para este sistema não foi "
-"reconhecida. Estes ajustes na configuração talvez precisem ser atualizados:"
-
-#. Type: error
-#. Description
-#: ../linux-base.templates:6001
-msgid ""
-" * The root device ID passed as a kernel parameter;\n"
-" * The boot device ID used to install and update the boot loader."
-msgstr ""
-" * O ID do dispositivo raiz passado como um parâmetro do kernel;\n"
-" * O ID do dispositivo de inicialização (\"boot\") usado para instalar e "
-"atualizar o carregador de inicialização."
-
-#. Type: error
-#. Description
-#: ../linux-base.templates:6001
-msgid ""
-"You should generally identify these devices by UUID or label. However, on "
-"MIPS systems the root device must be identified by name."
-msgstr ""
-"Geralmente você deveria identificar estes dispositivos pelo UUID ou rótulo "
-"(\"label\"). Entretanto, em sistemas MIPS o dispositivo raiz deve ser "
-"identificado pelo nome."
-
-#. Type: error
-#. Description
-#: ../linux-base.templates:8001
-msgid "Boot loader may need to be upgraded"
-msgstr ""
-"O carregador de inicialização (\"boot loader\") pode precisar ser atualizado"
-
-#. Type: error
-#. Description
-#: ../linux-base.templates:8001
-msgid "Kernel packages no longer update a default boot loader."
-msgstr ""
-"Pacotes do kernel já não atualizam o carregador de inicialização padrão."
-
 #. Type: error
 #. Description
 #: ../linux-base.templates:8001 ../templates/temp.image.plain/templates:5001
diff --git a/debian/po/ru.po b/debian/po/ru.po
index a8c9e1170..e9a7891af 100644
--- a/debian/po/ru.po
+++ b/debian/po/ru.po
@@ -19,144 +19,6 @@ msgstr ""
 "Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
 "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#. Type: boolean
-#. Description
-#: ../linux-base.templates:2001
-msgid "Update disk device IDs in system configuration?"
-msgstr "Обновить идентификаторы дисковых устройств в настройках системы?"
-
-#. Type: boolean
-#. Description
-#: ../linux-base.templates:2001
-msgid ""
-"The new Linux kernel version provides different drivers for some PATA (IDE) "
-"controllers. The names of some hard disk, CD-ROM, and tape devices may "
-"change."
-msgstr ""
-"Новая версия ядра Linux предоставляет другие драйверы для некоторых "
-"контроллеров PATA (IDE), в следствие чего могут измениться имена некоторых "
-"жёстких дисков, CD-ROM и ленточных накопителей."
-
-#. Type: boolean
-#. Description
-#: ../linux-base.templates:2001
-msgid ""
-"It is now recommended to identify disk devices in configuration files by "
-"label or UUID (unique identifier) rather than by device name, which will "
-"work with both old and new kernel versions."
-msgstr ""
-"Теперь рекомендуется указывать дисковые устройства в файлах настроек в виде "
-"меток и UUID (уникальных идентификаторов), а не имён устройств. Это будет "
-"работать и в старых и в новых версиях ядер."
-
-#. Type: boolean
-#. Description
-#: ../linux-base.templates:2001
-msgid ""
-"If you choose to not update the system configuration automatically, you must "
-"update device IDs yourself before the next system reboot or the system may "
-"become unbootable."
-msgstr ""
-"Если вы не выберете автоматическое обновление системных настроек, то должны "
-"обновить идентификаторы устройств самостоятельно до следующей перезагрузки, "
-"иначе "
-"система не запустится."
-
-#. Type: boolean
-#. Description
-#. Type: boolean
-#. Description
-#: ../linux-base.templates:3001 ../linux-base.templates:4001
-msgid "Apply configuration changes to disk device IDs?"
-msgstr "Применить изменение настроек для идентификаторов дисковых устройств?"
-
-#. Type: boolean
-#. Description
-#: ../linux-base.templates:3001
-msgid "These devices will be assigned UUIDs or labels:"
-msgstr "Следующим устройствам будут назначены UUID или метки:"
-
-#. Type: boolean
-#. Description
-#. Type: boolean
-#. Description
-#: ../linux-base.templates:3001 ../linux-base.templates:4001
-msgid "These configuration files will be updated:"
-msgstr "Следующие файлы настройки будут обновлены:"
-
-#. Type: boolean
-#. Description
-#. Type: boolean
-#. Description
-#: ../linux-base.templates:3001 ../linux-base.templates:4001
-msgid "The device IDs will be changed as follows:"
-msgstr "Идентификаторы устройств будут изменены следующим образом:"
-
-#. Type: error
-#. Description
-#: ../linux-base.templates:5001
-msgid "Configuration files still contain deprecated device names"
-msgstr "Файлы настройки всё ещё содержат устаревшие имена устройств"
-
-#. Type: error
-#. Description
-#: ../linux-base.templates:5001
-msgid ""
-"The following configuration files still use some device names that may "
-"change when using the new kernel:"
-msgstr ""
-"В следующих файлах настройки всё ещё используются некоторые имена устройств, "
-"которые могут измениться при использовании нового ядра:"
-
-#. Type: error
-#. Description
-#: ../linux-base.templates:6001
-msgid "Boot loader configuration check needed"
-msgstr "Требуется проверка настроек системного загрузчика"
-
-#. Type: error
-#. Description
-#: ../linux-base.templates:6001
-msgid ""
-"The boot loader configuration for this system was not recognized. These "
-"settings in the configuration may need to be updated:"
-msgstr ""
-"Не удалось определить настройки системного загрузчика данной системы. "
-"Следующие настройки может потребоваться изменить:"
-
-#. Type: error
-#. Description
-#: ../linux-base.templates:6001
-msgid ""
-" * The root device ID passed as a kernel parameter;\n"
-" * The boot device ID used to install and update the boot loader."
-msgstr ""
-" * ID корневого устройства, передаваемого параметром ядра;\n"
-" * ID загрузочного устройства, используемого для установки и обновления "
-"системного загрузчика."
-
-#. Type: error
-#. Description
-#: ../linux-base.templates:6001
-msgid ""
-"You should generally identify these devices by UUID or label. However, on "
-"MIPS systems the root device must be identified by name."
-msgstr ""
-"Обычно вы можете определить эти устройства по их UUID или метке. Однако, на "
-"системах MIPS корневое устройство должно быть определено по имени."
-
-#. Type: error
-#. Description
-#: ../linux-base.templates:8001
-msgid "Boot loader may need to be upgraded"
-msgstr "Может потребоваться обновление системного загрузчика"
-
-#. Type: error
-#. Description
-#: ../linux-base.templates:8001
-msgid "Kernel packages no longer update a default boot loader."
-msgstr "Пакеты ядра больше не обновляют системный загрузчик по умолчанию"
-
 #. Type: error
 #. Description
 #: ../linux-base.templates:8001 ../templates/temp.image.plain/templates:5001
diff --git a/debian/po/sv.po b/debian/po/sv.po
index 25c7e23b5..cb43c50c7 100644
--- a/debian/po/sv.po
+++ b/debian/po/sv.po
@@ -18,143 +18,6 @@ msgstr ""
 "X-Poedit-Language: Swedish\n"
 "X-Poedit-Country: Sweden\n"
 
-#. Type: boolean
-#. Description
-#: ../linux-base.templates:2001
-msgid "Update disk device IDs in system configuration?"
-msgstr "Uppdatera diskenheters ID i systeminställningar?"
-
-#. Type: boolean
-#. Description
-#: ../linux-base.templates:2001
-msgid ""
-"The new Linux kernel version provides different drivers for some PATA (IDE) "
-"controllers. The names of some hard disk, CD-ROM, and tape devices may "
-"change."
-msgstr ""
-"Den nya versionen av Linuxkärnan tillhandahåller olika drivrutiner för några "
-"PATA(IDE)-kontroller. Namnen på en del hårddiskar, CD-Rom- och band-enheter "
-"kan ändras."
-
-#. Type: boolean
-#. Description
-#: ../linux-base.templates:2001
-msgid ""
-"It is now recommended to identify disk devices in configuration files by "
-"label or UUID (unique identifier) rather than by device name, which will "
-"work with both old and new kernel versions."
-msgstr ""
-"Det är rekomenderat att identifiera diskenheter i konfigurationsfiler med "
-"ettikett eller UUID (unik identifierare) snarare än efter enhetsnamn. "
-"Ettikett och UUID fungerar både med nya och äldre verisioner av kärnan."
-
-#. Type: boolean
-#. Description
-#: ../linux-base.templates:2001
-msgid ""
-"If you choose to not update the system configuration automatically, you must "
-"update device IDs yourself before the next system reboot or the system may "
-"become unbootable."
-msgstr ""
-"Om du väljer att inte uppdatera systeminställningarna automatiskt måste du "
-"uppdatera enhets-ID själv innan nästa omstart av systemet annars kan "
-"systemet bli ostartbart."
-
-#. Type: boolean
-#. Description
-#. Type: boolean
-#. Description
-#: ../linux-base.templates:3001 ../linux-base.templates:4001
-msgid "Apply configuration changes to disk device IDs?"
-msgstr "Genomför förändring av enheternas ID?"
-
-#. Type: boolean
-#. Description
-#: ../linux-base.templates:3001
-msgid "These devices will be assigned UUIDs or labels:"
-msgstr "Dessa enheter kommer att få UUID eller ettiketter:"
-
-#. Type: boolean
-#. Description
-#. Type: boolean
-#. Description
-#: ../linux-base.templates:3001 ../linux-base.templates:4001
-msgid "These configuration files will be updated:"
-msgstr "Dessa konfigurationsfiler kommer att uppdateras:"
-
-#. Type: boolean
-#. Description
-#. Type: boolean
-#. Description
-#: ../linux-base.templates:3001 ../linux-base.templates:4001
-msgid "The device IDs will be changed as follows:"
-msgstr "Enhets-ID kommer att anges som följer:"
-
-#. Type: error
-#. Description
-#: ../linux-base.templates:5001
-msgid "Configuration files still contain deprecated device names"
-msgstr "Konfigurationsfiler innehåller fortfarande utfasade enhetsnamn"
-
-#. Type: error
-#. Description
-#: ../linux-base.templates:5001
-msgid ""
-"The following configuration files still use some device names that may "
-"change when using the new kernel:"
-msgstr ""
-"Följande konfigurationsfiler använder fortfarande några enhetsnamn som kan "
-"komma att ändras med den nya kärnan:"
-
-#. Type: error
-#. Description
-#: ../linux-base.templates:6001
-msgid "Boot loader configuration check needed"
-msgstr "Kontroll av konfigurationen i uppstartshanteraren behövs"
-
-#. Type: error
-#. Description
-#: ../linux-base.templates:6001
-msgid ""
-"The boot loader configuration for this system was not recognized. These "
-"settings in the configuration may need to be updated:"
-msgstr ""
-"Inställningarna för uppstartshanteraren i det här systemet kunde inte kännas "
-"igen. Dessa inställningar kan behöva uppdateras:"
-
-#. Type: error
-#. Description
-#: ../linux-base.templates:6001
-msgid ""
-" * The root device ID passed as a kernel parameter;\n"
-" * The boot device ID used to install and update the boot loader."
-msgstr ""
-"* rotenhetens ID som en parameter till kärnan\n"
-"* uppstartsenhetens ID som används för att installera och uppdatera "
-"uppstartshanteraren"
-
-#. Type: error
-#. Description
-#: ../linux-base.templates:6001
-msgid ""
-"You should generally identify these devices by UUID or label. However, on "
-"MIPS systems the root device must be identified by name."
-msgstr ""
-"Generellt sett ska dessa enheter identifierac med UUID eller ettikett. Dock "
-"måste rotenheten identifieras med namn på Mips-system."
-
-#. Type: error
-#. Description
-#: ../linux-base.templates:8001
-msgid "Boot loader may need to be upgraded"
-msgstr "Uppstartshanteraren kan behöva uppgraderas"
-
-#. Type: error
-#. Description
-#: ../linux-base.templates:8001
-msgid "Kernel packages no longer update a default boot loader."
-msgstr "Kärnpaket uppdaterar inte längre uppstartshanterare."
-
 #. Type: error
 #. Description
 #: ../linux-base.templates:8001 ../templates/temp.image.plain/templates:5001
diff --git a/debian/po/templates.pot b/debian/po/templates.pot
index db151fc6e..3a90e4b26 100644
--- a/debian/po/templates.pot
+++ b/debian/po/templates.pot
@@ -17,125 +17,6 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#. Type: boolean
-#. Description
-#: ../linux-base.templates:2001
-msgid "Update disk device IDs in system configuration?"
-msgstr ""
-
-#. Type: boolean
-#. Description
-#: ../linux-base.templates:2001
-msgid ""
-"The new Linux kernel version provides different drivers for some PATA (IDE) "
-"controllers. The names of some hard disk, CD-ROM, and tape devices may "
-"change."
-msgstr ""
-
-#. Type: boolean
-#. Description
-#: ../linux-base.templates:2001
-msgid ""
-"It is now recommended to identify disk devices in configuration files by "
-"label or UUID (unique identifier) rather than by device name, which will "
-"work with both old and new kernel versions."
-msgstr ""
-
-#. Type: boolean
-#. Description
-#: ../linux-base.templates:2001
-msgid ""
-"If you choose to not update the system configuration automatically, you must "
-"update device IDs yourself before the next system reboot or the system may "
-"become unbootable."
-msgstr ""
-
-#. Type: boolean
-#. Description
-#. Type: boolean
-#. Description
-#: ../linux-base.templates:3001 ../linux-base.templates:4001
-msgid "Apply configuration changes to disk device IDs?"
-msgstr ""
-
-#. Type: boolean
-#. Description
-#: ../linux-base.templates:3001
-msgid "These devices will be assigned UUIDs or labels:"
-msgstr ""
-
-#. Type: boolean
-#. Description
-#. Type: boolean
-#. Description
-#: ../linux-base.templates:3001 ../linux-base.templates:4001
-msgid "These configuration files will be updated:"
-msgstr ""
-
-#. Type: boolean
-#. Description
-#. Type: boolean
-#. Description
-#: ../linux-base.templates:3001 ../linux-base.templates:4001
-msgid "The device IDs will be changed as follows:"
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../linux-base.templates:5001
-msgid "Configuration files still contain deprecated device names"
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../linux-base.templates:5001
-msgid ""
-"The following configuration files still use some device names that may "
-"change when using the new kernel:"
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../linux-base.templates:6001
-msgid "Boot loader configuration check needed"
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../linux-base.templates:6001
-msgid ""
-"The boot loader configuration for this system was not recognized. These "
-"settings in the configuration may need to be updated:"
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../linux-base.templates:6001
-msgid ""
-" * The root device ID passed as a kernel parameter;\n"
-" * The boot device ID used to install and update the boot loader."
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../linux-base.templates:6001
-msgid ""
-"You should generally identify these devices by UUID or label. However, on "
-"MIPS systems the root device must be identified by name."
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../linux-base.templates:8001
-msgid "Boot loader may need to be upgraded"
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../linux-base.templates:8001
-msgid "Kernel packages no longer update a default boot loader."
-msgstr ""
-
 #. Type: error
 #. Description
 #: ../linux-base.templates:8001 ../templates/temp.image.plain/templates:5001
diff --git a/debian/po/vi.po b/debian/po/vi.po
index 8fa8d43fe..350eb6d14 100644
--- a/debian/po/vi.po
+++ b/debian/po/vi.po
@@ -17,142 +17,6 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: LocFactoryEditor 1.8\n"
 
-#. Type: boolean
-#. Description
-#: ../linux-base.templates:2001
-msgid "Update disk device IDs in system configuration?"
-msgstr "Cập nhật các mã số thiết bị đĩa trong cấu hình hệ thống ?"
-
-#. Type: boolean
-#. Description
-#: ../linux-base.templates:2001
-msgid ""
-"The new Linux kernel version provides different drivers for some PATA (IDE) "
-"controllers. The names of some hard disk, CD-ROM, and tape devices may "
-"change."
-msgstr ""
-"Phiên bản hạt nhân Linux mới cung cấp các trình điều khiển khác nhau cho một "
-"số bộ điều khiển PATA (IDE). Vì thế có thể thay đổi tên của một số thiết bị "
-"loại đĩa cứng, đĩa CD và băng."
-
-#. Type: boolean
-#. Description
-#: ../linux-base.templates:2001
-msgid ""
-"It is now recommended to identify disk devices in configuration files by "
-"label or UUID (unique identifier) rather than by device name, which will "
-"work with both old and new kernel versions."
-msgstr ""
-"Giờ khuyến khích xác định thiết bị đĩa (trong tập tin cấu hình) theo nhãn "
-"hay UUID (mã số duy nhất) hơn là theo tên thiết bị, mà có tác động trong "
-"phiên bản hạt nhân cả hai cũ và mới."
-
-#. Type: boolean
-#. Description
-#: ../linux-base.templates:2001
-msgid ""
-"If you choose to not update the system configuration automatically, you must "
-"update device IDs yourself before the next system reboot or the system may "
-"become unbootable."
-msgstr ""
-"Nếu bạn chọn không tự động cập nhật cấu hình hệ thống thì bạn cần phải tự "
-"cập nhật các mã số thiết bị trước lần khởi động hệ thống kế tiếp: không thì "
-"hệ thống có thể không khởi động được."
-
-#. Type: boolean
-#. Description
-#. Type: boolean
-#. Description
-#: ../linux-base.templates:3001 ../linux-base.templates:4001
-msgid "Apply configuration changes to disk device IDs?"
-msgstr "Áp dụng thay đổi cấu hình cho các mã số thiết bị đĩa ?"
-
-#. Type: boolean
-#. Description
-#: ../linux-base.templates:3001
-msgid "These devices will be assigned UUIDs or labels:"
-msgstr "UUID hay nhãn sẽ được gán cho những thiết bị này:"
-
-#. Type: boolean
-#. Description
-#. Type: boolean
-#. Description
-#: ../linux-base.templates:3001 ../linux-base.templates:4001
-msgid "These configuration files will be updated:"
-msgstr "Sắp cập nhật những tập tin cấu hình này:"
-
-#. Type: boolean
-#. Description
-#. Type: boolean
-#. Description
-#: ../linux-base.templates:3001 ../linux-base.templates:4001
-msgid "The device IDs will be changed as follows:"
-msgstr "Các mã số thiết bị sẽ được thay đổi như theo sau :"
-
-#. Type: error
-#. Description
-#: ../linux-base.templates:5001
-msgid "Configuration files still contain deprecated device names"
-msgstr "Tập tin cấu hình vẫn còn chứa tên thiết bị bị phản đối"
-
-#. Type: error
-#. Description
-#: ../linux-base.templates:5001
-msgid ""
-"The following configuration files still use some device names that may "
-"change when using the new kernel:"
-msgstr ""
-"Những tập tin cấu hình theo đây vẫn còn sử dụng một số tên thiết bị mà có "
-"thể thay đổi khi sử dụng hạt nhân mới:"
-
-#. Type: error
-#. Description
-#: ../linux-base.templates:6001
-msgid "Boot loader configuration check needed"
-msgstr "Yêu cầu kiểm tra cấu hình bộ nạp khởi động"
-
-#. Type: error
-#. Description
-#: ../linux-base.templates:6001
-msgid ""
-"The boot loader configuration for this system was not recognized. These "
-"settings in the configuration may need to be updated:"
-msgstr ""
-"Không nhận ra cấu hình bộ nạp khởi động cho hệ thống này. Trong cấu hình thì "
-"có thể cần phải cập nhật những thiết lập này:"
-
-#. Type: error
-#. Description
-#: ../linux-base.templates:6001
-msgid ""
-" * The root device ID passed as a kernel parameter;\n"
-" * The boot device ID used to install and update the boot loader."
-msgstr ""
-" * Mã số thiết bị gốc được gửi dưới dạng một tham số hạt nhân\n"
-" * Mã số thiết bị khởi động được dùng để cài đặt và cập nhật bộ nạp khởi động"
-
-#. Type: error
-#. Description
-#: ../linux-base.templates:6001
-msgid ""
-"You should generally identify these devices by UUID or label. However, on "
-"MIPS systems the root device must be identified by name."
-msgstr ""
-"Nói chung bạn nên xác định thiết bị này theo UUID hay nhãn. Tuy nhiên, trên "
-"hệ thống MIPS thiết bị gốc phải được xác định theo tên."
-
-#. Type: error
-#. Description
-#: ../linux-base.templates:8001
-msgid "Boot loader may need to be upgraded"
-msgstr "Có thể là cần phải nâng cấp bộ nạp khởi động"
-
-#. Type: error
-#. Description
-#: ../linux-base.templates:8001
-msgid "Kernel packages no longer update a default boot loader."
-msgstr "Gói hạt nhân không còn nâng cấp lại bộ nạp khởi động mặc định."
-
 #. Type: error
 #. Description
 #: ../linux-base.templates:8001 ../templates/temp.image.plain/templates:5001
diff --git a/debian/rules.real b/debian/rules.real
index c85a1adc2..a9d47db6f 100644
--- a/debian/rules.real
+++ b/debian/rules.real
@@ -56,8 +56,6 @@ binary-indep: install-manual
 binary-indep: install-patch
 binary-indep: install-source
 binary-indep: install-support
-binary-indep: install-firmware
-binary-indep: install-linux-base
 
 build: $(STAMPS_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_$(TYPE)
 
@@ -530,29 +528,4 @@ install-source: $(BUILD_DIR)/linux-source-$(UPSTREAMVERSION).tar.bz2
 	dh_install '$<' /usr/src
 	+$(MAKE_SELF) install-base
 
-install-firmware: PACKAGE_NAME = firmware-linux-free
-install-firmware: DIR = $(BUILD_DIR)/build-firmware
-install-firmware: SOURCE_DIR = $(BUILD_DIR)/source
-install-firmware: PACKAGE_DIR = debian/$(PACKAGE_NAME)
-install-firmware: DH_OPTIONS := -p$(PACKAGE_NAME)
-install-firmware: $(STAMPS_DIR)/source
-	dh_testdir
-	dh_testroot
-	dh_prep
-	rm -rf '$(DIR)'
-	mkdir '$(DIR)'
-	+$(MAKE_CLEAN) -C '$(SOURCE_DIR)' O='$(CURDIR)/$(DIR)' INSTALL_MOD_PATH='$(CURDIR)'/$(PACKAGE_DIR) firmware_install
-	+$(MAKE_SELF) install-base
-
-install-linux-base: PACKAGE_NAME = linux-base
-install-linux-base: DH_OPTIONS := -p$(PACKAGE_NAME)
-install-linux-base:
-	dh_testdir
-	dh_testroot
-	dh_prep
-	dh_install debian/bin/perf /usr/bin
-	dh_installman debian/perf.1
-	dh_installdebconf
-	+$(MAKE_SELF) install-base
-
 # vim: filetype=make
diff --git a/debian/templates/control.image.type-plain.in b/debian/templates/control.image.type-plain.in
index 4a00c4007..1e1656fc9 100644
--- a/debian/templates/control.image.type-plain.in
+++ b/debian/templates/control.image.type-plain.in
@@ -1,8 +1,8 @@
 Package: linux-image-@upstreamversion@@abiname@@localversion@
 Provides: linux-image, linux-image-@major@, linux-modules-@upstreamversion@@abiname@@localversion@
 Pre-Depends: debconf | debconf-2.0
-Depends: module-init-tools, linux-base (>= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
-Recommends: firmware-linux-free (>= @source_upstream@)
+Depends: module-init-tools, linux-base (>= 3~), ${shlibs:Depends}, ${misc:Depends}
+Recommends: firmware-linux-free (>= 3~)
 Suggests: linux-doc-@version@
 Description: Linux @upstreamversion@ for @class@
  The Linux kernel @upstreamversion@ and modules for use on @longclass@.
diff --git a/debian/templates/control.main.in b/debian/templates/control.main.in
index bcfde7df4..66796dd8a 100644
--- a/debian/templates/control.main.in
+++ b/debian/templates/control.main.in
@@ -67,17 +67,6 @@ Description: Debian patches to version @version@ of the Linux kernel
  Linux @version@ kernel but only against the kernel tarball
  linux-@major@_@source_upstream@.orig.tar.gz from the Debian archive.
 
-Package: firmware-linux-free
-Architecture: all
-Depends: ${misc:Depends}
-Description: Binary firmware for various drivers in the Linux kernel
- This package contains firmware which was previously included in the
- Linux kernel and which is compliant with the Debian Free Software
- Guidelines.
- .
- Most firmware previously included in the Linux kernel is non-free
- and has been moved to the firmware-linux-nonfree package.
-
 Package: linux-support-@upstreamversion@@abiname@
 Architecture: all
 Section: devel
@@ -87,10 +76,3 @@ Description: Support files for Linux @upstreamversion@
  e.g. scripts to handle ABI information and for generation of
  build system meta data.
 
-Package: linux-base
-Architecture: all
-Depends: 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.
-