Bug#611183: unblock: grub2/1.98+20100804-14
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Is there any chance at all of this last grub2 fix for squeeze? It's
been in unstable for a week now and seems to be holding up fine. The
situation where you can end up with a black-on-black GRUB menu is
particularly nasty, although slightly obscure; I was caught by it myself
at one point and have to say I'd have had no idea what to do if I didn't
know how to change the colours blind.
grub2 (1.98+20100804-14) unstable; urgency=low
[ Updated translations ]
* Kazakh (Baurzhan Muftakhidinov / Timur Birsh). Closes: #609187
[ Alexander Kurtz ]
* 05_debian_theme:
- If we find a background image and no colours were specified, use
upstream defaults for color_normal and color_highlight rather than
setting color_normal to black/black.
- Don't try the other alternatives when $GRUB_BACKGROUND is set; you can
now add GRUB_BACKGROUND= to /etc/default/grub to force no background
image (closes: #608263).
-- Colin Watson <cjwatson@debian.org> Mon, 17 Jan 2011 23:19:38 +0000
I've attached the debdiff.
Thanks,
--
Colin Watson [cjwatson@debian.org]
diff -u grub2-1.98+20100804/debian/changelog grub2-1.98+20100804/debian/changelog
--- grub2-1.98+20100804/debian/changelog
+++ grub2-1.98+20100804/debian/changelog
@@ -1,3 +1,19 @@
+grub2 (1.98+20100804-14) unstable; urgency=low
+
+ [ Updated translations ]
+ * Kazakh (Baurzhan Muftakhidinov / Timur Birsh). Closes: #609187
+
+ [ Alexander Kurtz ]
+ * 05_debian_theme:
+ - If we find a background image and no colours were specified, use
+ upstream defaults for color_normal and color_highlight rather than
+ setting color_normal to black/black.
+ - Don't try the other alternatives when $GRUB_BACKGROUND is set; you can
+ now add GRUB_BACKGROUND= to /etc/default/grub to force no background
+ image (closes: #608263).
+
+ -- Colin Watson <cjwatson@debian.org> Mon, 17 Jan 2011 23:19:38 +0000
+
grub2 (1.98+20100804-13) unstable; urgency=low
* Backport from upstream:
diff -u grub2-1.98+20100804/debian/grub.d/05_debian_theme grub2-1.98+20100804/debian/grub.d/05_debian_theme
--- grub2-1.98+20100804/debian/grub.d/05_debian_theme
+++ grub2-1.98+20100804/debian/grub.d/05_debian_theme
@@ -92,8 +92,15 @@
# If loading the background image fails, use the default theme.
echo "insmod ${reader}"
echo "if background_image `make_system_path_relative_to_its_root "${1}"`; then"
- echo " set color_normal=${2:-black/black}"
- echo " set color_highlight=${3:-magenta/black}"
+ if [ -n "${2}" ]; then
+ echo " set color_normal=${2}"
+ fi
+ if [ -n "${3}" ]; then
+ echo " set color_highlight=${3}"
+ fi
+ if [ -z "${2}" ] && [ -z "${3}" ]; then
+ echo " true"
+ fi
echo "else"
set_default_theme " "
echo "fi"
@@ -123,11 +130,17 @@
fi
# First check whether the user has specified a background image explicitly.
+# If so, try to use it. Don't try the other possibilities in that case
+# (#608263).
+if [ -n "${GRUB_BACKGROUND+x}" ]; then
+ set_background_image "${GRUB_BACKGROUND}" || set_default_theme
+ exit 0
+fi
+
# Next search for pictures the user put into /boot/grub/ and use the first one.
# Next try to use the background image and colors specified by desktop-base.
# If we haven't found a background image yet, use the default from desktop-base.
# Finally, if all of the above fails, use the default theme.
-set_background_image "${GRUB_BACKGROUND}" ||
set_background_image "`ls -1 *.jpg *.JPG *.jpeg *.JPEG *.png *.PNG *.tga *.TGA 2>/dev/null | head -1`" ||
set_background_image "${WALLPAPER}" "${COLOR_NORMAL}" "${COLOR_HIGHLIGHT}" ||
set_background_image "/usr/share/images/desktop-base/desktop-grub.png" ||
diff -u grub2-1.98+20100804/debian/po/kk.po grub2-1.98+20100804/debian/po/kk.po
--- grub2-1.98+20100804/debian/po/kk.po
+++ grub2-1.98+20100804/debian/po/kk.po
@@ -7,8 +7,8 @@
msgstr ""
"Project-Id-Version: master\n"
"Report-Msgid-Bugs-To: grub2@packages.debian.org\n"
-"POT-Creation-Date: 2010-12-08 18:02-0400\n"
-"PO-Revision-Date: 2010-09-27 15:51+0600\n"
+"POT-Creation-Date: 2010-12-08 21:22+0000\n"
+"PO-Revision-Date: 2011-01-05 21:06+0600\n"
"Last-Translator: Baurzhan Muftakhidinov <baurthefirst@gmail.com>\n"
"Language-Team: Kazakh <kk_KZ@googlegroups.com>\n"
"Language: kk\n"
@@ -34,12 +34,6 @@
#. Type: boolean
#. Description
#: ../grub-pc.templates.in:2001
-#, fuzzy
-#| msgid ""
-#| "In order to replace the Legacy version of GRUB in your system, it is "
-#| "recommended that /boot/grub/menu.lst is adjusted to chainload GRUB 2 from "
-#| "your existing GRUB Legacy setup. This step may be automaticaly performed "
-#| "now."
msgid ""
"In order to replace the Legacy version of GRUB in your system, it is "
"recommended that /boot/grub/menu.lst is adjusted to load a GRUB 2 boot image "
@@ -53,18 +47,14 @@
#. Type: boolean
#. Description
#: ../grub-pc.templates.in:2001
-#, fuzzy
-#| msgid ""
-#| "It's recommended that you accept chainloading GRUB 2 from menu.lst, and "
-#| "verify that your new GRUB 2 setup is functional for you, before you "
-#| "install it directly to your MBR (Master Boot Record)."
msgid ""
"It's recommended that you accept chainloading GRUB 2 from menu.lst, and "
"verify that the new GRUB 2 setup works before it is written to the MBR "
"(Master Boot Record)."
msgstr ""
-"GRUB 2 алдымен menu.lst ішінен тізбектей жүктеле алатынына көз жеткізіңіз, "
-"содан кейін ғана оны MBR (Басты жүктелу жазбасына) орнату ұсынылады."
+"GRUB 2-ні menu.lst ішінен тізбектей жүктеуді қабылдау, және жаңа GRUB 2 "
+"орнатуы оны MBR (Басты жүктелу жазбасына) ішіне жазбас бұрын жұмыс "
+"істейтінін тексеру ұсынылады."
#. Type: boolean
#. Description
@@ -73,16 +63,16 @@
"Whatever your decision, you can replace the old MBR image with GRUB 2 later "
"by issuing the following command as root:"
msgstr ""
+"Шешіміңіз қандай болса да, кейін сіз әрқашан да ескі MBR бейнесін жаңа GRUB "
+"2-мен ауыстыра аласыз, ол үшін root атынан келесі команда орындауыңыз керек:"
#. Type: multiselect
#. Description
#. Type: multiselect
#. Description
#: ../grub-pc.templates.in:3001 ../grub-pc.templates.in:4001
-#, fuzzy
-#| msgid "GRUB failed to install to the following devices:"
msgid "GRUB install devices:"
-msgstr "GRUB келесі құрылғыларға орнату сәтсіз аяқталды:"
+msgstr "GRUB орнатылатын құрылғылар:"
#. Type: multiselect
#. Description
@@ -91,6 +81,9 @@
"The grub-pc package is being upgraded. This menu allows you to select which "
"devices you'd like grub-install to be automatically run for, if any."
msgstr ""
+"grub-pc дестесі жаңартылуда. Бұл мәзір сізге қай құрылғылар үшін grub-"
+"install автожөнелту қалайтыныңызды көрсетуге мүмкін қылады, егер ондай "
+"құрылғылар бар болса."
#. Type: multiselect
#. Description
@@ -100,6 +93,8 @@
"prevent the installed GRUB core image from getting out of sync with GRUB "
"modules or grub.cfg."
msgstr ""
+"grub-install автожөнелту көп жағдайда ұсынылады, орнатылған GRUB өзегі және "
+"модульдер не grub.cfg-мен үйлесімді болуы үшін."
#. Type: multiselect
#. Description
@@ -110,6 +105,8 @@
"If you're unsure which drive is designated as boot drive by your BIOS, it is "
"often a good idea to install GRUB to all of them."
msgstr ""
+"Егер сіз BIOS-та қай диск жүктелетін етіп орнатылғанын нақты білмесеңіз, "
+"GRUB-ты дисктердің барлығына орнатуға да болады."
#. Type: multiselect
#. Description
@@ -122,6 +119,10 @@
"use the blocklist mechanism, which makes it less reliable, and therefore is "
"not recommended."
msgstr ""
+"Ескерту: GRUB-ты бөлімнің жүктелу жазбасына да орнатуға болады, сәйкес "
+"келетін бөлімдер тізімі төменде көрсетілген. Алайда, бұл әрекет GRUB-ты "
+"блоктізімді қолдануға мәжбүрлетеді, яғни оның икемділігін төмендетеді, сол "
+"үшін ұсынылмайды."
#. Type: multiselect
#. Description
@@ -133,6 +134,10 @@
"GRUB modules and grub.cfg. Please check again to make sure that GRUB is "
"written to the appropriate boot devices."
msgstr ""
+"GRUB жүктеушісі қазір жоқ болып тұрған, немесе қандай да бір себептермен "
+"уникалды идентификаторы өзгерген дискіге бұрын орнатулы болған. Орнатылған "
+"GRUB өзегі және модульдер мен grub.cfg-мен үйлесімді болуын тексеру маңызды. "
+"GRUB дұрыс жүктелу құрылғыларына жазылғанын тағы да бір рет тексеріңіз."
#. Type: text
#. Description
@@ -146,16 +151,14 @@
#. Description
#. The "-" is used to indicate indentation. Leading spaces may not work.
#: ../grub-pc.templates.in:6001
-#, fuzzy
-#| msgid "${DEVICE} (${SIZE} MB; ${MODEL})"
msgid "- ${DEVICE} (${SIZE} MB; ${PATH})"
-msgstr "${DEVICE} (${SIZE} МБ; ${MODEL})"
+msgstr "- ${DEVICE} (${SIZE} МБ; ${PATH})"
#. Type: boolean
#. Description
#: ../grub-pc.templates.in:7001
msgid "Writing GRUB to boot device failed - continue?"
-msgstr ""
+msgstr "GRUB-ты жүктелу құрылғысына жазу сәтсіз - жалғастыру керек пе?"
#. Type: boolean
#. Description
@@ -178,10 +181,8 @@
#. Type: boolean
#. Description
#: ../grub-pc.templates.in:8001
-#, fuzzy
-#| msgid "GRUB installation failed. Try again?"
msgid "Writing GRUB to boot device failed - try again?"
-msgstr "GRUB орнату сәтсіз. Қайталау керек пе?"
+msgstr "GRUB-ты жүктелу құрылғысына жазу сәтсіз - қайталау керек пе?"
#. Type: boolean
#. Description
@@ -204,13 +205,6 @@
#. Type: boolean
#. Description
#: ../grub-pc.templates.in:9001
-#, fuzzy
-#| msgid ""
-#| "You chose not to install GRUB to any devices. If you continue, the boot "
-#| "loader may not be properly configured, and when your computer next starts "
-#| "up it will use whatever was previously in the boot sector. If there is an "
-#| "earlier version of GRUB 2 in the boot sector, it may be unable to load "
-#| "modules or handle the current configuration file."
msgid ""
"You chose not to install GRUB to any devices. If you continue, the boot "
"loader may not be properly configured, and when this computer next starts up "
@@ -227,12 +221,6 @@
#. Type: boolean
#. Description
#: ../grub-pc.templates.in:9001
-#, fuzzy
-#| msgid ""
-#| "If you are already running a different boot loader and want to carry on "
-#| "doing so, or if this is a special environment where you do not need a "
-#| "boot loader, then you should continue anyway. Otherwise, you should "
-#| "install GRUB somewhere."
msgid ""
"If you are already using a different boot loader and want to carry on doing "
"so, or if this is a special environment where you do not need a boot loader, "
@@ -240,20 +228,20 @@
"somewhere."
msgstr ""
"Егер сіз басқа жүктеушіні қолданып, оны жалғастыруды қаласаңыз, немесе бұл - "
-"жүктеушіні талап етпейтін ерекше жүйе болса, олда жалғастырыңыз. Болмаса, "
+"жүктеушіні талап етпейтін ерекше жүйе болса, онда жалғастырыңыз. Болмаса, "
"қайда болса да, GRUB орнатуыңыз керек."
#. Type: boolean
#. Description
#: ../grub-pc.templates.in:10001
msgid "Remove GRUB 2 from /boot/grub?"
-msgstr ""
+msgstr "GRUB 2 /boot/grub ішінен өшіру керек пе?"
#. Type: boolean
#. Description
#: ../grub-pc.templates.in:10001
msgid "Do you want to have all GRUB 2 files removed from /boot/grub?"
-msgstr ""
+msgstr "GRUB 2 барлық файлдарын /boot/grub ішінен өшіруді шынымен қалайсыз ба?"
#. Type: boolean
#. Description
@@ -261,6 +249,7 @@
msgid ""
"This will make the system unbootable unless another boot loader is installed."
msgstr ""
+"Бұл әрекет басқа жүктеуші орнатылмаған болса, жүйеңізді жүктелмейтін қылады."
#. Type: boolean
#. Description
@@ -392,12 +381,6 @@
#. Type: note
#. Description
#: ../templates.in:5001
-#, fuzzy
-#| msgid ""
-#| "However, since you have more than one disk in your system, it is possible "
-#| "that you were depending on the old device map. Please check whether you "
-#| "have any custom boot menu entries that rely on GRUB's (hdN) drive "
-#| "numbering, and update them if necessary."
msgid ""
"However, since more than one disk is present in the system, it is possible "
"that the system is depending on the old device map. Please check whether "
@@ -411,10 +394,6 @@
#. Type: note
#. Description
#: ../templates.in:5001
-#, fuzzy
-#| msgid ""
-#| "If you do not understand this message, or if you do not have any custom "
-#| "boot menu entries, you can ignore this message."
msgid ""
"If you do not understand this message, or if there are no custom boot menu "
"entries, you can ignore this message."
Reply to: