diff --git a/debian/changelog b/debian/changelog index 75a843aa3..8dc1698c6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,6 +16,8 @@ linux (3.11~rc5-1~exp1) UNRELEASED; urgency=low environment - Use only one template syntax (@keyword@) and do all substitutions in gencontrol.py + - linux-image.postinst: Remove debconf warning about ramdisk variable in + /etc/kernel-img.conf -- Ben Hutchings Sun, 11 Aug 2013 19:34:47 +0200 diff --git a/debian/templates/image.plain.postinst.in b/debian/templates/image.plain.postinst.in index 1650078e8..792429d3c 100755 --- a/debian/templates/image.plain.postinst.in +++ b/debian/templates/image.plain.postinst.in @@ -22,7 +22,6 @@ my $use_hard_links = ''; # hardlinks do not work across fs boundaries my $postinst_hook = ''; #Normally we do not my $minimal_swap = ''; # Do not swap symlinks my $ignore_depmod_err = ''; # normally we do not -my $ramdisk = ''; my $package_name = "linux-image-$version"; #known variables @@ -68,7 +67,6 @@ if (-r "$CONF_LOC" && -f "$CONF_LOC" ) { $image_dest = "$1" if /image_dest\s*=\s*(\S+)/i; $postinst_hook = "$1" if /postinst_hook\s*=\s*(\S+)/i; $mkimage = "$1" if /mkimage\s*=\s*(.+)$/i; - $ramdisk = "$1" if /ramdisk\s*=\s*(.+)$/i; } close CONF; $have_conffile = "Yes"; @@ -624,16 +622,6 @@ if (-d "$modules_base/$version") { } -# Warn if we are ignoring the old ramdisk setting -if ($ramdisk =~ /\S/) { - my ($question, $ret, $seen); - $question = "${package_name}/postinst/ignoring-ramdisk"; - ($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; -} - # Only change the symlinks if we are not being upgraded if (! defined $ARGV[1] || ! $ARGV[1] || $ARGV[1] =~ m//o) { image_magic($kimage, $image_dest); diff --git a/debian/templates/image.plain.templates.in b/debian/templates/image.plain.templates.in index a2d5274f2..feaaf2a1a 100644 --- a/debian/templates/image.plain.templates.in +++ b/debian/templates/image.plain.templates.in @@ -52,12 +52,3 @@ _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. - -# This has not yet been reviewed -Template: linux-image-@abiname@@localversion@/postinst/ignoring-ramdisk -Type: error -_Description: Ramdisk configuration must be updated - Kernel packages will no longer run a specific ramdisk creator. The - ramdisk creator package must install a script in - /etc/kernel/postinst.d, and you should remove the line beginning - 'ramdisk =' from /etc/kernel-img.conf. diff --git a/debian/templates/po/ca.po b/debian/templates/po/ca.po index 77c0c6be0..575f03050 100644 --- a/debian/templates/po/ca.po +++ b/debian/templates/po/ca.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: linux-2.6 2.6.32-24\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-08-10 00:20+0200\n" +"POT-Creation-Date: 2013-08-10 00:38+0200\n" "PO-Revision-Date: 2013-08-15 13:20+0200\n" "Last-Translator: Jordi Mallach \n" "Language-Team: Catalan \n" @@ -129,18 +129,3 @@ msgstr "" "possible que necessiteu reconfigurar el gestor de paquets per a incloure les " "seccions «contrib» i «non-free» de l'arxiu de paquets abans de poder " "instaŀlar aquests fitxers de microprogramari." - -#. Type: error -#. Description -#: ../image.plain.templates.in:5001 -msgid "Ramdisk configuration must be updated" -msgstr "" - -#. Type: error -#. Description -#: ../image.plain.templates.in:5001 -msgid "" -"Kernel packages will no longer run a specific ramdisk creator. The ramdisk " -"creator package must install a script in /etc/kernel/postinst.d, and you " -"should remove the line beginning 'ramdisk =' from /etc/kernel-img.conf." -msgstr "" diff --git a/debian/templates/po/cs.po b/debian/templates/po/cs.po index 6ab82ff63..2c1ea0c5f 100644 --- a/debian/templates/po/cs.po +++ b/debian/templates/po/cs.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: linux 3.2.21-3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-08-10 00:20+0200\n" +"POT-Creation-Date: 2013-08-10 00:38+0200\n" "PO-Revision-Date: 2012-06-30 13:02+0200\n" "Last-Translator: Michal Simunek \n" "Language-Team: Czech \n" @@ -122,22 +122,3 @@ 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 -#: ../image.plain.templates.in:5001 -msgid "Ramdisk configuration must be updated" -msgstr "Nastavení ramdisku musí být aktualizováno" - -#. Type: error -#. Description -#: ../image.plain.templates.in:5001 -msgid "" -"Kernel packages will no longer run a specific ramdisk creator. The ramdisk " -"creator package must install a script in /etc/kernel/postinst.d, and you " -"should remove the line beginning 'ramdisk =' from /etc/kernel-img.conf." -msgstr "" -"Jaderný balíček již nespouští konkrétního tvůrce ramdisku. Balíček s tvůrcem " -"ramdisku musí do adresáře /etc/kernel/postinst.d nainstalovat skript, a vy " -"byste měli ze souboru /etc/kernel-img.conf odstranit řádek začínající " -"'ramdisk ='." diff --git a/debian/templates/po/da.po b/debian/templates/po/da.po index 62b211a62..14a2dfda6 100644 --- a/debian/templates/po/da.po +++ b/debian/templates/po/da.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: linux\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-08-10 00:20+0200\n" +"POT-Creation-Date: 2013-08-10 00:38+0200\n" "PO-Revision-Date: 2011-07-03 05:26+0100\n" "Last-Translator: Joe Hansen \n" "Language-Team: Danish \n" @@ -125,22 +125,3 @@ msgstr "" "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 -#: ../image.plain.templates.in:5001 -msgid "Ramdisk configuration must be updated" -msgstr "Konfiguration af ramdisk skal opdateres" - -#. Type: error -#. Description -#: ../image.plain.templates.in:5001 -msgid "" -"Kernel packages will no longer run a specific ramdisk creator. The ramdisk " -"creator package must install a script in /etc/kernel/postinst.d, and you " -"should remove the line beginning 'ramdisk =' from /etc/kernel-img.conf." -msgstr "" -"Kernepakker vil ikke længere køre et specifikt ramdiskoprettelsesprogram. " -"Pakken for ramdiskrettelsesprogrammet skal installere et skript i /etc/" -"kernel/postinst.d, og du skal fjerne linjen der begynder med »ramdisk =« " -"fra /etc/kernel-img.conf." diff --git a/debian/templates/po/de.po b/debian/templates/po/de.po index 86a117f05..f8214c19d 100644 --- a/debian/templates/po/de.po +++ b/debian/templates/po/de.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: linux-2.6 3.0.0-3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-08-10 00:20+0200\n" +"POT-Creation-Date: 2013-08-10 00:38+0200\n" "PO-Revision-Date: 2011-09-13 20:41+0200\n" "Last-Translator: Holger Wansing \n" "Language-Team: Debian German \n" @@ -129,22 +129,3 @@ 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 -#: ../image.plain.templates.in:5001 -msgid "Ramdisk configuration must be updated" -msgstr "Aktualisierung der Ramdisk-Konfiguration erforderlich" - -#. Type: error -#. Description -#: ../image.plain.templates.in:5001 -msgid "" -"Kernel packages will no longer run a specific ramdisk creator. The ramdisk " -"creator package must install a script in /etc/kernel/postinst.d, and you " -"should remove the line beginning 'ramdisk =' from /etc/kernel-img.conf." -msgstr "" -"Kernel-Pakete werden keinen spezifischen Ramdisk-Ersteller mehr ausführen. " -"Das Ramdisk-Ersteller-Paket muss ein Skript in /etc/kernel/postinst.d " -"installieren und Sie sollten in /etc/kernel-img.conf die Zeile entfernen, " -"die mit »ramdisk =« beginnt." diff --git a/debian/templates/po/es.po b/debian/templates/po/es.po index 41891abfc..25f164670 100644 --- a/debian/templates/po/es.po +++ b/debian/templates/po/es.po @@ -30,7 +30,7 @@ msgid "" msgstr "" "Project-Id-Version: linux-2.6 2.6.32+5\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-08-10 00:20+0200\n" +"POT-Creation-Date: 2013-08-10 00:38+0200\n" "PO-Revision-Date: 2011-07-16 17:59+0200\n" "Last-Translator: Omar Campagne \n" "Language-Team: Debian l10n Spanish \n" @@ -158,22 +158,3 @@ 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 -#: ../image.plain.templates.in:5001 -msgid "Ramdisk configuration must be updated" -msgstr "Se debe actualizar la configuración del disco RAM" - -#. Type: error -#. Description -#: ../image.plain.templates.in:5001 -msgid "" -"Kernel packages will no longer run a specific ramdisk creator. The ramdisk " -"creator package must install a script in /etc/kernel/postinst.d, and you " -"should remove the line beginning 'ramdisk =' from /etc/kernel-img.conf." -msgstr "" -"Los paquetes de núcleo ya no ejecutarán un creador de disco RAM. El paquete " -"de creador de disco RAM debe instalar un script en «/etc/kernel/postinst.d», " -"y el usuario debería eliminar manualmente la línea que empieza con «ramdisk " -"=» del fichero «/etc/kernel-img.conf»." diff --git a/debian/templates/po/et.po b/debian/templates/po/et.po index 84ea3ba3d..98f74bdda 100644 --- a/debian/templates/po/et.po +++ b/debian/templates/po/et.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: linux 2.6.32-11\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-08-10 00:20+0200\n" +"POT-Creation-Date: 2013-08-10 00:38+0200\n" "PO-Revision-Date: 2013-08-15 13:20+0200\n" "Last-Translator: mihkel \n" "Language-Team: Estonian \n" @@ -128,18 +128,3 @@ 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 -#: ../image.plain.templates.in:5001 -msgid "Ramdisk configuration must be updated" -msgstr "" - -#. Type: error -#. Description -#: ../image.plain.templates.in:5001 -msgid "" -"Kernel packages will no longer run a specific ramdisk creator. The ramdisk " -"creator package must install a script in /etc/kernel/postinst.d, and you " -"should remove the line beginning 'ramdisk =' from /etc/kernel-img.conf." -msgstr "" diff --git a/debian/templates/po/fr.po b/debian/templates/po/fr.po index 7298019d4..c118c9400 100644 --- a/debian/templates/po/fr.po +++ b/debian/templates/po/fr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: linux-2.6 2.6.39-1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-08-10 00:20+0200\n" +"POT-Creation-Date: 2013-08-10 00:38+0200\n" "PO-Revision-Date: 2011-05-22 08:48-0400\n" "Last-Translator: David Prévot \n" "Language-Team: French \n" @@ -130,23 +130,3 @@ msgstr "" "nécessaire de modifier la configuration du gestionnaire de paquets et " "d'ajouter les sections « contrib » (contributions) et « non-free » (non " "libre) de l'archive avant de pouvoir installer ces fichiers." - -#. Type: error -#. Description -#: ../image.plain.templates.in:5001 -msgid "Ramdisk configuration must be updated" -msgstr "" -"Mise à jour indispensable de la configuration du disque virtuel initial" - -#. Type: error -#. Description -#: ../image.plain.templates.in:5001 -msgid "" -"Kernel packages will no longer run a specific ramdisk creator. The ramdisk " -"creator package must install a script in /etc/kernel/postinst.d, and you " -"should remove the line beginning 'ramdisk =' from /etc/kernel-img.conf." -msgstr "" -"Les paquets du noyau ne s'occupent plus de la création du disque virtuel " -"(RAM disque). Le programme en charge de la création du disque virtuel " -"doivent installer un script dans /etc/kernel/postinst.d, et vous devriez " -"supprimer la ligne commençant par « ramdisk = » de /etc/kernel-img.conf." diff --git a/debian/templates/po/it.po b/debian/templates/po/it.po index 4748d1f62..282865001 100644 --- a/debian/templates/po/it.po +++ b/debian/templates/po/it.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: linux-2.6 2.6.32-27\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-08-10 00:20+0200\n" +"POT-Creation-Date: 2013-08-10 00:38+0200\n" "PO-Revision-Date: 2013-08-15 13:21+0200\n" "Last-Translator: Luca Bruno \n" "Language-Team: Italian \n" @@ -127,18 +127,3 @@ msgstr "" "conformi alle Linee Guida Debian per il Software Libero. Potrebbe essere " "necessario riconfigurare il gestore dei pacchetti ed includere le sezioni " "contrib e non-free per poterli installare." - -#. Type: error -#. Description -#: ../image.plain.templates.in:5001 -msgid "Ramdisk configuration must be updated" -msgstr "" - -#. Type: error -#. Description -#: ../image.plain.templates.in:5001 -msgid "" -"Kernel packages will no longer run a specific ramdisk creator. The ramdisk " -"creator package must install a script in /etc/kernel/postinst.d, and you " -"should remove the line beginning 'ramdisk =' from /etc/kernel-img.conf." -msgstr "" diff --git a/debian/templates/po/ja.po b/debian/templates/po/ja.po index 6a63625da..489b536df 100644 --- a/debian/templates/po/ja.po +++ b/debian/templates/po/ja.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: linux\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-08-10 00:20+0200\n" +"POT-Creation-Date: 2013-08-10 00:38+0200\n" "PO-Revision-Date: 2013-08-15 13:21+0200\n" "Last-Translator: Nobuhiro Iwamatsu \n" "Language-Team: Japanese \n" @@ -128,18 +128,3 @@ msgstr "" "致しないため、システムに含まれていません。これらのファームウェアファイルをイ" "ンストール可能にするために、パッケージアーカイブの contrib および non-free セ" "クションを含むようパッケージマネージャを再設定する必要があるかもしれません。" - -#. Type: error -#. Description -#: ../image.plain.templates.in:5001 -msgid "Ramdisk configuration must be updated" -msgstr "" - -#. Type: error -#. Description -#: ../image.plain.templates.in:5001 -msgid "" -"Kernel packages will no longer run a specific ramdisk creator. The ramdisk " -"creator package must install a script in /etc/kernel/postinst.d, and you " -"should remove the line beginning 'ramdisk =' from /etc/kernel-img.conf." -msgstr "" diff --git a/debian/templates/po/nl.po b/debian/templates/po/nl.po index 1b7ca2a66..0b69c7566 100644 --- a/debian/templates/po/nl.po +++ b/debian/templates/po/nl.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: linux\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-08-10 00:20+0200\n" +"POT-Creation-Date: 2013-08-10 00:38+0200\n" "PO-Revision-Date: 2012-02-04 12:27+0100\n" "Last-Translator: willem kuyn \n" "Language-Team: Debian-Dutch \n" @@ -128,22 +128,3 @@ msgstr "" "u de configuratie van de pakketbeheerprogramma aanpassen en de contrib en " "non-free secties van het pakketarchief toevoegen voordat u deze firmware " "bestanden kunt installeren. " - -#. Type: error -#. Description -#: ../image.plain.templates.in:5001 -msgid "Ramdisk configuration must be updated" -msgstr "De ramdisk-configuratie moet worden aangepast." - -#. Type: error -#. Description -#: ../image.plain.templates.in:5001 -msgid "" -"Kernel packages will no longer run a specific ramdisk creator. The ramdisk " -"creator package must install a script in /etc/kernel/postinst.d, and you " -"should remove the line beginning 'ramdisk =' from /etc/kernel-img.conf." -msgstr "" -"Kernel pakketten starten niet langer een bepaalde ramdisk generator. Het " -"ramdisk generator pakket moet een script in /etc/kernel/postinst.d " -"installeren en u dient de regel te verwijderen die begint met 'ramdisk =' " -"uit /etc/kernel-img.conf." diff --git a/debian/templates/po/pl.po b/debian/templates/po/pl.po index 8d38a953b..9b1501cf2 100644 --- a/debian/templates/po/pl.po +++ b/debian/templates/po/pl.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-08-10 00:20+0200\n" +"POT-Creation-Date: 2013-08-10 00:38+0200\n" "PO-Revision-Date: 2012-02-05 18:38+0100\n" "Last-Translator: Michał Kułach \n" "Language-Team: Polish \n" @@ -131,22 +131,3 @@ msgstr "" "potrzeba ponownej konfiguracji menedżera pakietów, aby dołączyć sekcje " "contrib i non-free archiwum pakietów, przed możliwością zainstalowania " "potrzebnych plików firmware." - -#. Type: error -#. Description -#: ../image.plain.templates.in:5001 -msgid "Ramdisk configuration must be updated" -msgstr "Konfiguracja ramdisku musi zostać zaktualizowana" - -#. Type: error -#. Description -#: ../image.plain.templates.in:5001 -msgid "" -"Kernel packages will no longer run a specific ramdisk creator. The ramdisk " -"creator package must install a script in /etc/kernel/postinst.d, and you " -"should remove the line beginning 'ramdisk =' from /etc/kernel-img.conf." -msgstr "" -"Pakiety jądra nie uruchamiają dłużej specjalnego kreatora ramdisku. Pakiet " -"kreatora ramdisku musi zainstalować skrypt w /etc/kernel/postinst.d, a " -"użytkownik powinien usunąć wszystkie wiersze zaczynające się od \"ramdisk =" -"\" z pliku /etc/kernel-img.conf." diff --git a/debian/templates/po/pt.po b/debian/templates/po/pt.po index f17b12e91..2426f38d9 100644 --- a/debian/templates/po/pt.po +++ b/debian/templates/po/pt.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: linux 2.6.39.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-08-10 00:20+0200\n" +"POT-Creation-Date: 2013-08-10 00:38+0200\n" "PO-Revision-Date: 2011-05-22 23:53+0100\n" "Last-Translator: Américo Monteiro \n" "Language-Team: Portuguese \n" @@ -128,22 +128,3 @@ 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 -#: ../image.plain.templates.in:5001 -msgid "Ramdisk configuration must be updated" -msgstr "A configuração de ramdisk tem de ser actualizada" - -#. Type: error -#. Description -#: ../image.plain.templates.in:5001 -msgid "" -"Kernel packages will no longer run a specific ramdisk creator. The ramdisk " -"creator package must install a script in /etc/kernel/postinst.d, and you " -"should remove the line beginning 'ramdisk =' from /etc/kernel-img.conf." -msgstr "" -"Os pacotes de kernel não irão mais correr um criador de ramdisk " -"especificado. O pacote do criador de ramdisk deve instalar um script em /etc/" -"kernel/postinst.d, e você deve remover a linha que começa com 'ramdisk =' do " -"ficheiro /etc/kernel-img.conf." diff --git a/debian/templates/po/pt_BR.po b/debian/templates/po/pt_BR.po index f819a8227..dd6b540f7 100644 --- a/debian/templates/po/pt_BR.po +++ b/debian/templates/po/pt_BR.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: linux\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-08-10 00:20+0200\n" +"POT-Creation-Date: 2013-08-10 00:38+0200\n" "PO-Revision-Date: 2013-08-15 13:21+0200\n" "Last-Translator: Flamarion Jorge \n" "Language-Team: Brazilian Portuguese