pool/grub2
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 437618 from Base:System

Browse Source 
1

OBS-URL: https://build.opensuse.org/request/show/437618
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/grub2?expand=0&rev=147
This commit is contained in:
Dominique Leuenberger 2016-11-03 10:12:13 +00:00 committed by Git OBS Bridge
commit 20c175dea2
3 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
grub2-default-distributor.patch
View File

@ -2,7 +2,7 @@ Index: grub-2.02~beta3/grub-core/osdep/unix/config.c
=================================================================== ===================================================================
--- grub-2.02~beta3.orig/grub-core/osdep/unix/config.c --- grub-2.02~beta3.orig/grub-core/osdep/unix/config.c
+++ grub-2.02~beta3/grub-core/osdep/unix/config.c +++ grub-2.02~beta3/grub-core/osdep/unix/config.c
@@ -61,6 +61,140 @@ grub_util_get_localedir (void) @@ -61,6 +61,143 @@ grub_util_get_localedir (void)
return LOCALEDIR; return LOCALEDIR;
} }
@ -94,6 +94,9 @@ Index: grub-2.02~beta3/grub-core/osdep/unix/config.c
+ +
+ while (fgets (buf, sizeof (buf), fp)) + while (fgets (buf, sizeof (buf), fp))
+ { + {
+ if (buf[grub_strlen(buf) - 1] == '\n')
+ buf[grub_strlen(buf) - 1] = '\0';
+
+ if (!os_pretty_name + if (!os_pretty_name
+ && (os_pretty_name = os_release_get_val (buf, "PRETTY_NAME"))) + && (os_pretty_name = os_release_get_val (buf, "PRETTY_NAME")))
+ continue; + continue;
@ -143,7 +146,7 @@ Index: grub-2.02~beta3/grub-core/osdep/unix/config.c
void void
grub_util_load_config (struct grub_util_config *cfg) grub_util_load_config (struct grub_util_config *cfg)
{ {
@@ -125,7 +259,17 @@ grub_util_load_config (struct grub_util_ @@ -125,7 +262,17 @@ grub_util_load_config (struct grub_util_
waitpid (pid, NULL, 0); waitpid (pid, NULL, 0);
} }
if (f) if (f)
@ -162,7 +165,7 @@ Index: grub-2.02~beta3/grub-core/osdep/unix/config.c
f = grub_util_fopen (cfgfile, "r"); f = grub_util_fopen (cfgfile, "r");
if (f) if (f)
@@ -136,4 +280,13 @@ grub_util_load_config (struct grub_util_ @@ -136,4 +283,13 @@ grub_util_load_config (struct grub_util_
else else
grub_util_warn (_("cannot open configuration file `%s': %s"), grub_util_warn (_("cannot open configuration file `%s': %s"),
cfgfile, strerror (errno)); cfgfile, strerror (errno));

6
grub2.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Oct 28 04:08:19 UTC 2016 - mchang@suse.com
- Fix new line character in distributor (bsc#1007212)
* modified grub2-default-distributor.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Oct 21 09:34:58 UTC 2016 - mchang@suse.com Fri Oct 21 09:34:58 UTC 2016 - mchang@suse.com

3
grub2.spec
View File

@ -14,10 +14,9 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/ # Please submit bugfixes or comments via http://bugs.opensuse.org/
# #
# needssslcertforbuild # needssslcertforbuild
Name: grub2 Name: grub2
%ifarch x86_64 ppc64 %ifarch x86_64 ppc64
BuildRequires: gcc-32bit BuildRequires: gcc-32bit