Hello community,
here is the log from the commit of package grub2 for openSUSE:Factory checked
in at 2016-03-26 15:21:06
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/grub2 (Old)
and /work/SRC/openSUSE:Factory/.grub2.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "grub2"
Changes:
--------
--- /work/SRC/openSUSE:Factory/grub2/grub2.changes 2016-03-07
13:26:27.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.grub2.new/grub2.changes 2016-03-26
15:21:08.000000000 +0100
@@ -1,0 +2,8 @@
+Mon Mar 21 11:27:54 UTC 2016 - mch...@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
+
+-------------------------------------------------------------------
New:
----
0001-10_linux-Fix-grouping-of-tests-for-GRUB_DEVICE.patch
0002-20_linux_xen-fix-test-for-GRUB_DEVICE.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ grub2.spec ++++++
--- /var/tmp/diff_new_pack.6frRSN/_old 2016-03-26 15:21:10.000000000 +0100
+++ /var/tmp/diff_new_pack.6frRSN/_new 2016-03-26 15:21:10.000000000 +0100
@@ -187,6 +187,8 @@
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 @@
%patch70 -p1
%patch71 -p1
%patch72 -p1
+%patch73 -p1
+%patch74 -p1
%patch101 -p1
%patch102 -p1
%patch103 -p1
++++++ 0001-10_linux-Fix-grouping-of-tests-for-GRUB_DEVICE.patch ++++++
>From 082bc9f77b200eb48a5f1147163dea9c9d02d44c Mon Sep 17 00:00:00 2001
From: Mike Gilbert <flop...@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}
++++++ 0002-20_linux_xen-fix-test-for-GRUB_DEVICE.patch ++++++
>From 9545a8fd04ca33bcecc1907fec4d2354b02992ba Mon Sep 17 00:00:00 2001
From: Andrei Borzenkov <arvidj...@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}
