From 882627ffaf0f29f16fe506329abe4717e95593f0 Mon Sep 17 00:00:00 2001
From: udeved <flower_of_life@gmx.net>
Date: Sun, 11 Jan 2015 21:02:29 +0100
Subject: [PATCH] reactivate branch setting

---
 bin/buildiso.in   |  1 -
 bin/chroot-run.in |  6 +++---
 bin/mkchroot.in   | 15 ++++++++-------
 lib/util-iso.sh   |  9 +--------
 4 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/bin/buildiso.in b/bin/buildiso.in
index a24430f..ae4eb83 100755
--- a/bin/buildiso.in
+++ b/bin/buildiso.in
@@ -188,7 +188,6 @@ fi
 mirrors_conf="${PKGDATADIR}/pacman-mirrors-${branch}.conf"
 
 create_args+=(-v -a ${arch} -D ${install_dir} -C ${pacman_conf} -M ${mirrors_conf})
-# mkchroot_args+=(-C ${pacman_conf} -M ${mirrors_conf})
 
 mkiso_args+=(-a ${arch} -D ${install_dir} -L ${iso_label} -c ${compression})
 
diff --git a/bin/chroot-run.in b/bin/chroot-run.in
index f7cf8ae..f58083d 100644
--- a/bin/chroot-run.in
+++ b/bin/chroot-run.in
@@ -93,9 +93,9 @@ build_mount_args() {
     track_mount "/etc/resolv.conf" "${working_dir}/etc/resolv.conf" -B
     track_mount "${cache_dirs[0]}" "${working_dir}${cache_dirs[0]}" -B
 
-#     for cache_dir in ${cache_dirs[@]:1}; do
-# 	track_mount "$cache_dir" "${working_dir}${cache_dir}" -Br
-#     done
+    for cache_dir in ${cache_dirs[@]:1}; do
+	track_mount "$cache_dir" "${working_dir}${cache_dir}" -Br
+    done
     
     if [[ -n ${mountargs_ro[@]} ]];then
 	local IFS=','
diff --git a/bin/mkchroot.in b/bin/mkchroot.in
index 97e0d37..59e4543 100644
--- a/bin/mkchroot.in
+++ b/bin/mkchroot.in
@@ -84,11 +84,12 @@ echo "$version" > "$working_dir/.manjaro-tools"
 if ${build_locales};then
     printf '%s.UTF-8 UTF-8\n' en_US de_DE > "$working_dir/etc/locale.gen"
     echo 'LANG=C' > "$working_dir/etc/locale.conf"
-
-    exec chroot-run \
-	    ${pac_conf:+-C "$pac_conf"} \
-	    ${makepkg_conf:+-M "$makepkg_conf"} \
-	    ${mirrors_conf:+-S "$mirrors_conf"} \
-	    ${cache_dir:+-c "$cache_dir"} \
-	    "$working_dir" locale-gen
 fi
+
+exec chroot-run \
+	${pac_conf:+-C "$pac_conf"} \
+	${makepkg_conf:+-M "$makepkg_conf"} \
+	${mirrors_conf:+-S "$mirrors_conf"} \
+	${cache_dir:+-c "$cache_dir"} \
+	"$working_dir" locale-gen
+
diff --git a/lib/util-iso.sh b/lib/util-iso.sh
index b82f3d9..3796e66 100644
--- a/lib/util-iso.sh
+++ b/lib/util-iso.sh
@@ -528,17 +528,10 @@ make_root_image() {
 #	cp "${work_dir}/root-image"/etc/machine-id "${work_dir}/root-image"/var/lib/dbus/machine-id
 
 # 	configure_machine_id "${work_dir}/root-image"
-
-# 	mkdir -p "${work_dir}/iso/${install_dir}/${arch}"
-# 	
-# 	setarch ${arch} \
-# 	mkchroot ${mkchroot_args[*]} ${work_dir}/root-image ${packages} || die "Please check you Packages file! Exiting." 
-# 	
-# 	clean_image "${work_dir}/root-image"
 	
 	pacman -Qr "${work_dir}/root-image" > "${work_dir}/root-image/root-image-pkgs.txt"
 		
-# 	cp ${work_dir}/root-image/etc/locale.gen.bak ${work_dir}/root-image/etc/locale.gen
+	cp ${work_dir}/root-image/etc/locale.gen.bak ${work_dir}/root-image/etc/locale.gen
 	
 	if [ -e ${work_dir}/root-image/boot/grub/grub.cfg ] ; then
 	    rm ${work_dir}/root-image/boot/grub/grub.cfg