From f29388d27ac1c733697d8f64d703a00ac60a4c89 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Wed, 23 Mar 2022 16:48:18 -0700 Subject: [PATCH] Fix a syntax error in the ostree BLS fix attempt --- 0064-Add-grub2-switch-to-blscfg.patch | 2 +- grub2.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/0064-Add-grub2-switch-to-blscfg.patch b/0064-Add-grub2-switch-to-blscfg.patch index 650d56f..ccac357 100644 --- a/0064-Add-grub2-switch-to-blscfg.patch +++ b/0064-Add-grub2-switch-to-blscfg.patch @@ -420,7 +420,7 @@ index 9fcd77cacc3..81f35a2f3f0 100644 get_sorted_bls() { - if ! [ -d "${blsdir}" ]; then -+ if ! [ -d "${blsdir}" ] || [ -f /run/ostree-booted ] || [ -d /ostree/repo ]]; then ++ if ! [ -d "${blsdir}" ] || [ -f /run/ostree-booted ] || [ -d /ostree/repo ]; then return fi diff --git a/grub2.spec b/grub2.spec index cf68e0c..486931c 100644 --- a/grub2.spec +++ b/grub2.spec @@ -17,7 +17,7 @@ Name: grub2 Epoch: 1 Version: 2.06 -Release: 28%{?dist} +Release: 29%{?dist} Summary: Bootloader with support for Linux, Multiboot and more License: GPLv3+ URL: http://www.gnu.org/software/grub/ @@ -526,6 +526,9 @@ mv ${EFI_HOME}/grub.cfg.stb ${EFI_HOME}/grub.cfg %endif %changelog +* Wed Mar 23 2022 Adam Williamson - 2.06-29 +- Fix a syntax error in the ostree BLS fix attempt + * Wed Mar 23 2022 Peter Robinson 2.06-28 - Rebuild for secure-boot signing