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

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

Browse Source 
- Fix GRUB_DISABLE_LINUX_UUID to be ignore and also fallback kernel device
  won't be used if fs uuid not detected (bsc#971867)
  * added 0001-10_linux-Fix-grouping-of-tests-for-GRUB_DEVICE.patch
  * added 0002-20_linux_xen-fix-test-for-GRUB_DEVICE.patch

OBS-URL: https://build.opensuse.org/request/show/377163
OBS-URL: https://build.opensuse.org/package/show/Base:System/grub2?expand=0&rev=209
This commit is contained in:
Andrei Borzenkov 2016-03-22 08:53:27 +00:00 committed by Git OBS Bridge
parent 2e14e5acb8
commit 4051ae3843
4 changed files with 59 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
0001-10_linux-Fix-grouping-of-tests-for-GRUB_DEVICE.patch Normal file
View File

@ -0,0 +1,24 @@
From 082bc9f77b200eb48a5f1147163dea9c9d02d44c Mon Sep 17 00:00:00 2001
From: Mike Gilbert <floppym@gentoo.org>
Date: Sat, 5 Mar 2016 17:30:48 -0500
Subject: [PATCH 1/2] 10_linux: Fix grouping of tests for GRUB_DEVICE
Commit 7290bb562 causes GRUB_DISABLE_LINUX_UUID to be ignored due to
mixing of || and && operators. Add some parens to help with that.
---
util/grub.d/10_linux.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: grub-2.02~beta2/util/grub.d/10_linux.in
===================================================================
--- grub-2.02~beta2.orig/util/grub.d/10_linux.in
+++ grub-2.02~beta2/util/grub.d/10_linux.in
@@ -47,7 +47,7 @@ esac
# and mounting btrfs requires user space scanning, so force UUID in this case.
if [ "x${GRUB_DEVICE_UUID}" = "x" ] || [ "x${GRUB_DISABLE_LINUX_UUID}" = "xtrue" ] \
|| ! test -e "/dev/disk/by-uuid/${GRUB_DEVICE_UUID}" \
- || test -e "${GRUB_DEVICE}" && uses_abstraction "${GRUB_DEVICE}" lvm; then
+ || ( test -e "${GRUB_DEVICE}" && uses_abstraction "${GRUB_DEVICE}" lvm ); then
LINUX_ROOT_DEVICE=${GRUB_DEVICE}
else
LINUX_ROOT_DEVICE=UUID=${GRUB_DEVICE_UUID}

23
0002-20_linux_xen-fix-test-for-GRUB_DEVICE.patch Normal file
View File

@ -0,0 +1,23 @@
From 9545a8fd04ca33bcecc1907fec4d2354b02992ba Mon Sep 17 00:00:00 2001
From: Andrei Borzenkov <arvidjaar@gmail.com>
Date: Sun, 6 Mar 2016 08:54:19 +0300
Subject: [PATCH 2/2] 20_linux_xen: fix test for GRUB_DEVICE
Same fix as in 082bc9f.
---
util/grub.d/20_linux_xen.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: grub-2.02~beta2/util/grub.d/20_linux_xen.in
===================================================================
--- grub-2.02~beta2.orig/util/grub.d/20_linux_xen.in
+++ grub-2.02~beta2/util/grub.d/20_linux_xen.in
@@ -53,7 +53,7 @@ esac
# and mounting btrfs requires user space scanning, so force UUID in this case.
if [ "x${GRUB_DEVICE_UUID}" = "x" ] || [ "x${GRUB_DISABLE_LINUX_UUID}" = "xtrue" ] \
|| ! test -e "/dev/disk/by-uuid/${GRUB_DEVICE_UUID}" \
- || test -e "${GRUB_DEVICE}" && uses_abstraction "${GRUB_DEVICE}" lvm; then
+ || ( test -e "${GRUB_DEVICE}" && uses_abstraction "${GRUB_DEVICE}" lvm ); then
LINUX_ROOT_DEVICE=${GRUB_DEVICE}
else
LINUX_ROOT_DEVICE=UUID=${GRUB_DEVICE_UUID}

8
grub2.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Mon Mar 21 11:27:54 UTC 2016 - mchang@suse.com
- Fix GRUB_DISABLE_LINUX_UUID to be ignore and also fallback kernel device
won't be used if fs uuid not detected (bsc#971867)
* added 0001-10_linux-Fix-grouping-of-tests-for-GRUB_DEVICE.patch
* added 0002-20_linux_xen-fix-test-for-GRUB_DEVICE.patch
-------------------------------------------------------------------
Tue Mar 1 18:53:17 UTC 2016 - arvidjaar@gmail.com

4
grub2.spec
View File

@ -187,6 +187,8 @@ Patch65: grub2-mkconfig-aarch64.patch
Patch70: grub2-default-distributor.patch
Patch71: grub2-menu-unrestricted.patch
Patch72: grub2-mkconfig-arm.patch
Patch73: 0001-10_linux-Fix-grouping-of-tests-for-GRUB_DEVICE.patch
Patch74: 0002-20_linux_xen-fix-test-for-GRUB_DEVICE.patch
# Btrfs snapshot booting related patches
Patch101: grub2-btrfs-01-add-ability-to-boot-from-subvolumes.patch
Patch102: grub2-btrfs-02-export-subvolume-envvars.patch
@ -409,6 +411,8 @@ mv po/grub.pot po/%{name}.pot
%patch70 -p1
%patch71 -p1
%patch72 -p1
%patch73 -p1
%patch74 -p1
%patch101 -p1
%patch102 -p1
%patch103 -p1