From b3b67c4b2808fc35b34523acd82b7b9cc95fffe9 Mon Sep 17 00:00:00 2001
From: udeved <artoo@manjaro.org>
Date: Sun, 21 Aug 2016 20:02:39 +0200
Subject: [PATCH] check-yaml: show all relevant profile vars

---
 bin/check-yaml.in    | 27 ++++++++++++++++++++++++++-
 lib/util-iso-yaml.sh |  1 -
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/bin/check-yaml.in b/bin/check-yaml.in
index 77d00b4..e0596fb 100644
--- a/bin/check-yaml.in
+++ b/bin/check-yaml.in
@@ -23,14 +23,39 @@ import ${LIBDIR}/util-iso-yaml.sh
 show_profile(){
 	prepare_check "$1"
 	msg2 "yaml_dir: %s" "${yaml_dir}"
-	msg2 "yaml file: %s" "${yaml##*/}"
 	msg2 "nonfree_mhwd: %s" "${nonfree_mhwd}"
+	msg2 "autologin: %s" "${autologin}"
+	msg2 "nonfree_mhwd: %s" "${nonfree_mhwd}"
+	msg2 "pxe_boot: %s" "${pxe_boot}"
+	msg2 "plymouth_boot: %s" "${plymouth_boot}"
+	${plymouth_boot} && msg2 "plymouth_theme: %s" "${plymouth_theme}"
 
 	[[ ${target_arch} == 'x86_64' ]] && msg2 "multilib: %s" "${multilib}"
 
+	msg2 "netinstall: %s" "${netinstall}"
 	${netinstall} && msg2 "netgroups: %s" "$(get_yaml)"
+	msg2 "unpackfs: %s" "${unpackfs}"
+
+	msg2 "efi_boot_loader: %s" "${efi_boot_loader}"
+
+	msg2 "hostname: %s" "${hostname}"
+	msg2 "username: %s" "${username}"
+	msg2 "password: %s" "${password}"
+	msg2 "login_shell: %s" "${login_shell}"
+	msg2 "addgroups: %s" "${addgroups}"
+
+	if [[ ${initsys} == 'systemd' ]];then
+		msg2 "enable_systemd: %s" "${enable_systemd[*]}"
+		msg2 "enable_systemd_live: %s" "${enable_systemd_live[*]}"
+		[[ -n ${disable_systemd[*]} ]] && msg2 "disable_systemd: %s" "${disable_systemd[*]}"
+	else
+		msg2 "enable_openrc: %s" "${enable_openrc[*]}"
+		msg2 "enable_openrc_live: %s" "${enable_openrc_live[*]}"
+		[[ -n ${disable_openrc[*]} ]] && msg2 "disable_openrc: %s" "${disable_openrc[*]}"
+	fi
 
 	reset_profile
+	unset yaml_dir
 }
 
 display_settings(){
diff --git a/lib/util-iso-yaml.sh b/lib/util-iso-yaml.sh
index 7996873..601b0d7 100644
--- a/lib/util-iso-yaml.sh
+++ b/lib/util-iso-yaml.sh
@@ -59,7 +59,6 @@ prepare_check(){
 	load_profile_config "${profile_dir}/profile.conf"
 
 	yaml_dir=${cache_dir_netinstall}/${profile}/${target_arch}
-	work_dir=${chroots_iso}/${profile}/${target_arch}
 
 	prepare_dir "${yaml_dir}"
 	chown "${OWNER}:${OWNER}" "${yaml_dir}"