From 1ab0ef0f7962fabbf45f8ba81b684981aa18fbec Mon Sep 17 00:00:00 2001
From: udeved <artoo@manjaro.org>
Date: Sun, 6 Dec 2015 01:52:40 +0100
Subject: [PATCH] buildiso: add profile_repo variable to configure

---
 README.md               | 3 +++
 bin/buildiso.in         | 4 ++++
 data/manjaro-tools.conf | 3 +++
 lib/util.sh             | 2 ++
 4 files changed, 12 insertions(+)

diff --git a/README.md b/README.md
index dc0a991..6009b9b 100644
--- a/README.md
+++ b/README.md
@@ -83,6 +83,9 @@ overriding
 
 ################ buildiso ################
 
+# the iso-profiles directory name/git repo name
+# profile_repo='manjaro-tools-iso-profiles'
+
 # default iso buildset; name without .set extension
 # buildset_iso=default
 
diff --git a/bin/buildiso.in b/bin/buildiso.in
index 74d39ae..c4ae9d7 100755
--- a/bin/buildiso.in
+++ b/bin/buildiso.in
@@ -69,6 +69,7 @@ display_settings(){
 	msg2 "buildsets: $(load_sets ${sets_dir_iso})"
 	msg2 "buildset_iso: ${buildset_iso}"
 	msg2 "is_buildset: ${is_buildset}"
+	msg2 "profile_repo: ${profile_repo}"
 
 	msg "OPTIONS:"
 	msg2 "arch: ${arch}"
@@ -103,6 +104,9 @@ load_user_info
 load_config "${USER_CONFIG}/manjaro-tools.conf"
 load_config "${SYSCONFDIR}/manjaro-tools.conf"
 
+# to force old way to have buildiso run in iso-profiles dir
+# run_dir=$(pwd)
+
 load_run_dir "${profile_repo}"
 
 clean_first=true
diff --git a/data/manjaro-tools.conf b/data/manjaro-tools.conf
index aadfa38..d322751 100644
--- a/data/manjaro-tools.conf
+++ b/data/manjaro-tools.conf
@@ -34,6 +34,9 @@
 
 ################ buildiso ################
 
+# the iso-profiles directory name/git repo name
+profile_repo='manjaro-tools-iso-profiles'
+
 # default iso buildset; name without .set extension
 # buildset_iso=default
 
diff --git a/lib/util.sh b/lib/util.sh
index 1ffdcfe..8590cbf 100644
--- a/lib/util.sh
+++ b/lib/util.sh
@@ -201,6 +201,8 @@ init_buildiso(){
 	[[ -z ${use_overlayfs} ]] && use_overlayfs='true'
 	used_kernel=$(uname -r | cut -d . -f1)
 	[[ ${used_kernel} -lt "4" ]] && use_overlayfs='false'
+
+	[[ -z ${profile_repo} ]] && profile_repo='manjaro-tools-iso-profiles'
 }
 
 init_deployiso(){