From 6d1f6027e8356845de0eaa2b2b9f50da65f61f0e Mon Sep 17 00:00:00 2001 From: udeved Date: Sat, 5 Dec 2015 00:20:04 +0100 Subject: [PATCH] [util-iso] fix profile pacman.conf check --- lib/util-iso.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/util-iso.sh b/lib/util-iso.sh index 38c3f99..fe57757 100644 --- a/lib/util-iso.sh +++ b/lib/util-iso.sh @@ -519,8 +519,8 @@ load_pkgs(){ } check_custom_pacman_conf(){ - if [[ -f pacman-${pacman_conf_arch}.conf ]]; then - pacman_conf="pacman-${pacman_conf_arch}.conf" + if [[ -f $1/pacman-${pacman_conf_arch}.conf ]]; then + pacman_conf="$1/pacman-${pacman_conf_arch}.conf" is_custom_pac_conf=true else pacman_conf="${PKGDATADIR}/pacman-${pacman_conf_arch}.conf" @@ -609,7 +609,7 @@ load_profile(){ iso_file="${iso_name}-${custom}-${dist_release}-${arch}.iso" fi - check_custom_pacman_conf + check_custom_pacman_conf "$1" mkchroot_args+=(-C ${pacman_conf} -S ${mirrors_conf} -B "${build_mirror}/${branch}" -K) work_dir=${chroots_iso}/$prof/${arch}