From 6602cbbcddd7b044177dc5a9963ca029b59c0219 Mon Sep 17 00:00:00 2001
From: Kevin Kofler <Kevin@tigcc.ticalc.org>
Date: May 12 2019 12:12:40 +0000
Subject: bootloader: fix sb-shim mode to write grub.cfg into the EFI System Partition


* Sun May 12 2019 Kevin Kofler <Kevin@tigcc.ticalc.org> - 3.2.8-2
- bootloader: fix sb-shim mode to write grub.cfg into the EFI System Partition

---

diff --git a/calamares-3.2.8-shim-grub-cfg.patch b/calamares-3.2.8-shim-grub-cfg.patch
new file mode 100644
index 0000000..576d408
--- /dev/null
+++ b/calamares-3.2.8-shim-grub-cfg.patch
@@ -0,0 +1,35 @@
+diff -ur calamares-3.2.8/src/modules/bootloader/main.py calamares-3.2.8-shim-grub-cfg/src/modules/bootloader/main.py
+--- calamares-3.2.8/src/modules/bootloader/main.py	2019-05-11 01:00:11.000000000 +0200
++++ calamares-3.2.8-shim-grub-cfg/src/modules/bootloader/main.py	2019-05-12 14:06:05.122216534 +0200
+@@ -7,7 +7,7 @@
+ #   Copyright 2014, Anke Boersma <demm@kaosx.us>
+ #   Copyright 2014, Daniel Hillenbrand <codeworkx@bbqlinux.org>
+ #   Copyright 2014, Benjamin Vaudour <benjamin.vaudour@yahoo.fr>
+-#   Copyright 2014, Kevin Kofler <kevin.kofler@chello.at>
++#   Copyright 2014-2019, Kevin Kofler <kevin.kofler@chello.at>
+ #   Copyright 2015-2018, Philip Mueller <philm@manjaro.org>
+ #   Copyright 2016-2017, Teo Mrnjavac <teo@kde.org>
+ #   Copyright 2017, Alf Gaida <agaida@siduction.org>
+@@ -339,8 +339,8 @@
+                                "--force",
+                                boot_loader["installPath"]])
+ 
+-    # The file specified in grubCfg should already be filled out
+-    # by the grubcfg job module.
++    # The input file /etc/default/grub should already be filled out by the
++    # grubcfg job module.
+     check_target_env_call([libcalamares.job.configuration["grubMkconfig"],
+                            "-o", libcalamares.job.configuration["grubCfg"]])
+ 
+@@ -395,6 +395,11 @@
+         "-p", efi_partition_number,
+         "-l", install_efi_directory + "/" + install_efi_bin])
+ 
++    # The input file /etc/default/grub should already be filled out by the
++    # grubcfg job module.
++    check_target_env_call([libcalamares.job.configuration["grubMkconfig"],
++                           "-o", os.path.join(install_efi_directory, "grub.cfg")])
++
+ 
+ def vfat_correct_case(parent, name):
+     for candidate in os.listdir(parent):
diff --git a/calamares.spec b/calamares.spec
index 586b97e..9356021 100644
--- a/calamares.spec
+++ b/calamares.spec
@@ -23,7 +23,7 @@
 
 Name:           calamares
 Version:        3.2.8
-Release:        1%{?snaphash:.%{snapdate}git%(echo %{snaphash} | cut -c -13)}%{!?snaphash:%{?prerelease:.%{prerelease}}}%{?dist}
+Release:        2%{?snaphash:.%{snapdate}git%(echo %{snaphash} | cut -c -13)}%{!?snaphash:%{?prerelease:.%{prerelease}}}%{?dist}
 Summary:        Installer from a live CD/DVD/USB to disk
 
 License:        GPLv3+
@@ -49,6 +49,9 @@ Patch0:         calamares-3.2.8-default-settings.patch
 # use kdesu instead of pkexec (works around #1171779)
 Patch1:         calamares-3.2.7-kdesu.patch
 
+# bootloader: fix sb-shim mode to write grub.cfg into the EFI System Partition
+Patch2:         calamares-3.2.8-shim-grub-cfg.patch
+
 # Calamares is only supported where live images (and GRUB) are. (#1171380)
 # This list matches the livearches global from anaconda.spec
 ExclusiveArch:  %{ix86} x86_64
@@ -212,6 +215,7 @@ developing custom modules for Calamares.
 # delete backup files so they don't get installed
 rm -f src/modules/*/*.conf.default-settings
 %patch1 -p1 -b .kdesu
+%patch2 -p1 .b .shim-grub-cfg
 
 %build
 mkdir -p %{_target_platform}
@@ -366,6 +370,9 @@ EOF
 
 
 %changelog
+* Sun May 12 2019 Kevin Kofler <Kevin@tigcc.ticalc.org> - 3.2.8-2
+- bootloader: fix sb-shim mode to write grub.cfg into the EFI System Partition
+
 * Fri May 10 2019 Kevin Kofler <Kevin@tigcc.ticalc.org> - 3.2.8-1
 - Update to 3.2.8
 - Rebase default-settings patch, disable GeoIP that is now enabled by default