diff --git a/debian/changelog b/debian/changelog index 6e48d72a5..037648099 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,17 @@ linux-2.6 (2.6.35~rc6-1~experimental.1) UNRELEASED; urgency=low * New upstream release candidate - + - drm/i915: Add 'reclaimable' to i915 self-reclaimable page allocations + (Closes: #534422) + [ Ben Hutchings ] * [!x86] Disable FB_VIA; these GPUs are only found on x86 motherboards * ds2782_battery: Fix build failure on several architectures + * postinst: Remove support for 'default' boot loaders. Warn users on + upgrade if the current configuration may rely on this. + * [i386/686] Remove AMD K6 from the list of supported processors; it + does not implement the CMOV instruction + * 3c59x: Fix call to mdio_sync() with the wrong argument (Closes: #589989) -- Ben Hutchings Tue, 13 Jul 2010 14:01:16 +0100 diff --git a/debian/config/i386/defines b/debian/config/i386/defines index 2512e4046..d4fc8b171 100644 --- a/debian/config/i386/defines +++ b/debian/config/i386/defines @@ -25,7 +25,7 @@ configs: [686_description] hardware: modern PCs -hardware-long: PCs with Intel Pentium Pro/II/III/4/4M/D/M, Xeon, Celeron, Core or Atom; AMD K6, Geode LX/NX, Athlon (K7), Duron, Opteron, Sempron, Turion or Phenom; Transmeta Efficeon; VIA C3 "Nehemiah" or C7 processors +hardware-long: PCs with Intel Pentium Pro/II/III/4/4M/D/M, Xeon, Celeron, Core or Atom; AMD Geode LX/NX, Athlon (K7), Duron, Opteron, Sempron, Turion or Phenom; Transmeta Efficeon; VIA C3 "Nehemiah" or C7 processors [686_image] configs: diff --git a/debian/patches/bugfix/all/3c59x-Fix-call-to-mdio_sync-with-the-wrong-argument.patch b/debian/patches/bugfix/all/3c59x-Fix-call-to-mdio_sync-with-the-wrong-argument.patch new file mode 100644 index 000000000..73dd4f7cb --- /dev/null +++ b/debian/patches/bugfix/all/3c59x-Fix-call-to-mdio_sync-with-the-wrong-argument.patch @@ -0,0 +1,32 @@ +From d3928b11844fededd058aaa4ebcbbfedfc42e22b Mon Sep 17 00:00:00 2001 +From: Ben Hutchings +Date: Fri, 23 Jul 2010 00:56:59 +0100 +Subject: [PATCH] 3c59x: Fix call to mdio_sync() with the wrong argument + +commit a095cfc40ec7ebe63e9532383c5b5c2a27b14075 +"3c59x: Specify window explicitly for access to windowed registers" +changed the first parameter to mdio_sync(), from a pointer to the +register mapping, to a pointer to the vortex_private structure, +and changed all but one of the call sites. Fix that last one. + +Signed-off-by: Ben Hutchings +--- + drivers/net/3c59x.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/drivers/net/3c59x.c b/drivers/net/3c59x.c +index 3c85600..53a8ca5 100644 +--- a/drivers/net/3c59x.c ++++ b/drivers/net/3c59x.c +@@ -1387,7 +1387,7 @@ static int __devinit vortex_probe1(struct device *gendev, + mii_preamble_required++; + if (vp->drv_flags & EXTRA_PREAMBLE) + mii_preamble_required++; +- mdio_sync(ioaddr, 32); ++ mdio_sync(vp, 32); + mdio_read(dev, 24, MII_BMSR); + for (phy = 0; phy < 32 && phy_idx < 1; phy++) { + int mii_status, phyx; +-- +1.7.1 + diff --git a/debian/po/cs.po b/debian/po/cs.po index e22f6aff6..a7796d7d3 100644 --- a/debian/po/cs.po +++ b/debian/po/cs.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: linux-2.6\n" "Report-Msgid-Bugs-To: linux-2.6@packages.debian.org\n" -"POT-Creation-Date: 2010-06-18 05:20+0100\n" +"POT-Creation-Date: 2010-07-16 15:55+0100\n" "PO-Revision-Date: 2010-05-12 18:02+0200\n" "Last-Translator: Michal Simunek \n" "Language-Team: Czech \n" @@ -140,6 +140,28 @@ 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 "" + +#. 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 @@ -150,8 +172,8 @@ msgstr "Přerušit po chybě depmod instalaci?" #. Description #: ../templates/temp.image.plain/templates:2001 msgid "" -"The 'depmod' command exited with the exit code ${exit_value} (${SIGNAL}" -"${CORE})." +"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 @@ -179,95 +201,12 @@ msgstr "" #. Type: boolean #. Description #: ../templates/temp.image.plain/templates:3001 -msgid "Run the default boot loader?" -msgstr "Spustit výchozí zavaděč?" - -#. Type: boolean -#. Description -#: ../templates/temp.image.plain/templates:3001 -msgid "" -"The default boot loader for this architecture is $loader, which is present." -msgstr "Výchozí nainstalovaný zavaděč pro tuto architekturu je $loader." - -#. Type: boolean -#. Description -#: ../templates/temp.image.plain/templates:3001 -msgid "" -"However, there is no explicit request to run that boot loader in /etc/kernel-" -"img.conf while GRUB seems to be installed with a postinst hook set." -msgstr "" -"Nicméně, neexistuje žádný explicitní požadavek na spuštění zavaděče v /etc/" -"kernel-img.conf, když byl po instalaci systému nainstalován a nastaven GRUB." - -#. Type: boolean -#. Description -#: ../templates/temp.image.plain/templates:3001 -msgid "" -"It thus seems that this system is using GRUB as boot loader instead of " -"$loader." -msgstr "Zdá se tedy, že tento systém používá místo $loader jako zavaděč GRUB." - -#. Type: boolean -#. Description -#: ../templates/temp.image.plain/templates:3001 -msgid "" -"Please choose which should run: the default boot loader now, or the GRUB " -"update later." -msgstr "" -"Zvolte prosím, který se má spustit: současný výchozí zavaděč, nebo později " -"aktualizovaný GRUB." - -#. Type: note -#. Description -#: ../templates/temp.image.plain/templates:4001 -msgid "Error running the boot loader in test mode" -msgstr "Chyba při spouštění zavaděče v testovacím režimu" - -#. Type: note -#. Description -#: ../templates/temp.image.plain/templates:4001 -msgid "An error occurred while running the ${loader} boot loader in test mode." -msgstr "Při spouštění zavaděče ${loader} v testovacím režimu nastala chyba." - -#. Type: note -#. Description -#. Type: note -#. Description -#: ../templates/temp.image.plain/templates:4001 -#: ../templates/temp.image.plain/templates:5001 -msgid "" -"A log is available in ${temp_file_name}. Please edit /etc/${loader}.conf " -"manually and re-run ${loader} to fix that issue and keep this system " -"bootable." -msgstr "" -"Log je dostupný v ${temp_file_name}. Pro opravení této chyby a zachování " -"zaveditelnosti systému, prosím ručně upravte /etc/${loader}.conf a znovu " -"spusťte ${loader}." - -#. Type: note -#. Description -#: ../templates/temp.image.plain/templates:5001 -msgid "Error running the boot loader" -msgstr "Chyba při spouštění zavaděče" - -#. Type: note -#. Description -#: ../templates/temp.image.plain/templates:5001 -msgid "An error occurred while running the ${loader} boot loader." -msgstr "Při spouštění zavaděče ${loader} nastala chyba." - -#. Type: boolean -#. Description -#. Type: boolean -#. Description -#: ../templates/temp.image.plain/templates:6001 -#: ../templates/temp.image.plain/templates:7001 msgid "Abort kernel removal?" msgstr "Přerušit odstraňování jádra?" #. Type: boolean #. Description -#: ../templates/temp.image.plain/templates:6001 +#: ../templates/temp.image.plain/templates:3001 msgid "" "You are running a kernel (version ${running}) and attempting to remove the " "same version." @@ -276,7 +215,7 @@ msgstr "" #. Type: boolean #. Description -#: ../templates/temp.image.plain/templates:6001 +#: ../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 " @@ -289,10 +228,7 @@ msgstr "" #. Type: boolean #. Description -#. Type: boolean -#. Description -#: ../templates/temp.image.plain/templates:6001 -#: ../templates/temp.image.plain/templates:7001 +#: ../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." @@ -300,37 +236,15 @@ 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: boolean -#. Description -#: ../templates/temp.image.plain/templates:7001 -msgid "" -"This system uses a valid /etc/${loader}.conf file that mentions ${kimage}-" -"=V. Removing linux-image-=V will invalidate that file." -msgstr "" -"Tento systém používá platný soubor /etc/${loader}.conf, který obsahuje " -"${kimage}-=V. Odstranění linux-image-=V tento soubor zneplatní." - -#. Type: boolean -#. Description -#: ../templates/temp.image.plain/templates:7001 -msgid "" -"You will need to edit /etc/${loader}.conf or re-target symbolic links " -"mentioned there (typically, /vmlinuz and /vmlinuz.old) to not refer to " -"${kimage}-=V. Then, you will have to re-run ${loader}." -msgstr "" -"Bude potřeba, abyste upravili /etc/${loader}.conf, nebo přesměrovali " -"symbolické odkazy, které jsou zde uvedené (běžně /vmlinuz a /vmlinuz.old), " -"aby neodkazovaly na ${kimage}-=V. Potom musíte znovu spustit ${loader}." - #. Type: note #. Description -#: ../templates/temp.image.plain/templates:8001 +#: ../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:8001 +#: ../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 " @@ -342,7 +256,7 @@ msgstr "" #. Type: note #. Description -#: ../templates/temp.image.plain/templates:8001 +#: ../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 " @@ -353,3 +267,19 @@ msgstr "" "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 +#, fuzzy +#| msgid "Boot loader configuration check needed" +msgid "Boot loader configuration must be updated" +msgstr "Je vyžadováno ověření nastavení zavaděče" + +#. 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 "" diff --git a/debian/po/da.po b/debian/po/da.po index c95dba9ce..c35bd2ab0 100644 --- a/debian/po/da.po +++ b/debian/po/da.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: linux-2.6\n" "Report-Msgid-Bugs-To: linux-2.6@packages.debian.org\n" -"POT-Creation-Date: 2010-06-18 05:20+0100\n" +"POT-Creation-Date: 2010-07-16 15:55+0100\n" "PO-Revision-Date: 2010-06-18 05:26+0100\n" "Last-Translator: Joe Hansen \n" "Language-Team: Danish \n" @@ -101,8 +101,8 @@ msgid "" "The following configuration files still use some device names that may " "change when using the new kernel:" msgstr "" -"De følgende konfigurationsfiler bruger stadig nogle enhedsnavne som måske vil " -"ændre sig, når den nye kerne bruges:" +"De følgende konfigurationsfiler bruger stadig nogle enhedsnavne som måske " +"vil ændre sig, når den nye kerne bruges:" #. Type: error #. Description @@ -138,8 +138,30 @@ msgid "" "You should generally identify these devices by UUID or label. However, on " "MIPS systems the root device must be identified by name." msgstr "" -"Vi anbefaler, at du identificerer disse enheder efter UUID eller etiket. " -"På MIPS-systemer skal rootenheden dog være identificeret med navn." +"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 "" + +#. 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 @@ -151,8 +173,8 @@ msgstr "Afbryd installation efter depmod-fejl?" #. Description #: ../templates/temp.image.plain/templates:2001 msgid "" -"The 'depmod' command exited with the exit code ${exit_value} (${SIGNAL}" -"${CORE})." +"The 'depmod' command exited with the exit code ${exit_value} " +"(${SIGNAL}${CORE})." msgstr "" "Kommandoen depmod afsluttedes med koden afslutningskoden ${exit_value} " "(${SIGNAL} ${CORE})." @@ -182,100 +204,12 @@ msgstr "" #. Type: boolean #. Description #: ../templates/temp.image.plain/templates:3001 -msgid "Run the default boot loader?" -msgstr "Kør standardopstartsindlæseren?" - -#. Type: boolean -#. Description -#: ../templates/temp.image.plain/templates:3001 -msgid "" -"The default boot loader for this architecture is $loader, which is present." -msgstr "" -"Standardopstartsindlæseren for denne arkitektur er $loader, som er til stede." - -#. Type: boolean -#. Description -#: ../templates/temp.image.plain/templates:3001 -msgid "" -"However, there is no explicit request to run that boot loader in /etc/kernel-" -"img.conf while GRUB seems to be installed with a postinst hook set." -msgstr "" -"Der er dog ingen eksplicit krav om at køre den opstartsindlæser i /etc/" -"kernel-img.conf mens GRUB ser ud til at være installeret med et postinst " -"hooksæt." - -#. Type: boolean -#. Description -#: ../templates/temp.image.plain/templates:3001 -msgid "" -"It thus seems that this system is using GRUB as boot loader instead of " -"$loader." -msgstr "" -"Det ser ud til at dette system bruger GRUB som opstartsindlæser (boot " -"loader) i steden for $loader." - -#. Type: boolean -#. Description -#: ../templates/temp.image.plain/templates:3001 -msgid "" -"Please choose which should run: the default boot loader now, or the GRUB " -"update later." -msgstr "" -"Vælg venligst hvilken der skal køre: Standardopstartsindlæseren nu, eller " -"GRUB-opdatering senere." - -#. Type: note -#. Description -#: ../templates/temp.image.plain/templates:4001 -msgid "Error running the boot loader in test mode" -msgstr "Fejl ved kørsel af opstartsindlæseren i testtilstand" - -#. Type: note -#. Description -#: ../templates/temp.image.plain/templates:4001 -msgid "An error occurred while running the ${loader} boot loader in test mode." -msgstr "" -"En fejl opstod under kørsel af opstartsindlæseren ${loader} i testtilstand." - -#. Type: note -#. Description -#. Type: note -#. Description -#: ../templates/temp.image.plain/templates:4001 -#: ../templates/temp.image.plain/templates:5001 -msgid "" -"A log is available in ${temp_file_name}. Please edit /etc/${loader}.conf " -"manually and re-run ${loader} to fix that issue and keep this system " -"bootable." -msgstr "" -"En log er tilgængelig i ${temp_file_name}. Rediger venligst /etc/${loader}." -"conf manuelt og genkør ${loader} for at rette dette og sikre at dette system " -"stadig kan startes op." - -#. Type: note -#. Description -#: ../templates/temp.image.plain/templates:5001 -msgid "Error running the boot loader" -msgstr "Fejl ved kørsel af opstartsindlæseren" - -#. Type: note -#. Description -#: ../templates/temp.image.plain/templates:5001 -msgid "An error occurred while running the ${loader} boot loader." -msgstr "En fejl opstod under kørsel af opstartsindlæseren ${loader}." - -#. Type: boolean -#. Description -#. Type: boolean -#. Description -#: ../templates/temp.image.plain/templates:6001 -#: ../templates/temp.image.plain/templates:7001 msgid "Abort kernel removal?" msgstr "Afbryd kernefjernelse?" #. Type: boolean #. Description -#: ../templates/temp.image.plain/templates:6001 +#: ../templates/temp.image.plain/templates:3001 msgid "" "You are running a kernel (version ${running}) and attempting to remove the " "same version." @@ -285,7 +219,7 @@ msgstr "" #. Type: boolean #. Description -#: ../templates/temp.image.plain/templates:6001 +#: ../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 " @@ -298,10 +232,7 @@ msgstr "" #. Type: boolean #. Description -#. Type: boolean -#. Description -#: ../templates/temp.image.plain/templates:6001 -#: ../templates/temp.image.plain/templates:7001 +#: ../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." @@ -309,37 +240,15 @@ msgstr "" "Det anbefales stærkt, at afbryde kernefjernelsen med mindre du er forberedt " "på at rette systemet op efter fjernelsen." -#. Type: boolean -#. Description -#: ../templates/temp.image.plain/templates:7001 -msgid "" -"This system uses a valid /etc/${loader}.conf file that mentions ${kimage}-" -"=V. Removing linux-image-=V will invalidate that file." -msgstr "" -"Dette system bruger en gyldig /etc/${loader}.conf-fil som nævner ${kimage}-" -"=V. Fjernelse af linux-image-=V vil invalidere den fil." - -#. Type: boolean -#. Description -#: ../templates/temp.image.plain/templates:7001 -msgid "" -"You will need to edit /etc/${loader}.conf or re-target symbolic links " -"mentioned there (typically, /vmlinuz and /vmlinuz.old) to not refer to " -"${kimage}-=V. Then, you will have to re-run ${loader}." -msgstr "" -"Du vil skulle redigere /etc//${loader}.conf eller geninstallere symbolske " -"henvisninger nævnt der (typisk, /vmlinuz og /vmlinuz.old) til ikke at " -"referere til ${kimage}-=V. Derefter skal du genkøre ${loader}." - #. Type: note #. Description -#: ../templates/temp.image.plain/templates:8001 +#: ../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:8001 +#: ../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 " @@ -351,14 +260,30 @@ msgstr "" #. Type: note #. Description -#: ../templates/temp.image.plain/templates:8001 +#: ../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." +"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 +#, fuzzy +#| msgid "Boot loader configuration check needed" +msgid "Boot loader configuration must be updated" +msgstr "Behov for tjek af opstartsindlæseren (boot loader)" + +#. 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 "" diff --git a/debian/po/de.po b/debian/po/de.po index 5d0e1bc50..2281649d8 100644 --- a/debian/po/de.po +++ b/debian/po/de.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: linux-2.6 2.6.32-11\n" "Report-Msgid-Bugs-To: linux-2.6@packages.debian.org\n" -"POT-Creation-Date: 2010-06-18 05:20+0100\n" +"POT-Creation-Date: 2010-07-16 15:55+0100\n" "PO-Revision-Date: 2010-06-18 05:27+0100\n" "Last-Translator: Holger Wansing \n" "Language-Team: Debian German \n" @@ -145,6 +145,28 @@ msgstr "" "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 "" + +#. 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 @@ -155,11 +177,11 @@ msgstr "Installation nach depmod-Fehler abbrechen?" #. Description #: ../templates/temp.image.plain/templates:2001 msgid "" -"The 'depmod' command exited with the exit code ${exit_value} (${SIGNAL}" -"${CORE})." +"The 'depmod' command exited with the exit code ${exit_value} " +"(${SIGNAL}${CORE})." msgstr "" -"Der »depmod«-Befehl wurde beendet: Rückgabewert ${exit_value} (${SIGNAL}" -"${CORE})." +"Der »depmod«-Befehl wurde beendet: Rückgabewert ${exit_value} " +"(${SIGNAL}${CORE})." #. Type: boolean #. Description @@ -187,103 +209,12 @@ msgstr "" #. Type: boolean #. Description #: ../templates/temp.image.plain/templates:3001 -msgid "Run the default boot loader?" -msgstr "Den Standard-Bootloader ausführen?" - -#. Type: boolean -#. Description -#: ../templates/temp.image.plain/templates:3001 -msgid "" -"The default boot loader for this architecture is $loader, which is present." -msgstr "" -"Der Standard-Bootloader für diese Architektur ist $loader und dieser ist " -"auch vorhanden." - -#. Type: boolean -#. Description -#: ../templates/temp.image.plain/templates:3001 -msgid "" -"However, there is no explicit request to run that boot loader in /etc/kernel-" -"img.conf while GRUB seems to be installed with a postinst hook set." -msgstr "" -"Allerdings gibt es keinen expliziten Aufruf in /etc/kernel-img.conf, diesen " -"Bootloader auszuführen, während GRUB scheinbar über ein postinst-hook-set " -"installiert wird." - -#. Type: boolean -#. Description -#: ../templates/temp.image.plain/templates:3001 -msgid "" -"It thus seems that this system is using GRUB as boot loader instead of " -"$loader." -msgstr "" -"Daher scheint es, als ob dieses System GRUB als Bootloader verwendet statt " -"$loader." - -#. Type: boolean -#. Description -#: ../templates/temp.image.plain/templates:3001 -msgid "" -"Please choose which should run: the default boot loader now, or the GRUB " -"update later." -msgstr "" -"Bitte wählen Sie aus, ob Sie jetzt den Standard-Bootloader ausführen möchten " -"oder später den GRUB-Bootloader." - -#. Type: note -#. Description -#: ../templates/temp.image.plain/templates:4001 -msgid "Error running the boot loader in test mode" -msgstr "Fehler bei Ausführung des Bootloaders im Testmodus" - -#. Type: note -#. Description -#: ../templates/temp.image.plain/templates:4001 -msgid "An error occurred while running the ${loader} boot loader in test mode." -msgstr "" -"Bei der Ausführung des ${loader}-Bootloaders im Testmodus ist ein Fehler " -"aufgetreten." - -#. Type: note -#. Description -#. Type: note -#. Description -#: ../templates/temp.image.plain/templates:4001 -#: ../templates/temp.image.plain/templates:5001 -msgid "" -"A log is available in ${temp_file_name}. Please edit /etc/${loader}.conf " -"manually and re-run ${loader} to fix that issue and keep this system " -"bootable." -msgstr "" -"Ein Protokoll ist in ${temp_file_name} verfügbar. Bitte passen Sie /etc/" -"${loader}.conf von Hand an und führen Sie ${loader} erneut aus, um das " -"Problem zu beheben und die Startfähigkeit des Systems zu erhalten." - -#. Type: note -#. Description -#: ../templates/temp.image.plain/templates:5001 -msgid "Error running the boot loader" -msgstr "Fehler bei Ausführung des Bootloaders" - -#. Type: note -#. Description -#: ../templates/temp.image.plain/templates:5001 -msgid "An error occurred while running the ${loader} boot loader." -msgstr "" -"Bei der Ausführung des ${loader}-Bootloaders ist ein Fehler aufgetreten." - -#. Type: boolean -#. Description -#. Type: boolean -#. Description -#: ../templates/temp.image.plain/templates:6001 -#: ../templates/temp.image.plain/templates:7001 msgid "Abort kernel removal?" msgstr "Entfernen des Kernels abbrechen?" #. Type: boolean #. Description -#: ../templates/temp.image.plain/templates:6001 +#: ../templates/temp.image.plain/templates:3001 msgid "" "You are running a kernel (version ${running}) and attempting to remove the " "same version." @@ -293,7 +224,7 @@ msgstr "" #. Type: boolean #. Description -#: ../templates/temp.image.plain/templates:6001 +#: ../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 " @@ -307,10 +238,7 @@ msgstr "" #. Type: boolean #. Description -#. Type: boolean -#. Description -#: ../templates/temp.image.plain/templates:6001 -#: ../templates/temp.image.plain/templates:7001 +#: ../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." @@ -319,39 +247,15 @@ msgstr "" "ausgenommen Sie sind darauf vorbereitet, das System nach der Entfernung " "wieder instandzusetzen." -#. Type: boolean -#. Description -#: ../templates/temp.image.plain/templates:7001 -msgid "" -"This system uses a valid /etc/${loader}.conf file that mentions ${kimage}-" -"=V. Removing linux-image-=V will invalidate that file." -msgstr "" -"Dieses System nutzt eine gültige /etc/${loader}.conf-Datei, in der ${kimage}-" -"=V enthalten ist. Durch das Entfernen von linux-image-=V wird diese Datei " -"ungültig." - -#. Type: boolean -#. Description -#: ../templates/temp.image.plain/templates:7001 -msgid "" -"You will need to edit /etc/${loader}.conf or re-target symbolic links " -"mentioned there (typically, /vmlinuz and /vmlinuz.old) to not refer to " -"${kimage}-=V. Then, you will have to re-run ${loader}." -msgstr "" -"Sie werden /etc/${loader}.conf anpassen müssen. Oder Sie weisen den " -"symbolischen Verknüpfungen, die dort verwendet sind (typischerweise /vmlinuz " -"und /vmlinuz.old) neue Ziele zu, so dass sie nicht mehr auf ${kimage}-=V " -"verweisen. Danach müssen Sie ${loader} erneut ausführen." - #. Type: note #. Description -#: ../templates/temp.image.plain/templates:8001 +#: ../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:8001 +#: ../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 " @@ -363,7 +267,7 @@ msgstr "" #. Type: note #. Description -#: ../templates/temp.image.plain/templates:8001 +#: ../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 " @@ -375,3 +279,19 @@ msgstr "" "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 +#, fuzzy +#| msgid "Boot loader configuration check needed" +msgid "Boot loader configuration must be updated" +msgstr "Überprüfung 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 "" diff --git a/debian/po/es.po b/debian/po/es.po index 206d37fb7..676e2d73e 100644 --- a/debian/po/es.po +++ b/debian/po/es.po @@ -29,7 +29,7 @@ msgid "" msgstr "" "Project-Id-Version: linux-2.6 2.6.32+5\n" "Report-Msgid-Bugs-To: linux-2.6@packages.debian.org\n" -"POT-Creation-Date: 2010-06-18 05:20+0100\n" +"POT-Creation-Date: 2010-07-16 15:55+0100\n" "PO-Revision-Date: 2010-06-06 19:04+0200\n" "Last-Translator: Omar Campagne \n" "Language-Team: Debian l10n Spanish \n" @@ -174,6 +174,28 @@ msgstr "" "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 "" + +#. 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 @@ -184,11 +206,11 @@ msgstr "¿Desea interrumpir la instalación después de un fallo de depmod?" #. Description #: ../templates/temp.image.plain/templates:2001 msgid "" -"The 'depmod' command exited with the exit code ${exit_value} (${SIGNAL}" -"${CORE})." +"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})»." +"La orden «depmod» finalizó con el código de salida «${exit_value} " +"(${SIGNAL}${CORE})»." #. Type: boolean #. Description @@ -197,8 +219,9 @@ 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." +"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 @@ -209,110 +232,19 @@ msgid "" "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." +"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 "Run the default boot loader?" -msgstr "¿Desea ejecutar el gestor de arranque predefinido?" - -#. Type: boolean -#. Description -#: ../templates/temp.image.plain/templates:3001 -msgid "" -"The default boot loader for this architecture is $loader, which is present." -msgstr "" -"El gestor de arranque predefinido para esta arquitectura es $loader, " -"presente en el sistema." - -#. Type: boolean -#. Description -#: ../templates/temp.image.plain/templates:3001 -msgid "" -"However, there is no explicit request to run that boot loader in /etc/kernel-" -"img.conf while GRUB seems to be installed with a postinst hook set." -msgstr "" -"Sin embargo, no hay una petición explicita en «/etc/kernel-img.conf» para " -"iniciar ese gestor de arranque, mientras que GRUB parece estar instalado con " -"un «hook» de post-instalación definido." - -#. Type: boolean -#. Description -#: ../templates/temp.image.plain/templates:3001 -msgid "" -"It thus seems that this system is using GRUB as boot loader instead of " -"$loader." -msgstr "" -"Por lo tanto, parece que este sistema está usando GRUB como gestor de " -"arranque en lugar de $loader." - -#. Type: boolean -#. Description -#: ../templates/temp.image.plain/templates:3001 -msgid "" -"Please choose which should run: the default boot loader now, or the GRUB " -"update later." -msgstr "" -"Por favor, seleccione cual se debería ejecutar: el gestor de arranque " -"predefinido, o la actualización de GRUB más tarde." - -#. Type: note -#. Description -#: ../templates/temp.image.plain/templates:4001 -msgid "Error running the boot loader in test mode" -msgstr "" -"Se produjo un fallo al ejecutar el gestor de arranque en modo de pruebas" - -#. Type: note -#. Description -#: ../templates/temp.image.plain/templates:4001 -msgid "An error occurred while running the ${loader} boot loader in test mode." -msgstr "" -"Se produjo un fallo al ejecutar el gestor de arranque ${loader} en modo de " -"pruebas." - -#. Type: note -#. Description -#. Type: note -#. Description -#: ../templates/temp.image.plain/templates:4001 -#: ../templates/temp.image.plain/templates:5001 -msgid "" -"A log is available in ${temp_file_name}. Please edit /etc/${loader}.conf " -"manually and re-run ${loader} to fix that issue and keep this system " -"bootable." -msgstr "" -"Dispone de un registro en «${temp_file_name}». Edite «/etc/${loader}.conf» " -"manualmente y ejecute ${loader} otra vez para arreglar el fallo, y permitir " -"el arranque del sistema." - -#. Type: note -#. Description -#: ../templates/temp.image.plain/templates:5001 -msgid "Error running the boot loader" -msgstr "Se produjo un fallo al ejecutar el gestor de arranque" - -#. Type: note -#. Description -#: ../templates/temp.image.plain/templates:5001 -msgid "An error occurred while running the ${loader} boot loader." -msgstr "Se produjo un fallo al ejecutar el gestor de arranque ${loader}." - -#. Type: boolean -#. Description -#. Type: boolean -#. Description -#: ../templates/temp.image.plain/templates:6001 -#: ../templates/temp.image.plain/templates:7001 msgid "Abort kernel removal?" msgstr "¿Desea cancelar la eliminación del núcleo?" #. Type: boolean #. Description -#: ../templates/temp.image.plain/templates:6001 +#: ../templates/temp.image.plain/templates:3001 msgid "" "You are running a kernel (version ${running}) and attempting to remove the " "same version." @@ -322,7 +254,7 @@ msgstr "" #. Type: boolean #. Description -#: ../templates/temp.image.plain/templates:6001 +#: ../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 " @@ -336,10 +268,7 @@ msgstr "" #. Type: boolean #. Description -#. Type: boolean -#. Description -#: ../templates/temp.image.plain/templates:6001 -#: ../templates/temp.image.plain/templates:7001 +#: ../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." @@ -347,38 +276,15 @@ 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: boolean -#. Description -#: ../templates/temp.image.plain/templates:7001 -msgid "" -"This system uses a valid /etc/${loader}.conf file that mentions ${kimage}-" -"=V. Removing linux-image-=V will invalidate that file." -msgstr "" -"Este sistema usa un fichero «/etc/${loader}.conf» válido que menciona " -"«${kimage}-=V». Eliminar «linux-image-=V» invalidará ese fichero." - -#. Type: boolean -#. Description -#: ../templates/temp.image.plain/templates:7001 -msgid "" -"You will need to edit /etc/${loader}.conf or re-target symbolic links " -"mentioned there (typically, /vmlinuz and /vmlinuz.old) to not refer to " -"${kimage}-=V. Then, you will have to re-run ${loader}." -msgstr "" -"Necesitará editar «/etc/${loader}.conf», o direccionar nuevamente los enlaces " -"simbólicos ahí mencionados (habitualmente, «/vmlinuz» y «/vmlinuz.old») para " -"que no se refieran a «${kimage}-=V». Por último, tendrá que ejecutar " -"${loader} otra vez." - #. Type: note #. Description -#: ../templates/temp.image.plain/templates:8001 +#: ../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:8001 +#: ../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 " @@ -390,7 +296,7 @@ msgstr "" #. Type: note #. Description -#: ../templates/temp.image.plain/templates:8001 +#: ../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 " @@ -402,3 +308,19 @@ msgstr "" "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 +#, fuzzy +#| msgid "Boot loader configuration check needed" +msgid "Boot loader configuration must be updated" +msgstr "Se necesita comprobar 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 "" diff --git a/debian/po/et.po b/debian/po/et.po index 8b6e6da29..5b3aa64ff 100644 --- a/debian/po/et.po +++ b/debian/po/et.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: linux-2.6 2.6.32-11\n" "Report-Msgid-Bugs-To: linux-2.6@packages.debian.org\n" -"POT-Creation-Date: 2010-06-18 05:20+0100\n" +"POT-Creation-Date: 2010-07-16 15:55+0100\n" "PO-Revision-Date: 2010-04-24 14:20+0300\n" "Last-Translator: mihkel \n" "Language-Team: Estonian \n" @@ -144,6 +144,28 @@ 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 @@ -154,8 +176,8 @@ msgstr "Katkesta paigaldus peale depmod veateadet?" #. Description #: ../templates/temp.image.plain/templates:2001 msgid "" -"The 'depmod' command exited with the exit code ${exit_value} (${SIGNAL}" -"${CORE})." +"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})." @@ -184,95 +206,12 @@ msgstr "" #. Type: boolean #. Description #: ../templates/temp.image.plain/templates:3001 -msgid "Run the default boot loader?" -msgstr "Käivita vaikimisi alglaadur?" - -#. Type: boolean -#. Description -#: ../templates/temp.image.plain/templates:3001 -msgid "" -"The default boot loader for this architecture is $loader, which is present." -msgstr "Selle arhitektuuri vaikimisi alglaadur on $loader, mis on ka olemas." - -#. Type: boolean -#. Description -#: ../templates/temp.image.plain/templates:3001 -msgid "" -"However, there is no explicit request to run that boot loader in /etc/kernel-" -"img.conf while GRUB seems to be installed with a postinst hook set." -msgstr "" -"Alglaadurit käivitada pole /etc/kernel-img.conf andmetel otsest vajadust, " -"GRUB tundub olevat paigaldatud postinst haagiga." - -#. Type: boolean -#. Description -#: ../templates/temp.image.plain/templates:3001 -msgid "" -"It thus seems that this system is using GRUB as boot loader instead of " -"$loader." -msgstr "Paistab, et see süsteem kasutab $loader asemel GRUB-i alglaadurina." - -#. Type: boolean -#. Description -#: ../templates/temp.image.plain/templates:3001 -msgid "" -"Please choose which should run: the default boot loader now, or the GRUB " -"update later." -msgstr "" -"Vali, milline peaks käivituma: vaikimisi alglaadur kohe või GRUB update " -"hiljem." - -#. Type: note -#. Description -#: ../templates/temp.image.plain/templates:4001 -msgid "Error running the boot loader in test mode" -msgstr "Alglaaduri käivitamisel testi režiimis tekkis viga" - -#. Type: note -#. Description -#: ../templates/temp.image.plain/templates:4001 -msgid "An error occurred while running the ${loader} boot loader in test mode." -msgstr "${loader} alglaaduri käivitamisel testi režiimis tekkis viga." - -#. Type: note -#. Description -#. Type: note -#. Description -#: ../templates/temp.image.plain/templates:4001 -#: ../templates/temp.image.plain/templates:5001 -msgid "" -"A log is available in ${temp_file_name}. Please edit /etc/${loader}.conf " -"manually and re-run ${loader} to fix that issue and keep this system " -"bootable." -msgstr "" -"Logi fail on saadaval ${temp_file_name}. Palun redigeeri käsitsi faili /etc/" -"${loader}.conf ja taaskäivita ${loader} parandamaks need vead ja hoia see " -"süsteem töökorras." - -#. Type: note -#. Description -#: ../templates/temp.image.plain/templates:5001 -msgid "Error running the boot loader" -msgstr "Viga alglaaduri käivitamisel" - -#. Type: note -#. Description -#: ../templates/temp.image.plain/templates:5001 -msgid "An error occurred while running the ${loader} boot loader." -msgstr "Tekkis viga alglaaduri ${loader} käivitamisel." - -#. Type: boolean -#. Description -#. Type: boolean -#. Description -#: ../templates/temp.image.plain/templates:6001 -#: ../templates/temp.image.plain/templates:7001 msgid "Abort kernel removal?" msgstr "Katkesta tuuma eemaldamine?" #. Type: boolean #. Description -#: ../templates/temp.image.plain/templates:6001 +#: ../templates/temp.image.plain/templates:3001 msgid "" "You are running a kernel (version ${running}) and attempting to remove the " "same version." @@ -282,7 +221,7 @@ msgstr "" #. Type: boolean #. Description -#: ../templates/temp.image.plain/templates:6001 +#: ../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 " @@ -296,10 +235,7 @@ msgstr "" #. Type: boolean #. Description -#. Type: boolean -#. Description -#: ../templates/temp.image.plain/templates:6001 -#: ../templates/temp.image.plain/templates:7001 +#: ../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." @@ -307,37 +243,15 @@ msgstr "" "On äärmiselt soovituslik katkestada tuuma eemaldamine, kui sa just pole " "valmistunud süsteemi ise parandama." -#. Type: boolean -#. Description -#: ../templates/temp.image.plain/templates:7001 -msgid "" -"This system uses a valid /etc/${loader}.conf file that mentions ${kimage}-" -"=V. Removing linux-image-=V will invalidate that file." -msgstr "" -"See süsteem kasutab kehtivat /etc/${loader}.conf faili, mis mainib ${kimage}-" -"=V. Eemaldades linux-image-=V muudab selle faili kehtetuks." - -#. Type: boolean -#. Description -#: ../templates/temp.image.plain/templates:7001 -msgid "" -"You will need to edit /etc/${loader}.conf or re-target symbolic links " -"mentioned there (typically, /vmlinuz and /vmlinuz.old) to not refer to " -"${kimage}-=V. Then, you will have to re-run ${loader}." -msgstr "" -"Sa pead muutma /etc/${loader}.conf faili või ümber suunama seal mainitud " -"sümboolsed lingid (tavaliselt /vmlinuz ja /vmlinuz.old), et nad ei viitaks " -"${kimage}-=V. Siis pead taaskäivitama ${loader}." - #. Type: note #. Description -#: ../templates/temp.image.plain/templates:8001 +#: ../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:8001 +#: ../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 " @@ -349,7 +263,7 @@ msgstr "" #. Type: note #. Description -#: ../templates/temp.image.plain/templates:8001 +#: ../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 " @@ -360,3 +274,19 @@ msgstr "" "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 "" diff --git a/debian/po/fr.po b/debian/po/fr.po index db3638641..c5b908e1d 100644 --- a/debian/po/fr.po +++ b/debian/po/fr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: linux-2.6 2.6.32-11\n" "Report-Msgid-Bugs-To: linux-2.6@packages.debian.org\n" -"POT-Creation-Date: 2010-06-18 05:20+0100\n" +"POT-Creation-Date: 2010-07-16 15:55+0100\n" "PO-Revision-Date: 2010-04-30 05:35-0400\n" "Last-Translator: David Prévot \n" "Language-Team: French \n" @@ -78,8 +78,8 @@ msgstr "" #: ../linux-base.templates:3001 msgid "These devices will be assigned UUIDs or labels:" msgstr "" -"Les périphériques suivants seront identifiés par une étiquette (« label ») ou " -"un UUID :" +"Les périphériques suivants seront identifiés par une étiquette (« label ») " +"ou un UUID :" #. Type: boolean #. Description @@ -154,6 +154,28 @@ msgstr "" "é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 "" + +#. 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 @@ -164,8 +186,8 @@ msgstr "Abandonner l'installation après l'erreur de depmod ?" #. Description #: ../templates/temp.image.plain/templates:2001 msgid "" -"The 'depmod' command exited with the exit code ${exit_value} (${SIGNAL}" -"${CORE})." +"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})." @@ -196,104 +218,12 @@ msgstr "" #. Type: boolean #. Description #: ../templates/temp.image.plain/templates:3001 -msgid "Run the default boot loader?" -msgstr "Faut-il exécuter le programme d'amorçage par défaut ?" - -#. Type: boolean -#. Description -#: ../templates/temp.image.plain/templates:3001 -msgid "" -"The default boot loader for this architecture is $loader, which is present." -msgstr "" -"Le programme d'amorçage par défaut pour cette architecture, $loader, est " -"présent." - -#. Type: boolean -#. Description -#: ../templates/temp.image.plain/templates:3001 -msgid "" -"However, there is no explicit request to run that boot loader in /etc/kernel-" -"img.conf while GRUB seems to be installed with a postinst hook set." -msgstr "" -"Cependant, il n'est pas explicitement demandé de l'exécuter dans /etc/kernel-" -"img.conf alors que GRUB semble être configuré par un script exécuté en fin " -"d'installation (« postinst hook »)." - -#. Type: boolean -#. Description -#: ../templates/temp.image.plain/templates:3001 -msgid "" -"It thus seems that this system is using GRUB as boot loader instead of " -"$loader." -msgstr "" -"Il semble donc que ce système utilise GRUB comme programme d'amorçage au " -"lieu de $loader." - -#. Type: boolean -#. Description -#: ../templates/temp.image.plain/templates:3001 -msgid "" -"Please choose which should run: the default boot loader now, or the GRUB " -"update later." -msgstr "" -"Veuillez choisir lequel doit être exécuté : le programme d'amorçage par " -"défaut maintenant, ou la mise à jour de GRUB plus tard." - -#. Type: note -#. Description -#: ../templates/temp.image.plain/templates:4001 -msgid "Error running the boot loader in test mode" -msgstr "Erreur d'exécution du programme d'amorçage en mode test" - -#. Type: note -#. Description -#: ../templates/temp.image.plain/templates:4001 -msgid "An error occurred while running the ${loader} boot loader in test mode." -msgstr "" -"Une erreur s'est produite lors de l'exécution du programme d'amorçage " -"${loader} en mode test." - -#. Type: note -#. Description -#. Type: note -#. Description -#: ../templates/temp.image.plain/templates:4001 -#: ../templates/temp.image.plain/templates:5001 -msgid "" -"A log is available in ${temp_file_name}. Please edit /etc/${loader}.conf " -"manually and re-run ${loader} to fix that issue and keep this system " -"bootable." -msgstr "" -"Un journal est disponible dans ${temp_file_name}. Veuillez modifier /etc/" -"${loader}.conf vous-même et exécuter de nouveau ${loader} afin de corriger " -"ce problème et conserver le système amorçable." - -#. Type: note -#. Description -#: ../templates/temp.image.plain/templates:5001 -msgid "Error running the boot loader" -msgstr "Erreur d'exécution du programme d'amorçage" - -#. Type: note -#. Description -#: ../templates/temp.image.plain/templates:5001 -msgid "An error occurred while running the ${loader} boot loader." -msgstr "" -"Une erreur s'est produite lors de l'exécution du programme d'amorçage " -"${loader}." - -#. Type: boolean -#. Description -#. Type: boolean -#. Description -#: ../templates/temp.image.plain/templates:6001 -#: ../templates/temp.image.plain/templates:7001 msgid "Abort kernel removal?" msgstr "Abandonner la suppression du noyau ?" #. Type: boolean #. Description -#: ../templates/temp.image.plain/templates:6001 +#: ../templates/temp.image.plain/templates:3001 msgid "" "You are running a kernel (version ${running}) and attempting to remove the " "same version." @@ -303,7 +233,7 @@ msgstr "" #. Type: boolean #. Description -#: ../templates/temp.image.plain/templates:6001 +#: ../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 " @@ -317,10 +247,7 @@ msgstr "" #. Type: boolean #. Description -#. Type: boolean -#. Description -#: ../templates/temp.image.plain/templates:6001 -#: ../templates/temp.image.plain/templates:7001 +#: ../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." @@ -328,38 +255,15 @@ msgstr "" "Il est fortement recommandé d'interrompre la suppression du noyau à moins " "d'être ensuite prêt à réparer le système." -#. Type: boolean -#. Description -#: ../templates/temp.image.plain/templates:7001 -msgid "" -"This system uses a valid /etc/${loader}.conf file that mentions ${kimage}-" -"=V. Removing linux-image-=V will invalidate that file." -msgstr "" -"Le fichier /etc/${loader}.conf contenant la mention « ${kimage}-=V » est " -"valable. Enlever « linux-image-=V » rendra ce fichier non valable." - -#. Type: boolean -#. Description -#: ../templates/temp.image.plain/templates:7001 -msgid "" -"You will need to edit /etc/${loader}.conf or re-target symbolic links " -"mentioned there (typically, /vmlinuz and /vmlinuz.old) to not refer to " -"${kimage}-=V. Then, you will have to re-run ${loader}." -msgstr "" -"Il est nécessaire de modifier /etc/${loader}.conf ou la cible du lien " -"symbolique qui y est mentionné (en général, /vmlinuz et /vmlinuz.old) afin " -"de ne pas pointer vers ${kimage}-=V. Il sera ensuite nécessaire d'exécuter " -"de nouveau ${loader}." - #. Type: note #. Description -#: ../templates/temp.image.plain/templates:8001 +#: ../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:8001 +#: ../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 " @@ -371,7 +275,7 @@ msgstr "" #. Type: note #. Description -#: ../templates/temp.image.plain/templates:8001 +#: ../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 " @@ -381,5 +285,21 @@ 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." +"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 +#, fuzzy +#| msgid "Boot loader configuration check needed" +msgid "Boot loader configuration must be updated" +msgstr "Vérification 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 "" diff --git a/debian/po/ja.po b/debian/po/ja.po index e35f884c1..617350733 100644 --- a/debian/po/ja.po +++ b/debian/po/ja.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: linux-2.6\n" "Report-Msgid-Bugs-To: linux-2.6@packages.debian.org\n" -"POT-Creation-Date: 2010-06-18 05:20+0100\n" +"POT-Creation-Date: 2010-07-16 15:55+0100\n" "PO-Revision-Date: 2010-05-09 19:10+0900\n" "Last-Translator: Kenshi Muto \n" "Language-Team: Japanese \n" @@ -140,6 +140,28 @@ 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 "" + #. Type: boolean #. Description #: ../templates/temp.image.plain/templates:2001 @@ -150,8 +172,8 @@ msgstr "depmod のエラー後にインストールを中止しますか?" #. Description #: ../templates/temp.image.plain/templates:2001 msgid "" -"The 'depmod' command exited with the exit code ${exit_value} (${SIGNAL}" -"${CORE})." +"The 'depmod' command exited with the exit code ${exit_value} " +"(${SIGNAL}${CORE})." msgstr "" "'depmod' コマンドは終了コード ${exit_value} (${SIGNAL}${CORE}) で終了しまし" "た。" @@ -181,99 +203,12 @@ msgstr "" #. Type: boolean #. Description #: ../templates/temp.image.plain/templates:3001 -msgid "Run the default boot loader?" -msgstr "デフォルトのブートローダを実行しますか?" - -#. Type: boolean -#. Description -#: ../templates/temp.image.plain/templates:3001 -msgid "" -"The default boot loader for this architecture is $loader, which is present." -msgstr "" -"このアーキテクチャのデフォルトのブートローダは $loader で、現在提供されていま" -"す。" - -#. Type: boolean -#. Description -#: ../templates/temp.image.plain/templates:3001 -msgid "" -"However, there is no explicit request to run that boot loader in /etc/kernel-" -"img.conf while GRUB seems to be installed with a postinst hook set." -msgstr "" -"ただし、GRUB が postinst フックセットでインストールされたようですが、/etc/" -"kernel-img.conf でブートローダを実行する明示的な要求がありません。" - -#. Type: boolean -#. Description -#: ../templates/temp.image.plain/templates:3001 -msgid "" -"It thus seems that this system is using GRUB as boot loader instead of " -"$loader." -msgstr "" -"したがってこのシステムは、$loader の代わりに GRUB をブートローダとして使用し" -"ています。" - -#. Type: boolean -#. Description -#: ../templates/temp.image.plain/templates:3001 -msgid "" -"Please choose which should run: the default boot loader now, or the GRUB " -"update later." -msgstr "" -"デフォルトのブートローダを今実行するか、GRUB の更新を後で行うかのどちらをすべ" -"きか選んでください。" - -#. Type: note -#. Description -#: ../templates/temp.image.plain/templates:4001 -msgid "Error running the boot loader in test mode" -msgstr "テストモードでのブートローダの実行中にエラー" - -#. Type: note -#. Description -#: ../templates/temp.image.plain/templates:4001 -msgid "An error occurred while running the ${loader} boot loader in test mode." -msgstr "テストモードでブートローダ ${loader} を実行中にエラーが発生しました。" - -#. Type: note -#. Description -#. Type: note -#. Description -#: ../templates/temp.image.plain/templates:4001 -#: ../templates/temp.image.plain/templates:5001 -msgid "" -"A log is available in ${temp_file_name}. Please edit /etc/${loader}.conf " -"manually and re-run ${loader} to fix that issue and keep this system " -"bootable." -msgstr "" -"ログは ${temp_file_name} から参照できます。/etc/${loader}.conf を手で編集し、" -"問題を修正してこのシステムが起動できる状態を保つために ${loader} を再実行して" -"ください。" - -#. Type: note -#. Description -#: ../templates/temp.image.plain/templates:5001 -msgid "Error running the boot loader" -msgstr "ブートローダの実行中にエラー" - -#. Type: note -#. Description -#: ../templates/temp.image.plain/templates:5001 -msgid "An error occurred while running the ${loader} boot loader." -msgstr "ブートローダ ${loader} の実行中にエラーが発生しました。" - -#. Type: boolean -#. Description -#. Type: boolean -#. Description -#: ../templates/temp.image.plain/templates:6001 -#: ../templates/temp.image.plain/templates:7001 msgid "Abort kernel removal?" msgstr "カーネルの削除を中止しますか?" #. Type: boolean #. Description -#: ../templates/temp.image.plain/templates:6001 +#: ../templates/temp.image.plain/templates:3001 msgid "" "You are running a kernel (version ${running}) and attempting to remove the " "same version." @@ -283,7 +218,7 @@ msgstr "" #. Type: boolean #. Description -#: ../templates/temp.image.plain/templates:6001 +#: ../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 " @@ -297,10 +232,7 @@ msgstr "" #. Type: boolean #. Description -#. Type: boolean -#. Description -#: ../templates/temp.image.plain/templates:6001 -#: ../templates/temp.image.plain/templates:7001 +#: ../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." @@ -308,38 +240,15 @@ msgstr "" "削除後でもシステムに問題がないような準備を済ませるまで、カーネルの削除を中止" "することを強くお勧めします。" -#. Type: boolean -#. Description -#: ../templates/temp.image.plain/templates:7001 -msgid "" -"This system uses a valid /etc/${loader}.conf file that mentions ${kimage}-" -"=V. Removing linux-image-=V will invalidate that file." -msgstr "" -"このシステムは、${kimage}-=V について記述した有効な /etc/${loader}.conf ファ" -"イルを使用しています。linux-image-=V の削除はこのファイルを無効化することになり" -"ます。" - -#. Type: boolean -#. Description -#: ../templates/temp.image.plain/templates:7001 -msgid "" -"You will need to edit /etc/${loader}.conf or re-target symbolic links " -"mentioned there (typically, /vmlinuz and /vmlinuz.old) to not refer to " -"${kimage}-=V. Then, you will have to re-run ${loader}." -msgstr "" -"${kimage}-=V を参照しないように、/etc/${loader}.conf を編集するか、関連するシ" -"ンボリックリンク (通常 /vmlinuz および /vmlinuz.old) のターゲットを再設定する" -"必要があります。その後、${loader} を再実行してください。" - #. Type: note #. Description -#: ../templates/temp.image.plain/templates:8001 +#: ../templates/temp.image.plain/templates:4001 msgid "Required firmware files may be missing" msgstr "必要なファームウェアファイルがなくなっている可能性があります" #. Type: note #. Description -#: ../templates/temp.image.plain/templates:8001 +#: ../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 " @@ -351,7 +260,7 @@ msgstr "" #. Type: note #. Description -#: ../templates/temp.image.plain/templates:8001 +#: ../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 " @@ -362,3 +271,19 @@ msgstr "" "致しないため、システムに含まれていません。これらのファームウェアファイルをイ" "ンストール可能にするために、パッケージアーカイブの contrib および non-free セ" "クションを含むようパッケージマネージャを再設定する必要があるかもしれません。" + +#. Type: error +#. Description +#: ../templates/temp.image.plain/templates:5001 +#, fuzzy +#| 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 "" diff --git a/debian/po/pt.po b/debian/po/pt.po index f9a6ae868..8fab98f35 100644 --- a/debian/po/pt.po +++ b/debian/po/pt.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: linux-2.6 2.6.32-11\n" "Report-Msgid-Bugs-To: linux-2.6@packages.debian.org\n" -"POT-Creation-Date: 2010-06-18 05:20+0100\n" +"POT-Creation-Date: 2010-07-16 15:55+0100\n" "PO-Revision-Date: 2010-04-23 22:12+0100\n" "Last-Translator: Américo Monteiro \n" "Language-Team: Portuguese \n" @@ -147,6 +147,28 @@ msgstr "" "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 "" + +#. 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 @@ -157,11 +179,11 @@ msgstr "Abortar a instalação após erro do depmod?" #. Description #: ../templates/temp.image.plain/templates:2001 msgid "" -"The 'depmod' command exited with the exit code ${exit_value} (${SIGNAL}" -"${CORE})." +"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})." +"O comando 'depmod' terminou com o código de erro ${exit_value} " +"(${SIGNAL}${CORE})." #. Type: boolean #. Description @@ -188,101 +210,12 @@ msgstr "" #. Type: boolean #. Description #: ../templates/temp.image.plain/templates:3001 -msgid "Run the default boot loader?" -msgstr "Correr o gestor de arranque predefinido?" - -#. Type: boolean -#. Description -#: ../templates/temp.image.plain/templates:3001 -msgid "" -"The default boot loader for this architecture is $loader, which is present." -msgstr "" -"O gestor de arranque predefinido para esta arquitectura é $loader, o qual " -"está presente." - -#. Type: boolean -#. Description -#: ../templates/temp.image.plain/templates:3001 -msgid "" -"However, there is no explicit request to run that boot loader in /etc/kernel-" -"img.conf while GRUB seems to be installed with a postinst hook set." -msgstr "" -"No entanto, não existe um pedido específico para correr esse gestor de " -"arranque em /etc/kernel-img.conf embora o GRUB pareça estar instalado com um " -"hook de pós-instalação definido." - -#. Type: boolean -#. Description -#: ../templates/temp.image.plain/templates:3001 -msgid "" -"It thus seems that this system is using GRUB as boot loader instead of " -"$loader." -msgstr "" -"Assim, parece que este sistema usa o GRUB como gestor de arranque em vez de " -"$loader." - -#. Type: boolean -#. Description -#: ../templates/temp.image.plain/templates:3001 -msgid "" -"Please choose which should run: the default boot loader now, or the GRUB " -"update later." -msgstr "" -"Por favor escolha qual deve correr: o gestor de arranque predefinido agora, " -"ou a actualização ao GRUB mais tarde." - -#. Type: note -#. Description -#: ../templates/temp.image.plain/templates:4001 -msgid "Error running the boot loader in test mode" -msgstr "Erro ao correr o gestor de arranque em modo de teste" - -#. Type: note -#. Description -#: ../templates/temp.image.plain/templates:4001 -msgid "An error occurred while running the ${loader} boot loader in test mode." -msgstr "" -"Ocorreu um erro ao correr o gestor de arranque ${loader} em modo de teste." - -#. Type: note -#. Description -#. Type: note -#. Description -#: ../templates/temp.image.plain/templates:4001 -#: ../templates/temp.image.plain/templates:5001 -msgid "" -"A log is available in ${temp_file_name}. Please edit /etc/${loader}.conf " -"manually and re-run ${loader} to fix that issue and keep this system " -"bootable." -msgstr "" -"Está disponível um relatório em ${temp_file_name}. Por favor edite o /etc/" -"${loader}.conf manualmente e execute de novo ${loader} para corrigir esse " -"problema e manter este sistema de forma a que possa arrancar." - -#. Type: note -#. Description -#: ../templates/temp.image.plain/templates:5001 -msgid "Error running the boot loader" -msgstr "Erro ao correr o gestor de arranque" - -#. Type: note -#. Description -#: ../templates/temp.image.plain/templates:5001 -msgid "An error occurred while running the ${loader} boot loader." -msgstr "Ocorreu um erro ao correr o gestor de arranque ${loader}." - -#. Type: boolean -#. Description -#. Type: boolean -#. Description -#: ../templates/temp.image.plain/templates:6001 -#: ../templates/temp.image.plain/templates:7001 msgid "Abort kernel removal?" msgstr "Abortar a remoção do kernel?" #. Type: boolean #. Description -#: ../templates/temp.image.plain/templates:6001 +#: ../templates/temp.image.plain/templates:3001 msgid "" "You are running a kernel (version ${running}) and attempting to remove the " "same version." @@ -292,7 +225,7 @@ msgstr "" #. Type: boolean #. Description -#: ../templates/temp.image.plain/templates:6001 +#: ../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 " @@ -306,10 +239,7 @@ msgstr "" #. Type: boolean #. Description -#. Type: boolean -#. Description -#: ../templates/temp.image.plain/templates:6001 -#: ../templates/temp.image.plain/templates:7001 +#: ../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." @@ -317,37 +247,15 @@ msgstr "" "É altamente recomendado abortar a remoção do kernel a menos que esteja " "preparado para corrigir o sistema após a remoção." -#. Type: boolean -#. Description -#: ../templates/temp.image.plain/templates:7001 -msgid "" -"This system uses a valid /etc/${loader}.conf file that mentions ${kimage}-" -"=V. Removing linux-image-=V will invalidate that file." -msgstr "" -"Este sistema usa um ficheiro /etc/${loader}.conf válido que menciona " -"${kimage}-=V. Remover linux-image-=V irá invalidar esse ficheiro." - -#. Type: boolean -#. Description -#: ../templates/temp.image.plain/templates:7001 -msgid "" -"You will need to edit /etc/${loader}.conf or re-target symbolic links " -"mentioned there (typically, /vmlinuz and /vmlinuz.old) to not refer to " -"${kimage}-=V. Then, you will have to re-run ${loader}." -msgstr "" -"Você precisa de editar o /etc/${loader}.conf ou re-orientar os links " -"simbólicos mencionados lá (tipicamente, /vmlinuz and /vmlinuz.old) para não " -"apontarem para ${kimage}-=V. Depois terá que executar novamente o ${loader}." - #. Type: note #. Description -#: ../templates/temp.image.plain/templates:8001 +#: ../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:8001 +#: ../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 " @@ -359,7 +267,7 @@ msgstr "" #. Type: note #. Description -#: ../templates/temp.image.plain/templates:8001 +#: ../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 " @@ -370,3 +278,19 @@ msgstr "" "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 +#, fuzzy +#| msgid "Boot loader configuration check needed" +msgid "Boot loader configuration must be updated" +msgstr "Necessária verificação da configuração do 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 "" diff --git a/debian/po/ru.po b/debian/po/ru.po index 2c8afe06c..2a4f5ba29 100644 --- a/debian/po/ru.po +++ b/debian/po/ru.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: linux-2.6 new\n" "Report-Msgid-Bugs-To: linux-2.6@packages.debian.org\n" -"POT-Creation-Date: 2010-06-18 05:20+0100\n" +"POT-Creation-Date: 2010-07-16 15:55+0100\n" "PO-Revision-Date: 2010-04-24 10:31+0400\n" "Last-Translator: Yuri Kozlov \n" "Language-Team: Russian \n" @@ -16,8 +16,8 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.11.4\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" -"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" #. Type: boolean #. Description @@ -144,6 +144,28 @@ 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 "" + #. Type: boolean #. Description #: ../templates/temp.image.plain/templates:2001 @@ -154,8 +176,8 @@ msgstr "Прервать установку после ошибки depmod?" #. Description #: ../templates/temp.image.plain/templates:2001 msgid "" -"The 'depmod' command exited with the exit code ${exit_value} (${SIGNAL}" -"${CORE})." +"The 'depmod' command exited with the exit code ${exit_value} " +"(${SIGNAL}${CORE})." msgstr "" "Команда depmod завершилась с кодом ошибки ${exit_value} (${SIGNAL}${CORE})." @@ -184,102 +206,12 @@ msgstr "" #. Type: boolean #. Description #: ../templates/temp.image.plain/templates:3001 -msgid "Run the default boot loader?" -msgstr "Запустить системный загрузчик по умолчанию?" - -#. Type: boolean -#. Description -#: ../templates/temp.image.plain/templates:3001 -msgid "" -"The default boot loader for this architecture is $loader, which is present." -msgstr "" -"Для данной архитектуры системным загрузчиком по умолчанию является $loader " -"(уже установлен)." - -#. Type: boolean -#. Description -#: ../templates/temp.image.plain/templates:3001 -msgid "" -"However, there is no explicit request to run that boot loader in /etc/kernel-" -"img.conf while GRUB seems to be installed with a postinst hook set." -msgstr "" -"Однако нет явного указания запускать данный системный загрузчик в /etc/" -"kernel-img.conf, так как, вероятно, GRUB установлен с помощью " -"заключительного сценария установки пакета (postinst)." - -#. Type: boolean -#. Description -#: ../templates/temp.image.plain/templates:3001 -msgid "" -"It thus seems that this system is using GRUB as boot loader instead of " -"$loader." -msgstr "" -"Вероятно, что на данной системе в качестве системного загрузчика " -"используется GRUB, а не $loader." - -#. Type: boolean -#. Description -#: ../templates/temp.image.plain/templates:3001 -msgid "" -"Please choose which should run: the default boot loader now, or the GRUB " -"update later." -msgstr "" -"Выберите что нужно запускать: системный загрузчик по умолчанию прямо сейчас " -"или позднее GRUB." - -#. Type: note -#. Description -#: ../templates/temp.image.plain/templates:4001 -msgid "Error running the boot loader in test mode" -msgstr "Ошибка при работе системного загрузчика в тестовом режиме" - -#. Type: note -#. Description -#: ../templates/temp.image.plain/templates:4001 -msgid "An error occurred while running the ${loader} boot loader in test mode." -msgstr "" -"При работе системного загрузчика ${loader} в тестовом режиме произошла " -"ошибка." - -#. Type: note -#. Description -#. Type: note -#. Description -#: ../templates/temp.image.plain/templates:4001 -#: ../templates/temp.image.plain/templates:5001 -msgid "" -"A log is available in ${temp_file_name}. Please edit /etc/${loader}.conf " -"manually and re-run ${loader} to fix that issue and keep this system " -"bootable." -msgstr "" -"Журнал работы доступен в файле ${temp_file_name}. Отредактируйте /etc/" -"${loader}.conf вручную и перезапустите ${loader} для исправления ошибки и " -"сохранения загрузочного состояния системы." - -#. Type: note -#. Description -#: ../templates/temp.image.plain/templates:5001 -msgid "Error running the boot loader" -msgstr "Ошибка при работе системного загрузчика" - -#. Type: note -#. Description -#: ../templates/temp.image.plain/templates:5001 -msgid "An error occurred while running the ${loader} boot loader." -msgstr "При работе системного загрузчика ${loader} произошла ошибка." - -#. Type: boolean -#. Description -#. Type: boolean -#. Description -#: ../templates/temp.image.plain/templates:6001 -#: ../templates/temp.image.plain/templates:7001 msgid "Abort kernel removal?" msgstr "Прервать удаление ядра?" #. Type: boolean #. Description -#: ../templates/temp.image.plain/templates:6001 +#: ../templates/temp.image.plain/templates:3001 msgid "" "You are running a kernel (version ${running}) and attempting to remove the " "same version." @@ -287,7 +219,7 @@ msgstr "Вы пытаетесь удалить запущенную версию #. Type: boolean #. Description -#: ../templates/temp.image.plain/templates:6001 +#: ../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 " @@ -301,10 +233,7 @@ msgstr "" #. Type: boolean #. Description -#. Type: boolean -#. Description -#: ../templates/temp.image.plain/templates:6001 -#: ../templates/temp.image.plain/templates:7001 +#: ../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." @@ -312,37 +241,15 @@ msgstr "" "Настоятельно рекомендуется прервать удаление ядра, если вы не готовы чинить " "систему после его удаления." -#. Type: boolean -#. Description -#: ../templates/temp.image.plain/templates:7001 -msgid "" -"This system uses a valid /etc/${loader}.conf file that mentions ${kimage}-" -"=V. Removing linux-image-=V will invalidate that file." -msgstr "" -"В данной системе используется корректный файл /etc/${loader}.conf, в котором " -"указано ${kimage}-=V. Удаление linux-image-=V сделает файл некорректным." - -#. Type: boolean -#. Description -#: ../templates/temp.image.plain/templates:7001 -msgid "" -"You will need to edit /etc/${loader}.conf or re-target symbolic links " -"mentioned there (typically, /vmlinuz and /vmlinuz.old) to not refer to " -"${kimage}-=V. Then, you will have to re-run ${loader}." -msgstr "" -"Вам будет нужно отредактировать /etc/${loader}.conf или переназначить " -"символьные ссылки, упомянутые там (обычно, /vmlinuz и /vmlinuz.old), на " -"неуказывающие на ${kimage}-=V. Затем нужно перезапустить ${loader}." - #. Type: note #. Description -#: ../templates/temp.image.plain/templates:8001 +#: ../templates/temp.image.plain/templates:4001 msgid "Required firmware files may be missing" msgstr "Могут отсутствовать необходимые файлы микропрограмм" #. Type: note #. Description -#: ../templates/temp.image.plain/templates:8001 +#: ../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 " @@ -354,7 +261,7 @@ msgstr "" #. Type: note #. Description -#: ../templates/temp.image.plain/templates:8001 +#: ../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 " @@ -365,3 +272,19 @@ msgstr "" "удовлетворяют критериям свободного ПО Debian. Для установки этих файлов из " "архива вам может потребоваться перенастроить менеджер пакетов, чтобы " "включить разделы contrib и non-free." + +#. Type: error +#. Description +#: ../templates/temp.image.plain/templates:5001 +#, fuzzy +#| 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 "" diff --git a/debian/po/sv.po b/debian/po/sv.po index 1b5b35a09..fd4c31430 100644 --- a/debian/po/sv.po +++ b/debian/po/sv.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: linux-2.6\n" "Report-Msgid-Bugs-To: linux-2.6@packages.debian.org\n" -"POT-Creation-Date: 2010-06-18 05:20+0100\n" +"POT-Creation-Date: 2010-07-16 15:55+0100\n" "PO-Revision-Date: 2010-04-26 23:37+0100\n" "Last-Translator: Martin Bagge \n" "Language-Team: Swedish \n" @@ -141,6 +141,28 @@ 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 "" + +#. 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 @@ -151,8 +173,8 @@ msgstr "Avbryt installation efter fel i depmod?" #. Description #: ../templates/temp.image.plain/templates:2001 msgid "" -"The 'depmod' command exited with the exit code ${exit_value} (${SIGNAL}" -"${CORE})." +"The 'depmod' command exited with the exit code ${exit_value} " +"(${SIGNAL}${CORE})." msgstr "" "Kommandot \"depmod\" avslutades med felkod ${exit_value} (${SIGNAL}${CORE})." @@ -181,101 +203,12 @@ msgstr "" #. Type: boolean #. Description #: ../templates/temp.image.plain/templates:3001 -msgid "Run the default boot loader?" -msgstr "Kör uppstartshanteraren?" - -#. Type: boolean -#. Description -#: ../templates/temp.image.plain/templates:3001 -msgid "" -"The default boot loader for this architecture is $loader, which is present." -msgstr "" -"Uppstartshanteraren för den här arkitekturen är $loader och den finns " -"installerad." - -#. Type: boolean -#. Description -#: ../templates/temp.image.plain/templates:3001 -msgid "" -"However, there is no explicit request to run that boot loader in /etc/kernel-" -"img.conf while GRUB seems to be installed with a postinst hook set." -msgstr "" -"Det finns dock ingen specifik begäran att köra uppstartshanteraren i filen /" -"etc/kernel-img.conf medan GRUB verkar vara installerad med alternativet för " -"uppdatering efter installaitonen angiven (\"postinst hook\")." - -#. Type: boolean -#. Description -#: ../templates/temp.image.plain/templates:3001 -msgid "" -"It thus seems that this system is using GRUB as boot loader instead of " -"$loader." -msgstr "" -"Det verkar därför som att detta system använder GRUB som uppstartshanterare " -"istället för $loader." - -#. Type: boolean -#. Description -#: ../templates/temp.image.plain/templates:3001 -msgid "" -"Please choose which should run: the default boot loader now, or the GRUB " -"update later." -msgstr "" -"Ange vad som ska köras, standardhanteraren för uppstart nu eller GRUB vid " -"ett senare tillfälle." - -#. Type: note -#. Description -#: ../templates/temp.image.plain/templates:4001 -msgid "Error running the boot loader in test mode" -msgstr "Fel vid körning av uppstartshanteraren i testläge" - -#. Type: note -#. Description -#: ../templates/temp.image.plain/templates:4001 -msgid "An error occurred while running the ${loader} boot loader in test mode." -msgstr "" -"Ett fel uppstod när uppstartshanteraren ${loader} skulle köras i testläge." - -#. Type: note -#. Description -#. Type: note -#. Description -#: ../templates/temp.image.plain/templates:4001 -#: ../templates/temp.image.plain/templates:5001 -msgid "" -"A log is available in ${temp_file_name}. Please edit /etc/${loader}.conf " -"manually and re-run ${loader} to fix that issue and keep this system " -"bootable." -msgstr "" -"En logg finns i ${temp_file_name}. Redigera filen /etc/${loader}.conf " -"manuellt och kör sedan ${loader} på nytt för att laga felet och hålla " -"systemet startbart." - -#. Type: note -#. Description -#: ../templates/temp.image.plain/templates:5001 -msgid "Error running the boot loader" -msgstr "Fel vid körning av uppstartshanteraren" - -#. Type: note -#. Description -#: ../templates/temp.image.plain/templates:5001 -msgid "An error occurred while running the ${loader} boot loader." -msgstr "Ett fel uppstod när uppstartshanteraren ${loader} skulle köras." - -#. Type: boolean -#. Description -#. Type: boolean -#. Description -#: ../templates/temp.image.plain/templates:6001 -#: ../templates/temp.image.plain/templates:7001 msgid "Abort kernel removal?" msgstr "Avbryt radering av kärnan?" #. Type: boolean #. Description -#: ../templates/temp.image.plain/templates:6001 +#: ../templates/temp.image.plain/templates:3001 msgid "" "You are running a kernel (version ${running}) and attempting to remove the " "same version." @@ -285,7 +218,7 @@ msgstr "" #. Type: boolean #. Description -#: ../templates/temp.image.plain/templates:6001 +#: ../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 " @@ -299,10 +232,7 @@ msgstr "" #. Type: boolean #. Description -#. Type: boolean -#. Description -#: ../templates/temp.image.plain/templates:6001 -#: ../templates/temp.image.plain/templates:7001 +#: ../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." @@ -310,37 +240,15 @@ msgstr "" "Det rekomenderas starkt att du avbryter raderingen av kärnan om du inte är " "beredd på att laga systemet efter raderingen." -#. Type: boolean -#. Description -#: ../templates/temp.image.plain/templates:7001 -msgid "" -"This system uses a valid /etc/${loader}.conf file that mentions ${kimage}-" -"=V. Removing linux-image-=V will invalidate that file." -msgstr "" -"Detta system använder en korrekt /etc/${loader}.conf-fil som pekar ut " -"${kimage}-=V. Att ta bort linux-image-=V kommer göra filen inaktuell." - -#. Type: boolean -#. Description -#: ../templates/temp.image.plain/templates:7001 -msgid "" -"You will need to edit /etc/${loader}.conf or re-target symbolic links " -"mentioned there (typically, /vmlinuz and /vmlinuz.old) to not refer to " -"${kimage}-=V. Then, you will have to re-run ${loader}." -msgstr "" -"Du måte redigera filen /etc/${loader}.conf eller ställa om symboliska länkar " -"som omnämns där (vanligen /vmlinuz och /vmlinuz.old) så att de inte pekar på " -"${kimage}-=V. Därefter ska du åter köra ${loader}." - #. Type: note #. Description -#: ../templates/temp.image.plain/templates:8001 +#: ../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:8001 +#: ../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 " @@ -352,7 +260,7 @@ msgstr "" #. Type: note #. Description -#: ../templates/temp.image.plain/templates:8001 +#: ../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 " @@ -363,3 +271,19 @@ msgstr "" "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 +#, fuzzy +#| msgid "Boot loader configuration check needed" +msgid "Boot loader configuration must be updated" +msgstr "Kontroll av konfigurationen i uppstartshanteraren behövs" + +#. 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 "" diff --git a/debian/po/templates.pot b/debian/po/templates.pot index f7f22a54f..db151fc6e 100644 --- a/debian/po/templates.pot +++ b/debian/po/templates.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: linux-2.6@packages.debian.org\n" -"POT-Creation-Date: 2010-06-18 05:20+0100\n" +"POT-Creation-Date: 2010-07-16 15:55+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -124,6 +124,28 @@ msgid "" "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 @@ -134,8 +156,8 @@ msgstr "" #. Description #: ../templates/temp.image.plain/templates:2001 msgid "" -"The 'depmod' command exited with the exit code ${exit_value} (${SIGNAL}" -"${CORE})." +"The 'depmod' command exited with the exit code ${exit_value} " +"(${SIGNAL}${CORE})." msgstr "" #. Type: boolean @@ -158,88 +180,12 @@ msgstr "" #. Type: boolean #. Description #: ../templates/temp.image.plain/templates:3001 -msgid "Run the default boot loader?" -msgstr "" - -#. Type: boolean -#. Description -#: ../templates/temp.image.plain/templates:3001 -msgid "" -"The default boot loader for this architecture is $loader, which is present." -msgstr "" - -#. Type: boolean -#. Description -#: ../templates/temp.image.plain/templates:3001 -msgid "" -"However, there is no explicit request to run that boot loader in /etc/kernel-" -"img.conf while GRUB seems to be installed with a postinst hook set." -msgstr "" - -#. Type: boolean -#. Description -#: ../templates/temp.image.plain/templates:3001 -msgid "" -"It thus seems that this system is using GRUB as boot loader instead of " -"$loader." -msgstr "" - -#. Type: boolean -#. Description -#: ../templates/temp.image.plain/templates:3001 -msgid "" -"Please choose which should run: the default boot loader now, or the GRUB " -"update later." -msgstr "" - -#. Type: note -#. Description -#: ../templates/temp.image.plain/templates:4001 -msgid "Error running the boot loader in test mode" -msgstr "" - -#. Type: note -#. Description -#: ../templates/temp.image.plain/templates:4001 -msgid "An error occurred while running the ${loader} boot loader in test mode." -msgstr "" - -#. Type: note -#. Description -#. Type: note -#. Description -#: ../templates/temp.image.plain/templates:4001 -#: ../templates/temp.image.plain/templates:5001 -msgid "" -"A log is available in ${temp_file_name}. Please edit /etc/${loader}.conf " -"manually and re-run ${loader} to fix that issue and keep this system " -"bootable." -msgstr "" - -#. Type: note -#. Description -#: ../templates/temp.image.plain/templates:5001 -msgid "Error running the boot loader" -msgstr "" - -#. Type: note -#. Description -#: ../templates/temp.image.plain/templates:5001 -msgid "An error occurred while running the ${loader} boot loader." -msgstr "" - -#. Type: boolean -#. Description -#. Type: boolean -#. Description -#: ../templates/temp.image.plain/templates:6001 -#: ../templates/temp.image.plain/templates:7001 msgid "Abort kernel removal?" msgstr "" #. Type: boolean #. Description -#: ../templates/temp.image.plain/templates:6001 +#: ../templates/temp.image.plain/templates:3001 msgid "" "You are running a kernel (version ${running}) and attempting to remove the " "same version." @@ -247,7 +193,7 @@ msgstr "" #. Type: boolean #. Description -#: ../templates/temp.image.plain/templates:6001 +#: ../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 " @@ -257,41 +203,21 @@ msgstr "" #. Type: boolean #. Description -#. Type: boolean -#. Description -#: ../templates/temp.image.plain/templates:6001 -#: ../templates/temp.image.plain/templates:7001 +#: ../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: boolean -#. Description -#: ../templates/temp.image.plain/templates:7001 -msgid "" -"This system uses a valid /etc/${loader}.conf file that mentions ${kimage}-" -"=V. Removing linux-image-=V will invalidate that file." -msgstr "" - -#. Type: boolean -#. Description -#: ../templates/temp.image.plain/templates:7001 -msgid "" -"You will need to edit /etc/${loader}.conf or re-target symbolic links " -"mentioned there (typically, /vmlinuz and /vmlinuz.old) to not refer to " -"${kimage}-=V. Then, you will have to re-run ${loader}." -msgstr "" - #. Type: note #. Description -#: ../templates/temp.image.plain/templates:8001 +#: ../templates/temp.image.plain/templates:4001 msgid "Required firmware files may be missing" msgstr "" #. Type: note #. Description -#: ../templates/temp.image.plain/templates:8001 +#: ../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 " @@ -300,10 +226,24 @@ msgstr "" #. Type: note #. Description -#: ../templates/temp.image.plain/templates:8001 +#: ../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 "" diff --git a/debian/po/vi.po b/debian/po/vi.po index c214d172e..0bb674c7b 100644 --- a/debian/po/vi.po +++ b/debian/po/vi.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: linux-2.6\n" "Report-Msgid-Bugs-To: linux-2.6@packages.debian.org\n" -"POT-Creation-Date: 2010-06-18 05:20+0100\n" +"POT-Creation-Date: 2010-07-16 15:55+0100\n" "PO-Revision-Date: 2010-04-26 21:53+0930\n" "Last-Translator: Clytie Siddall \n" "Language-Team: Vietnamese \n" @@ -141,6 +141,28 @@ 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 "" + +#. 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 @@ -151,9 +173,10 @@ msgstr "Hủy bỏ tiến trình cài đặt sau khi gặp lỗi depmod ?" #. 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})." +"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 @@ -180,98 +203,12 @@ msgstr "" #. Type: boolean #. Description #: ../templates/temp.image.plain/templates:3001 -msgid "Run the default boot loader?" -msgstr "Chạy bộ nạp khởi động mặc định ?" - -#. Type: boolean -#. Description -#: ../templates/temp.image.plain/templates:3001 -msgid "" -"The default boot loader for this architecture is $loader, which is present." -msgstr "Bộ nạp khởi động mặc định cho kiến trúc này là $loader (có)." - -#. Type: boolean -#. Description -#: ../templates/temp.image.plain/templates:3001 -msgid "" -"However, there is no explicit request to run that boot loader in /etc/kernel-" -"img.conf while GRUB seems to be installed with a postinst hook set." -msgstr "" -"Tuy nhiên, không có yêu cầu dứt khoát chạy bộ nạp khởi động đó trong tập tin " -"cấu hình « /etc/kernel-img.conf » còn hình như GRUB được cài đặt với một tập " -"hợp hàm móc cuối cùng cài đặt." - -#. Type: boolean -#. Description -#: ../templates/temp.image.plain/templates:3001 -msgid "" -"It thus seems that this system is using GRUB as boot loader instead of " -"$loader." -msgstr "" -"Do đó hình như hệ thống này đang sử dụng GRUB làm bộ nạp khởi động, thay cho " -"$loader." - -#. Type: boolean -#. Description -#: ../templates/temp.image.plain/templates:3001 -msgid "" -"Please choose which should run: the default boot loader now, or the GRUB " -"update later." -msgstr "" -"Hãy chọn bộ nạp khởi động nên chạy: bộ nạp khởi động mặc định ngay bây giờ, " -"hoặc bản cập nhật GRUB về sau." - -#. Type: note -#. Description -#: ../templates/temp.image.plain/templates:4001 -msgid "Error running the boot loader in test mode" -msgstr "Lỗi chạy bộ nạp khởi động ở chế độ thử" - -#. Type: note -#. Description -#: ../templates/temp.image.plain/templates:4001 -msgid "An error occurred while running the ${loader} boot loader in test mode." -msgstr "Gặp lỗi trong khi chạy bộ nạp khởi động ${loader} ở chế độ thử." - -#. Type: note -#. Description -#. Type: note -#. Description -#: ../templates/temp.image.plain/templates:4001 -#: ../templates/temp.image.plain/templates:5001 -msgid "" -"A log is available in ${temp_file_name}. Please edit /etc/${loader}.conf " -"manually and re-run ${loader} to fix that issue and keep this system " -"bootable." -msgstr "" -"Một sổ theo dõi sẵn sàng trong « ${temp_file_name} ». Hãy chỉnh sửa « /etc/" -"${loader}.conf » bằng tay, và chạy lại ${loader} để sửa chữa vấn đề đó và " -"bảo tồn hệ thống này có khả năng khởi động." - -#. Type: note -#. Description -#: ../templates/temp.image.plain/templates:5001 -msgid "Error running the boot loader" -msgstr "Lỗi chạy bộ nạp khởi động" - -#. Type: note -#. Description -#: ../templates/temp.image.plain/templates:5001 -msgid "An error occurred while running the ${loader} boot loader." -msgstr "Gặp lỗi trong khi chạy bộ nạp khởi động ${loader}." - -#. Type: boolean -#. Description -#. Type: boolean -#. Description -#: ../templates/temp.image.plain/templates:6001 -#: ../templates/temp.image.plain/templates:7001 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:6001 +#: ../templates/temp.image.plain/templates:3001 msgid "" "You are running a kernel (version ${running}) and attempting to remove the " "same version." @@ -281,7 +218,7 @@ msgstr "" #. Type: boolean #. Description -#: ../templates/temp.image.plain/templates:6001 +#: ../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 " @@ -294,10 +231,7 @@ msgstr "" #. Type: boolean #. Description -#. Type: boolean -#. Description -#: ../templates/temp.image.plain/templates:6001 -#: ../templates/temp.image.plain/templates:7001 +#: ../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." @@ -305,39 +239,15 @@ 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: boolean -#. Description -#: ../templates/temp.image.plain/templates:7001 -msgid "" -"This system uses a valid /etc/${loader}.conf file that mentions ${kimage}-" -"=V. Removing linux-image-=V will invalidate that file." -msgstr "" -"Hệ thống này sử dụng một tập tin cấu hình « /etc/${loader}.conf » mà xác định " -"« ${kimage}-=V ». Gỡ bỏ mục « linux-image-=V » thì làm cho tập tin đó không có " -"hiệu lực." - -#. Type: boolean -#. Description -#: ../templates/temp.image.plain/templates:7001 -msgid "" -"You will need to edit /etc/${loader}.conf or re-target symbolic links " -"mentioned there (typically, /vmlinuz and /vmlinuz.old) to not refer to " -"${kimage}-=V. Then, you will have to re-run ${loader}." -msgstr "" -"Bạn cần phải chỉnh sửa « /etc/${loader}.conf » hoặc thay đổi đích đến của " -"liên kết tượng trưng bên trong (bình thường là « /vmlinuz » và « /vmlinuz.old " -"») để không tham chiếu đến « ${kimage}-=V ». Sau đó thì bạn cần phải chạy lại " -"${loader}." - #. Type: note #. Description -#: ../templates/temp.image.plain/templates:8001 +#: ../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:8001 +#: ../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 " @@ -349,7 +259,7 @@ msgstr "" #. Type: note #. Description -#: ../templates/temp.image.plain/templates:8001 +#: ../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 " @@ -361,3 +271,19 @@ msgstr "" "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 +#, fuzzy +#| msgid "Boot loader configuration check needed" +msgid "Boot loader configuration must be updated" +msgstr "Yêu cầu kiểm tra cấu hình 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 "" diff --git a/debian/templates/temp.image.plain/postinst b/debian/templates/temp.image.plain/postinst index 019b8a3e0..9c7a75453 100755 --- a/debian/templates/temp.image.plain/postinst +++ b/debian/templates/temp.image.plain/postinst @@ -14,10 +14,7 @@ my $version = "=V"; my $link_in_boot = ""; my $no_symlink = ""; my $do_symlink = "Yes"; # target machine defined -my $do_boot_enable = "Yes"; # target machine defined -my $do_bootloader = "Yes"; # target machine defined my $kimage = "=K"; -my $loader = "=L"; # lilo, silo, quik, palo, vmelilo, nettrom, arcboot or delo my $initrd = "=I"; # initrd kernel my $mkimage = ""; # command to generate the initrd image my $use_hard_links = ''; # hardlinks do not work across fs boundaries @@ -32,22 +29,6 @@ my $ramdisk = "=MK"; # List of tools to create initial ram fs. my $package_name = "linux-image-$version"; my $explicit_do_loader = ''; -my $Loader = "NoLOADER"; # -$Loader = "LILO" if $loader =~ /^lilo/io; -$Loader = "SILO" if $loader =~ /^silo/io; -$Loader = "QUIK" if $loader =~ /^quik/io; -$Loader = "yaboot" if $loader =~ /^yaboot/io; -$Loader = "PALO" if $loader =~ /^palo/io; -$Loader = "NETTROM" if $loader =~ /^nettrom/io; -$Loader = "VMELILO" if $loader =~ /^vmelilo/io; -$Loader = "ZIPL" if $loader =~ /^zipl/io; -$Loader = "ELILO" if $loader =~ /^elilo/io; -$Loader = "ARCBOOT" if $loader =~ /^arcboot/io; -$Loader = "DELO" if $loader =~ /^delo/io; - -# This should not point to /tmp, because of security risks. -my $temp_file_name = "/var/log/$loader" . "_log.$$"; - #known variables my $image_dest = "/"; my $realimageloc = "/boot/"; @@ -77,8 +58,6 @@ if (-r "$CONF_LOC" && -f "$CONF_LOC" ) { $do_symlink = "" if /do_symlinks\s*=\s*(no|false|0)\s*$/i; $no_symlink = "" if /no_symlinks\s*=\s*(no|false|0)\s*$/i; $link_in_boot = "" if /link_in_boot\s*=\s*(no|false|0)\s*$/i; - $do_boot_enable = '' if /do_boot_enable\s*=\s*(no|false|0)\s*$/i; - $do_bootloader = '' if /do_bootloader\s*=\s*(no|false|0)\s*$/i; $use_hard_links = '' if /use_hard_links\s*=\s*(no|false|0)\s*$/i; $minimal_swap = '' if /minimal_swap\s*=\s*(no|false|0)\s*$/i; $ignore_depmod_err = '' if /ignore_depmod_err\s*=\s*(no|false|0)\s*$/i; @@ -89,8 +68,6 @@ if (-r "$CONF_LOC" && -f "$CONF_LOC" ) { $do_symlink = "Yes" if /do_symlinks\s*=\s*(yes|true|1)\s*$/i; $no_symlink = "Yes" if /no_symlinks\s*=\s*(yes|true|1)\s*$/i; $link_in_boot = "Yes" if /link_in_boot\s*=\s*(yes|true|1)\s*$/i; - $do_boot_enable = "Yes" if /do_boot_enable\s*=\s*(yes|true|1)\s*$/i; - $do_bootloader = "Yes" if /do_bootloader\s*=\s*(yes|true|1)\s*$/i; $explicit_do_loader = "YES" if /do_bootloader\s*=\s*(yes|true|1)\s*$/i; $use_hard_links = "Yes" if /use_hard_links\s*=\s*(yes|true|1)\s*$/i; $minimal_swap = 'Yes' if /minimal_swap\s*=\s*(yes|true|1)\s*$/i; @@ -124,9 +101,6 @@ if (! -d "$image_dest") { } # sanity -if (! $do_bootloader) { - $do_boot_enable = ''; -} if ($do_symlink && $no_symlink) { warn "Both do_symlinks and no_symlinks options enabled; disabling no_symlinks\n"; $no_symlink = 0; @@ -142,12 +116,6 @@ die "Internal Error: Could not find image (" . $realimageloc . "$kimage-$version)\n" unless -e $realimageloc . "$kimage-$version"; -# search for the boot loader in the path -my $loader_exec; -($loader_exec = $loader) =~ s|.*/||; -my ($loaderloc) = grep -x, map "$_/$loader_exec", - map { length($_) ? $_ : "." } split /:/, $ENV{PATH}; - ###################################################################### ## Fix the build link @@ -454,22 +422,6 @@ sub handle_missing_link { die("Failed to copy " . $realimageloc . "$image_name to " . $image_dest . "$kimage .\n"); } - } else { - if (! $have_conffile) { - # current default - $do_symlink = "Yes"; - - if ($loader =~ /palo/i) { - if (open(CONF, ">$CONF_LOC")) { - print CONF "# Kernel Image management overrides\n"; - print CONF "link_in_boot = Yes\n"; - print CONF "do_symlinks = Yes\n"; - print CONF "do_bootloader = No\n"; - close CONF; - $have_conffile = "Yes"; - } - } - } } if (! $no_symlink && $do_symlink =~ /Yes/i) { @@ -858,148 +810,13 @@ if (-d "/etc/kernel/postinst.d/$version") { die "Failed to process /etc/kernel/postinst.d/$version"; } -LOADER: { - last unless $do_boot_enable; # Exit if explicitly asked to - - last if $loader =~ /silo/i; # SILO does not have to be executed. - last if $loader =~ /yaboot/i; # yaboot does not have to be executed. - last if $loader =~ /milo/i; # MILO does not have to be executed. - last if $loader =~ /nettrom/i; # NETTROM does not have to be executed. - last if $loader =~ /arcboot/i; # ARCBOOT does not have to be executed. - last if $loader =~ /delo/i; # DELO does not have to be executed. - last if $loader =~ /quik/i; # maintainer asked quik invocation to be ignored - - last unless $loaderloc; - last unless -x $loaderloc; - last unless $do_bootloader; - - if (-T "/etc/$loader.conf") { - # Trust and use the existing lilo.conf. - print STDERR "You already have a $Loader configuration in /etc/$loader.conf\n"; - my $ret = &run_lilo(); - exit $ret if $ret; - } -} - - -sub run_lilo (){ - my $ret; - # Try and figure out if the user really wants lilo to be run -- - # since the default is to run the boot laoder, which is ! grub -- but - # the user may be using grub now, and not changed the default. - - # So, if the user has explicitly asked for the loader to be run, or - # if there is no postinst hook, or if there is no grub installed -- - # we are OK. Or else, we ask. - if ($explicit_do_loader || (! ($postinst_hook && -x '/sbin/grub'))) { - print STDERR "Running boot loader as requested\n"; - } - else { - # Ask the user - my $seen; - my $question = "shared/kernel-image/really-run-bootloader"; - - print STDERR "Do we really want to run bootloader $loader?\n"; - - ($ret,$seen) = fset ("$question", 'seen', 'false'); - die "Error setting debconf flags in $question: $seen" if $ret; - - $ret = subst("$question", 'loader', "$loader"); - die "Error setting debconf substitutions in $question: $seen" if $ret; - - ($ret,$seen) = input('critical', "$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 retreiving answer for $question: $answer" if $ret; - - if ($answer =~ /^(y|t)/i) { - print STDERR "Ok, not running $loader\n"; - return 0; - } - else { - print STDERR "Ok, continuing as directed.\n"; - } - - } - if ($loader =~ /^lilo/io or $loader =~ /vmelilo/io) { - print STDERR "Testing $loader.conf ... \n"; - unlink $temp_file_name; # security - $ret = system("$loaderloc -t >$temp_file_name 2>&1"); - if ($ret) { - my $seen; - my $note = "${package_name}/postinst/bootloader-test-error-$version"; - - print STDERR "Failed test for bootloader $loader\n"; - - ($ret,$seen) = fset ("$note", 'seen', 'false'); - die "Error setting debconf flags in $note: $seen" if $ret; - - $ret = subst("$note", 'loader', "$loader"); - die "Error setting debconf substitutions in $note: $seen" if $ret; - - $ret = subst("$note", 'temp_file_name', "$temp_file_name"); - die "Error setting debconf substitutions in $note: $seen" if $ret; - - ($ret,$seen) = input('critical', "$note"); - if ($ret && $ret != 30 ) { - die "Error setting debconf note $note: $seen"; - } - - ($ret,$seen) = go (); - if ($ret && $ret != 30 ) { - die "Error showing debconf note $note: $seen"; - } - return $ret; - } - unlink "$temp_file_name"; - print STDERR "Testing successful.\n"; - print STDERR "Installing the "; - print STDERR "partition " if $loader =~ /^lilo/io; - print STDERR "boot sector... \n"; - } - - print STDERR "Running $loaderloc ... \n"; - if ($loader =~ /^elilo/io) { - $ret = system("$loaderloc 2>&1 | tee $temp_file_name"); - } else { - $ret = system("$loaderloc >$temp_file_name 2>&1"); - } - if ($ret) { - my $ret; - my $seen; - my $note = "${package_name}/postinst/bootloader-error-$version"; - - ($ret,$seen) = fset ("$note", 'seen', 'false'); - die "Error setting debconf flags in $note: $seen" if $ret; - - $ret = subst("$note", 'locader', "$loader"); - die "Error setting debconf substitutions in $note: $seen" if $ret; - - $ret = subst("$note", 'temp_file_name', "$temp_file_name"); - die "Error setting debconf substitutions in $note: $seen" if $ret; - - ($ret,$seen) = input('critical', "$note"); - if ($ret && $ret != 30 ) { - die "Error setting debconf note $note: $seen"; - } - - ($ret,$seen) = go (); - if ($ret && $ret != 30 ) { - die "Error asking debconf question $note: $seen"; - } - return $ret; - } - unlink $temp_file_name; - print STDERR "Installation successful.\n"; - return 0; +if ($explicit_do_bootloader) { + my ($question, $ret, $seen); + $question = "${package_name}/postinst/ignoring-do-bootloader-$version"; + ($ret,$seen) = input('high', "$question"); + die "Error setting debconf question $question: $seen" if $ret && $ret != 30; + ($ret,$seen) = go(); + die "Error asking debconf question $question: $seen" if $ret && $ret != 30; } exit 0; diff --git a/debian/templates/temp.image.plain/postrm b/debian/templates/temp.image.plain/postrm index 0b55b5d9b..11ca80710 100755 --- a/debian/templates/temp.image.plain/postrm +++ b/debian/templates/temp.image.plain/postrm @@ -23,9 +23,7 @@ my $link_in_boot = ""; my $no_symlink = ""; my $do_symlink = "Yes"; # target machine defined my $do_boot_enable = "Yes"; # target machine defined -my $do_bootloader = "Yes"; # target machine defined my $kimage = "=K"; -my $loader = "=L"; # lilo, silo, quik, palo, vmelilo, or nettrom my $initrd = "=I"; # initrd kernel my $use_hard_links = ''; # hardlinks do not work across fs boundaries my $postrm_hook = ''; #Normally we do not @@ -37,21 +35,6 @@ my $kernel_arch = "=B"; my $ramdisk = "=MK"; # List of tools to create initial ram fs. my $package_name = "linux-image-$version"; -my $Loader = "NoLOADER"; # -$Loader = "LILO" if $loader =~ /^lilo/io; -$Loader = "SILO" if $loader =~ /^silo/io; -$Loader = "QUIK" if $loader =~ /^quik/io; -$Loader = "yaboot" if $loader =~ /^yaboot/io; -$Loader = "PALO" if $loader =~ /^palo/io; -$Loader = "NETTROM" if $loader =~ /^nettrom/io; -$Loader = "VMELILO" if $loader =~ /^vmelilo/io; -$Loader = "ZIPL" if $loader =~ /^zipl/io; -$Loader = "ELILO" if $loader =~ /^elilo/io; - - -# This should not point to /tmp, because of security risks. -my $temp_file_name = "/var/log/$loader" . "_log.$$"; - #known variables my $image_dest = "/"; my $realimageloc = "/boot/"; @@ -71,7 +54,6 @@ if (-r "$CONF_LOC" && -f "$CONF_LOC" ) { $no_symlink = "" if /no_symlinks\s*=\s*(no|false|0)\s*$/i; $link_in_boot = "" if /link_in_boot\s*=\s*(no|false|0)\s*$/i; $do_boot_enable = '' if /do_boot_enable\s*=\s*(no|false|0)\s*$/i; - $do_bootloader = '' if /do_bootloader\s*=\s*(no|false|0)\s*$/i; $use_hard_links = '' if /use_hard_links\s*=\s*(no|false|0)\s*$/i; $minimal_swap = '' if /minimal_swap\s*=\s*(no|false|0)\s*$/i; $ignore_depmod_err = '' if /ignore_depmod_err\s*=\s*(no|false|0)\s*$/i; @@ -81,8 +63,6 @@ if (-r "$CONF_LOC" && -f "$CONF_LOC" ) { $do_symlink = "Yes" if /do_symlinks\s*=\s*(yes|true|1)\s*$/i; $no_symlink = "Yes" if /no_symlinks\s*=\s*(yes|true|1)\s*$/i; $link_in_boot = "Yes" if /link_in_boot\s*=\s*(yes|true|1)\s*$/i; - $do_boot_enable = "Yes" if /do_boot_enable\s*=\s*(yes|true|1)\s*$/i; - $do_bootloader = "Yes" if /do_bootloader\s*=\s*(yes|true|1)\s*$/i; $use_hard_links = "Yes" if /use_hard_links\s*=\s*(yes|true|1)\s*$/i; $minimal_swap = 'Yes' if /minimal_swap\s*=\s*(yes|true|1)\s*$/i; $ignore_depmod_err = 'Yes' if /ignore_depmod_err\s*=\s*(yes|true|1)\s*$/i; @@ -120,12 +100,7 @@ sub remove_sym_link { my $bad_image = $_[0]; warn "Removing symbolic link $bad_image \n"; - if ($loader =~ /lilo/i) - { - warn "Unless you used the optional flag in lilo, \n"; - } - warn " you may need to re-run your boot loader" . ($loader ? "[$loader]":"") - . "\n"; + warn "You may need to re-run your boot loader\n"; # Remove the dangling link unlink "$bad_image"; } diff --git a/debian/templates/temp.image.plain/prerm b/debian/templates/temp.image.plain/prerm index 3931c93f3..96796269d 100755 --- a/debian/templates/temp.image.plain/prerm +++ b/debian/templates/temp.image.plain/prerm @@ -12,9 +12,7 @@ my $link_in_boot = ""; my $no_symlink = ""; my $do_symlinks = "Yes"; # target machine defined my $do_boot_enable = "Yes"; # target machine defined -my $do_bootloader = "Yes"; # target machine defined my $kimage = "=K"; -my $loader = "=L"; # lilo, silo, quik, palo, vmelilo, or nettrom my $use_hard_links = ''; # hardlinks do not wirk across fs boundaries my $prerm_hook = ''; #Normally we do not my $minimal_swap = ''; # Do not swap symlinks @@ -24,21 +22,6 @@ my $force_build_link = ''; # There is no harm in checking the link my $kernel_arch = "=B"; my $package_name = "linux-image-$version"; -my $Loader = "NoLOADER"; # -$Loader = "LILO" if $loader =~ /^lilo/io; -$Loader = "SILO" if $loader =~ /^silo/io; -$Loader = "QUIK" if $loader =~ /^quik/io; -$Loader = "yaboot" if $loader =~ /^yaboot/io; -$Loader = "PALO" if $loader =~ /^palo/io; -$Loader = "NETTROM" if $loader =~ /^nettrom/io; -$Loader = "VMELILO" if $loader =~ /^vmelilo/io; -$Loader = "ZIPL" if $loader =~ /^zipl/io; -$Loader = "ELILO" if $loader =~ /^elilo/io; - - -# This should not point to /tmp, because of security risks. -my $temp_file_name = "/var/log/$loader" . "_log.$$"; - #known variables my $image_dest = "/"; my $realimageloc = "/boot/"; @@ -72,7 +55,6 @@ if (-r "$CONF_LOC" && -f "$CONF_LOC" ) { $no_symlink = "" if /no_symlinks\s*=\s*(no|false|0)\s*$/i; $link_in_boot = "" if /link_in_boot\s*=\s*(no|false|0)\s*$/i; $do_boot_enable = '' if /do_boot_enable\s*=\s*(no|false|0)\s*$/i; - $do_bootloader = '' if /do_bootloader\s*=\s*(no|false|0)\s*$/i; $use_hard_links = '' if /use_hard_links\s*=\s*(no|false|0)\s*$/i; $warn_reboot = '' if /warn_reboot\s*=\s*(no|false|0)\s*$/i; $minimal_swap = '' if /minimal_swap\s*=\s*(no|false|0)\s*$/i; @@ -85,7 +67,6 @@ if (-r "$CONF_LOC" && -f "$CONF_LOC" ) { $no_symlink = "Yes" if /no_symlinks\s*=\s*(yes|true|1)\s*$/i; $link_in_boot = "Yes" if /link_in_boot\s*=\s*(yes|true|1)\s*$/i; $do_boot_enable = "Yes" if /do_boot_enable\s*=\s*(yes|true|1)\s*$/i; - $do_bootloader = "Yes" if /do_bootloader\s*=\s*(yes|true|1)\s*$/i; $use_hard_links = "Yes" if /use_hard_links\s*=\s*(yes|true|1)\s*$/i; $warn_reboot = 'Yes' if /warn_reboot\s*=\s*(yes|true|1)\s*$/i; $minimal_swap = 'Yes' if /minimal_swap\s*=\s*(yes|true|1)\s*$/i; @@ -138,68 +119,8 @@ if ($running eq $version) { #Now, they have an alternate kernel which they are currently running -# This is just us being nice to lilo users. - chdir("/") or die "could not chdir to /:$!\n"; -if (-f "/etc/$loader.conf") { #I know, could be a link, but .. - open (LILO, "/etc/$loader.conf"); # this is not critical - while () { - chop; - s/\#.*//; # nix the comments - next unless /^\s*image\s*=\s(\S+)/o; - $image = $1; - if ($image && -e $image) { - while (defined($image) && -l $image) { - $image = readlink ($image); - } - if (defined($image) && -e $image) { - $WouldInvalidate |= $image =~ /$kimage-$version/; - } - else { - last; # invalid $loader.conf file - } - } - else { - last; # invalid $loader.conf file - } - } - close (LILO); - if ($WouldInvalidate) { - my $question = "${package_name}/prerm/would-invalidate-boot-loader-$version"; - - ($ret,$seen) = fset ("$question", 'seen', 'false'); - die "Error setting debconf flags in $question: $seen" if $ret; - - $ret = subst("$question", 'loader', "$loader"); - die "Error setting debconf substitutions in $question: $seen" if $ret; - - $ret = subst("$question", 'kimage', "$kimage"); - die "Error setting debconf substitutions in $question: $seen" if $ret; - - ($ret,$seen) = input('critical', "$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 retreiving answer for $question: $answer" if $ret; - - if ($answer =~ /^(y|t)/i) { - print STDERR "\nNot removing linux-image-$version.\n"; - exit 1; #Operation not permitted - } - else { - print STFERR "Ok, proceeding with removing running kernel image.\n"; - } - } -} - # set the env var stem $ENV{'STEM'} = "linux"; diff --git a/debian/templates/temp.image.plain/templates b/debian/templates/temp.image.plain/templates index 10a273cdc..7ae19dfe6 100644 --- a/debian/templates/temp.image.plain/templates +++ b/debian/templates/temp.image.plain/templates @@ -22,41 +22,6 @@ _Description: Abort installation after depmod error? modules.dep file. If you don't abort the installation, there is a danger that the system will fail to boot. -Template: shared/kernel-image/really-run-bootloader -Type: boolean -Default: true -_Description: Run the default boot loader? - The default boot loader for this architecture is $loader, which is - present. - . - However, there is no explicit request to run that boot loader in - /etc/kernel-img.conf while GRUB seems to be installed with - a postinst hook set. - . - It thus seems that this system is using GRUB as - boot loader instead of $loader. - . - Please choose which should run: the default boot loader now, or the - GRUB update later. - -Template: linux-image-=V/postinst/bootloader-test-error-=V -Type: note -_Description: Error running the boot loader in test mode - An error occurred while running the ${loader} boot loader in test mode. - . - A log is available in ${temp_file_name}. Please edit /etc/${loader}.conf - manually and re-run ${loader} to fix that issue and keep this system - bootable. - -Template: linux-image-=V/postinst/bootloader-error-=V -Type: note -_Description: Error running the boot loader - An error occurred while running the ${loader} boot loader. - . - A log is available in ${temp_file_name}. Please edit /etc/${loader}.conf - manually and re-run ${loader} to fix that issue and keep this system - bootable. - Template: linux-image-=V/prerm/removing-running-kernel-=V Type: boolean Default: true @@ -72,21 +37,6 @@ _Description: Abort kernel removal? It is highly recommended to abort the kernel removal unless you are prepared to fix the system after removal. -Template: linux-image-=V/prerm/would-invalidate-boot-loader-=V -Type: boolean -Default: true -_Description: Abort kernel removal? - This system uses a valid /etc/${loader}.conf file that mentions - ${kimage}-=V. Removing linux-image-=V will invalidate - that file. - . - You will need to edit /etc/${loader}.conf or re-target - symbolic links mentioned there (typically, /vmlinuz and /vmlinuz.old) - to not refer to ${kimage}-=V. Then, you will have to re-run ${loader}. - . - It is highly recommended to abort the kernel removal unless you are - prepared to fix the system after removal. - Template: linux-image-=V/postinst/missing-firmware-=V Type: note #flag:translate!:3 @@ -102,3 +52,15 @@ _Description: Required firmware files may be missing reconfigure the package manager to include the contrib and non-free sections of the package archive before you can install these firmware files. + +Template: linux-image-=V/postinst/ignoring-do-bootloader-=V +Type: error +_Description: Boot loader configuration must be updated + Kernel packages no longer update a default boot loader. You should + remove 'do_bootloader = yes' from /etc/kernel-img.conf. + . + If the boot loader needs to be updated whenever a new kernel is + installed, the boot loader package should install a script in + /etc/kernel/postinst.d. Alternately, you can specify the command + to update the boot loader by setting the 'postinst_hook' variable + in /etc/kernel-img.conf.