c4bfec4a4c
I think it is good time to update to 2.02 so it can get more testing. Although internal changes are pretty extensive, externally it should be pretty much the same. The main user visible changes are - autogen is not used anymore, so we can finally simplify patches and recreate files during RPM build. So generated files need not be patched and shipped any more. - GRUB_HIDDEN_TIMEOUT is deprecated, we should use GRUB_TIMEOUT_STYLE instead. This will need perl-Bootloader and YaST changes. Old config is still accpepted so nothing should be broken. - native pvgrub2 support for Xen PV guests. - ARM support (32 and 64 bit), although it has rough edges. (forwarded request 212604 from arvidjaar) OBS-URL: https://build.opensuse.org/request/show/212884 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/grub2?expand=0&rev=79
38 lines
1.1 KiB
Diff
38 lines
1.1 KiB
Diff
From e7500166b343874447e6abf385a791998c77f4c4 Mon Sep 17 00:00:00 2001
|
|
From: Michael Chang <mchang@suse.com>
|
|
Date: Wed, 26 Sep 2012 15:55:44 +0800
|
|
Subject: [PATCH] Silence error messages when translations are unavailable
|
|
|
|
From: Colin Watson <cjwatson@ubuntu.com>
|
|
|
|
References: bnc#771393
|
|
https://savannah.gnu.org/bugs/?35880
|
|
Patch-Mainline: no
|
|
|
|
Signed-off-by: Michael Chang <mchang@suse.com>
|
|
---
|
|
grub-core/gettext/gettext.c | 8 ++++++++
|
|
1 files changed, 8 insertions(+), 0 deletions(-)
|
|
|
|
Index: grub-2.00/grub-core/gettext/gettext.c
|
|
===================================================================
|
|
--- grub-2.00.orig/grub-core/gettext/gettext.c
|
|
+++ grub-2.00/grub-core/gettext/gettext.c
|
|
@@ -424,9 +424,13 @@ grub_gettext_init_ext (struct grub_gette
|
|
grub_free (lang);
|
|
}
|
|
|
|
- if (locale[0] == 'e' && locale[1] == 'n'
|
|
- && (locale[2] == '\0' || locale[2] == '_'))
|
|
- grub_errno = err = GRUB_ERR_NONE;
|
|
+ /* If no translations are available, fall back to untranslated text. */
|
|
+ if (err == GRUB_ERR_FILE_NOT_FOUND)
|
|
+ {
|
|
+ grub_errno = GRUB_ERR_NONE;
|
|
+ return 0;
|
|
+ }
|
|
+
|
|
return err;
|
|
}
|
|
|