From 7ae70bfae5e444114f1af3ef9a897a2121ecaae766ea27dade1130f2e6108070 Mon Sep 17 00:00:00 2001
From: Andrei Borzenkov <arvidjaar@gmail.com>
Date: Tue, 6 Oct 2015 08:47:39 +0000
Subject: [PATCH] Accepting request 336648 from
 home:michael-chang:branches:Base:System

- 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
---
 grub2-secureboot-provide-linuxefi-config.patch | 2 +-
 grub2-secureboot-use-linuxefi-on-uefi.patch    | 2 +-
 grub2.changes                                  | 7 +++++++
 grub2.spec                                     | 2 +-
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/grub2-secureboot-provide-linuxefi-config.patch b/grub2-secureboot-provide-linuxefi-config.patch
index 5f1bd29..d313c9b 100644
--- a/grub2-secureboot-provide-linuxefi-config.patch
+++ b/grub2-secureboot-provide-linuxefi-config.patch
@@ -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
      sed "s/^/$submenu_indentation/" << EOF
  	echo	'$message'
- 	linuxefi ${rel_dirname}/${basename} ${root_device} ro ${args}
+ 	linuxefi ${rel_dirname}/${basename} ${root_device} ${args}
 @@ -147,7 +147,7 @@ EOF
    if test -n "${initrd}" ; then
      # TRANSLATORS: ramdisk isn't identifier. Should be translated.
diff --git a/grub2-secureboot-use-linuxefi-on-uefi.patch b/grub2-secureboot-use-linuxefi-on-uefi.patch
index 49854cc..ce7f8e6 100644
--- a/grub2-secureboot-use-linuxefi-on-uefi.patch
+++ b/grub2-secureboot-use-linuxefi-on-uefi.patch
@@ -23,7 +23,7 @@ Index: grub-2.02~beta2/util/grub.d/10_linux.in
 +  if [ -d /sys/firmware/efi ]; then
 +    sed "s/^/$submenu_indentation/" << EOF
 +	echo	'$message'
-+	linuxefi ${rel_dirname}/${basename} ${root_device} ro ${args}
++	linuxefi ${rel_dirname}/${basename} ${root_device} ${args}
 +EOF
 +  else
 +    sed "s/^/$submenu_indentation/" << EOF
diff --git a/grub2.changes b/grub2.changes
index 087bbc8..aaa004c 100644
--- a/grub2.changes
+++ b/grub2.changes
@@ -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
 
diff --git a/grub2.spec b/grub2.spec
index 5686788..3b06745 100644
--- a/grub2.spec
+++ b/grub2.spec
@@ -1,7 +1,7 @@
 #
 # 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
 # remain the property of their copyright owners, unless otherwise agreed