[util-iso] fix profile pacman.conf check
This commit is contained in:
parent
6ab4db5a32
commit
6d1f6027e8
1 changed files with 3 additions and 3 deletions
|
@ -519,8 +519,8 @@ load_pkgs(){
|
||||||
}
|
}
|
||||||
|
|
||||||
check_custom_pacman_conf(){
|
check_custom_pacman_conf(){
|
||||||
if [[ -f pacman-${pacman_conf_arch}.conf ]]; then
|
if [[ -f $1/pacman-${pacman_conf_arch}.conf ]]; then
|
||||||
pacman_conf="pacman-${pacman_conf_arch}.conf"
|
pacman_conf="$1/pacman-${pacman_conf_arch}.conf"
|
||||||
is_custom_pac_conf=true
|
is_custom_pac_conf=true
|
||||||
else
|
else
|
||||||
pacman_conf="${PKGDATADIR}/pacman-${pacman_conf_arch}.conf"
|
pacman_conf="${PKGDATADIR}/pacman-${pacman_conf_arch}.conf"
|
||||||
|
@ -609,7 +609,7 @@ load_profile(){
|
||||||
iso_file="${iso_name}-${custom}-${dist_release}-${arch}.iso"
|
iso_file="${iso_name}-${custom}-${dist_release}-${arch}.iso"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
check_custom_pacman_conf
|
check_custom_pacman_conf "$1"
|
||||||
|
|
||||||
mkchroot_args+=(-C ${pacman_conf} -S ${mirrors_conf} -B "${build_mirror}/${branch}" -K)
|
mkchroot_args+=(-C ${pacman_conf} -S ${mirrors_conf} -B "${build_mirror}/${branch}" -K)
|
||||||
work_dir=${chroots_iso}/$prof/${arch}
|
work_dir=${chroots_iso}/$prof/${arch}
|
||||||
|
|
Loading…
Reference in a new issue