root/nix-tools
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[util-iso] fix profile pacman.conf check

Browse source
This commit is contained in:
udeved 2015-12-05 00:20:04 +01:00
parent 6ab4db5a32
commit 6d1f6027e8
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/util-iso.sh
View file

@ -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}