From b346757383170e1377688073f91d06a4bf7cdf88f74a4bda20fe803ef85a9d50 Mon Sep 17 00:00:00 2001
From: Michael Chang <mchang@suse.com>
Date: Fri, 30 Oct 2015 10:01:48 +0000
Subject: [PATCH] Accepting request 341430 from
 home:michael-chang:branches:Base:System

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

diff --git a/grub2-secureboot-provide-linuxefi-config.patch b/grub2-secureboot-provide-linuxefi-config.patch
index d313c9b..3628b26 100644
--- a/grub2-secureboot-provide-linuxefi-config.patch
+++ b/grub2-secureboot-provide-linuxefi-config.patch
@@ -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 ] && [ "x${GRUB_USE_LINUXEFI}" = "xtrue" ]; then
      sed "s/^/$submenu_indentation/" << EOF
- 	echo	'$message'
+ 	echo	'$(echo "$message" | grub_quote)'
  	linuxefi ${rel_dirname}/${basename} ${root_device} ${args}
 @@ -147,7 +147,7 @@ EOF
    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 ] && [ "x${GRUB_USE_LINUXEFI}" = "xtrue" ]; then
        sed "s/^/$submenu_indentation/" << EOF
- 	echo	'$message'
+ 	echo	'$(echo "$message" | grub_quote)'
  	initrdefi ${rel_dirname}/${initrd}
diff --git a/grub2-secureboot-use-linuxefi-on-uefi.patch b/grub2-secureboot-use-linuxefi-on-uefi.patch
index ce7f8e6..23c28a6 100644
--- a/grub2-secureboot-use-linuxefi-on-uefi.patch
+++ b/grub2-secureboot-use-linuxefi-on-uefi.patch
@@ -22,7 +22,7 @@ Index: grub-2.02~beta2/util/grub.d/10_linux.in
 -  sed "s/^/$submenu_indentation/" << EOF
 +  if [ -d /sys/firmware/efi ]; then
 +    sed "s/^/$submenu_indentation/" << EOF
-+	echo	'$message'
++	echo	'$(echo "$message" | grub_quote)'
 +	linuxefi ${rel_dirname}/${basename} ${root_device} ${args}
 +EOF
 +  else
@@ -37,7 +37,7 @@ Index: grub-2.02~beta2/util/grub.d/10_linux.in
 -    sed "s/^/$submenu_indentation/" << EOF
 +    if [ -d /sys/firmware/efi ]; then
 +      sed "s/^/$submenu_indentation/" << EOF
-+	echo	'$message'
++	echo	'$(echo "$message" | grub_quote)'
 +	initrdefi ${rel_dirname}/${initrd}
 +EOF
 +    else
diff --git a/grub2.changes b/grub2.changes
index b8b1784..87aebfd 100644
--- a/grub2.changes
+++ b/grub2.changes
@@ -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
 
diff --git a/grub2.spec b/grub2.spec
index 250b7f0..d7ec470 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