Merge branch 'devel' of github.com:manjaro/manjaro-tools into devel

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
+}

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]"
 }
 

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)"