From fee11646ece5d7c0da3b2018f3af86e53ec0e28b Mon Sep 17 00:00:00 2001 From: P. J. McDermott Date: Tue, 26 May 2015 01:46:13 -0400 Subject: install_system(): Pick mirror before validating arch/plat Based on commit 83bcfb5 in the master branch. --- (limited to 'lib') diff --git a/lib/install.sh b/lib/install.sh index 331fcbb..b7ca485 100644 --- a/lib/install.sh +++ b/lib/install.sh @@ -47,16 +47,18 @@ install_system() if [ "x${plat}" = 'x' ]; then plat="$(profile_default_plat)" fi - if ! profile_validate_archplat "${arch}" "${plat}"; then + if [ "x${mirror}" = 'x' ]; then + mirror="$(profile_select_mirror)" + fi + + if ! profile_validate_archplat "${mirror}" "${arch}" "${plat}" \ + "${suite}"; then error 2 "$(get_msg 'install_bad_archplat')" \ "${arch}" "${plat}" fi + info "$(get_msg 'install_selected_arch')" "${arch}" info "$(get_msg 'install_selected_plat')" "${plat}" - - if [ "x${mirror}" = 'x' ]; then - mirror="$(profile_select_mirror)" - fi info "$(get_msg 'install_selected_mirror')" "${mirror}" info "$(get_msg 'install_setting_up_chroot')" -- cgit v0.9.1