From b5dc21f07e52cc051e725870eb8c1a5aab888766 Mon Sep 17 00:00:00 2001
From: Philip <philm@manjaro.org>
Date: Thu, 19 Feb 2015 21:52:12 +0100
Subject: [PATCH 1/6] [util-iso-calamares] add
 write_calamares_bootloader_conf()

---
 lib/util-iso-calamares.sh | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/lib/util-iso-calamares.sh b/lib/util-iso-calamares.sh
index 0ba658e..975fa11 100644
--- a/lib/util-iso-calamares.sh
+++ b/lib/util-iso-calamares.sh
@@ -24,6 +24,21 @@ write_calamares_finished_conf(){
 	echo 'restartNowCommand: "shutdown -r now"' >> "$conf"
 }
 
+write_calamares_bootloader_conf(){
+	source "$1/etc/mkinitcpio.d/${manjaro_kernel}.preset"
+	local conf="$1/etc/calamares/modules/bootloader.conf"
+	echo '---' > "$conf"
+	echo "kernel: \"${ALL_kver}\"" >> "$conf"
+	echo "img: \"${default_image}\"" >> "$conf"
+	echo "fallback: \"${fallback_image}\"" >> "$conf"
+	echo "kernelLine: \"${ALL_kver}\"" >> "$conf"
+	echo "fallbackKernelLine: \"${ALL_kver} (fallback initramfs)\"" >> "$conf"
+	echo 'timeout: "10"' >> "$conf"
+	echo 'grubInstall: "grub-install"' >> "$conf"
+	echo 'grubMkconfig: "grub-mkconfig"' >> "$conf"
+	echo 'grubCfg: "/boot/grub/grub.cfg"' >> "$conf"
+}
+
 write_calamares_services_conf(){
 	local conf="$1/etc/calamares/modules/services.conf"
 	echo '---' >  "$conf"
@@ -98,6 +113,7 @@ configure_calamares(){
 	if [[ -f $1/usr/bin/calamares ]];then
 		msg2 "Configuring Calamares ..."
 		mkdir -p $1/etc/calamares/modules
+		write_calamares_bootloader_conf $1
 		write_calamares_unpack_conf $1
 		write_calamares_dm_conf $1
 		write_calamares_initcpio_conf $1
@@ -111,7 +127,6 @@ configure_calamares(){
 		mkdir -p $1/home/${username}/Desktop
 		cp $1/usr/share/applications/calamares.desktop $1/home/${username}/Desktop/calamares.desktop
 		chmod a+x $1/home/${username}/Desktop/calamares.desktop
-# 		chown ${username}:users $1/home/${username}/Desktop/calamares.desktop
 		echo "QT_STYLE_OVERRIDE=gtk" >> $1/etc/environment
 	fi
 }
@@ -128,6 +143,5 @@ configure_thus(){
 		mkdir -p $1/home/${username}/Desktop
 		cp $1/usr/share/applications/thus.desktop $1/home/${username}/Desktop/thus.desktop
 		chmod a+x $1/home/${username}/Desktop/thus.desktop
-# 		chown ${username}:users $1/home/${username}/Desktop/thus.desktop
 	fi
 }

From 6fbc632a74b517d46a9eb5fda1c4f881b2dcc5ea Mon Sep 17 00:00:00 2001
From: Philip <philm@manjaro.org>
Date: Thu, 19 Feb 2015 22:03:23 +0100
Subject: [PATCH 2/6] [util-iso-calamares] use manjaro_kernel value for
 (fallback_)kernel_line

---
 lib/util-iso-calamares.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/util-iso-calamares.sh b/lib/util-iso-calamares.sh
index 975fa11..3455055 100644
--- a/lib/util-iso-calamares.sh
+++ b/lib/util-iso-calamares.sh
@@ -31,8 +31,8 @@ write_calamares_bootloader_conf(){
 	echo "kernel: \"${ALL_kver}\"" >> "$conf"
 	echo "img: \"${default_image}\"" >> "$conf"
 	echo "fallback: \"${fallback_image}\"" >> "$conf"
-	echo "kernelLine: \"${ALL_kver}\"" >> "$conf"
-	echo "fallbackKernelLine: \"${ALL_kver} (fallback initramfs)\"" >> "$conf"
+	echo "kernelLine: \"${manjaro_kernel}\"" >> "$conf"
+	echo "fallbackKernelLine: \"${manjaro_kernel} (fallback initramfs)\"" >> "$conf"
 	echo 'timeout: "10"' >> "$conf"
 	echo 'grubInstall: "grub-install"' >> "$conf"
 	echo 'grubMkconfig: "grub-mkconfig"' >> "$conf"

From 0eed99d92edfdb2367ec3c1547d56e7354f61a59 Mon Sep 17 00:00:00 2001
From: Philip <philm@manjaro.org>
Date: Thu, 19 Feb 2015 23:22:21 +0100
Subject: [PATCH 3/6] [util-iso-calamares] fix gummiboot config

---
 lib/util-iso-calamares.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/util-iso-calamares.sh b/lib/util-iso-calamares.sh
index 3455055..1c61d6e 100644
--- a/lib/util-iso-calamares.sh
+++ b/lib/util-iso-calamares.sh
@@ -29,8 +29,8 @@ write_calamares_bootloader_conf(){
 	local conf="$1/etc/calamares/modules/bootloader.conf"
 	echo '---' > "$conf"
 	echo "kernel: \"${ALL_kver}\"" >> "$conf"
-	echo "img: \"${default_image}\"" >> "$conf"
-	echo "fallback: \"${fallback_image}\"" >> "$conf"
+	echo "img: \"$(echo ${default_image} | sed s'|/boot||'\"" >> "$conf"
+	echo "fallback: \"$(echo ${fallback_image} | sed s'|/boot||'\"" >> "$conf"
 	echo "kernelLine: \"${manjaro_kernel}\"" >> "$conf"
 	echo "fallbackKernelLine: \"${manjaro_kernel} (fallback initramfs)\"" >> "$conf"
 	echo 'timeout: "10"' >> "$conf"

From c301b504f833c16e1a9336650467246122707e71 Mon Sep 17 00:00:00 2001
From: Philip <philm@manjaro.org>
Date: Thu, 19 Feb 2015 23:24:11 +0100
Subject: [PATCH 4/6] [util-iso-calamares] fix typo

---
 lib/util-iso-calamares.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/util-iso-calamares.sh b/lib/util-iso-calamares.sh
index 1c61d6e..8197cad 100644
--- a/lib/util-iso-calamares.sh
+++ b/lib/util-iso-calamares.sh
@@ -29,8 +29,8 @@ write_calamares_bootloader_conf(){
 	local conf="$1/etc/calamares/modules/bootloader.conf"
 	echo '---' > "$conf"
 	echo "kernel: \"${ALL_kver}\"" >> "$conf"
-	echo "img: \"$(echo ${default_image} | sed s'|/boot||'\"" >> "$conf"
-	echo "fallback: \"$(echo ${fallback_image} | sed s'|/boot||'\"" >> "$conf"
+	echo "img: \"$(echo ${default_image} | sed s'|/boot||')\"" >> "$conf"
+	echo "fallback: \"$(echo ${fallback_image} | sed s'|/boot||')\"" >> "$conf"
 	echo "kernelLine: \"${manjaro_kernel}\"" >> "$conf"
 	echo "fallbackKernelLine: \"${manjaro_kernel} (fallback initramfs)\"" >> "$conf"
 	echo 'timeout: "10"' >> "$conf"

From 3d7f7dec75d227a514839f1e0676cbd8f40848ef Mon Sep 17 00:00:00 2001
From: Philip <philm@manjaro.org>
Date: Thu, 19 Feb 2015 23:30:32 +0100
Subject: [PATCH 5/6] [util-iso-calamares] get rid of /boot also for kernel
 value

---
 lib/util-iso-calamares.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/util-iso-calamares.sh b/lib/util-iso-calamares.sh
index 8197cad..881c78c 100644
--- a/lib/util-iso-calamares.sh
+++ b/lib/util-iso-calamares.sh
@@ -28,7 +28,7 @@ write_calamares_bootloader_conf(){
 	source "$1/etc/mkinitcpio.d/${manjaro_kernel}.preset"
 	local conf="$1/etc/calamares/modules/bootloader.conf"
 	echo '---' > "$conf"
-	echo "kernel: \"${ALL_kver}\"" >> "$conf"
+	echo "kernel: \"$(echo ${ALL_kver} | sed s'|/boot||')\"" >> "$conf"
 	echo "img: \"$(echo ${default_image} | sed s'|/boot||')\"" >> "$conf"
 	echo "fallback: \"$(echo ${fallback_image} | sed s'|/boot||')\"" >> "$conf"
 	echo "kernelLine: \"${manjaro_kernel}\"" >> "$conf"

From f7e5220a4fc0e173ecbc849791111308de77ab53 Mon Sep 17 00:00:00 2001
From: Philip <philm@manjaro.org>
Date: Fri, 20 Feb 2015 00:46:43 +0100
Subject: [PATCH 6/6] adopt to latest calamares changes

---
 conf/manjaro-tools.conf   | 3 +++
 lib/util-iso-calamares.sh | 1 +
 lib/util.sh               | 4 ++++
 3 files changed, 8 insertions(+)

diff --git a/conf/manjaro-tools.conf b/conf/manjaro-tools.conf
index 5ebb9b0..042b975 100644
--- a/conf/manjaro-tools.conf
+++ b/conf/manjaro-tools.conf
@@ -98,6 +98,9 @@
 # unset defaults to given value
 # manjaro_kernel="linux319"
 
+# unset defaults to given value
+# efi_boot_loader="grub"
+
 # unset defaults to given value
 # plymouth_theme=manjaro-elegant
 
diff --git a/lib/util-iso-calamares.sh b/lib/util-iso-calamares.sh
index 881c78c..e1a81ef 100644
--- a/lib/util-iso-calamares.sh
+++ b/lib/util-iso-calamares.sh
@@ -28,6 +28,7 @@ write_calamares_bootloader_conf(){
 	source "$1/etc/mkinitcpio.d/${manjaro_kernel}.preset"
 	local conf="$1/etc/calamares/modules/bootloader.conf"
 	echo '---' > "$conf"
+	echo "efiBootLoader: ${efi_boot_loader}" >> "$conf"
 	echo "kernel: \"$(echo ${ALL_kver} | sed s'|/boot||')\"" >> "$conf"
 	echo "img: \"$(echo ${default_image} | sed s'|/boot||')\"" >> "$conf"
 	echo "fallback: \"$(echo ${fallback_image} | sed s'|/boot||')\"" >> "$conf"
diff --git a/lib/util.sh b/lib/util.sh
index 4b8172f..51a6ad6 100644
--- a/lib/util.sh
+++ b/lib/util.sh
@@ -274,6 +274,10 @@ load_config(){
 
 	manjaro_kernel_ver=${manjaro_kernel#*linux}
 
+	if [[ -z ${efi_boot_loader} ]];then
+		efi_boot_loader="grub"
+	fi
+
 	if [[ -z ${manjaro_version} ]];then
 		manjaro_version=$(date +%Y.%m)
 	fi