From 5c19f101e6fd9a564cd710835d12bfb7ae542902 Mon Sep 17 00:00:00 2001
From: Denis Pynkin <denis.pynkin@collabora.com>
Date: Fri, 15 Feb 2019 14:04:36 +0300
Subject: [PATCH] Fix the path to ostree BootLoaderSpec filename
Starting ostree v.2018.7 (commit 9f48e212) the BLS specification has
been changed to 'ostree-$NUM-$OSNAME.conf'.
Signed-off-by: Denis Pynkin <denis.pynkin@collabora.com>
---
scripts/setup-uefi-bootloader.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/scripts/setup-uefi-bootloader.sh b/scripts/setup-uefi-bootloader.sh
index 64b1257c..bab4662d 100755
--- a/scripts/setup-uefi-bootloader.sh
+++ b/scripts/setup-uefi-bootloader.sh
@@ -12,7 +12,7 @@ sysroot=${ROOTDIR}
osname=$1
-bootconf=$sysroot/boot/loader/entries/ostree-${osname}-0.conf
+bootconf=$sysroot/boot/loader/entries/ostree-1-${osname}.conf
if [ ! -f "$bootconf" ]; then
echo "OStree setup is not available!"
@@ -45,5 +45,5 @@ umount $ostree/etc/machine-id
# Copy config, kernel and initrd
# Change the name of config to unify with patch added in T4469
rsync -Pav $sysroot/boot/ostree $sysroot/boot/efi/
-cp $sysroot/boot/loader/entries/ostree-${osname}-0.conf $sysroot/boot/efi/loader/entries/ostree-0-1.conf
+cp $bootconf $sysroot/boot/efi/loader/entries/ostree-0-1.conf
rm -f $sysroot/boot/efi/loader/loader.conf
--
GitLab