grub2 1.96+20080724-5
Robert Millan
rmh at aybabtu.com
Sun Aug 3 00:14:02 UTC 2008
Hi,
Please consider approving grub2 1.96+20080724-5. It fixes 3 important bugs
and adds a translation.
--
Robert Millan
The DRM opt-in fallacy: "Your data belongs to us. We will decide when (and
how) you may access your data; but nobody's threatening your freedom: we
still allow you to remove your data and not access it at all."
-------------- next part --------------
diff -u grub2-1.96+20080724/debian/changelog grub2-1.96+20080724/debian/changelog
--- grub2-1.96+20080724/debian/changelog
+++ grub2-1.96+20080724/debian/changelog
@@ -1,3 +1,20 @@
+grub2 (1.96+20080724-5) unstable; urgency=high
+
+ [ Felix Zielcke ]
+ * patches/00_getline.diff: Fix access to a pointer which has been free'd
+ before in the configline parser from grub's menu (Closes: #493289)
+ * patches/00_fix_double_prefix.diff: Fix double prefix with chainloading
+ from grub-legacy (Closes: #487565)
+
+ [ Updated translations ]
+ * Japanese (ja.po) by Hideki Yamane (Closes: #493347)
+
+ [ Robert Millan ]
+ * patches/07_skip_invalid_bsd_parts.diff: Add patch from Felix to skip
+ invalid/corrupt partitions gracefuly. (Closes: #478238)
+
+ -- Robert Millan <rmh at aybabtu.com> Sat, 2 Aug 2008 22:49:05 +0200
+
grub2 (1.96+20080724-4) unstable; urgency=high
* patches/00_fix_overflow.diff: fix overflow with a big grub.cfg.
only in patch2:
unchanged:
--- grub2-1.96+20080724.orig/debian/po/ja.po
+++ grub2-1.96+20080724/debian/po/ja.po
@@ -0,0 +1,117 @@
+# Copyright (C) 2008 GRUB Maintainers <pkg-grub-devel at lists.alioth.debian.org>
+# This file is distributed under the same license as the grub2 package.
+# Hideki Yamane (Debian-JP) <henrich at debian.or.jp>, 2008.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: grub2 1.96+20080724-4\n"
+"Report-Msgid-Bugs-To: pkg-grub-devel at lists.alioth.debian.org\n"
+"POT-Creation-Date: 2008-02-13 14:53+0100\n"
+"PO-Revision-Date: 2008-07-31 11:21+0200\n"
+"Last-Translator: Hideki Yamane (Debian-JP) <henrich at debian.or.jp>\n"
+"Language-Team: Japanese <debian-japanese at lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: note
+#. Description
+#: ../grub2.templates:1001
+msgid "GRUB 1.95 numbering scheme transition"
+msgstr "GRUB 1.95 ?????????????"
+
+#. Type: note
+#. Description
+#: ../grub2.templates:1001
+msgid ""
+"As of version 1.95, GRUB 2 has changed its numbering scheme. Partitions are "
+"now counted starting from 1 rather than 0. This is to make it consistent "
+"with device names of Linux and the other kernels used in Debian. For "
+"example, when using Linux as the kernel, \"(hd0,1)\" refers to the same "
+"partition as the /dev/sda1 device node."
+msgstr ""
+"????? 1.95 ??GRUB 2 ?????????????????????????"
+"? 0 ?????? 1 ??????????????????Linux ? Debian ??"
+"???????????????????????????????????Linux "
+"????????????????\"(hd0,1)\" ? /dev/sda1 ??????????"
+"?????????????"
+
+#. Type: note
+#. Description
+#: ../grub2.templates:1001
+msgid ""
+"Because of this, there's a chance your system becomes unbootable if update-"
+"grub(8) is run before GRUB is updated, generating a grub.cfg file that your "
+"installed GRUB won't yet be able to parse correctly. To ensure your system "
+"will be able to boot, you have to:"
+msgstr ""
+"???????GRUB ???????????? update-grub(8) ????????"
+"??????? GRUB ????????????? grub.cfg ?????????"
+"??????????????????????????????????????"
+"??????????????????????:"
+
+#. Type: note
+#. Description
+#: ../grub2.templates:1001
+msgid ""
+" - Reinstall GRUB (typically, by running grub-install).\n"
+" - Rerun update-grub to generate a new grub.cfg."
+msgstr ""
+" - GRUB ???????? (????grub-install ???)?\n"
+" - ??? grub.cfg ??????? update-grub ?????"
+
+#. Type: boolean
+#. Description
+#: ../grub-pc.templates:1001
+msgid "Chainload from menu.lst?"
+msgstr "menu.lst ??????? (???????)?????"
+
+#. Type: boolean
+#. Description
+#: ../grub-pc.templates:1001
+msgid "GRUB upgrade scripts have detected a GRUB Legacy setup in /boot/grub."
+msgstr ""
+"GRUB ?????????????? GRUB Legacy ???? /boot/grub ?????"
+"???????"
+
+#. Type: boolean
+#. Description
+#: ../grub-pc.templates:1001
+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."
+msgstr ""
+"????????????????????? GRUB ???????????/boot/"
+"grub/menu.lst ??? GRUB Legacy ??????? GRUB2 ??????????"
+"???????????????????????????????"
+
+#. Type: boolean
+#. Description
+#: ../grub-pc.templates:1001
+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)."
+msgstr ""
+"MBR (??????????) ??????????????GRUB 2 ? menu.lst ?"
+"???????????????????? GRUB 2 ??????????????"
+"????????????"
+
+#. Type: boolean
+#. Description
+#: ../grub-pc.templates:1001
+msgid ""
+"In either case, whenever you want GRUB 2 to be loaded directly from MBR, you "
+"can do so by issuing (as root) the following command:"
+msgstr ""
+"???????GRUB 2 ? MBR ?????????????????? (root ??) "
+"?????????????????????:"
+
+#. Type: boolean
+#. Description
+#: ../grub-pc.templates:1001
+msgid "upgrade-from-grub-legacy"
+msgstr "upgrade-from-grub-legacy"
+
only in patch2:
unchanged:
--- grub2-1.96+20080724.orig/debian/patches/00_fix_double_prefix.diff
+++ grub2-1.96+20080724/debian/patches/00_fix_double_prefix.diff
@@ -0,0 +1,13 @@
+Index: kern/i386/pc/init.c
+===================================================================
+--- kern/i386/pc/init.c (Revision 1763)
++++ kern/i386/pc/init.c (Arbeitskopie)
+@@ -64,7 +64,7 @@
+ /* XXX: This should be enough. */
+ char dev[100];
+
+- if (grub_install_dos_part != -2)
++ if (grub_prefix[0] != '(')
+ {
+ /* If the root drive is not set explicitly, assume that it is identical
+ to the boot drive. */
only in patch2:
unchanged:
--- grub2-1.96+20080724.orig/debian/patches/07_skip_invalid_bsd_parts.diff
+++ grub2-1.96+20080724/debian/patches/07_skip_invalid_bsd_parts.diff
@@ -0,0 +1,42 @@
+2008-07-31 Felix Zielcke <fzielcke at z-51.de>
+
+ * partmap/pc.c (pc_partition_map_iterate): Skip over invalid BSD partitions
+ or if there's no space for the disk label and print the partition number on a
+ invalid magic
+
+Index: partmap/pc.c
+===================================================================
+--- partmap/pc.c (Revision 1753)
++++ partmap/pc.c (Arbeitskopie)
+@@ -160,9 +160,11 @@
+ {
+ /* Check if the BSD label is within the DOS partition. */
+ if (p.len <= GRUB_PC_PARTITION_BSD_LABEL_SECTOR)
+- return grub_error (GRUB_ERR_BAD_PART_TABLE,
+- "no space for disk label");
+-
++ {
++ grub_error (GRUB_ERR_BAD_PART_TABLE,
++ "no space for disk label");
++ continue;
++ }
+ /* Read the BSD label. */
+ if (grub_disk_read (&raw,
+ (p.start
+@@ -175,10 +177,12 @@
+ /* Check if it is valid. */
+ if (label.magic
+ != grub_cpu_to_le32 (GRUB_PC_PARTITION_BSD_LABEL_MAGIC))
+- return grub_error (GRUB_ERR_BAD_PART_TABLE,
+- "invalid disk label magic 0x%x",
+- label.magic);
+-
++ {
++ grub_error (GRUB_ERR_BAD_PART_TABLE,
++ "invalid disk label magic 0x%x on partition %d",
++ label.magic,p.index);
++ continue;
++ }
+ for (pcdata.bsd_part = 0;
+ pcdata.bsd_part < grub_cpu_to_le16 (label.num_partitions);
+ pcdata.bsd_part++)
only in patch2:
unchanged:
--- grub2-1.96+20080724.orig/debian/patches/00_getline.diff
+++ grub2-1.96+20080724/debian/patches/00_getline.diff
@@ -0,0 +1,13 @@
+Index: normal/menu_entry.c
+===================================================================
+--- normal/menu_entry.c (Revision 1758)
++++ normal/menu_entry.c (Revision 1759)
+@@ -996,7 +996,7 @@
+ linep->len = p - linep->buf;
+ for (p = linep->buf; grub_isspace (*p); p++)
+ ;
+- *line = p;
++ *line = grub_strdup (p);
+ currline++;
+ return 0;
+ }
More information about the Pkg-grub-devel
mailing list