[kernel] r17048 - in dists/trunk/linux-base: . debian debian/bin debian/po
Ben Hutchings
benh at alioth.debian.org
Sat Mar 12 08:28:51 UTC 2011
Author: benh
Date: Sat Mar 12 08:28:46 2011
New Revision: 17048
Log:
Separate linux-base from the linux-2.6 source package
Added:
dists/trunk/linux-base/
dists/trunk/linux-base/debian/
dists/trunk/linux-base/debian/bin/
dists/trunk/linux-base/debian/bin/perf
- copied unchanged from r17042, dists/trunk/linux-2.6/debian/bin/perf
dists/trunk/linux-base/debian/changelog
dists/trunk/linux-base/debian/compat
- copied unchanged from r17042, dists/trunk/linux-2.6/debian/compat
dists/trunk/linux-base/debian/control
dists/trunk/linux-base/debian/copyright
dists/trunk/linux-base/debian/perf.1
- copied unchanged from r17042, dists/trunk/linux-2.6/debian/perf.1
dists/trunk/linux-base/debian/po/
- copied from r17042, dists/trunk/linux-2.6/debian/po/
dists/trunk/linux-base/debian/postinst
- copied unchanged from r17042, dists/trunk/linux-2.6/debian/linux-base.postinst
dists/trunk/linux-base/debian/rules (contents, props changed)
dists/trunk/linux-base/debian/templates
- copied unchanged from r17042, dists/trunk/linux-2.6/debian/linux-base.templates
Modified:
dists/trunk/linux-base/debian/po/ca.po
dists/trunk/linux-base/debian/po/cs.po
dists/trunk/linux-base/debian/po/da.po
dists/trunk/linux-base/debian/po/de.po
dists/trunk/linux-base/debian/po/es.po
dists/trunk/linux-base/debian/po/et.po
dists/trunk/linux-base/debian/po/fr.po
dists/trunk/linux-base/debian/po/it.po
dists/trunk/linux-base/debian/po/ja.po
dists/trunk/linux-base/debian/po/pt.po
dists/trunk/linux-base/debian/po/pt_BR.po
dists/trunk/linux-base/debian/po/ru.po
dists/trunk/linux-base/debian/po/sv.po
dists/trunk/linux-base/debian/po/templates.pot
dists/trunk/linux-base/debian/po/vi.po
Copied: dists/trunk/linux-base/debian/bin/perf (from r17042, dists/trunk/linux-2.6/debian/bin/perf)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/trunk/linux-base/debian/bin/perf Sat Mar 12 08:28:46 2011 (r17048, copy of r17042, dists/trunk/linux-2.6/debian/bin/perf)
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+# Execute the right version of perf for the current kernel.
+version="$(uname -r)"
+version="${version%%-*}"
+shopt -s execfail
+exec "perf_$version" "$@"
+
+# Not found? Tell the user which package to install.
+echo >&2 "E: linux-tools-$version is not installed."
+exit 1
Added: dists/trunk/linux-base/debian/changelog
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/trunk/linux-base/debian/changelog Sat Mar 12 08:28:46 2011 (r17048)
@@ -0,0 +1,5 @@
+linux-base (3~experimental) UNRELEASED; urgency=low
+
+ * Separate linux-base from the linux-2.6 source package
+
+ -- Ben Hutchings <ben at decadent.org.uk> Sat, 12 Mar 2011 08:02:30 +0000
Copied: dists/trunk/linux-base/debian/compat (from r17042, dists/trunk/linux-2.6/debian/compat)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/trunk/linux-base/debian/compat Sat Mar 12 08:28:46 2011 (r17048, copy of r17042, dists/trunk/linux-2.6/debian/compat)
@@ -0,0 +1 @@
+7
Added: dists/trunk/linux-base/debian/control
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/trunk/linux-base/debian/control Sat Mar 12 08:28:46 2011 (r17048)
@@ -0,0 +1,16 @@
+Source: linux-base
+Section: kernel
+Priority: optional
+Maintainer: Debian Kernel Team <debian-kernel at lists.debian.org>
+Uploaders: Bastian Blank <waldi at debian.org>, Frederik Schüler <fs at debian.org>, maximilian attems <maks at debian.org>, Ben Hutchings <ben at decadent.org.uk>
+Standards-Version: 3.9.1
+Build-Depends: debhelper (>> 7)
+Vcs-Svn: svn://svn.debian.org/svn/kernel/dists/sid/linux-base/
+Vcs-Browser: http://svn.debian.org/wsvn/kernel/dists/sid/linux-base/?op=log
+
+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.
Added: dists/trunk/linux-base/debian/copyright
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/trunk/linux-base/debian/copyright Sat Mar 12 08:28:46 2011 (r17048)
@@ -0,0 +1,31 @@
+Copyright 2010-2011 Ben Hutchings
+Catalan translation: Copyright 2010 Jordi Mallach
+Czech translation: Copyright 2010 Michal Simunek
+Danish translation: Copyright 2010 Joe Hansen
+German translation: Copyright 2010 Holger Wansing
+Spanish translation: Copyright 2010 Omar Campagne, Javier Fernández-Sanguino
+Estonian translation: Copyright 2010 mihkel <mihkel at turakas.com>
+French translation: Copyright 2010 Debian French l10n team
+Italian translation: Copyright 2010 Luca Bruno
+Japanese translation: Copyright 2010 Kenshi Muto, Nobuhiro Iwamatsu
+Portugese translation: Copyright 2010 Américo Monteiro
+Brazilian Portugese translation: Copyright 2010 Flamarion Jorge
+Russian translation: Copyright 2010 Yuri Kozlov
+Swedish translation: Copyright 2010 Martin Bagge
+Vietnamese translation: Copyright 2010 Clytie Siddall
+
+This package is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License version 2 as
+published by the Free Software Foundation.
+
+This package 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 package; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+On Debian systems, the complete text of the GNU General Public License
+version 2 can be found in `/usr/share/common-licenses/GPL-2'.
Copied: dists/trunk/linux-base/debian/perf.1 (from r17042, dists/trunk/linux-2.6/debian/perf.1)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/trunk/linux-base/debian/perf.1 Sat Mar 12 08:28:46 2011 (r17048, copy of r17042, dists/trunk/linux-2.6/debian/perf.1)
@@ -0,0 +1,19 @@
+.TH PERF 1 "4 July 2010"
+.SH NAME
+perf \- performance analysis tools for Linux
+.SH SYNOPSIS
+.HP
+\fBperf\fR [\fB\-\-version\fR] [\fB\-\-help\fR] \fICOMMAND\fR [\fIARGS\fR]
+.SH DESCRIPTION
+.LP
+Performance counters for Linux are are a new kernel\-based subsystem
+that provide a framework for all things performance analysis. It
+covers hardware level (CPU/PMU, Performance Monitoring Unit) features
+and software features (software counters, tracepoints) as well.
+.LP
+Each version of the perf tools may depend on new kernel features, so
+you must install a different version for each kernel version. The
+\fBperf\fR command will automatically run the correct version for the
+running kernel version.
+.SH SEE ALSO
+perf_\fIversion\fR(1)
Modified: dists/trunk/linux-base/debian/po/ca.po
==============================================================================
--- dists/trunk/linux-2.6/debian/po/ca.po Sat Mar 12 03:29:30 2011 (r17042)
+++ dists/trunk/linux-base/debian/po/ca.po Sat Mar 12 08:28:46 2011 (r17048)
@@ -124,127 +124,3 @@
"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
-msgid ""
-"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."
-msgstr "Si s'ha d'actualitzar el carregador cada vegada que s'instaŀla un nou nucli, el paquet del carregador hauria d'instaŀlar un script en /etc/kernel/postinst.d. Alternativament, podeu especificar l'ordre per a actualitzar el carregador establint la variable «postinst_hook» en /etc/kernel-img.conf."
-
-#. Type: boolean
-#. Description
-#: ../templates/temp.image.plain/templates:2001
-msgid "Abort installation after depmod error?"
-msgstr "Voleu avortar la instaŀlació degut a un error de depmod?"
-
-#. Type: boolean
-#. Description
-#: ../templates/temp.image.plain/templates:2001
-msgid ""
-"The 'depmod' command exited with the exit code ${exit_value} "
-"(${SIGNAL}${CORE})."
-msgstr "L'ordre «depmod» ha sortit amb el codi d'error ${exit_value} (${SIGNAL}${CORE})."
-
-#. Type: boolean
-#. Description
-#: ../templates/temp.image.plain/templates:2001
-msgid ""
-"Since this image uses initrd, the ${modules_base}/=V/modules.dep file will "
-"not be deleted, even though it may be invalid."
-msgstr "Com aquesta imatge empra un initrd, no es suprimirà el fitxer ${modules_base}/=V/modules.dep, tot i que potser és invàlid."
-
-#. Type: boolean
-#. Description
-#: ../templates/temp.image.plain/templates:2001
-msgid ""
-"You should abort the installation and fix the errors in depmod, or "
-"regenerate the initrd image with a known good modules.dep file. If you don't "
-"abort the installation, there is a danger that the system will fail to boot."
-msgstr "Hauríeu d'avortar la instaŀlació i corregir els errors de depmod, o regenerar la imatge initrd amb un fitxer modules.dep que siga correcte amb certesa. Si no avorteu la instaŀlació, hi ha el perill que l'arrencada del sistema falle."
-
-#. Type: boolean
-#. Description
-#: ../templates/temp.image.plain/templates:3001
-msgid "Abort kernel removal?"
-msgstr "Voleu avortar la supressió del nucli?"
-
-#. Type: boolean
-#. Description
-#: ../templates/temp.image.plain/templates:3001
-msgid ""
-"You are running a kernel (version ${running}) and attempting to remove the "
-"same version."
-msgstr "Esteu executant un nucli (versió ${running}) i esteu intentant suprimir la mateixa versió."
-
-#. Type: boolean
-#. Description
-#: ../templates/temp.image.plain/templates:3001
-msgid ""
-"This can make the system unbootable as it will remove /boot/vmlinuz-"
-"${running} and all modules under the directory /lib/modules/${running}. This "
-"can only be fixed with a copy of the kernel image and the corresponding "
-"modules."
-msgstr "Això pot fer que el sistema no arrenque perquè suprimirà /boot/vmlinuz-${running} i tots els mòduls sota el directori /lib/modules/${running}. Això només es pot corregir amb una còpia de la imatge del nucli i els mòduls corresponents."
-
-#. Type: boolean
-#. Description
-#: ../templates/temp.image.plain/templates:3001
-msgid ""
-"It is highly recommended to abort the kernel removal unless you are prepared "
-"to fix the system after removal."
-msgstr "És molt recomanable que avorteu la supressió del nucli si no esteu preparat per a reparar el sistema després de la supressió."
-
-#. Type: note
-#. Description
-#: ../templates/temp.image.plain/templates:4001
-msgid "Required firmware files may be missing"
-msgstr "És possible que manquen fitxers de microprogramari requerits"
-
-#. Type: note
-#. Description
-#: ../templates/temp.image.plain/templates:4001
-msgid ""
-"This system is currently running Linux ${runningversion} and you are "
-"installing Linux ${version}. In the new version some of the drivers used on "
-"this system may require additional firmware files:"
-msgstr "Actualment, el sistema està executant el Linux ${runningversion} i esteu instaŀlant el Linux ${version}. A la nova versió, és possible que alguns dels dispositius emprats en el sistema requereixen fitxers de microprogramari addicionals:"
-
-#. Type: note
-#. Description
-#: ../templates/temp.image.plain/templates:4001
-msgid ""
-"Most firmware files are not included in the system because they do not "
-"conform to the Debian Free Software Guidelines. You may need to reconfigure "
-"the package manager to include the contrib and non-free sections of the "
-"package archive before you can install these firmware files."
-msgstr "La major part dels fitxers de microprogramari no estan inclosos al sistema perquè no compleixen els principis del programari lliure de Debian. És possible que necessiteu reconfigurar el gestor de paquets per a incloure les seccions «contrib» i «non-free» de l'arxiu de paquets abans de poder instaŀlar aquests fitxers de microprogramari."
-
-#. Type: error
-#. Description
-#: ../templates/temp.image.plain/templates:5001
-msgid "Boot loader configuration must be updated"
-msgstr "S'ha d'actualitzar la configuració del carregador"
-
-#. Type: error
-#. Description
-#: ../templates/temp.image.plain/templates:5001
-msgid ""
-"Kernel packages no longer update a default boot loader. You should remove "
-"'do_bootloader = yes' from /etc/kernel-img.conf."
-msgstr "Els paquets del nucli ja no actualitzen el carregador per defecte. Hauríeu de suprimir la línia «do_bootloader = yes» del fitxer /etc/kernel-img.conf."
Modified: dists/trunk/linux-base/debian/po/cs.po
==============================================================================
--- dists/trunk/linux-2.6/debian/po/cs.po Sat Mar 12 03:29:30 2011 (r17042)
+++ dists/trunk/linux-base/debian/po/cs.po Sat Mar 12 08:28:46 2011 (r17048)
@@ -139,151 +139,3 @@
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
-msgid ""
-"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."
-msgstr ""
-"Pokud je nutné aktualizovat zavaděč kdykoli je nainstalováno nové jádro, "
-"balíček zavaděče nainstalovuje skript v /etc/kernel/postinst.d. "
-"Můžete také zadat příkaz k aktualizaci zavaděče nastavením proměnné "
-"'postinst_hook' v /etc/kernel-img.conf."
-
-#. Type: boolean
-#. Description
-#: ../templates/temp.image.plain/templates:2001
-msgid "Abort installation after depmod error?"
-msgstr "Přerušit po chybě depmod instalaci?"
-
-#. Type: boolean
-#. Description
-#: ../templates/temp.image.plain/templates:2001
-msgid ""
-"The 'depmod' command exited with the exit code ${exit_value} "
-"(${SIGNAL}${CORE})."
-msgstr "Příkaz 'depmod' skončil s chybou ${exit_value} (${SIGNAL}${CORE})."
-
-#. Type: boolean
-#. Description
-#: ../templates/temp.image.plain/templates:2001
-msgid ""
-"Since this image uses initrd, the ${modules_base}/=V/modules.dep file will "
-"not be deleted, even though it may be invalid."
-msgstr ""
-"Vzhledem k tomu, že tento obraz používá initrd, nebude soubor "
-"${modules_base}/=V/modules.dep smazán, přesto že může být neplatný."
-
-#. Type: boolean
-#. Description
-#: ../templates/temp.image.plain/templates:2001
-msgid ""
-"You should abort the installation and fix the errors in depmod, or "
-"regenerate the initrd image with a known good modules.dep file. If you don't "
-"abort the installation, there is a danger that the system will fail to boot."
-msgstr ""
-"Měli byste přerušit instalaci a opravit chyby v depmod, nebo vytvořit obraz "
-"initrd s prověřeným souborem modules.dep. Nepřerušíte-li instalaci, "
-"vystavujete se riziku, že se nepodaří systém zavést."
-
-#. Type: boolean
-#. Description
-#: ../templates/temp.image.plain/templates:3001
-msgid "Abort kernel removal?"
-msgstr "Přerušit odstraňování jádra?"
-
-#. Type: boolean
-#. Description
-#: ../templates/temp.image.plain/templates:3001
-msgid ""
-"You are running a kernel (version ${running}) and attempting to remove the "
-"same version."
-msgstr ""
-"Pokoušíte se odstranit verzi jádra (version ${running}), která nyní běží."
-
-#. Type: boolean
-#. Description
-#: ../templates/temp.image.plain/templates:3001
-msgid ""
-"This can make the system unbootable as it will remove /boot/vmlinuz-"
-"${running} and all modules under the directory /lib/modules/${running}. This "
-"can only be fixed with a copy of the kernel image and the corresponding "
-"modules."
-msgstr ""
-"To může způsobit, že se nepodaří zavést systém, a také bude odstraněno /boot/"
-"vmlinuz-${running} a všechny moduly v adresáři /lib/modules/${running}. Toto "
-"je možné opravit pouze nakopírováním obrazu jádra a příslušných modulů."
-
-#. Type: boolean
-#. Description
-#: ../templates/temp.image.plain/templates:3001
-msgid ""
-"It is highly recommended to abort the kernel removal unless you are prepared "
-"to fix the system after removal."
-msgstr ""
-"Je silně doporučeno přerušit odstraňování jádra, pokud nejste připraveni "
-"opravovat systém po jeho odstranění."
-
-#. Type: note
-#. Description
-#: ../templates/temp.image.plain/templates:4001
-msgid "Required firmware files may be missing"
-msgstr "Mohou chybět potřebné soubory s firmwarem"
-
-#. Type: note
-#. Description
-#: ../templates/temp.image.plain/templates:4001
-msgid ""
-"This system is currently running Linux ${runningversion} and you are "
-"installing Linux ${version}. In the new version some of the drivers used on "
-"this system may require additional firmware files:"
-msgstr ""
-"Systém nyní běží na Linuxu ${runningversion} a vy instalujete Linux "
-"${version}. V nové verzi mohou některé ovladače používané v tomto systému, "
-"vyžadovat dodatečné soubory s firmwarem:"
-
-#. Type: note
-#. Description
-#: ../templates/temp.image.plain/templates:4001
-msgid ""
-"Most firmware files are not included in the system because they do not "
-"conform to the Debian Free Software Guidelines. You may need to reconfigure "
-"the package manager to include the contrib and non-free sections of the "
-"package archive before you can install these firmware files."
-msgstr ""
-"Většina souborů s firmwarem není zahrnuta v systému, protože nejsou v "
-"souladu se Zásadami svobodného softwaru Debianu. Než budete moci tyto "
-"soubory s firmwarem nainstalovat, budete možná muset nastavit správce "
-"balíčků, aby zahrnoval archiv sekce balíčků non-free."
-
-#. Type: error
-#. Description
-#: ../templates/temp.image.plain/templates:5001
-msgid "Boot loader configuration must be updated"
-msgstr "Nastavení zavaděče musí být aktualizováno"
-
-#. Type: error
-#. Description
-#: ../templates/temp.image.plain/templates:5001
-msgid ""
-"Kernel packages no longer update a default boot loader. You should remove "
-"'do_bootloader = yes' from /etc/kernel-img.conf."
-msgstr ""
-"Jaderný balíček již neaktualizuje výchozí zavaděč. Odstraňte "
-"'do_bootloader = yes' z /etc/kernel-img.conf."
Modified: dists/trunk/linux-base/debian/po/da.po
==============================================================================
--- dists/trunk/linux-2.6/debian/po/da.po Sat Mar 12 03:29:30 2011 (r17042)
+++ dists/trunk/linux-base/debian/po/da.po Sat Mar 12 08:28:46 2011 (r17048)
@@ -140,155 +140,3 @@
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
-msgid ""
-"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."
-msgstr ""
-"Hvis opstartsindlæseren (boot loader) skal opdateres, når en ny kerne er "
-"installeret, bør opstartsindlæserens pakke installere et skript i "
-"/etc/kernel/postinst.d. Alternativt kan du angive kommandoen til opdatering "
-"af opstartsindlæseren ved at angive variablen 'postinst_hook' i "
-"/etc/kernel-img.conf."
-
-#. Type: boolean
-#. Description
-#: ../templates/temp.image.plain/templates:2001
-msgid "Abort installation after depmod error?"
-msgstr "Afbryd installation efter depmod-fejl?"
-
-#. Type: boolean
-#. Description
-#: ../templates/temp.image.plain/templates:2001
-msgid ""
-"The 'depmod' command exited with the exit code ${exit_value} "
-"(${SIGNAL}${CORE})."
-msgstr ""
-"Kommandoen depmod afsluttedes med koden afslutningskoden ${exit_value} "
-"(${SIGNAL} ${CORE})."
-
-#. Type: boolean
-#. Description
-#: ../templates/temp.image.plain/templates:2001
-msgid ""
-"Since this image uses initrd, the ${modules_base}/=V/modules.dep file will "
-"not be deleted, even though it may be invalid."
-msgstr ""
-"Da dette aftryk bruger initrd, vil filen ${modules_base}/=V/modules.dep ikke "
-"blive slettet, selvom den måske er ugyldig."
-
-#. Type: boolean
-#. Description
-#: ../templates/temp.image.plain/templates:2001
-msgid ""
-"You should abort the installation and fix the errors in depmod, or "
-"regenerate the initrd image with a known good modules.dep file. If you don't "
-"abort the installation, there is a danger that the system will fail to boot."
-msgstr ""
-"Du skal afbryde installationen og rette fejlene i depmod, eller gendanne "
-"initrd-aftrykket med en kendt god fil af typen modules-dep. Hvis du ikke "
-"afbryder installationen, er der fare for at systemet vil fejle ved opstart."
-
-#. Type: boolean
-#. Description
-#: ../templates/temp.image.plain/templates:3001
-msgid "Abort kernel removal?"
-msgstr "Afbryd kernefjernelse?"
-
-#. Type: boolean
-#. Description
-#: ../templates/temp.image.plain/templates:3001
-msgid ""
-"You are running a kernel (version ${running}) and attempting to remove the "
-"same version."
-msgstr ""
-"Du kører en kerne (version ${running}) og forsøger at fjerne den samme "
-"version."
-
-#. Type: boolean
-#. Description
-#: ../templates/temp.image.plain/templates:3001
-msgid ""
-"This can make the system unbootable as it will remove /boot/vmlinuz-"
-"${running} and all modules under the directory /lib/modules/${running}. This "
-"can only be fixed with a copy of the kernel image and the corresponding "
-"modules."
-msgstr ""
-"Dette kan gøre at systemet ikke kan starte op da det vil fjerne /boot/"
-"vmlinuz-${running} og alle moduler i mappen /lib/modules//${running}. Dette "
-"kan kun rettes med en kopi af kerneaftrykket og de tilsvarende moduler."
-
-#. Type: boolean
-#. Description
-#: ../templates/temp.image.plain/templates:3001
-msgid ""
-"It is highly recommended to abort the kernel removal unless you are prepared "
-"to fix the system after removal."
-msgstr ""
-"Det anbefales stærkt, at afbryde kernefjernelsen med mindre du er forberedt "
-"på at rette systemet op efter fjernelsen."
-
-#. Type: note
-#. Description
-#: ../templates/temp.image.plain/templates:4001
-msgid "Required firmware files may be missing"
-msgstr "Krævet firmwarefiler mangler måske"
-
-#. Type: note
-#. Description
-#: ../templates/temp.image.plain/templates:4001
-msgid ""
-"This system is currently running Linux ${runningversion} and you are "
-"installing Linux ${version}. In the new version some of the drivers used on "
-"this system may require additional firmware files:"
-msgstr ""
-"Dette system kører aktuelt Linux ${runningversion}, og du installerer Linux "
-"${version}. I den nye version kræver nogle af driverne på dette system måske "
-"yderligere firmwarefiler:"
-
-#. Type: note
-#. Description
-#: ../templates/temp.image.plain/templates:4001
-msgid ""
-"Most firmware files are not included in the system because they do not "
-"conform to the Debian Free Software Guidelines. You may need to reconfigure "
-"the package manager to include the contrib and non-free sections of the "
-"package archive before you can install these firmware files."
-msgstr ""
-"De fleste firmwarefiler er ikke inkluderet i Debiansystemet, da de ikke "
-"overholder Debian Free Softwares retningslinjer. Du skal måske rekonfigurere "
-"pakkehåndteringen for at inkludere contrib og det ikke frie afsnit af "
-"Debianarkivet, før du kan installere disse firmwarefiler."
-
-#. Type: error
-#. Description
-#: ../templates/temp.image.plain/templates:5001
-msgid "Boot loader configuration must be updated"
-msgstr "Konfiguration af opstartsindlæseren (boot loader) skal opdateres"
-
-#. Type: error
-#. Description
-#: ../templates/temp.image.plain/templates:5001
-msgid ""
-"Kernel packages no longer update a default boot loader. You should remove "
-"'do_bootloader = yes' from /etc/kernel-img.conf."
-msgstr ""
-"Kernepakker opdaterer ikke længere en standardopstartsindlæser (boot loader). "
-"Du bør fjerne 'do_bootloader = yes' fra /etc/kernel-img.conf."
Modified: dists/trunk/linux-base/debian/po/de.po
==============================================================================
--- dists/trunk/linux-2.6/debian/po/de.po Sat Mar 12 03:29:30 2011 (r17042)
+++ dists/trunk/linux-base/debian/po/de.po Sat Mar 12 08:28:46 2011 (r17048)
@@ -144,161 +144,3 @@
"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
-msgid ""
-"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."
-msgstr ""
-"Falls der Bootloader aktualisiert werden muss, wenn ein neuer Kernel "
-"installiert wird, sollte das Bootloader-Paket ein Skript in "
-"/etc/kernel/postinst.d installieren. Alternativ können Sie den Befehl für "
-"die Aktualisierung des Bootloaders über das Setzen der Variable "
-"»postinst_hook« in /etc/kernel-img.conf festlegen."
-
-#. Type: boolean
-#. Description
-#: ../templates/temp.image.plain/templates:2001
-msgid "Abort installation after depmod error?"
-msgstr "Installation nach depmod-Fehler abbrechen?"
-
-#. Type: boolean
-#. Description
-#: ../templates/temp.image.plain/templates:2001
-msgid ""
-"The 'depmod' command exited with the exit code ${exit_value} "
-"(${SIGNAL}${CORE})."
-msgstr ""
-"Der »depmod«-Befehl wurde beendet: Rückgabewert ${exit_value} "
-"(${SIGNAL}${CORE})."
-
-#. Type: boolean
-#. Description
-#: ../templates/temp.image.plain/templates:2001
-msgid ""
-"Since this image uses initrd, the ${modules_base}/=V/modules.dep file will "
-"not be deleted, even though it may be invalid."
-msgstr ""
-"Da dieses Image eine initrd verwendet, wird die Datei ${modules_base}/=V/"
-"modules.dep nicht gelöscht, obwohl sie ungültig sein könnte."
-
-#. Type: boolean
-#. Description
-#: ../templates/temp.image.plain/templates:2001
-msgid ""
-"You should abort the installation and fix the errors in depmod, or "
-"regenerate the initrd image with a known good modules.dep file. If you don't "
-"abort the installation, there is a danger that the system will fail to boot."
-msgstr ""
-"Sie sollten die Installation abbrechen und die Fehler bezüglich depmod "
-"beheben, oder erstellen Sie das initrd-Image neu mit einer bekanntermaßen "
-"korrekten modules.dep-Datei. Falls Sie die Installation nicht abbrechen, "
-"besteht die Gefahr, dass das System nicht mehr neu starten kann."
-
-#. Type: boolean
-#. Description
-#: ../templates/temp.image.plain/templates:3001
-msgid "Abort kernel removal?"
-msgstr "Entfernen des Kernels abbrechen?"
-
-#. Type: boolean
-#. Description
-#: ../templates/temp.image.plain/templates:3001
-msgid ""
-"You are running a kernel (version ${running}) and attempting to remove the "
-"same version."
-msgstr ""
-"Es läuft derzeit ein Kernel Version ${running} und Sie versuchen, die "
-"gleiche Version zu entfernen."
-
-#. Type: boolean
-#. Description
-#: ../templates/temp.image.plain/templates:3001
-msgid ""
-"This can make the system unbootable as it will remove /boot/vmlinuz-"
-"${running} and all modules under the directory /lib/modules/${running}. This "
-"can only be fixed with a copy of the kernel image and the corresponding "
-"modules."
-msgstr ""
-"Das kann dazu führen, dass das System nicht mehr startfähig ist, da dadurch /"
-"boot/vmlinuz-${running} und alle Module unterhalb des Verzeichnisses /lib/"
-"modules/${running} entfernt werden. Dies kann nur mit einer Kopie des Kernel-"
-"Images und der dazugehörigen Module behoben werden."
-
-#. Type: boolean
-#. Description
-#: ../templates/temp.image.plain/templates:3001
-msgid ""
-"It is highly recommended to abort the kernel removal unless you are prepared "
-"to fix the system after removal."
-msgstr ""
-"Es wird dringend empfohlen, das Entfernen des Kernels abzubrechen, "
-"ausgenommen Sie sind darauf vorbereitet, das System nach der Entfernung "
-"wieder instandzusetzen."
-
-#. Type: note
-#. Description
-#: ../templates/temp.image.plain/templates:4001
-msgid "Required firmware files may be missing"
-msgstr "Benötigte Firmware-Dateien möglicherweise nicht vorhanden"
-
-#. Type: note
-#. Description
-#: ../templates/temp.image.plain/templates:4001
-msgid ""
-"This system is currently running Linux ${runningversion} and you are "
-"installing Linux ${version}. In the new version some of the drivers used on "
-"this system may require additional firmware files:"
-msgstr ""
-"Auf diesem System läuft derzeit Linux ${runningversion} und Sie installieren "
-"gerade Linux ${version}. In der neuen Version könnten einige Treiber, die "
-"auf diesem System verwendet werden, zusätzliche Firmware-Dateien benötigen:"
-
-#. Type: note
-#. Description
-#: ../templates/temp.image.plain/templates:4001
-msgid ""
-"Most firmware files are not included in the system because they do not "
-"conform to the Debian Free Software Guidelines. You may need to reconfigure "
-"the package manager to include the contrib and non-free sections of the "
-"package archive before you can install these firmware files."
-msgstr ""
-"Die meisten Firmware-Dateien sind nicht im System enthalten, da sie nicht "
-"mit den Debian-Richtlinien für Freie Software (DFSG) konform sind. Sie "
-"müssen unter Umständen den Paketmanager neu konfigurieren, so dass die "
-"contrib- und non-free-Sektionen des Paketarchivs ebenfalls enthalten sind, "
-"bevor Sie diese Firmware-Dateien installieren können."
-
-#. Type: error
-#. Description
-#: ../templates/temp.image.plain/templates:5001
-msgid "Boot loader configuration must be updated"
-msgstr "Aktualisierung der Bootloader-Konfiguration erforderlich"
-
-#. Type: error
-#. Description
-#: ../templates/temp.image.plain/templates:5001
-msgid ""
-"Kernel packages no longer update a default boot loader. You should remove "
-"'do_bootloader = yes' from /etc/kernel-img.conf."
-msgstr ""
-"Kernel-Pakete aktualisieren nicht mehr länger den Standard-Bootloader. "
-"Sie sollten den Eintrag »do_bootloader = yes« aus /etc/kernel-img.conf "
-"entfernen."
Modified: dists/trunk/linux-base/debian/po/es.po
==============================================================================
--- dists/trunk/linux-2.6/debian/po/es.po Sat Mar 12 03:29:30 2011 (r17042)
+++ dists/trunk/linux-base/debian/po/es.po Sat Mar 12 08:28:46 2011 (r17048)
@@ -31,7 +31,7 @@
"Project-Id-Version: linux-2.6 2.6.32+5\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-12-11 10:35+0100\n"
-"PO-Revision-Date: 2010-12-15 04:08+0100\n"
+"PO-Revision-Date: 2011-03-12 08:16+0000\n"
"Last-Translator: Omar Campagne <ocampagne at gmail.com>\n"
"Language-Team: Debian l10n Spanish <debian-l10n-spanish at lists.debian.org>\n"
"MIME-Version: 1.0\n"
@@ -178,160 +178,3 @@
"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
-msgid ""
-"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."
-msgstr ""
-"El paquete del gestor de arranque debería instalar un script en "
-"«/etc/kernel/postinst.d» si tiene que actualizarse cada vez que se instala "
-"un nuevo núcleo. También puede especificar la orden a ejecutar para "
-"actualizar el gestor de arranque configurando la variable «postinst_hook» "
-"en el fichero de configuración «/etc/kernel-img.conf»."
-
-#. Type: boolean
-#. Description
-#: ../templates/temp.image.plain/templates:2001
-msgid "Abort installation after depmod error?"
-msgstr "¿Desea interrumpir la instalación cuando se produzca un fallo de depmod?"
-
-#. Type: boolean
-#. Description
-#: ../templates/temp.image.plain/templates:2001
-msgid ""
-"The 'depmod' command exited with the exit code ${exit_value} "
-"(${SIGNAL}${CORE})."
-msgstr ""
-"La orden «depmod» finalizó con el código de salida «${exit_value} "
-"(${SIGNAL}${CORE})»."
-
-#. Type: boolean
-#. Description
-#: ../templates/temp.image.plain/templates:2001
-msgid ""
-"Since this image uses initrd, the ${modules_base}/=V/modules.dep file will "
-"not be deleted, even though it may be invalid."
-msgstr ""
-"Debido a que esta imagen usa una imagen de arranque «initrd», no se "
-"eliminará el fichero «${modules_base}/=V/modules.dep», aún cuando no sea "
-"válido."
-
-#. Type: boolean
-#. Description
-#: ../templates/temp.image.plain/templates:2001
-msgid ""
-"You should abort the installation and fix the errors in depmod, or "
-"regenerate the initrd image with a known good modules.dep file. If you don't "
-"abort the installation, there is a danger that the system will fail to boot."
-msgstr ""
-"Debería cancelar la instalación y arreglar los errores de depmod, o "
-"regenerar la imagen de arranque «initrd» con un fichero «modules.dep» "
-"fiable. Si no cancela la instalación, existe el peligro de que el sistema no "
-"pueda arrancar."
-
-#. Type: boolean
-#. Description
-#: ../templates/temp.image.plain/templates:3001
-msgid "Abort kernel removal?"
-msgstr "¿Desea cancelar la eliminación del núcleo?"
-
-#. Type: boolean
-#. Description
-#: ../templates/temp.image.plain/templates:3001
-msgid ""
-"You are running a kernel (version ${running}) and attempting to remove the "
-"same version."
-msgstr ""
-"Su sistema está ejecutando el núcleo (versión ${running}), y está intentando "
-"eliminar la misma versión del núcleo."
-
-#. Type: boolean
-#. Description
-#: ../templates/temp.image.plain/templates:3001
-msgid ""
-"This can make the system unbootable as it will remove /boot/vmlinuz-"
-"${running} and all modules under the directory /lib/modules/${running}. This "
-"can only be fixed with a copy of the kernel image and the corresponding "
-"modules."
-msgstr ""
-"Puede que el sistema no pueda arrancar posteriormente, ya que eliminaría «/"
-"boot/vmlinuz-${running}» y todos los módulos en el directorio «/lib/modules/"
-"${running}». Esto sólo se puede arreglar esto con una copia de la imagen del "
-"núcleo y los correspondientes módulos."
-
-#. Type: boolean
-#. Description
-#: ../templates/temp.image.plain/templates:3001
-msgid ""
-"It is highly recommended to abort the kernel removal unless you are prepared "
-"to fix the system after removal."
-msgstr ""
-"Se recomienda encarecidamente cancelar la eliminación del núcleo, a menos "
-"que esté preparado para arreglar el sistema después de la eliminación."
-
-#. Type: note
-#. Description
-#: ../templates/temp.image.plain/templates:4001
-msgid "Required firmware files may be missing"
-msgstr "Puede que los ficheros de firmware requeridos no estén disponibles"
-
-#. Type: note
-#. Description
-#: ../templates/temp.image.plain/templates:4001
-msgid ""
-"This system is currently running Linux ${runningversion} and you are "
-"installing Linux ${version}. In the new version some of the drivers used on "
-"this system may require additional firmware files:"
-msgstr ""
-"Este sistema ejecuta actualmente la versión ${runningversion} de Linux, y se "
-"está instalando la versión ${version}. Puede que los controladores incluidos "
-"en la nueva versión requieran ficheros de firmware adicionales:"
-
-#. Type: note
-#. Description
-#: ../templates/temp.image.plain/templates:4001
-msgid ""
-"Most firmware files are not included in the system because they do not "
-"conform to the Debian Free Software Guidelines. You may need to reconfigure "
-"the package manager to include the contrib and non-free sections of the "
-"package archive before you can install these firmware files."
-msgstr ""
-"La mayoría de ficheros de firmware no se incluyen en el sistema porque no "
-"cumplen las normas de software libre de Debian («Debian Free Software "
-"Guidelines»). Puede que tenga que reconfigurar el gestor de paquetes para "
-"incluir las secciones «contrib» y «non-free» del archivo de Debian antes de "
-"instalar estos ficheros de firmware."
-
-#. Type: error
-#. Description
-#: ../templates/temp.image.plain/templates:5001
-msgid "Boot loader configuration must be updated"
-msgstr "Debe actualizarse la configuración del gestor de arranque"
-
-#. Type: error
-#. Description
-#: ../templates/temp.image.plain/templates:5001
-msgid ""
-"Kernel packages no longer update a default boot loader. You should remove "
-"'do_bootloader = yes' from /etc/kernel-img.conf."
-msgstr ""
-"Los paquetes del núcleo ya no actualizan el gestor de arranque por omisión. "
-"Debe eliminar la línea «do_bootloader = yes» del archivo de configuración "
-"«/etc/kernel-img.conf»."
Modified: dists/trunk/linux-base/debian/po/et.po
==============================================================================
--- dists/trunk/linux-2.6/debian/po/et.po Sat Mar 12 03:29:30 2011 (r17042)
+++ dists/trunk/linux-base/debian/po/et.po Sat Mar 12 08:28:46 2011 (r17048)
@@ -143,150 +143,3 @@
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
-msgid ""
-"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."
-msgstr ""
-
-#. Type: boolean
-#. Description
-#: ../templates/temp.image.plain/templates:2001
-msgid "Abort installation after depmod error?"
-msgstr "Katkesta paigaldus peale depmod veateadet?"
-
-#. Type: boolean
-#. Description
-#: ../templates/temp.image.plain/templates:2001
-msgid ""
-"The 'depmod' command exited with the exit code ${exit_value} "
-"(${SIGNAL}${CORE})."
-msgstr ""
-"'depmod' käsk lõpetas väljumise koodiga ${exit_value} (${SIGNAL}${CORE})."
-
-#. Type: boolean
-#. Description
-#: ../templates/temp.image.plain/templates:2001
-msgid ""
-"Since this image uses initrd, the ${modules_base}/=V/modules.dep file will "
-"not be deleted, even though it may be invalid."
-msgstr ""
-"Kuna tõmmis kasutab initrd-d, siis ${modules_base}/=V/modules.dep faili ei "
-"kustutata, kuigi ta võib olla vigane."
-
-#. Type: boolean
-#. Description
-#: ../templates/temp.image.plain/templates:2001
-msgid ""
-"You should abort the installation and fix the errors in depmod, or "
-"regenerate the initrd image with a known good modules.dep file. If you don't "
-"abort the installation, there is a danger that the system will fail to boot."
-msgstr ""
-"Sa peaksid paigaldamise katkestama ja parandama depmodi vead või "
-"regenereerima initrd tõmmise heade modules.dep failiga. Kui sa ei katkesta, "
-"siis suure tõenäosusega süsteem enam ei käivitu alglaadimisel."
-
-#. Type: boolean
-#. Description
-#: ../templates/temp.image.plain/templates:3001
-msgid "Abort kernel removal?"
-msgstr "Katkesta tuuma eemaldamine?"
-
-#. Type: boolean
-#. Description
-#: ../templates/temp.image.plain/templates:3001
-msgid ""
-"You are running a kernel (version ${running}) and attempting to remove the "
-"same version."
-msgstr ""
-"Sa kasutad tuuma versiooni (version ${running}) ning üritad seda sama "
-"versiooni eemaldada."
-
-#. Type: boolean
-#. Description
-#: ../templates/temp.image.plain/templates:3001
-msgid ""
-"This can make the system unbootable as it will remove /boot/vmlinuz-"
-"${running} and all modules under the directory /lib/modules/${running}. This "
-"can only be fixed with a copy of the kernel image and the corresponding "
-"modules."
-msgstr ""
-"See võib süsteemi muuta mitte käivitatavaks kuna eemaldatakse /boot/vmlinuz-"
-"${running} ja kõik moodulid kataloogist /lib/modules/${running}. Seda saab "
-"parandada ainult sama tumma ja vastavate moodulite kopeerimisega õigetesse "
-"kohtadesse."
-
-#. Type: boolean
-#. Description
-#: ../templates/temp.image.plain/templates:3001
-msgid ""
-"It is highly recommended to abort the kernel removal unless you are prepared "
-"to fix the system after removal."
-msgstr ""
-"On äärmiselt soovituslik katkestada tuuma eemaldamine, kui sa just pole "
-"valmistunud süsteemi ise parandama."
-
-#. Type: note
-#. Description
-#: ../templates/temp.image.plain/templates:4001
-msgid "Required firmware files may be missing"
-msgstr "Vajalikud püsivara failid võivad olla puudu"
-
-#. Type: note
-#. Description
-#: ../templates/temp.image.plain/templates:4001
-msgid ""
-"This system is currently running Linux ${runningversion} and you are "
-"installing Linux ${version}. In the new version some of the drivers used on "
-"this system may require additional firmware files:"
-msgstr ""
-"See süsteem kasutab praegu Linuxi versiooni ${runningversion} ja sina "
-"paigaldad versiooni ${version}. Uues versionis võivad mõned ajurid vajada "
-"lisaks püsivara faile:"
-
-#. Type: note
-#. Description
-#: ../templates/temp.image.plain/templates:4001
-msgid ""
-"Most firmware files are not included in the system because they do not "
-"conform to the Debian Free Software Guidelines. You may need to reconfigure "
-"the package manager to include the contrib and non-free sections of the "
-"package archive before you can install these firmware files."
-msgstr ""
-"Enamik püsivara faile ei ole kaasatud süsteemi, sest nad ei vasta Debian "
-"vaba tarkvara juhtnööridele (Debian Free Software Guidelines). Võimalik, et "
-"pead enne oma pakimajandajat ümber seadistama, et kaasata varamutesse ka "
-"contrib ja non-free harud, kui saad need püsivara failid paigaldada."
-
-#. Type: error
-#. Description
-#: ../templates/temp.image.plain/templates:5001
-#, fuzzy
-#| msgid "Boot loader configuration check needed"
-msgid "Boot loader configuration must be updated"
-msgstr "Vajalik alglaaduri konfiguratsiooni kontroll"
-
-#. Type: error
-#. Description
-#: ../templates/temp.image.plain/templates:5001
-msgid ""
-"Kernel packages no longer update a default boot loader. You should remove "
-"'do_bootloader = yes' from /etc/kernel-img.conf."
-msgstr ""
Modified: dists/trunk/linux-base/debian/po/fr.po
==============================================================================
--- dists/trunk/linux-2.6/debian/po/fr.po Sat Mar 12 03:29:30 2011 (r17042)
+++ dists/trunk/linux-base/debian/po/fr.po Sat Mar 12 08:28:46 2011 (r17048)
@@ -153,162 +153,3 @@
"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
-msgid ""
-"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."
-msgstr ""
-"Si le programme d'amorçage doit être mis à jour à chaque fois qu'un nouveau "
-"noyau est installé, le paquet du programme d'amorçage doit installer un script "
-"dans /etc/kernel/postinst.d. Sinon, vous pouvez indiquer la commande de mise à "
-"jour du programme d'amorçage en configurant la variable « postinst_hook » dans "
-"/etc/kernel-img.conf."
-
-#. Type: boolean
-#. Description
-#: ../templates/temp.image.plain/templates:2001
-msgid "Abort installation after depmod error?"
-msgstr "Abandonner l'installation après l'erreur de depmod ?"
-
-#. Type: boolean
-#. Description
-#: ../templates/temp.image.plain/templates:2001
-msgid ""
-"The 'depmod' command exited with the exit code ${exit_value} "
-"(${SIGNAL}${CORE})."
-msgstr ""
-"La commande depmod s'est terminée avec le code de sortie ${exit_value} "
-"(${SIGNAL} ${CORE})."
-
-#. Type: boolean
-#. Description
-#: ../templates/temp.image.plain/templates:2001
-msgid ""
-"Since this image uses initrd, the ${modules_base}/=V/modules.dep file will "
-"not be deleted, even though it may be invalid."
-msgstr ""
-"Puisque cette image du noyau utilise initrd, le fichier ${modules_base}/=V/"
-"modules.dep ne sera pas effacé, mais il peut ne pas être valable."
-
-#. Type: boolean
-#. Description
-#: ../templates/temp.image.plain/templates:2001
-msgid ""
-"You should abort the installation and fix the errors in depmod, or "
-"regenerate the initrd image with a known good modules.dep file. If you don't "
-"abort the installation, there is a danger that the system will fail to boot."
-msgstr ""
-"Vous devriez abandonner l'installation et corriger les erreurs de dépendance "
-"entre les modules du noyau (depmod), ou créer une nouvelle image initrd avec "
-"un fichier modules.dep valable. Si vous n'annulez pas l'installation, le "
-"système risque de ne pas redémarrer correctement."
-
-#. Type: boolean
-#. Description
-#: ../templates/temp.image.plain/templates:3001
-msgid "Abort kernel removal?"
-msgstr "Abandonner la suppression du noyau ?"
-
-#. Type: boolean
-#. Description
-#: ../templates/temp.image.plain/templates:3001
-msgid ""
-"You are running a kernel (version ${running}) and attempting to remove the "
-"same version."
-msgstr ""
-"Le noyau actuellement utilisé (version ${running}) est en train d'être "
-"supprimé."
-
-#. Type: boolean
-#. Description
-#: ../templates/temp.image.plain/templates:3001
-msgid ""
-"This can make the system unbootable as it will remove /boot/vmlinuz-"
-"${running} and all modules under the directory /lib/modules/${running}. This "
-"can only be fixed with a copy of the kernel image and the corresponding "
-"modules."
-msgstr ""
-"Le système risque de ne plus pouvoir démarrer car /boot/vmlinuz-${running} "
-"sera enlevé ainsi que tous les modules du répertoire /lib/modules/"
-"${running}. Cela peut seulement être réparé avec une copie de l'image du "
-"noyau et des modules correspondants."
-
-#. Type: boolean
-#. Description
-#: ../templates/temp.image.plain/templates:3001
-msgid ""
-"It is highly recommended to abort the kernel removal unless you are prepared "
-"to fix the system after removal."
-msgstr ""
-"Il est fortement recommandé d'interrompre la suppression du noyau à moins "
-"d'être ensuite prêt à réparer le système."
-
-#. Type: note
-#. Description
-#: ../templates/temp.image.plain/templates:4001
-msgid "Required firmware files may be missing"
-msgstr "Microprogrammes (« firmwares ») probablement manquants"
-
-#. Type: note
-#. Description
-#: ../templates/temp.image.plain/templates:4001
-msgid ""
-"This system is currently running Linux ${runningversion} and you are "
-"installing Linux ${version}. In the new version some of the drivers used on "
-"this system may require additional firmware files:"
-msgstr ""
-"Ce système utilise actuellement Linux ${runningversion}, et Linux ${version} "
-"va être installé. Dans la nouvelle version, certains pilotes utilisés par ce "
-"système peuvent avoir besoin des microprogrammes additionnels :"
-
-#. Type: note
-#. Description
-#: ../templates/temp.image.plain/templates:4001
-msgid ""
-"Most firmware files are not included in the system because they do not "
-"conform to the Debian Free Software Guidelines. You may need to reconfigure "
-"the package manager to include the contrib and non-free sections of the "
-"package archive before you can install these firmware files."
-msgstr ""
-"La plupart des microprogrammes ne sont pas intégrés car ils ne sont pas "
-"conformes aux principes du logiciel libre selon Debian. Il est probablement "
-"nécessaire de modifier la configuration du gestionnaire de paquets et "
-"d'ajouter les sections « contrib » (contributions) et « non-free » (non "
-"libre) de l'archive avant de pouvoir installer ces fichiers."
-
-#. Type: error
-#. Description
-#: ../templates/temp.image.plain/templates:5001
-#| msgid "Boot loader configuration check needed"
-msgid "Boot loader configuration must be updated"
-msgstr "Mise à jour indispensable de la configuration du programme d'amorçage"
-
-#. Type: error
-#. Description
-#: ../templates/temp.image.plain/templates:5001
-msgid ""
-"Kernel packages no longer update a default boot loader. You should remove "
-"'do_bootloader = yes' from /etc/kernel-img.conf."
-msgstr ""
-"Les paquets du noyau ne s'occupent plus de la mise à jour d'un programme "
-"d'amorçage par défaut. Vous devriez enlever 'do_bootloader = yes' de "
-"/etc/kernel-img.conf."
Modified: dists/trunk/linux-base/debian/po/it.po
==============================================================================
--- dists/trunk/linux-2.6/debian/po/it.po Sat Mar 12 03:29:30 2011 (r17042)
+++ dists/trunk/linux-base/debian/po/it.po Sat Mar 12 08:28:46 2011 (r17048)
@@ -143,159 +143,3 @@
"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
-msgid ""
-"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."
-msgstr ""
-"Se il boot loader necessita di essere aggiornato ad ogni installazione di "
-"nuovi kernel, il pacchetto relativo dovrebbe installare uno script in /etc/"
-"kernel/postinst.d. In alternativa, è possibile specificare il comando di "
-"aggiornamento tramite la variabile «postinst_hook» in /etc/kernel-img.conf."
-
-#. Type: boolean
-#. Description
-#: ../templates/temp.image.plain/templates:2001
-msgid "Abort installation after depmod error?"
-msgstr "Interrompere l'installazione a seguito dell'errore di depmod?"
-
-#. Type: boolean
-#. Description
-#: ../templates/temp.image.plain/templates:2001
-msgid ""
-"The 'depmod' command exited with the exit code ${exit_value} "
-"(${SIGNAL}${CORE})."
-msgstr ""
-"Il comando «depmod» è terminato con codice d'uscita ${exit_value} "
-"(${SIGNAL}${CORE})."
-
-#. Type: boolean
-#. Description
-#: ../templates/temp.image.plain/templates:2001
-msgid ""
-"Since this image uses initrd, the ${modules_base}/=V/modules.dep file will "
-"not be deleted, even though it may be invalid."
-msgstr ""
-"Poiché questa immagine usa un initrd, il file ${modules_base}/=V/modules.dep "
-"non viene eliminato, anche se potrebbe risultare non più valido."
-
-#. Type: boolean
-#. Description
-#: ../templates/temp.image.plain/templates:2001
-msgid ""
-"You should abort the installation and fix the errors in depmod, or "
-"regenerate the initrd image with a known good modules.dep file. If you don't "
-"abort the installation, there is a danger that the system will fail to boot."
-msgstr ""
-"Si consiglia di interrompere l'installazione e correggere gli errori di "
-"depmod, o ricreare l'immagine initrd con un file modules.dep valido. Se "
-"l'installazione non viene interrotta, è possibile che il sistema possa "
-"risultare non avviabile."
-
-#. Type: boolean
-#. Description
-#: ../templates/temp.image.plain/templates:3001
-msgid "Abort kernel removal?"
-msgstr "Interrompere la rimozione del kernel?"
-
-#. Type: boolean
-#. Description
-#: ../templates/temp.image.plain/templates:3001
-msgid ""
-"You are running a kernel (version ${running}) and attempting to remove the "
-"same version."
-msgstr ""
-"Nel sistema è in esecuzione un kernel (versione ${running}) e si sta "
-"cercando di rimuovere la stessa versione."
-
-#. Type: boolean
-#. Description
-#: ../templates/temp.image.plain/templates:3001
-msgid ""
-"This can make the system unbootable as it will remove /boot/vmlinuz-"
-"${running} and all modules under the directory /lib/modules/${running}. This "
-"can only be fixed with a copy of the kernel image and the corresponding "
-"modules."
-msgstr ""
-"Ciò potrebbe rendere il sistema non avviabile poiché rimuoverà /boot/vmlinuz-"
-"${running} e tutti i moduli nella directory /lib/modules/${running}. A "
-"questo si potrà rimediare solo con una copia dell'immagine del kernel e dei "
-"moduli corrispondenti."
-
-#. Type: boolean
-#. Description
-#: ../templates/temp.image.plain/templates:3001
-msgid ""
-"It is highly recommended to abort the kernel removal unless you are prepared "
-"to fix the system after removal."
-msgstr ""
-"Si consiglia vivamente di interrompere la rimozione del kernel a meno che "
-"non si sia preparati a riparare il sistema in seguito."
-
-#. Type: note
-#. Description
-#: ../templates/temp.image.plain/templates:4001
-msgid "Required firmware files may be missing"
-msgstr "Alcuni firmware richiesti potrebbero non essere presenti"
-
-#. Type: note
-#. Description
-#: ../templates/temp.image.plain/templates:4001
-msgid ""
-"This system is currently running Linux ${runningversion} and you are "
-"installing Linux ${version}. In the new version some of the drivers used on "
-"this system may require additional firmware files:"
-msgstr ""
-"Su questo sistema è attualmente in esecuzione Linux ${runningversion} e si "
-"sta installando Linux ${version}. Nella nuova versione alcuni dei driver "
-"utilizzati su questo sistema potrebbero richiedere firmware aggiuntivi:"
-
-#. Type: note
-#. Description
-#: ../templates/temp.image.plain/templates:4001
-msgid ""
-"Most firmware files are not included in the system because they do not "
-"conform to the Debian Free Software Guidelines. You may need to reconfigure "
-"the package manager to include the contrib and non-free sections of the "
-"package archive before you can install these firmware files."
-msgstr ""
-"La maggior parte dei firmware non sono inclusi nel sistema in quanto non "
-"conformi alle Linee Guida Debian per il Software Libero. Potrebbe essere "
-"necessario riconfigurare il gestore dei pacchetti ed includere le sezioni "
-"contrib e non-free per poterli installare."
-
-#. Type: error
-#. Description
-#: ../templates/temp.image.plain/templates:5001
-msgid "Boot loader configuration must be updated"
-msgstr "La configurazione del boot loader deve essere aggiornata"
-
-#. Type: error
-#. Description
-#: ../templates/temp.image.plain/templates:5001
-msgid ""
-"Kernel packages no longer update a default boot loader. You should remove "
-"'do_bootloader = yes' from /etc/kernel-img.conf."
-msgstr ""
-"I pacchetti del kernel non provvedono più all'aggiornamento del boot loader "
-"predefinito. Si dovrebbe rimuovere la riga «do_bootloader = yes» da /etc/"
-"kernel-img.conf."
Modified: dists/trunk/linux-base/debian/po/ja.po
==============================================================================
--- dists/trunk/linux-2.6/debian/po/ja.po Sat Mar 12 03:29:30 2011 (r17042)
+++ dists/trunk/linux-base/debian/po/ja.po Sat Mar 12 08:28:46 2011 (r17048)
@@ -115,101 +115,3 @@
#: ../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
-msgid "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."
-msgstr "新しいカーネルがインストールされるときに、いつでもブートローダがアップデートされる必要があるなら、ブートローダパッケージは /etc/kernel/postinst.d にスクリプトをインストールしなければなりません。あるいは、/etc/kernel-img.conf にある 'postinst_hook' 変数を設定することによって、ブートローダをアップデートするコマンドを指定できます。"
-
-#. Type: boolean
-#. Description
-#: ../templates/temp.image.plain/templates:2001
-msgid "Abort installation after depmod error?"
-msgstr "depmod のエラー後にインストールを中止しますか?"
-
-#. Type: boolean
-#. Description
-#: ../templates/temp.image.plain/templates:2001
-msgid "The 'depmod' command exited with the exit code ${exit_value} (${SIGNAL}${CORE})."
-msgstr "'depmod' コマンドは終了コード ${exit_value} (${SIGNAL}${CORE}) で終了しました。"
-
-#. Type: boolean
-#. Description
-#: ../templates/temp.image.plain/templates:2001
-msgid "Since this image uses initrd, the ${modules_base}/=V/modules.dep file will not be deleted, even though it may be invalid."
-msgstr "このイメージは initrd を使っているので、${modules_base}/=V/modules.dep ファイルは (たとえ無効なものであったとしても) 削除されません。"
-
-#. Type: boolean
-#. Description
-#: ../templates/temp.image.plain/templates:2001
-msgid "You should abort the installation and fix the errors in depmod, or regenerate the initrd image with a known good modules.dep file. If you don't abort the installation, there is a danger that the system will fail to boot."
-msgstr "インストールを中止して depmod のエラーを修正するか、問題がないとわかっている modules.dep ファイルで initrd イメージを再生成すべきです。インストールを中止しないと、システムの起動に失敗する恐れがあります。"
-
-#. Type: boolean
-#. Description
-#: ../templates/temp.image.plain/templates:3001
-msgid "Abort kernel removal?"
-msgstr "カーネルの削除を中止しますか?"
-
-#. Type: boolean
-#. Description
-#: ../templates/temp.image.plain/templates:3001
-msgid "You are running a kernel (version ${running}) and attempting to remove the same version."
-msgstr "現在カーネル (バージョン ${running}) を実行しており、同一バージョンのカーネルの削除を試みています。"
-
-#. Type: boolean
-#. Description
-#: ../templates/temp.image.plain/templates:3001
-msgid "This can make the system unbootable as it will remove /boot/vmlinuz-${running} and all modules under the directory /lib/modules/${running}. This can only be fixed with a copy of the kernel image and the corresponding modules."
-msgstr "この操作は /boot/vmlinuz-${running} および /lib/modules/${running} ディレクトリ下のすべてのモジュールを削除するので、システムを起動不能にする可能性があります。これは、カーネルイメージおよび関連モジュールのコピーがない限り直せません。"
-
-#. Type: boolean
-#. Description
-#: ../templates/temp.image.plain/templates:3001
-msgid "It is highly recommended to abort the kernel removal unless you are prepared to fix the system after removal."
-msgstr "削除後でもシステムに問題がないような準備を済ませるまで、カーネルの削除を中止することを強くお勧めします。"
-
-#. Type: note
-#. Description
-#: ../templates/temp.image.plain/templates:4001
-msgid "Required firmware files may be missing"
-msgstr "必要なファームウェアファイルがなくなっている可能性があります"
-
-#. Type: note
-#. Description
-#: ../templates/temp.image.plain/templates:4001
-msgid "This system is currently running Linux ${runningversion} and you are installing Linux ${version}. In the new version some of the drivers used on this system may require additional firmware files:"
-msgstr "このシステムは現在 Linux ${runningversion} を実行しており、Linux ${version} をインストールしようとしています。新しいバージョンでは、このシステムで使われるドライバのいくつかは追加のファームウェアファイルを必要とするかもしれません:"
-
-#. Type: note
-#. Description
-#: ../templates/temp.image.plain/templates:4001
-msgid "Most firmware files are not included in the system because they do not conform to the Debian Free Software Guidelines. You may need to reconfigure the package manager to include the contrib and non-free sections of the package archive before you can install these firmware files."
-msgstr "ほとんどのファームウェアファイルは、Debian フリーソフトウェアガイドラインに合致しないため、システムに含まれていません。これらのファームウェアファイルをインストール可能にするために、パッケージアーカイブの contrib および non-free セクションを含むようパッケージマネージャを再設定する必要があるかもしれません。"
-
-#. Type: error
-#. Description
-#: ../templates/temp.image.plain/templates:5001
-msgid "Boot loader configuration must be updated"
-msgstr "ブートローダ設定を更新する必要があります"
-
-#. Type: error
-#. Description
-#: ../templates/temp.image.plain/templates:5001
-msgid "Kernel packages no longer update a default boot loader. You should remove 'do_bootloader = yes' from /etc/kernel-img.conf."
-msgstr "カーネルパッケージはデフォルトブートローダをもはやアップデートしません。/etc/kernel-img.conf から 'do_bootloader = yes' の行を削除しなければなりません。"
-
Modified: dists/trunk/linux-base/debian/po/pt.po
==============================================================================
--- dists/trunk/linux-2.6/debian/po/pt.po Sat Mar 12 03:29:30 2011 (r17042)
+++ dists/trunk/linux-base/debian/po/pt.po Sat Mar 12 08:28:46 2011 (r17048)
@@ -146,157 +146,3 @@
"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
-msgid ""
-"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."
-msgstr ""
-"Se o gestor de arranque precisa de ser actualizado sempre que um novo kernel "
-"é instalado, o pacote do gestor de arranque deve instalar um script em "
-"/etc/kernel/postinst.d. Em alternativa, você pode especificar o comando para "
-"actualizar o gestor de arranque ao definir a variável 'postinst_hook' em "
-"/etc/kernel-img.conf."
-
-#. Type: boolean
-#. Description
-#: ../templates/temp.image.plain/templates:2001
-msgid "Abort installation after depmod error?"
-msgstr "Abortar a instalação após erro do depmod?"
-
-#. Type: boolean
-#. Description
-#: ../templates/temp.image.plain/templates:2001
-msgid ""
-"The 'depmod' command exited with the exit code ${exit_value} "
-"(${SIGNAL}${CORE})."
-msgstr ""
-"O comando 'depmod' terminou com o código de erro ${exit_value} "
-"(${SIGNAL}${CORE})."
-
-#. Type: boolean
-#. Description
-#: ../templates/temp.image.plain/templates:2001
-msgid ""
-"Since this image uses initrd, the ${modules_base}/=V/modules.dep file will "
-"not be deleted, even though it may be invalid."
-msgstr ""
-"Como esta imagem usa initrd, o ficheiro ${modules_base}/=V/modules.dep não "
-"será apagado, apesar de poder ser inválido."
-
-#. Type: boolean
-#. Description
-#: ../templates/temp.image.plain/templates:2001
-msgid ""
-"You should abort the installation and fix the errors in depmod, or "
-"regenerate the initrd image with a known good modules.dep file. If you don't "
-"abort the installation, there is a danger that the system will fail to boot."
-msgstr ""
-"Você deve abortar a instalação e corrigir os erros do depmod, ou gerar "
-"novamente a imagem initrd com um ficheiro modules.dep conhecido como bom. Se "
-"não abortar a instalação, existe o perigo do sistema falhar no arranque."
-
-#. Type: boolean
-#. Description
-#: ../templates/temp.image.plain/templates:3001
-msgid "Abort kernel removal?"
-msgstr "Abortar a remoção do kernel?"
-
-#. Type: boolean
-#. Description
-#: ../templates/temp.image.plain/templates:3001
-msgid ""
-"You are running a kernel (version ${running}) and attempting to remove the "
-"same version."
-msgstr ""
-"Você está a correr um kernel (versão ${running}) e a tentar remover essa "
-"mesma versão."
-
-#. Type: boolean
-#. Description
-#: ../templates/temp.image.plain/templates:3001
-msgid ""
-"This can make the system unbootable as it will remove /boot/vmlinuz-"
-"${running} and all modules under the directory /lib/modules/${running}. This "
-"can only be fixed with a copy of the kernel image and the corresponding "
-"modules."
-msgstr ""
-"Isto pode fazer com que o sistema não arranque porque irá remover /boot/"
-"vmlinuz-${running} e todos os módulos no directório /lib/modules/${running}. "
-"Isto só pode ser corrigido com uma cópia da imagem do kernel e dos "
-"correspondentes módulos."
-
-#. Type: boolean
-#. Description
-#: ../templates/temp.image.plain/templates:3001
-msgid ""
-"It is highly recommended to abort the kernel removal unless you are prepared "
-"to fix the system after removal."
-msgstr ""
-"É altamente recomendado abortar a remoção do kernel a menos que esteja "
-"preparado para corrigir o sistema após a remoção."
-
-#. Type: note
-#. Description
-#: ../templates/temp.image.plain/templates:4001
-msgid "Required firmware files may be missing"
-msgstr "Podem estar em falta ficheiros de firmware necessários"
-
-#. Type: note
-#. Description
-#: ../templates/temp.image.plain/templates:4001
-msgid ""
-"This system is currently running Linux ${runningversion} and you are "
-"installing Linux ${version}. In the new version some of the drivers used on "
-"this system may require additional firmware files:"
-msgstr ""
-"Este sistema está actualmente a correr Linux ${runningversion} e você está a "
-"instalar Linux ${version}. Na nova versão algumas das drivers usadas neste "
-"sistema podem necessitar dos ficheiros de firmware adicionais:"
-
-#. Type: note
-#. Description
-#: ../templates/temp.image.plain/templates:4001
-msgid ""
-"Most firmware files are not included in the system because they do not "
-"conform to the Debian Free Software Guidelines. You may need to reconfigure "
-"the package manager to include the contrib and non-free sections of the "
-"package archive before you can install these firmware files."
-msgstr ""
-"A maioria dos ficheiros de firmware não estão incluídos no sistema porque "
-"não respeitam as Guidelines da Debian Free Software. Você pode precisar de "
-"reconfigurar o gestor de pacotes para incluir as secções contrib e non-free "
-"do arquivo de pacotes antes de poder instalar estes ficheiros de firmware."
-
-#. Type: error
-#. Description
-#: ../templates/temp.image.plain/templates:5001
-msgid "Boot loader configuration must be updated"
-msgstr "A configuração do gestor de arranque tem de ser actualizada"
-
-#. Type: error
-#. Description
-#: ../templates/temp.image.plain/templates:5001
-msgid ""
-"Kernel packages no longer update a default boot loader. You should remove "
-"'do_bootloader = yes' from /etc/kernel-img.conf."
-msgstr ""
-"Os pacotes do kernel já não actualizam um gestor de arranque predefinido. "
-"Você deve remover 'do_bootloader = yes' de /etc/kernel-img.conf."
Modified: dists/trunk/linux-base/debian/po/pt_BR.po
==============================================================================
--- dists/trunk/linux-2.6/debian/po/pt_BR.po Sat Mar 12 03:29:30 2011 (r17042)
+++ dists/trunk/linux-base/debian/po/pt_BR.po Sat Mar 12 08:28:46 2011 (r17048)
@@ -149,161 +149,3 @@
"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
-msgid ""
-"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."
-msgstr ""
-"Se o carregador de inicialização precisa ser atualizado sempre que um novo "
-"kernel é instalado, o pacote do carregador de inicialização deveria instalar "
-"um script em /etc/kernel/postinst.d. Alternativamente, você pode especificar "
-"o comando para atualizar o carregador de inicialização definindo a variável "
-"'postinst_hook' em /etc/kernel-img.conf."
-
-#. Type: boolean
-#. Description
-#: ../templates/temp.image.plain/templates:2001
-msgid "Abort installation after depmod error?"
-msgstr "Cancelar instalação após erro do depmod?"
-
-#. Type: boolean
-#. Description
-#: ../templates/temp.image.plain/templates:2001
-msgid ""
-"The 'depmod' command exited with the exit code ${exit_value} (${SIGNAL}"
-"${CORE})."
-msgstr ""
-"O comando 'depmod' terminou com o código de saída ${exit_value} (${SIGNAL}"
-"${CORE})."
-
-#. Type: boolean
-#. Description
-#: ../templates/temp.image.plain/templates:2001
-msgid ""
-"Since this image uses initrd, the ${modules_base}/=V/modules.dep file will "
-"not be deleted, even though it may be invalid."
-msgstr ""
-"Uma vez que esta imagem usa o initrd, o arquivo ${modules_base}/=V/modules."
-"dep não será removido, embora possa ser considerado inválido."
-
-#. Type: boolean
-#. Description
-#: ../templates/temp.image.plain/templates:2001
-msgid ""
-"You should abort the installation and fix the errors in depmod, or "
-"regenerate the initrd image with a known good modules.dep file. If you don't "
-"abort the installation, there is a danger that the system will fail to boot."
-msgstr ""
-"Você deve cancelar a instalação e consertar os erros no depmod, ou regerar a "
-"imagem do initrd com um arquivo modules.dep em bom estado. Se você não "
-"cancelar a instalação, existe um perigo de seu sistema falhar na "
-"inicialização."
-
-#. Type: boolean
-#. Description
-#: ../templates/temp.image.plain/templates:3001
-msgid "Abort kernel removal?"
-msgstr "Cancelar remoção do kernel?"
-
-#. Type: boolean
-#. Description
-#: ../templates/temp.image.plain/templates:3001
-msgid ""
-"You are running a kernel (version ${running}) and attempting to remove the "
-"same version."
-msgstr ""
-"Você está executando um kernel (version ${running}) e tentando remover a "
-"mesma versão."
-
-#. Type: boolean
-#. Description
-#: ../templates/temp.image.plain/templates:3001
-msgid ""
-"This can make the system unbootable as it will remove /boot/vmlinuz-"
-"${running} and all modules under the directory /lib/modules/${running}. This "
-"can only be fixed with a copy of the kernel image and the corresponding "
-"modules."
-msgstr ""
-"Isto pode tornar o sistema não inicializável, pois removerá /boot/vmlinuz-"
-"${running} e todos os módulos sob o diretório /lib/modules/${running}. Isto "
-"só pode ser consertado com uma cópia da imagem do kernel e dos módulos "
-"correspondentes."
-
-#. Type: boolean
-#. Description
-#: ../templates/temp.image.plain/templates:3001
-msgid ""
-"It is highly recommended to abort the kernel removal unless you are prepared "
-"to fix the system after removal."
-msgstr ""
-"É altamente recomendável cancelar a remoção do kernel, a menos que você "
-"esteja preparado para consertar o sistema após a remoção."
-
-#. Type: note
-#. Description
-#: ../templates/temp.image.plain/templates:4001
-msgid "Required firmware files may be missing"
-msgstr "Arquivos de firmware necessários podem estar faltando"
-
-#. Type: note
-#. Description
-#: ../templates/temp.image.plain/templates:4001
-msgid ""
-"This system is currently running Linux ${runningversion} and you are "
-"installing Linux ${version}. In the new version some of the drivers used on "
-"this system may require additional firmware files:"
-msgstr ""
-"Este sistema atualmente está executando o Linux ${runningversion} e você "
-"está instalando o Linux ${version}. Na nova versão alguns dos drivers usados "
-"neste sistema podem precisar de arquivos de firmware adicionais:"
-
-#. Type: note
-#. Description
-#: ../templates/temp.image.plain/templates:4001
-msgid ""
-"Most firmware files are not included in the system because they do not "
-"conform to the Debian Free Software Guidelines. You may need to reconfigure "
-"the package manager to include the contrib and non-free sections of the "
-"package archive before you can install these firmware files."
-msgstr ""
-"A maioria dos arquivos de firmware não estão incluídos no sistema porque não "
-"estão em conformidade com a Definição Debian de Software Livre (\"Debian "
-"Free Software Guidelines\"). Você poderá precisar reconfigurar o gerenciador "
-"de pacotes para incluir as seções contrib e non-free do repositório de "
-"pacotes antes de poder instalar estes arquivos de firmware."
-
-#. Type: error
-#. Description
-#: ../templates/temp.image.plain/templates:5001
-msgid "Boot loader configuration must be updated"
-msgstr "A configuração do carregador de inicialização deve ser atualizada"
-
-#. Type: error
-#. Description
-#: ../templates/temp.image.plain/templates:5001
-msgid ""
-"Kernel packages no longer update a default boot loader. You should remove "
-"'do_bootloader = yes' from /etc/kernel-img.conf."
-msgstr ""
-"Os pacotes do kernel não atualizam mais o carregador de inicialização "
-"padrão. Você deve remover 'do_bootloader = yes' do arquivo /etc/kernel-img."
-"conf."
Modified: dists/trunk/linux-base/debian/po/ru.po
==============================================================================
--- dists/trunk/linux-2.6/debian/po/ru.po Sat Mar 12 03:29:30 2011 (r17042)
+++ dists/trunk/linux-base/debian/po/ru.po Sat Mar 12 08:28:46 2011 (r17048)
@@ -144,155 +144,3 @@
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
-msgid ""
-"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."
-msgstr ""
-"Если системный загрузчик требует обновления после установки нового ядра, "
-"то пакет системного загрузчика должен устанавливать сценарий в каталог "
-"/etc/kernel/postinst.d. Или же вы можете задать команду обновления "
-"системного загрузчика, указав её в переменной postinst_hook в файле "
-"/etc/kernel-img.conf."
-
-#. Type: boolean
-#. Description
-#: ../templates/temp.image.plain/templates:2001
-msgid "Abort installation after depmod error?"
-msgstr "Прервать установку после ошибки depmod?"
-
-#. Type: boolean
-#. Description
-#: ../templates/temp.image.plain/templates:2001
-msgid ""
-"The 'depmod' command exited with the exit code ${exit_value} "
-"(${SIGNAL}${CORE})."
-msgstr ""
-"Команда depmod завершилась с кодом ошибки ${exit_value} (${SIGNAL}${CORE})."
-
-#. Type: boolean
-#. Description
-#: ../templates/temp.image.plain/templates:2001
-msgid ""
-"Since this image uses initrd, the ${modules_base}/=V/modules.dep file will "
-"not be deleted, even though it may be invalid."
-msgstr ""
-"Так как этот образ использует initrd, файл ${modules_base}/=V/modules.dep не "
-"будет удалён, даже если он может быть неправильным."
-
-#. Type: boolean
-#. Description
-#: ../templates/temp.image.plain/templates:2001
-msgid ""
-"You should abort the installation and fix the errors in depmod, or "
-"regenerate the initrd image with a known good modules.dep file. If you don't "
-"abort the installation, there is a danger that the system will fail to boot."
-msgstr ""
-"Вы должны прервать установку и исправить ошибки depmod, или пересобрать "
-"образ initrd с работающим файлом modules.dep. Если вы не прервёте установку, "
-"то система больше не сможет загружаться."
-
-#. Type: boolean
-#. Description
-#: ../templates/temp.image.plain/templates:3001
-msgid "Abort kernel removal?"
-msgstr "Прервать удаление ядра?"
-
-#. Type: boolean
-#. Description
-#: ../templates/temp.image.plain/templates:3001
-msgid ""
-"You are running a kernel (version ${running}) and attempting to remove the "
-"same version."
-msgstr "Вы пытаетесь удалить запущенную версию ядра (${running})."
-
-#. Type: boolean
-#. Description
-#: ../templates/temp.image.plain/templates:3001
-msgid ""
-"This can make the system unbootable as it will remove /boot/vmlinuz-"
-"${running} and all modules under the directory /lib/modules/${running}. This "
-"can only be fixed with a copy of the kernel image and the corresponding "
-"modules."
-msgstr ""
-"Это может привести к неспособности загрузки системы, так как будут удалён "
-"файл /boot/vmlinuz-${running} и все модули из каталога /lib/modules/"
-"${running}. Это можно будет исправить только копированием образа ядра и "
-"соответствующих модулей."
-
-#. Type: boolean
-#. Description
-#: ../templates/temp.image.plain/templates:3001
-msgid ""
-"It is highly recommended to abort the kernel removal unless you are prepared "
-"to fix the system after removal."
-msgstr ""
-"Настоятельно рекомендуется прервать удаление ядра, если вы не готовы чинить "
-"систему после его удаления."
-
-#. Type: note
-#. Description
-#: ../templates/temp.image.plain/templates:4001
-msgid "Required firmware files may be missing"
-msgstr "Могут отсутствовать необходимые файлы микропрограмм"
-
-#. Type: note
-#. Description
-#: ../templates/temp.image.plain/templates:4001
-msgid ""
-"This system is currently running Linux ${runningversion} and you are "
-"installing Linux ${version}. In the new version some of the drivers used on "
-"this system may require additional firmware files:"
-msgstr ""
-"В этой системе сейчас работает ядро Linux ${runningversion} и производится "
-"установка Linux ${version}. В новой версии некоторым драйверам, используемым "
-"в данной системе, могут потребоваться дополнительные файлы микропрограмм:"
-
-#. Type: note
-#. Description
-#: ../templates/temp.image.plain/templates:4001
-msgid ""
-"Most firmware files are not included in the system because they do not "
-"conform to the Debian Free Software Guidelines. You may need to reconfigure "
-"the package manager to include the contrib and non-free sections of the "
-"package archive before you can install these firmware files."
-msgstr ""
-"Большинства файлов микропрограмм нет в дистрибутиве, так как они не "
-"удовлетворяют критериям свободного ПО Debian. Для установки этих файлов из "
-"архива вам может потребоваться перенастроить менеджер пакетов, чтобы "
-"включить разделы contrib и non-free."
-
-#. Type: error
-#. Description
-#: ../templates/temp.image.plain/templates:5001
-#| msgid "Boot loader configuration check needed"
-msgid "Boot loader configuration must be updated"
-msgstr "Требуется обновление настроек системного загрузчика"
-
-#. Type: error
-#. Description
-#: ../templates/temp.image.plain/templates:5001
-msgid ""
-"Kernel packages no longer update a default boot loader. You should remove "
-"'do_bootloader = yes' from /etc/kernel-img.conf."
-msgstr ""
-"Пакеты ядра больше не обновляют системный загрузчик по умолчанию. "
-"Вы должны удалить строку \"do_bootloader = yes\" из файла "
-"/etc/kernel-img.conf."
Modified: dists/trunk/linux-base/debian/po/sv.po
==============================================================================
--- dists/trunk/linux-2.6/debian/po/sv.po Sat Mar 12 03:29:30 2011 (r17042)
+++ dists/trunk/linux-base/debian/po/sv.po Sat Mar 12 08:28:46 2011 (r17048)
@@ -142,156 +142,3 @@
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
-msgid ""
-"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."
-msgstr ""
-"Om uppstartshanteraren behöver uppdateras när en ny kärna installeras ska "
-"uppstartshanteraren installera ett skript i /etc/kernel/postinst.d. "
-"Alternativt kan du ange kommandot som används för att uppdatera "
-"uppstartshanteraren genom att sätta variabeln \"postinst_hook\" i /etc/"
-"kernel-img.conf."
-
-#. Type: boolean
-#. Description
-#: ../templates/temp.image.plain/templates:2001
-msgid "Abort installation after depmod error?"
-msgstr "Avbryt installation efter fel i depmod?"
-
-#. Type: boolean
-#. Description
-#: ../templates/temp.image.plain/templates:2001
-msgid ""
-"The 'depmod' command exited with the exit code ${exit_value} "
-"(${SIGNAL}${CORE})."
-msgstr ""
-"Kommandot \"depmod\" avslutades med felkod ${exit_value} (${SIGNAL}${CORE})."
-
-#. Type: boolean
-#. Description
-#: ../templates/temp.image.plain/templates:2001
-msgid ""
-"Since this image uses initrd, the ${modules_base}/=V/modules.dep file will "
-"not be deleted, even though it may be invalid."
-msgstr ""
-"Eftersom denna avbildning använder initrd kommer inte filen ${modules_base}/"
-"=V/modules.dep att raderas, trots att den kan vara felaktig."
-
-#. Type: boolean
-#. Description
-#: ../templates/temp.image.plain/templates:2001
-msgid ""
-"You should abort the installation and fix the errors in depmod, or "
-"regenerate the initrd image with a known good modules.dep file. If you don't "
-"abort the installation, there is a danger that the system will fail to boot."
-msgstr ""
-"Du bör avbryta installationen och laga felen i depmod eller skapa en ny "
-"initrd-avbildning med en fungerande modules.dep-fil. Om du inte avbryter "
-"installationen kan systemet hamna i ett läge där det inte kan starta."
-
-#. Type: boolean
-#. Description
-#: ../templates/temp.image.plain/templates:3001
-msgid "Abort kernel removal?"
-msgstr "Avbryt radering av kärnan?"
-
-#. Type: boolean
-#. Description
-#: ../templates/temp.image.plain/templates:3001
-msgid ""
-"You are running a kernel (version ${running}) and attempting to remove the "
-"same version."
-msgstr ""
-"Den kärna du kör (version ${running}) och den du försöker ta bort är samma "
-"version."
-
-#. Type: boolean
-#. Description
-#: ../templates/temp.image.plain/templates:3001
-msgid ""
-"This can make the system unbootable as it will remove /boot/vmlinuz-"
-"${running} and all modules under the directory /lib/modules/${running}. This "
-"can only be fixed with a copy of the kernel image and the corresponding "
-"modules."
-msgstr ""
-"Detta kan göra systemet ostartbart eftersom det kommer att innebära att /"
-"boot/vmlinuz-${running} och alla moduler i /lib/modules/${running} raderas. "
-"Detta kan endast återställas med en kopia av kärnavbildningen och "
-"motsvarande moduler."
-
-#. Type: boolean
-#. Description
-#: ../templates/temp.image.plain/templates:3001
-msgid ""
-"It is highly recommended to abort the kernel removal unless you are prepared "
-"to fix the system after removal."
-msgstr ""
-"Det rekomenderas starkt att du avbryter raderingen av kärnan om du inte är "
-"beredd på att laga systemet efter raderingen."
-
-#. Type: note
-#. Description
-#: ../templates/temp.image.plain/templates:4001
-msgid "Required firmware files may be missing"
-msgstr "Firmware-filer som krävs kan saknas"
-
-#. Type: note
-#. Description
-#: ../templates/temp.image.plain/templates:4001
-msgid ""
-"This system is currently running Linux ${runningversion} and you are "
-"installing Linux ${version}. In the new version some of the drivers used on "
-"this system may require additional firmware files:"
-msgstr ""
-"Detta system kör Linux ${runningversion} och du installerar Linux "
-"${version}. I den nya versionen kan vissa drivrutiner behöva ytterligare "
-"firmware-filer:"
-
-#. Type: note
-#. Description
-#: ../templates/temp.image.plain/templates:4001
-msgid ""
-"Most firmware files are not included in the system because they do not "
-"conform to the Debian Free Software Guidelines. You may need to reconfigure "
-"the package manager to include the contrib and non-free sections of the "
-"package archive before you can install these firmware files."
-msgstr ""
-"På grund av bestämmelserna i Debian Free Software Guidelines kan de flesta "
-"firmware-filer inte inkluderas i systemet. Du kan behöva anpassa "
-"pakethanteraren för att inkludera sektionerna \"contrib\" och \"non-free\" i "
-"paketarkivet innan du kan installera dessa filer."
-
-#. Type: error
-#. Description
-#: ../templates/temp.image.plain/templates:5001
-#| msgid "Boot loader configuration check needed"
-msgid "Boot loader configuration must be updated"
-msgstr "Inställningarna för uppstartshanteraren behöver uppdateras"
-
-#. Type: error
-#. Description
-#: ../templates/temp.image.plain/templates:5001
-msgid ""
-"Kernel packages no longer update a default boot loader. You should remove "
-"'do_bootloader = yes' from /etc/kernel-img.conf."
-msgstr ""
-"Kärnpaket uppdaterar inte längre uppstartshanterare. Du ska ta bort "
-"\"do_bootloader = yes\" från /etc/kernel-img.conf."
Modified: dists/trunk/linux-base/debian/po/templates.pot
==============================================================================
--- dists/trunk/linux-2.6/debian/po/templates.pot Sat Mar 12 03:29:30 2011 (r17042)
+++ dists/trunk/linux-base/debian/po/templates.pot Sat Mar 12 08:28:46 2011 (r17048)
@@ -123,127 +123,3 @@
"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
-msgid ""
-"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."
-msgstr ""
-
-#. Type: boolean
-#. Description
-#: ../templates/temp.image.plain/templates:2001
-msgid "Abort installation after depmod error?"
-msgstr ""
-
-#. Type: boolean
-#. Description
-#: ../templates/temp.image.plain/templates:2001
-msgid ""
-"The 'depmod' command exited with the exit code ${exit_value} "
-"(${SIGNAL}${CORE})."
-msgstr ""
-
-#. Type: boolean
-#. Description
-#: ../templates/temp.image.plain/templates:2001
-msgid ""
-"Since this image uses initrd, the ${modules_base}/=V/modules.dep file will "
-"not be deleted, even though it may be invalid."
-msgstr ""
-
-#. Type: boolean
-#. Description
-#: ../templates/temp.image.plain/templates:2001
-msgid ""
-"You should abort the installation and fix the errors in depmod, or "
-"regenerate the initrd image with a known good modules.dep file. If you don't "
-"abort the installation, there is a danger that the system will fail to boot."
-msgstr ""
-
-#. Type: boolean
-#. Description
-#: ../templates/temp.image.plain/templates:3001
-msgid "Abort kernel removal?"
-msgstr ""
-
-#. Type: boolean
-#. Description
-#: ../templates/temp.image.plain/templates:3001
-msgid ""
-"You are running a kernel (version ${running}) and attempting to remove the "
-"same version."
-msgstr ""
-
-#. Type: boolean
-#. Description
-#: ../templates/temp.image.plain/templates:3001
-msgid ""
-"This can make the system unbootable as it will remove /boot/vmlinuz-"
-"${running} and all modules under the directory /lib/modules/${running}. This "
-"can only be fixed with a copy of the kernel image and the corresponding "
-"modules."
-msgstr ""
-
-#. Type: boolean
-#. Description
-#: ../templates/temp.image.plain/templates:3001
-msgid ""
-"It is highly recommended to abort the kernel removal unless you are prepared "
-"to fix the system after removal."
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates/temp.image.plain/templates:4001
-msgid "Required firmware files may be missing"
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates/temp.image.plain/templates:4001
-msgid ""
-"This system is currently running Linux ${runningversion} and you are "
-"installing Linux ${version}. In the new version some of the drivers used on "
-"this system may require additional firmware files:"
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates/temp.image.plain/templates:4001
-msgid ""
-"Most firmware files are not included in the system because they do not "
-"conform to the Debian Free Software Guidelines. You may need to reconfigure "
-"the package manager to include the contrib and non-free sections of the "
-"package archive before you can install these firmware files."
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../templates/temp.image.plain/templates:5001
-msgid "Boot loader configuration must be updated"
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../templates/temp.image.plain/templates:5001
-msgid ""
-"Kernel packages no longer update a default boot loader. You should remove "
-"'do_bootloader = yes' from /etc/kernel-img.conf."
-msgstr ""
Modified: dists/trunk/linux-base/debian/po/vi.po
==============================================================================
--- dists/trunk/linux-2.6/debian/po/vi.po Sat Mar 12 03:29:30 2011 (r17042)
+++ dists/trunk/linux-base/debian/po/vi.po Sat Mar 12 08:28:46 2011 (r17048)
@@ -140,148 +140,3 @@
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
-msgid ""
-"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."
-msgstr "Nếu bộ nạp khởi động cần phải được cập nhật khi nào cài đặt một hạt nhân mới thì gói bộ nạp khởi động nên cài đặt một văn lệnh vào « /etc/kernel/postinst.d ». Hoặc bạn có thể ghi rõ câu lệnh cập nhật bộ nạp khởi động bằng cách lập biến « postinst_hook » (hàm móc hậu xử lý) trong tập tin cấu hình « /etc/kernel-img.conf »."
-
-#. Type: boolean
-#. Description
-#: ../templates/temp.image.plain/templates:2001
-msgid "Abort installation after depmod error?"
-msgstr "Hủy bỏ tiến trình cài đặt sau khi gặp lỗi depmod ?"
-
-#. Type: boolean
-#. Description
-#: ../templates/temp.image.plain/templates:2001
-msgid ""
-"The 'depmod' command exited with the exit code ${exit_value} "
-"(${SIGNAL}${CORE})."
-msgstr ""
-"Lệnh « depmod » đã thoát với mã thoát ${exit_value} (${SIGNAL}${CORE})."
-
-#. Type: boolean
-#. Description
-#: ../templates/temp.image.plain/templates:2001
-msgid ""
-"Since this image uses initrd, the ${modules_base}/=V/modules.dep file will "
-"not be deleted, even though it may be invalid."
-msgstr ""
-"Vì ảnh này sử dụng initrd, tập tin ${modules_base}/=V/modules.dep sẽ không "
-"bị xoá, dù là nó có thể không thích hợp."
-
-#. Type: boolean
-#. Description
-#: ../templates/temp.image.plain/templates:2001
-msgid ""
-"You should abort the installation and fix the errors in depmod, or "
-"regenerate the initrd image with a known good modules.dep file. If you don't "
-"abort the installation, there is a danger that the system will fail to boot."
-msgstr ""
-"Bạn nên hủy bỏ tiến trình cài đặt và sửa chữa các lỗi trong depmod, hoặc tạo "
-"lại ảnh initrd với một tập tin « modules.dep » tốt. Không hủy bỏ tiến trình "
-"cài đặt thì hệ thống có thể không khởi động được."
-
-#. Type: boolean
-#. Description
-#: ../templates/temp.image.plain/templates:3001
-msgid "Abort kernel removal?"
-msgstr "Hủy bỏ tiến trình gỡ bỏ hạt nhân ?"
-
-#. Type: boolean
-#. Description
-#: ../templates/temp.image.plain/templates:3001
-msgid ""
-"You are running a kernel (version ${running}) and attempting to remove the "
-"same version."
-msgstr ""
-"Bạn đang chạy một hạt nhân phiên bản ${running} trong khi thử gỡ bỏ phiên "
-"bản đó."
-
-#. Type: boolean
-#. Description
-#: ../templates/temp.image.plain/templates:3001
-msgid ""
-"This can make the system unbootable as it will remove /boot/vmlinuz-"
-"${running} and all modules under the directory /lib/modules/${running}. This "
-"can only be fixed with a copy of the kernel image and the corresponding "
-"modules."
-msgstr ""
-"Hành động này có thể làm cho hệ thống không có khả năng khởi động, vì nó gỡ "
-"bỏ « /boot/vmlinuz-${running} » và tất cả các mô-đụn nằm dưới thư mục « /lib/"
-"modules/${running} »."
-
-#. Type: boolean
-#. Description
-#: ../templates/temp.image.plain/templates:3001
-msgid ""
-"It is highly recommended to abort the kernel removal unless you are prepared "
-"to fix the system after removal."
-msgstr ""
-"Rất khuyên bạn hủy bỏ tiến trình gỡ bỏ hạt nhân, nếu bạn không sẵn sàng sửa "
-"chữa hệ thống sau khi gỡ bỏ."
-
-#. Type: note
-#. Description
-#: ../templates/temp.image.plain/templates:4001
-msgid "Required firmware files may be missing"
-msgstr "Có thể thiếu một số tập tin phần vững cần thiết"
-
-#. Type: note
-#. Description
-#: ../templates/temp.image.plain/templates:4001
-msgid ""
-"This system is currently running Linux ${runningversion} and you are "
-"installing Linux ${version}. In the new version some of the drivers used on "
-"this system may require additional firmware files:"
-msgstr ""
-"Hệ thống này hiện thời chạy Linux ${runningversion} còn bạn đang cài đặt "
-"Linux ${version}. Trong phiên bản mới, một số trình điều khiển dùng trên hệ "
-"thống này có thể yêu cầu tập tin phần vững bổ sung:"
-
-#. Type: note
-#. Description
-#: ../templates/temp.image.plain/templates:4001
-msgid ""
-"Most firmware files are not included in the system because they do not "
-"conform to the Debian Free Software Guidelines. You may need to reconfigure "
-"the package manager to include the contrib and non-free sections of the "
-"package archive before you can install these firmware files."
-msgstr ""
-"Phần lớn các tập tin phần vững không phải có sẵn trong hệ thống do không làm "
-"cho hợp với Nguyên tắc Chỉ đạo Phần mềm Tự do Debian. Có thể là bạn cần phải "
-"cấu hình lại trình quản lý gói phần mềm để bao gồm phần đóng góp (contrib) "
-"và phần khác tự do (non-free) của kho lưu gói trước khi có khả năng cài đặt "
-"tập tin phần vững như vậy."
-
-#. Type: error
-#. Description
-#: ../templates/temp.image.plain/templates:5001
-msgid "Boot loader configuration must be updated"
-msgstr "Cần phải cập nhật cấu hình của bộ nạp khởi động"
-
-#. Type: error
-#. Description
-#: ../templates/temp.image.plain/templates:5001
-msgid ""
-"Kernel packages no longer update a default boot loader. You should remove "
-"'do_bootloader = yes' from /etc/kernel-img.conf."
-msgstr "Gói hạt nhân không còn cập nhật lại bộ nạp khởi động mặc định. Bạn nên gỡ bỏ chuỗi « do_bootloader = yes » (làm bộ nạp khởi động = có) khỏi tập tin cấu hình « /etc/kernel-img.conf »."
Copied: dists/trunk/linux-base/debian/postinst (from r17042, dists/trunk/linux-2.6/debian/linux-base.postinst)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/trunk/linux-base/debian/postinst Sat Mar 12 08:28:46 2011 (r17048, copy of r17042, dists/trunk/linux-2.6/debian/linux-base.postinst)
@@ -0,0 +1,1699 @@
+#!/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(', ', at 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
Added: dists/trunk/linux-base/debian/rules
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/trunk/linux-base/debian/rules Sat Mar 12 08:28:46 2011 (r17048)
@@ -0,0 +1,28 @@
+#!/usr/bin/make -f
+
+build:
+
+binary: binary-arch binary-indep
+
+binary-arch:
+
+binary-indep:
+ dh_testdir
+ dh_testroot
+ dh_prep
+ dh_install debian/bin/perf /usr/bin
+ dh_installman debian/perf.1
+ dh_installdebconf
+ dh_installchangelogs
+ dh_installdocs
+ dh_strip
+ dh_compress
+ dh_fixperms
+ dh_installdeb
+ dh_shlibdeps
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+
+clean:
+ dh_clean
Copied: dists/trunk/linux-base/debian/templates (from r17042, dists/trunk/linux-2.6/debian/linux-base.templates)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/trunk/linux-base/debian/templates Sat Mar 12 08:28:46 2011 (r17048, copy of r17042, dists/trunk/linux-2.6/debian/linux-base.templates)
@@ -0,0 +1,98 @@
+# These templates have been reviewed by the debian-l10n-english
+# team
+#
+# If modifications/additions/rewording are needed, please ask
+# debian-l10n-english at 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.
More information about the Kernel-svn-changes
mailing list