From 339931e299b6bcd2136e5bfa353f44ab9ac5da0e Mon Sep 17 00:00:00 2001
From: Silvan Calarco <silvan.calarco@mambasoft.it>
Date: Fri, 21 Aug 2015 13:14:37 +0200
Subject: [PATCH] calamares: fix bootloader configuration

---
 .../etc/calamares/modules/bootloader.conf     | 28 +++++++++++++------
 calamares/etc/calamares/modules/grub.conf     | 11 --------
 calamares/etc/calamares/settings.conf         |  5 ++--
 3 files changed, 21 insertions(+), 23 deletions(-)
 delete mode 100644 calamares/etc/calamares/modules/grub.conf

diff --git a/calamares/etc/calamares/modules/bootloader.conf b/calamares/etc/calamares/modules/bootloader.conf
index 8a102c6..9093884 100644
--- a/calamares/etc/calamares/modules/bootloader.conf
+++ b/calamares/etc/calamares/modules/bootloader.conf
@@ -1,17 +1,27 @@
 ---
-# Gummiboot configuration files settings, set kernel and initramfs file names
-# and amount of time before default selection boots
-# Optionally set the menu entry name to use in Gummiboot. If not specified here,
-# this setting will be taken from branding.desc.
-# bootloaderEntryName: KaOS-kf5
-kernel: /vmlinuz-linux
-img: /initramfs-linux.img
-fallback: /initramfs-linux-fallback.img
+# Define which bootloader you want to use for EFI installations
+# Possible options are 'grub' and 'systemd-boot'.
+efiBootLoader: "grub"
 
-timeout: 10
+# systemd-boot configuration files settings, set kernel and initramfs file names
+# and amount of time before default selection boots
+kernel: "/vmlinuz"
+img: "/initramfs.img"
+fallback: "/initramfs-failsafe.img"
+timeout: "10"
+# Optionally set the menu entry name and kernel name to use in systemd-boot.
+# If not specified here, these settings will be taken from branding.desc.
+# bootloaderEntryName: "Generic GNU/Linux"
+# kernelLine: ", with Stable-Kernel"
+# fallbackKernelLine:  ", with Stable-Kernel (fallback initramfs)"
 
 # GRUB 2 binary names and boot directory
 # Some distributions (e.g. Fedora) use grub2-* (resp. /boot/grub2/) names.
 grubInstall: "grub-install"
 grubMkconfig: "grub-mkconfig"
 grubCfg: "/boot/grub/grub.cfg"
+# Optionally set the --bootloader-id to use for EFI. If not set, this defaults
+# to the bootloaderEntryName from branding.desc with problematic characters
+# replaced. If an efiBootloaderId is specified here, it is taken to already be a
+# valid directory name, so no such postprocessing is done in this case.
+# efiBootloaderId: "dirname"
diff --git a/calamares/etc/calamares/modules/grub.conf b/calamares/etc/calamares/modules/grub.conf
deleted file mode 100644
index ffef6f6..0000000
--- a/calamares/etc/calamares/modules/grub.conf
+++ /dev/null
@@ -1,11 +0,0 @@
----
-# GRUB 2 binary names and boot directory
-# Some distributions (e.g. Fedora) use grub2-* (resp. /boot/grub2/) names.
-grubInstall: "grub-install"
-grubMkconfig: "grub-mkconfig"
-grubCfg: "/boot/grub/grub.cfg"
-# Optionally set the --bootloader-id to use for EFI. If not set, this defaults
-# to the bootloaderEntryName from branding.desc with problematic characters
-# replaced. If an efiBootloaderId is specified here, it is taken to already be a
-# valid directory name, so no such postprocessing is done in this case.
-# efiBootloaderId: "dirname"
diff --git a/calamares/etc/calamares/settings.conf b/calamares/etc/calamares/settings.conf
index 9be4cab..b13d345 100644
--- a/calamares/etc/calamares/settings.conf
+++ b/calamares/etc/calamares/settings.conf
@@ -50,10 +50,9 @@ install:
 - services
 - dracut
 #- initramfs
-- grubcfg
-- grub
 - packages
-#- bootloader
+- grubcfg
+- bootloader
 - openmamba-postinstall
 - umount