rpm/grub2
SHA256
1
0
Fork 0
forked from pool/grub2
Code Pull Requests Activity

Accepting request 341430 from home:michael-chang:branches:Base:System

Browse Source 
- Add missing quoting for linuxefi (bsc#951962)
  * modified grub2-secureboot-use-linuxefi-on-uefi.patch 
  * refreshed grub2-secureboot-provide-linuxefi-config.patch

OBS-URL: https://build.opensuse.org/request/show/341430
OBS-URL: https://build.opensuse.org/package/show/Base:System/grub2?expand=0&rev=184
This commit is contained in:
Michael Chang 2015-10-30 10:01:48 +00:00 committed by Git OBS Bridge
parent 84b99e67aa
commit b346757383
4 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
grub2-secureboot-provide-linuxefi-config.patch
View File

@ -50,7 +50,7 @@ Index: grub-2.02~beta2/util/grub.d/10_linux.in
- if [ -d /sys/firmware/efi ]; then - if [ -d /sys/firmware/efi ]; then
+ if [ -d /sys/firmware/efi ] && [ "x${GRUB_USE_LINUXEFI}" = "xtrue" ]; then + if [ -d /sys/firmware/efi ] && [ "x${GRUB_USE_LINUXEFI}" = "xtrue" ]; then
sed "s/^/$submenu_indentation/" << EOF sed "s/^/$submenu_indentation/" << EOF
echo '$message' echo '$(echo "$message" | grub_quote)'
linuxefi ${rel_dirname}/${basename} ${root_device} ${args} linuxefi ${rel_dirname}/${basename} ${root_device} ${args}
@@ -147,7 +147,7 @@ EOF @@ -147,7 +147,7 @@ EOF
if test -n "${initrd}" ; then if test -n "${initrd}" ; then
@ -59,5 +59,5 @@ Index: grub-2.02~beta2/util/grub.d/10_linux.in
- if [ -d /sys/firmware/efi ]; then - if [ -d /sys/firmware/efi ]; then
+ if [ -d /sys/firmware/efi ] && [ "x${GRUB_USE_LINUXEFI}" = "xtrue" ]; then + if [ -d /sys/firmware/efi ] && [ "x${GRUB_USE_LINUXEFI}" = "xtrue" ]; then
sed "s/^/$submenu_indentation/" << EOF sed "s/^/$submenu_indentation/" << EOF
echo '$message' echo '$(echo "$message" | grub_quote)'
initrdefi ${rel_dirname}/${initrd} initrdefi ${rel_dirname}/${initrd}

4
grub2-secureboot-use-linuxefi-on-uefi.patch
View File

@ -22,7 +22,7 @@ Index: grub-2.02~beta2/util/grub.d/10_linux.in
- sed "s/^/$submenu_indentation/" << EOF - sed "s/^/$submenu_indentation/" << EOF
+ if [ -d /sys/firmware/efi ]; then + if [ -d /sys/firmware/efi ]; then
+ sed "s/^/$submenu_indentation/" << EOF + sed "s/^/$submenu_indentation/" << EOF
+ echo '$message' + echo '$(echo "$message" | grub_quote)'
+ linuxefi ${rel_dirname}/${basename} ${root_device} ${args} + linuxefi ${rel_dirname}/${basename} ${root_device} ${args}
+EOF +EOF
+ else + else
@ -37,7 +37,7 @@ Index: grub-2.02~beta2/util/grub.d/10_linux.in
- sed "s/^/$submenu_indentation/" << EOF - sed "s/^/$submenu_indentation/" << EOF
+ if [ -d /sys/firmware/efi ]; then + if [ -d /sys/firmware/efi ]; then
+ sed "s/^/$submenu_indentation/" << EOF + sed "s/^/$submenu_indentation/" << EOF
+ echo '$message' + echo '$(echo "$message" | grub_quote)'
+ initrdefi ${rel_dirname}/${initrd} + initrdefi ${rel_dirname}/${initrd}
+EOF +EOF
+ else + else

7
grub2.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Thu Oct 29 04:17:08 UTC 2015 - mchang@suse.com
- Add missing quoting for linuxefi (bsc#951962)
* modified grub2-secureboot-use-linuxefi-on-uefi.patch
* refreshed grub2-secureboot-provide-linuxefi-config.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Sun Oct 18 11:45:10 UTC 2015 - eich@suse.com Sun Oct 18 11:45:10 UTC 2015 - eich@suse.com

2
grub2.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package grub2 # spec file for package grub2
# #
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed