From e7e09aa1bdb026da5589b89ee5f7c0bd48963cb0 Mon Sep 17 00:00:00 2001
From: udeved <artoo@manjaro.org>
Date: Sat, 3 Sep 2016 10:46:50 +0200
Subject: [PATCH] util-iso-cal: prepare to use plymouthcfg module

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

diff --git a/lib/util-iso-calamares.sh b/lib/util-iso-calamares.sh
index ffec758..c327eae 100644
--- a/lib/util-iso-calamares.sh
+++ b/lib/util-iso-calamares.sh
@@ -237,6 +237,7 @@ write_settings_conf(){
 	fi
 	echo "  - grubcfg" >> "$conf"
 	echo "  - bootloader" >> "$conf"
+	echo "  - plymouthcfg" >> "$conf"
 	echo "  - postcfg" >> "$conf"
 	echo "  - umount" >> "$conf"
 	echo "- show:" >> "$conf"
@@ -346,10 +347,13 @@ write_grubcfg_conf(){
 	echo "    GRUB_DISABLE_SUBMENU: true" >> "$conf"
 	echo '    GRUB_TERMINAL_OUTPUT: "console"' >> "$conf"
 	echo "    GRUB_DISABLE_RECOVERY: true" >> "$conf"
-	if ${plymouth_boot};then
-		echo '' >> "$conf"
-		echo "plymouth_theme: ${plymouth_theme}" >> "$conf"
-	fi
+}
+
+write_plymouthcfg_conf(){
+	local conf="$1/etc/calamares/modules/plymouthcfg.conf"
+	msg2 "Writing %s ..." "${conf##*/}"
+	echo "---" > "$conf"
+    echo "plymouth_theme: ${plymouth_theme}" >> "$conf"
 }
 
 configure_calamares(){
@@ -379,6 +383,8 @@ configure_calamares(){
 
 	${netinstall} && write_netinstall_conf "$1"
 
+	${plymouth_boot} && write_plymouthcfg_conf "$1"
+
 	write_chrootcfg_conf "$1"
 
 	write_postcfg_conf "$1"