Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock d-i
Please unblock package grub2. This mainly deals with implementing the
discussions held with the Technical Committee on adding menu entries for
alternative init daemons, which I strongly believe should be present in
jessie in order to smooth migrations to systemd and make sure that
sysadmins have a straightforward way out in case they're migrated
accidentally.
I also brought grub-pc's postinst into sync with grub-efi-* in terms of
how it handles copying the Unicode font into place, which is IMO a very
safe change and should result in fewer time-consuming debugging
exercises trying to work out why graphical mode isn't coming up; and I
applied a couple of debconf translation updates.
I've CCed Cyril since this will require a d-i ack.
diff -Nru grub2-2.02~beta2/debian/.git-dpm grub2-2.02~beta2/debian/.git-dpm
--- grub2-2.02~beta2/debian/.git-dpm 2014-12-22 11:55:53.000000000 +0000
+++ grub2-2.02~beta2/debian/.git-dpm 2015-01-03 12:21:02.000000000 +0000
@@ -1,6 +1,6 @@
# see git-dpm(1) from git-dpm package
-617a691e4a95e67967ca8b0c77c59d347df182d6
-617a691e4a95e67967ca8b0c77c59d347df182d6
+cbc80b2e595a7c4938dabd8264c2ff6a26eb4863
+cbc80b2e595a7c4938dabd8264c2ff6a26eb4863
e8f07821cce1bd0ab6d5622c2a42440f15f4fd71
e8f07821cce1bd0ab6d5622c2a42440f15f4fd71
grub2_2.02~beta2.orig.tar.xz
diff -Nru grub2-2.02~beta2/debian/changelog grub2-2.02~beta2/debian/changelog
--- grub2-2.02~beta2/debian/changelog 2014-12-22 11:55:53.000000000 +0000
+++ grub2-2.02~beta2/debian/changelog 2015-01-03 12:39:53.000000000 +0000
@@ -1,3 +1,18 @@
+grub2 (2.02~beta2-20) unstable; urgency=medium
+
+ [ Colin Watson ]
+ * Generate alternative init entries in advanced menu (closes: #757298,
+ #773173).
+ * When configuring grub-pc, copy unicode.pf2 to /boot/grub/ even if
+ /boot/grub/grub.cfg does not exist yet; this matches the behaviour of
+ grub-efi-* (thanks, Luca Capello; closes: #617196).
+
+ [ Debconf translations ]
+ * [fi] Finnish (Timo Jyrinki; closes: #774060).
+ * [mr] Marathi (sampada nakhare; closes: #773901).
+
+ -- Colin Watson <cjwatson@debian.org> Sat, 03 Jan 2015 12:39:52 +0000
+
grub2 (2.02~beta2-19) unstable; urgency=medium
[ Steve McIntyre ]
@@ -19,7 +34,7 @@
* [cs] Czech (Miroslav Kure, Closes: #772924)
* [nl] Dutch (Frans Spiesschaert, Closes: 773637)
* [eo] Esperanto (Felipe Castro, Closes: #773096)
- * [fi] Finish (Timo Jyrinki, Closes: #772921)
+ * [fi] Finnish (Timo Jyrinki, Closes: #772921)
* [fr] French (Christian PERRIER, Closes: #772771)
* [de] German (Martin Eberhard Schauer, Closes: #773664)
* [el] Greek (Panagiotis Georgakopoulos, Closes: #773068)
diff -Nru grub2-2.02~beta2/debian/patches/mkconfig_other_inits.patch grub2-2.02~beta2/debian/patches/mkconfig_other_inits.patch
--- grub2-2.02~beta2/debian/patches/mkconfig_other_inits.patch 1970-01-01 01:00:00.000000000 +0100
+++ grub2-2.02~beta2/debian/patches/mkconfig_other_inits.patch 2015-01-03 12:21:02.000000000 +0000
@@ -0,0 +1,90 @@
+From cbc80b2e595a7c4938dabd8264c2ff6a26eb4863 Mon Sep 17 00:00:00 2001
+From: Colin Watson <cjwatson@debian.org>
+Date: Sat, 3 Jan 2015 12:04:59 +0000
+Subject: Generate alternative init entries in advanced menu
+
+Add fallback boot entries for alternative installed init systems. Based
+on patches from Michael Biebl and Didier Roche.
+
+Bug-Debian: https://bugs.debian.org/757298
+Bug-Debian: https://bugs.debian.org/773173
+Forwarded: no
+Last-Update: 2015-01-03
+
+Patch-Name: mkconfig_other_inits.patch
+---
+ util/grub.d/10_linux.in | 10 ++++++++++
+ util/grub.d/20_linux_xen.in | 11 +++++++++++
+ 2 files changed, 21 insertions(+)
+
+diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
+index 86e35f2..f201e7d 100644
+--- a/util/grub.d/10_linux.in
++++ b/util/grub.d/10_linux.in
+@@ -32,6 +32,7 @@ export TEXTDOMAIN=@PACKAGE@
+ export TEXTDOMAINDIR="@localedir@"
+
+ CLASS="--class gnu-linux --class gnu --class os"
++SUPPORTED_INITS="sysvinit:/lib/sysvinit/init systemd:/lib/systemd/systemd upstart:/sbin/upstart"
+
+ if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then
+ OS=GNU/Linux
+@@ -115,6 +116,8 @@ linux_entry ()
+ case $type in
+ recovery)
+ title="$(gettext_printf "%s, with Linux %s (%s)" "${os}" "${version}" "$(gettext "${GRUB_RECOVERY_TITLE}")")" ;;
++ init-*)
++ title="$(gettext_printf "%s, with Linux %s (%s)" "${os}" "${version}" "${type#init-}")" ;;
+ *)
+ title="$(gettext_printf "%s, with Linux %s" "${os}" "${version}")" ;;
+ esac
+@@ -340,6 +343,13 @@ while [ "x$list" != "x" ] ; do
+
+ linux_entry "${OS}" "${version}" advanced \
+ "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}"
++ for supported_init in ${SUPPORTED_INITS}; do
++ init_path="${supported_init#*:}"
++ if [ -x "${init_path}" ] && [ "$(readlink -f /sbin/init)" != "${init_path}" ]; then
++ linux_entry "${OS}" "${version}" "init-${supported_init%%:*}" \
++ "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT} init=${init_path}"
++ fi
++ done
+ if [ "x${GRUB_DISABLE_RECOVERY}" != "xtrue" ]; then
+ linux_entry "${OS}" "${version}" recovery \
+ "${GRUB_CMDLINE_LINUX_RECOVERY} ${GRUB_CMDLINE_LINUX}"
+diff --git a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in
+index a5e5e50..11b7e01 100644
+--- a/util/grub.d/20_linux_xen.in
++++ b/util/grub.d/20_linux_xen.in
+@@ -27,6 +27,7 @@ export TEXTDOMAIN=@PACKAGE@
+ export TEXTDOMAINDIR="@localedir@"
+
+ CLASS="--class gnu-linux --class gnu --class os --class xen"
++SUPPORTED_INITS="sysvinit:/lib/sysvinit/init systemd:/lib/systemd/systemd upstart:/sbin/upstart"
+
+ if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then
+ OS=GNU/Linux
+@@ -94,6 +95,8 @@ linux_entry ()
+ if [ x$type != xsimple ] ; then
+ if [ x$type = xrecovery ] ; then
+ title="$(gettext_printf "%s, with Xen %s and Linux %s (%s)" "${os}" "${xen_version}" "${version}" "$(gettext "${GRUB_RECOVERY_TITLE}")")"
++ elif [ "${type#init-}" != "$type" ] ; then
++ title="$(gettext_printf "%s, with Xen %s and Linux %s (%s)" "${os}" "${xen_version}" "${version}" "${type#init-}")"
+ else
+ title="$(gettext_printf "%s, with Xen %s and Linux %s" "${os}" "${xen_version}" "${version}")"
+ fi
+@@ -255,6 +258,14 @@ while [ "x${xen_list}" != "x" ] ; do
+
+ linux_entry "${OS}" "${version}" "${xen_version}" advanced \
+ "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" "${GRUB_CMDLINE_XEN} ${GRUB_CMDLINE_XEN_DEFAULT}"
++ for supported_init in ${SUPPORTED_INITS}; do
++ init_path="${supported_init#*:}"
++ if [ -x "${init_path}" ] && [ "$(readlink -f /sbin/init)" != "${init_path}" ]; then
++ linux_entry "${OS}" "${version}" "${xen_version}" "init-${supported_init%%:*}" \
++ "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT} init=${init_path}" "${GRUB_CMDLINE_XEN} ${GRUB_CMDLINE_XEN_DEFAULT}"
++
++ fi
++ done
+ if [ "x${GRUB_DISABLE_RECOVERY}" != "xtrue" ]; then
+ linux_entry "${OS}" "${version}" "${xen_version}" recovery \
+ "single ${GRUB_CMDLINE_LINUX}" "${GRUB_CMDLINE_XEN}"
diff -Nru grub2-2.02~beta2/debian/patches/series grub2-2.02~beta2/debian/patches/series
--- grub2-2.02~beta2/debian/patches/series 2014-12-22 11:55:53.000000000 +0000
+++ grub2-2.02~beta2/debian/patches/series 2015-01-03 12:21:00.000000000 +0000
@@ -63,3 +63,4 @@
gettext-print-typo.patch
insmod-xzio-and-lzopio-on-xen.patch
grub-install-extra-removable.patch
+mkconfig_other_inits.patch
diff -Nru grub2-2.02~beta2/debian/po/fi.po grub2-2.02~beta2/debian/po/fi.po
--- grub2-2.02~beta2/debian/po/fi.po 2014-12-22 11:55:53.000000000 +0000
+++ grub2-2.02~beta2/debian/po/fi.po 2015-01-03 12:34:51.000000000 +0000
@@ -5,7 +5,7 @@
"Project-Id-Version: grub2\n"
"Report-Msgid-Bugs-To: grub2@packages.debian.org\n"
"POT-Creation-Date: 2014-12-13 20:23+0000\n"
-"PO-Revision-Date: 2014-12-12 10:19+0200\n"
+"PO-Revision-Date: 2014-12-27 18:53+0200\n"
"Last-Translator: Timo Jyrinki <timo.jyrinki@iki.fi>\n"
"Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n"
"Language: fi\n"
@@ -336,23 +336,12 @@
#. Type: boolean
#. Description
#: ../templates.in:3001
-#, fuzzy
-#| msgid "Force extra installation to the EFI removable path?"
msgid "Force extra installation to the EFI removable media path?"
-msgstr "Pakotetaanko lisäasennus irrotettavissa olevaan EFI-polkuun?"
+msgstr "Pakotetaanko lisäasennus irrotettavissa olevan median EFI-polkuun?"
#. Type: boolean
#. Description
#: ../templates.in:3001
-#, fuzzy
-#| msgid ""
-#| "Some EFI-based systems are buggy and do not handle new bootloaders "
-#| "correctly. If you force extra installation of GRUB to the EFI removable "
-#| "path, it should make sure that this system will boot Debian correctly "
-#| "despite such a problem. However, this may remove the ability to boot any "
-#| "other operating systems that also depend on this path. If so, you will "
-#| "need to ensure that GRUB is configured successfully to be able boot any "
-#| "other OS installations correctly."
msgid ""
"Some EFI-based systems are buggy and do not handle new bootloaders "
"correctly. If you force an extra installation of GRUB to the EFI removable "
@@ -364,12 +353,12 @@
msgstr ""
"Jotkin EFI-järjestelmät sisältävät ohjelmavirheitä joidenka takia ne eivät "
"käsittele alkulatausohjelmia oikein. Jos pakotat GRUB:n lisäasentamisen "
-"irrotettavissa olevaan EFI-polkuun, järjestelmän pitäisi kyetä käynnistämään "
-"Debian riippumatta kyseisenkaltaisista ongelmista. Tämä kuitenkin saattaa "
-"poistaa mahdollisuuden muiden käyttöjärjestelmien käynnistämiseen, mikäli ne "
-"riippuvat samasta polusta. Tässä tapauksessa tulee varmistaa, että GRUBin "
-"asetukset on tehty niin, että GRUBista voidaan käynnistää nämä muut "
-"käyttöjärjestelmät oikein."
+"irrotettavissa olevan median EFI-polkuun, järjestelmän pitäisi kyetä "
+"käynnistämään Debian riippumatta kyseisenkaltaisista ongelmista. Tämä "
+"kuitenkin saattaa poistaa mahdollisuuden muiden käyttöjärjestelmien "
+"käynnistämiseen, mikäli ne riippuvat samasta polusta. Tässä tapauksessa "
+"tulee varmistaa, että GRUBin asetukset on tehty niin, että GRUBista voidaan "
+"käynnistää nämä muut käyttöjärjestelmät oikein."
#. Type: string
#. Description
diff -Nru grub2-2.02~beta2/debian/po/mr.po grub2-2.02~beta2/debian/po/mr.po
--- grub2-2.02~beta2/debian/po/mr.po 2014-12-22 11:55:53.000000000 +0000
+++ grub2-2.02~beta2/debian/po/mr.po 2015-01-03 12:30:55.000000000 +0000
@@ -1,20 +1,21 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
+# localuser <sampada.n@rediffmail.com>, 2014.
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: grub2@packages.debian.org\n"
"POT-Creation-Date: 2014-12-13 20:23+0000\n"
-"PO-Revision-Date: 2012-05-13 23:06+0530\n"
-"Last-Translator: sampada <sampadanakhare@gmail.com>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
+"PO-Revision-Date: 2014-12-24 20:56+0530\n"
+"Last-Translator: localuser <sampada.n@rediffmail.com>\n"
+"Language-Team: C-DAC/Sampada\n"
+"Language: mr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Virtaal 0.7.1\n"
#. Type: boolean
#. Description
@@ -90,7 +91,7 @@
"modules or grub.cfg."
msgstr ""
"ग्रब गाभा प्रतिमेच्या ग्रब मोड्यूल्स वा grub.cfg शी विसंवादाला आळा बसण्यासाठी बहुतांश "
-"परिस्थितींमध्ये ग्रब-इन्स्टाल स्वयंचलितपणे चालवले जाण्याची शिफारस केली जाते"
+"परिस्थितींमध्ये ग्रब-इन्स्टाल स्वयंचलितपणे चालवले जाण्याची शिफारस केली जाते."
#. Type: multiselect
#. Description
@@ -209,7 +210,7 @@
"कोणत्याही उपकरणांवर ग्रब अधिष्ठापित न करण्याचे तुम्ही निवडले आहे. तुम्ही पुढे चालू ठेवल्यास, "
"हा आरंभ सूचक योग्यरित्या संरचित झालेला नसू शकतो, व हा संगणक पुन्हा सुरू होईल तेव्हा बूट "
"सेक्टरमध्ये आधी जे काही होते ते वापरेल. बूट सेक्टरमध्ये ग्रब 2 ची आधीची आवृत्ती असेल, तर "
-"कदाचित तो मोड्युल्स लोड करू शकणार नाही वा सद्य संरचना फाईल हाताळू शकणार नाही.\t"
+"कदाचित तो मोड्युल्स लोड करू शकणार नाही वा सद्य संरचना फाईल हाताळू शकणार नाही."
#. Type: boolean
#. Description
@@ -322,7 +323,7 @@
#. Description
#: ../templates.in:3001
msgid "Force extra installation to the EFI removable media path?"
-msgstr ""
+msgstr "ईएफआय काढण्याजोग्या मिडीया मार्गात अतिरिक्त अधिष्ठापना जबरदस्ती करायची?"
#. Type: boolean
#. Description
@@ -336,6 +337,12 @@
"make sure that GRUB is configured successfully to be able to boot any other "
"OS installations correctly."
msgstr ""
+"काही ईएफआय-आधारित प्रणाली दोषपूर्ण असतात व नवीन आरंभसूचकांना योग्य रीतीने हाताळत "
+"नाहीत. तुम्ही ईएफआय काढण्याजोग्या मिडीया मार्गात ग्रबची अतिरिक्त अधिष्ठापना जबरदस्ती "
+"केल्यास, त्यामुळे अशी समस्या असूनही ही प्रणाली डेबियन योग्यरीत्या आरंभ करेल याची खात्री "
+"होईल. तथापि, त्यामुळे याच मार्गावर अवलंबून असणारी अन्य एखादी प्रचालन प्रणाली आरंभ "
+"होण्याची क्षमता काढून टाकली जाऊ शकते. असे असल्यास, अन्य एखादी प्रणाली योग्य रीतीने आरंभ "
+"होण्यासाठी ग्रब यशस्वीपणे संरचित केला गेला असल्याची खातरजमा तुम्ही करणे गरजेचे आहे."
#. Type: string
#. Description
@@ -400,7 +407,7 @@
msgstr ""
"तथापि, प्रणालीमध्ये एकाहून अधिक डिस्क अस्तित्वात असल्याने, प्रणाली जुन्या उपकरण नकाशावर "
"अवलंबून असणे शक्य आहे. ग्रबच्या (hdN) ड्राईव्ह क्रमांकांवर विसंबणार्या एखाद्या आरंभ मेन्यू नोंदी "
-"आहेत का हे कृपया तपासा, व आवश्यकता भासल्यास त्या अद्ययावत "
+"आहेत का हे कृपया तपासा, व आवश्यकता भासल्यास त्या अद्ययावत करा."
#. Type: note
#. Description
diff -Nru grub2-2.02~beta2/debian/postinst.in grub2-2.02~beta2/debian/postinst.in
--- grub2-2.02~beta2/debian/postinst.in 2014-12-22 11:55:53.000000000 +0000
+++ grub2-2.02~beta2/debian/postinst.in 2015-01-03 12:23:47.000000000 +0000
@@ -671,13 +671,12 @@
fi
# /boot/grub/ has more chances of being accessible by GRUB
- if test -e /boot/grub/grub.cfg ; then
- for i in /usr/share/grub/unicode.pf2 ; do
- if test -e $i ; then
- cp $i /boot/grub/
- fi
- done
- fi
+ for i in /usr/share/grub/unicode.pf2 ; do
+ if test -e $i ; then
+ mkdir -p /boot/grub
+ cp $i /boot/grub/
+ fi
+ done
if [ "$fix_mixed_system" ]; then
# These never contain any valuable information, and they aren't
unblock grub2/2.02~beta2-20
Thanks,
--
Colin Watson [cjwatson@debian.org]
Attachment:
signature.asc
Description: Digital signature