From e4cf7bcd28e8a255eb970e9526be94b8bb58c58e Mon Sep 17 00:00:00 2001
From: Philip <philm@manjaro.org>
Date: Sun, 1 Mar 2015 17:24:27 +0100
Subject: [PATCH] [livecd] fix some issues

---
 lib/util-iso-calamares.sh | 7 +++++++
 lib/util-iso.sh           | 1 +
 scripts/mhwd-live         | 1 +
 3 files changed, 9 insertions(+)

diff --git a/lib/util-iso-calamares.sh b/lib/util-iso-calamares.sh
index b4ed671..1427c6d 100644
--- a/lib/util-iso-calamares.sh
+++ b/lib/util-iso-calamares.sh
@@ -146,3 +146,10 @@ configure_thus(){
 		chmod a+x $1/home/${username}/Desktop/thus.desktop
 	fi
 }
+
+configure_cli(){
+	if [[ -f $1/usr/bin/setup ]];then
+		msg2 "Configuring cli-installer ..."
+		chmod a+x $1/etc/skel/Desktop/installer-launcher-cli.desktop
+	fi
+}
diff --git a/lib/util-iso.sh b/lib/util-iso.sh
index 51a6f9f..aa2ec8a 100644
--- a/lib/util-iso.sh
+++ b/lib/util-iso.sh
@@ -145,6 +145,7 @@ configure_livecd_image(){
 	configure_services_live "$1"
 	configure_calamares "$1"
 	configure_thus "$1"
+	configure_cli "$1"
 	msg "Done configuring [livecd-image]"
 }
 
diff --git a/scripts/mhwd-live b/scripts/mhwd-live
index 4e78c0d..77e8473 100755
--- a/scripts/mhwd-live
+++ b/scripts/mhwd-live
@@ -1,6 +1,7 @@
 #!/bin/sh
 
 [[ -r /opt/livecd/util.sh ]] && source /opt/livecd/util.sh
+[[ -r /opt/livecd/util-livecd.sh ]] && source /opt/livecd/util-livecd.sh
 
 USENONFREE="$(kernel_cmdline nonfree no)"
 VIDEO="$(kernel_cmdline xdriver no)"