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

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

Browse Source 
- Do not force ro option in linuxefi patch (bsc#948555)
  * modified grub2-secureboot-use-linuxefi-on-uefi.patch
  * refrehed grub2-secureboot-provide-linuxefi-config.patch

OBS-URL: https://build.opensuse.org/request/show/336648
OBS-URL: https://build.opensuse.org/package/show/Base:System/grub2?expand=0&rev=180
This commit is contained in:
Andrei Borzenkov 2015-10-06 08:47:39 +00:00 committed by Git OBS Bridge
parent 033239acc6
commit 7ae70bfae5
4 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -51,7 +51,7 @@ Index: grub-2.02~beta2/util/grub.d/10_linux.in
+ 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 '$message'
linuxefi ${rel_dirname}/${basename} ${root_device} ro ${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
# TRANSLATORS: ramdisk isn't identifier. Should be translated. # TRANSLATORS: ramdisk isn't identifier. Should be translated.

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

@ -23,7 +23,7 @@ Index: grub-2.02~beta2/util/grub.d/10_linux.in
+ 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 '$message'
+ linuxefi ${rel_dirname}/${basename} ${root_device} ro ${args} + linuxefi ${rel_dirname}/${basename} ${root_device} ${args}
+EOF +EOF
+ else + else
+ sed "s/^/$submenu_indentation/" << EOF + sed "s/^/$submenu_indentation/" << EOF

7
grub2.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue Oct 6 07:59:47 UTC 2015 - mchang@suse.com
- Do not force ro option in linuxefi patch (bsc#948555)
* modified grub2-secureboot-use-linuxefi-on-uefi.patch
* refrehed grub2-secureboot-provide-linuxefi-config.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Sep 23 20:02:47 UTC 2015 - dmueller@suse.com Wed Sep 23 20:02:47 UTC 2015 - dmueller@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