root/manjaro-tools
1
0
Fork 0
forked from mirrored-repos/manjaro-tools
Code Pull requests Activity

buildiso: redo custom repo support

Browse source
This commit is contained in:
udeved 2016-05-20 23:25:28 +02:00 committed by Philip
parent 47095986af
commit 024a4fb7d0
2 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bin/buildiso.in
View file

@ -51,7 +51,6 @@ show_profile(){
msg2 "start_openrc_live: %s" "${start_openrc_live[*]}" msg2 "start_openrc_live: %s" "${start_openrc_live[*]}"
msg2 "disable_openrc: %s" "${disable_openrc[*]}" msg2 "disable_openrc: %s" "${disable_openrc[*]}"
fi fi
# msg2 "is_custom_pac_conf: %s" "${is_custom_pac_conf}"
fi fi
reset_profile reset_profile
} }
@ -95,6 +94,7 @@ display_settings(){
msg2 "iso_checksum: %s" "${iso_checksum}" msg2 "iso_checksum: %s" "${iso_checksum}"
msg2 "use_overlayfs: %s" "${use_overlayfs}" msg2 "use_overlayfs: %s" "${use_overlayfs}"
${verbose} && msg2 "iso_fs: %s" "${iso_fs}" ${verbose} && msg2 "iso_fs: %s" "${iso_fs}"
msg2 "is_custom_pac_conf: %s" "${is_custom_pac_conf}"
msg "BUILD QUEUE:" msg "BUILD QUEUE:"
run show_profile "${buildset_iso}" run show_profile "${buildset_iso}"

21
lib/util-iso.sh
View file

@ -516,14 +516,17 @@ load_pkgs(){
fi fi
} }
check_custom_pacman_conf(){ set_pacman_conf(){
# if [[ -f ${profile_dir}/pacman-${pacman_conf_arch}.conf ]]; then if [[ -f ${USERCONFDIR}/user-repos.conf ]];then
# pacman_conf="${profile_dir}/pacman-${pacman_conf_arch}.conf" local temp=/tmp/custom-pacman.conf
# is_custom_pac_conf=true cat ${DATADIR}/pacman-${pacman_conf_arch}.conf > $temp
# else cat ${USERCONFDIR}/user-repos.conf >> $temp
pacman_conf=$temp
is_custom_pac_conf=true
else
pacman_conf="${DATADIR}/pacman-${pacman_conf_arch}.conf" pacman_conf="${DATADIR}/pacman-${pacman_conf_arch}.conf"
# is_custom_pac_conf=false is_custom_pac_conf=false
# fi fi
} }
check_profile(){ check_profile(){
@ -659,9 +662,7 @@ load_profile(){
load_profile_config "$conf" load_profile_config "$conf"
# check_custom_pacman_conf set_pacman_conf
pacman_conf="${DATADIR}/pacman-${pacman_conf_arch}.conf"
iso_file=$(gen_iso_fn).iso iso_file=$(gen_iso_fn).iso