From 5f0a9cfc7c3875f183c8f564e2c9873390295c70 Mon Sep 17 00:00:00 2001
From: udeved <artoo@manjaro.org>
Date: Sun, 14 Aug 2016 23:33:58 +0200
Subject: [PATCH 1/6] util-iso-cal: use localecfg module

---
 lib/util-iso-calamares.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/util-iso-calamares.sh b/lib/util-iso-calamares.sh
index ce5d1ab..2bf19ae 100644
--- a/lib/util-iso-calamares.sh
+++ b/lib/util-iso-calamares.sh
@@ -208,7 +208,7 @@ write_settings_conf(){
 	echo "  - fstab" >> "$conf"
 	echo "  - locale" >> "$conf"
 	echo "  - keyboard" >> "$conf"
-	echo "  - localegen" >> "$conf"
+	echo "  - localecfg" >> "$conf"
 	echo "  - luksopenswaphookcfg" >> "$conf"
 	echo "  - luksbootkeyfile" >> "$conf"
 	echo "  - initcpiocfg" >> "$conf"

From d49e88b08beae9166692b7814ed7cc1be9762e36 Mon Sep 17 00:00:00 2001
From: udeved <artoo@manjaro.org>
Date: Wed, 17 Aug 2016 16:15:25 +0200
Subject: [PATCH 2/6] util-lib-cal: update chrootcfg conf

---
 lib/util-iso-calamares.sh | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/lib/util-iso-calamares.sh b/lib/util-iso-calamares.sh
index 2bf19ae..fa441f8 100644
--- a/lib/util-iso-calamares.sh
+++ b/lib/util-iso-calamares.sh
@@ -267,29 +267,15 @@ write_mhwdcfg_conf(){
 write_chrootcfg_conf(){
 	local conf="$1/etc/calamares/modules/chrootcfg.conf" mode='"0o755"'
 	echo "---" > "$conf"
-	echo "directories:" >> "$conf"
-	echo "    - name: /etc" >> "$conf"
-	echo "      mode: ${mode}" >> "$conf"
-	echo "    - name: /var/log" >> "$conf"
-	echo "      mode: ${mode}" >> "$conf"
+	echo "requirements:" >> "$conf"
 	echo "    - name: /var/cache/pacman/pkg" >> "$conf"
 	echo "      mode: ${mode}" >> "$conf"
 	echo "    - name: /var/lib/pacman" >> "$conf"
 	echo "      mode: ${mode}" >> "$conf"
 	echo '' >> "$conf"
-	echo "requirements:" >> "$conf"
-	echo "    - pacman" >> "$conf"
-	echo "    - ${kernel}" >> "$conf"
-	if [[ ${initsys} == 'openrc' ]]; then
-		echo "    - eudev-systemdcompat" >> "$conf"
-		echo "    - udev-openrc" >> "$conf"
-	fi
-	echo '' >> "$conf"
 	echo "keyrings:" >> "$conf"
 	echo "    - archlinux" >> "$conf"
 	echo "    - manjaro" >> "$conf"
-	echo '' >> "$conf"
-	echo "branch: ${target_branch}" >> "$conf"
 }
 
 write_netinstall_conf(){

From b31d2eafc0331a0b6e3ed6cb16ad2d7c26c64311 Mon Sep 17 00:00:00 2001
From: udeved <artoo@manjaro.org>
Date: Thu, 18 Aug 2016 12:23:14 +0200
Subject: [PATCH 3/6] util-iso-cal: adopt chrootcfg and mhwdcfg changes

---
 lib/util-iso-calamares.sh | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/lib/util-iso-calamares.sh b/lib/util-iso-calamares.sh
index fa441f8..052dd10 100644
--- a/lib/util-iso-calamares.sh
+++ b/lib/util-iso-calamares.sh
@@ -240,16 +240,22 @@ write_settings_conf(){
 write_mhwdcfg_conf(){
 	local conf="$1/etc/calamares/modules/mhwdcfg.conf"
 	echo "---" > "$conf"
-	echo "bus_types:" >> "$conf"
+	echo "bus:" >> "$conf"
 	echo "    - pci" >> "$conf"
 	echo "    - usb" >> "$conf"
 	echo '' >> "$conf"
-	echo "identifiers:" >> "$conf"
+	echo "identifier:" >> "$conf"
 	echo "    net:" >> "$conf"
-	echo "      - '0200'" >> "$conf"
-	echo "      - '0280'" >> "$conf"
+	echo "      - 200" >> "$conf"
+	echo "      - 280" >> "$conf"
 	echo "    vid:" >> "$conf"
-	echo "      - '0300'" >> "$conf"
+	echo "      - 300" >> "$conf"
+	echo '' >> "$conf"
+	if ${nonfree_xorg};then
+		echo "driver: nonfree" >> "$conf"
+	else
+		echo "driver: free" >> "$conf"
+	fi
 	echo '' >> "$conf"
 	if ${cal_netinstall};then
 		if ${cal_unpackfs};then

From 9ed03569367b5ac1003fe60b151814237c7813c8 Mon Sep 17 00:00:00 2001
From: udeved <artoo@manjaro.org>
Date: Thu, 18 Aug 2016 15:39:48 +0200
Subject: [PATCH 4/6] manjaro-chroot: fix args bug in manual mode

---
 bin/manjaro-chroot.in | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/bin/manjaro-chroot.in b/bin/manjaro-chroot.in
index 057941b..bc7fb03 100644
--- a/bin/manjaro-chroot.in
+++ b/bin/manjaro-chroot.in
@@ -27,7 +27,7 @@ display_settings(){
 
 	msg "ARGS:"
 	msg2 "automount: %s" "${automount}"
-	msg2 "run_args: %s" "${run_args}"
+	msg2 "run_args: %s" "${run_args[*]}"
 
 	msg "PATHS:"
 	msg2 "chrootdir: %s" "${chrootdir}"
@@ -81,7 +81,7 @@ if ${automount};then
 else
 	chrootdir=$1
 	shift
-	run_args=$@
+	run_args="$@"
 
 	[[ -d ${chrootdir} ]] || die "Can't create chroot on non-directory %s" "${chrootdir}"
 
@@ -91,4 +91,4 @@ else
 	chroot_mount /etc/resolv.conf "${chrootdir}/etc/resolv.conf" --bind
 fi
 
-SHELL=/bin/sh unshare --fork --pid chroot "${chrootdir}" "${run_args}"
+SHELL=/bin/sh unshare --fork --pid chroot "${chrootdir}" ${run_args[*]}

From 365cd9af78a0e2fa9574c822265d3ae9c32caf4d Mon Sep 17 00:00:00 2001
From: udeved <artoo@manjaro.org>
Date: Thu, 18 Aug 2016 18:11:37 +0200
Subject: [PATCH 5/6] buildiso: don't clean sync dbs; cal mhwdcfg change

---
 lib/util-iso-calamares.sh | 10 +++++-----
 lib/util-iso-image.sh     |  8 ++++----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/lib/util-iso-calamares.sh b/lib/util-iso-calamares.sh
index 052dd10..a3bbc0e 100644
--- a/lib/util-iso-calamares.sh
+++ b/lib/util-iso-calamares.sh
@@ -248,7 +248,7 @@ write_mhwdcfg_conf(){
 	echo "    net:" >> "$conf"
 	echo "      - 200" >> "$conf"
 	echo "      - 280" >> "$conf"
-	echo "    vid:" >> "$conf"
+	echo "    video:" >> "$conf"
 	echo "      - 300" >> "$conf"
 	echo '' >> "$conf"
 	if ${nonfree_xorg};then
@@ -259,15 +259,15 @@ write_mhwdcfg_conf(){
 	echo '' >> "$conf"
 	if ${cal_netinstall};then
 		if ${cal_unpackfs};then
-			echo "local_repo: true" >> "$conf"
+			echo "local: true" >> "$conf"
 		else
-			echo "local_repo: false" >> "$conf"
+			echo "local: false" >> "$conf"
 		fi
 	else
-		echo "local_repo: true" >> "$conf"
+		echo "local: true" >> "$conf"
 	fi
 	echo '' >> "$conf"
-	echo "repo_conf: /opt/live/pacman-gfx.conf" >> "$conf"
+	echo "repo: /opt/live/pacman-gfx.conf" >> "$conf"
 }
 
 write_chrootcfg_conf(){
diff --git a/lib/util-iso-image.sh b/lib/util-iso-image.sh
index e6c6451..d416369 100644
--- a/lib/util-iso-image.sh
+++ b/lib/util-iso-image.sh
@@ -321,10 +321,10 @@ clean_up_image(){
 		if [[ -d "$path" ]]; then
 			find "$path" -name 'initramfs*.img' -delete &> /dev/null
 		fi
-		path=$1/var/lib/pacman/sync
-		if [[ -d $path ]];then
-			find "$path" -type f -delete &> /dev/null
-		fi
+# 		path=$1/var/lib/pacman/sync
+# 		if [[ -d $path ]];then
+# 			find "$path" -type f -delete &> /dev/null
+# 		fi
 		path=$1/var/cache/pacman/pkg
 		if [[ -d $path ]]; then
 			find "$path" -type f -delete &> /dev/null

From fb043a7068d0e3690a5ba5b2d2aa6c35cc1b9950 Mon Sep 17 00:00:00 2001
From: udeved <artoo@manjaro.org>
Date: Thu, 18 Aug 2016 20:27:39 +0200
Subject: [PATCH 6/6] util-iso-cal: update

---
 lib/util-iso-calamares.sh | 2 --
 1 file changed, 2 deletions(-)

diff --git a/lib/util-iso-calamares.sh b/lib/util-iso-calamares.sh
index a3bbc0e..d1cb98f 100644
--- a/lib/util-iso-calamares.sh
+++ b/lib/util-iso-calamares.sh
@@ -266,8 +266,6 @@ write_mhwdcfg_conf(){
 	else
 		echo "local: true" >> "$conf"
 	fi
-	echo '' >> "$conf"
-	echo "repo: /opt/live/pacman-gfx.conf" >> "$conf"
 }
 
 write_chrootcfg_conf(){