diff --git a/grub2-fix-locale-en.mo.gz-not-found-error-message.patch b/grub2-fix-locale-en.mo.gz-not-found-error-message.patch new file mode 100644 index 0000000..0d99d23 --- /dev/null +++ b/grub2-fix-locale-en.mo.gz-not-found-error-message.patch @@ -0,0 +1,39 @@ +From d01cc563e1f766ecb9c255438ee49b4d31432dc0 Mon Sep 17 00:00:00 2001 +From: Michael Chang +Date: Fri, 21 Sep 2012 15:25:56 +0800 +Subject: [PATCH] Fix /grub2/locale/en.mo.gz not found error message + +References: bnc#771393 +Patch-Mainline: no + +We don't insert gettext module if message catalog file missing to +prevent error message from being logged. +--- + util/grub.d/00_header.in | 10 +++++++--- + 1 files changed, 7 insertions(+), 3 deletions(-) + +diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in +index bb34ef2..d438d52 100644 +--- a/util/grub.d/00_header.in ++++ b/util/grub.d/00_header.in +@@ -182,10 +182,14 @@ EOF + + # Gettext variables and module + if [ "x${LANG}" != "xC" ] ; then ++# We don't insert gettext module if message catalog file missing ++# To prevent error message from being logged (bnc#771393) + cat << EOF +- set locale_dir=\$prefix/locale +- set lang=${grub_lang} +- insmod gettext ++ if [ -f "\$prefix/locale/${grub_lang}.mo" ] ; then ++ set locale_dir=\$prefix/locale ++ set lang=${grub_lang} ++ insmod gettext ++ fi + EOF + fi + +-- +1.7.3.4 + diff --git a/grub2.changes b/grub2.changes index 98aa668..2d84aa2 100644 --- a/grub2.changes +++ b/grub2.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Sep 21 07:37:53 UTC 2012 - mchang@suse.com + +- grub2-fix-locale-en.mo.gz-not-found-error-message.patch (bnc#771393) + ------------------------------------------------------------------- Wed Sep 19 18:54:34 UTC 2012 - arvidjaar@gmail.com diff --git a/grub2.spec b/grub2.spec index 9d4f77c..19c8e35 100644 --- a/grub2.spec +++ b/grub2.spec @@ -96,6 +96,7 @@ Patch14: grub2-stdio.in.patch Patch15: not-display-menu-when-boot-once.patch Patch16: grub2-fix-Grub2-with-SUSE-Xen-package-install.patch Patch17: grub2-pass-corret-root-for-nfsroot.patch +Patch18: grub2-fix-locale-en.mo.gz-not-found-error-message.patch Patch99: use-grub2-efi-as-a-package-name.patch PreReq: perl-Bootloader Requires: gettext-runtime @@ -164,6 +165,7 @@ cd grub-%{version} %patch15 -p1 %patch16 -p1 %patch17 -p1 +%patch18 -p1 cd .. # README.openSUSE