forked from mirrored-repos/manjaro-tools
buildiso: redo custom repo support
This commit is contained in:
parent
47095986af
commit
024a4fb7d0
2 changed files with 12 additions and 11 deletions
|
@ -51,7 +51,6 @@ show_profile(){
|
|||
msg2 "start_openrc_live: %s" "${start_openrc_live[*]}"
|
||||
msg2 "disable_openrc: %s" "${disable_openrc[*]}"
|
||||
fi
|
||||
# msg2 "is_custom_pac_conf: %s" "${is_custom_pac_conf}"
|
||||
fi
|
||||
reset_profile
|
||||
}
|
||||
|
@ -95,6 +94,7 @@ display_settings(){
|
|||
msg2 "iso_checksum: %s" "${iso_checksum}"
|
||||
msg2 "use_overlayfs: %s" "${use_overlayfs}"
|
||||
${verbose} && msg2 "iso_fs: %s" "${iso_fs}"
|
||||
msg2 "is_custom_pac_conf: %s" "${is_custom_pac_conf}"
|
||||
|
||||
msg "BUILD QUEUE:"
|
||||
run show_profile "${buildset_iso}"
|
||||
|
|
|
@ -516,14 +516,17 @@ load_pkgs(){
|
|||
fi
|
||||
}
|
||||
|
||||
check_custom_pacman_conf(){
|
||||
# if [[ -f ${profile_dir}/pacman-${pacman_conf_arch}.conf ]]; then
|
||||
# pacman_conf="${profile_dir}/pacman-${pacman_conf_arch}.conf"
|
||||
# is_custom_pac_conf=true
|
||||
# else
|
||||
set_pacman_conf(){
|
||||
if [[ -f ${USERCONFDIR}/user-repos.conf ]];then
|
||||
local temp=/tmp/custom-pacman.conf
|
||||
cat ${DATADIR}/pacman-${pacman_conf_arch}.conf > $temp
|
||||
cat ${USERCONFDIR}/user-repos.conf >> $temp
|
||||
pacman_conf=$temp
|
||||
is_custom_pac_conf=true
|
||||
else
|
||||
pacman_conf="${DATADIR}/pacman-${pacman_conf_arch}.conf"
|
||||
# is_custom_pac_conf=false
|
||||
# fi
|
||||
is_custom_pac_conf=false
|
||||
fi
|
||||
}
|
||||
|
||||
check_profile(){
|
||||
|
@ -659,9 +662,7 @@ load_profile(){
|
|||
|
||||
load_profile_config "$conf"
|
||||
|
||||
# check_custom_pacman_conf
|
||||
|
||||
pacman_conf="${DATADIR}/pacman-${pacman_conf_arch}.conf"
|
||||
set_pacman_conf
|
||||
|
||||
iso_file=$(gen_iso_fn).iso
|
||||
|
||||
|
|
Loading…
Reference in a new issue