diff options
| author | P. J. McDermott <pj@pehjota.net> | 2015-05-24 15:25:14 (EDT) |
|---|---|---|
| committer | P. J. McDermott <pj@pehjota.net> | 2015-05-24 15:25:14 (EDT) |
| commit | bc8ccc0f68494912d515a30f662d7afc3e76108e (patch) | |
| tree | 865d06832e2a290499fc28a72ee45c3916b9005c | |
| parent | 970a014a211ca37d5591f999391582a3ffc56508 (diff) | |
cmd/install: Drop default arch/plat/mirror setting
| -rw-r--r-- | lib/cmd/install.sh | 28 |
1 files changed, 3 insertions, 25 deletions
diff --git a/lib/cmd/install.sh b/lib/cmd/install.sh index c43be0a..879156e 100644 --- a/lib/cmd/install.sh +++ b/lib/cmd/install.sh @@ -62,30 +62,6 @@ cmd_install_main() profile_set "${profile}" suite="$(profile_normalize_suite "${suite}")" - if [ "x${cmd_install_opt_a+set}" = 'xset' ]; then - arch="${cmd_install_opt_a}" - else - arch="$(profile_detect_arch)" - fi - if [ "x${cmd_install_opt_p+set}" = 'xset' ]; then - plat="${cmd_install_opt_p}" - else - plat="$(profile_default_plat)" - fi - if ! profile_validate_archplat "${arch}" "${plat}"; then - error 2 "$(get_msg 'cmd_install_bad_archplat')" \ - "${arch}" "${plat}" - fi - info "$(get_msg 'cmd_install_selected_arch')" "${arch}" - info "$(get_msg 'cmd_install_selected_plat')" "${plat}" - - if [ "x${cmd_install_opt_m+set}" = 'xset' ]; then - mirror="${cmd_install_opt_m}" - else - mirror="$(profile_select_mirror)" - fi - info "$(get_msg 'cmd_install_selected_mirror')" "${mirror}" - if [ "x${cmd_install_opt_F+set}" = 'xset' ]; then foreign=true else @@ -98,7 +74,9 @@ cmd_install_main() chroot="$(block_mount "${dev}")" fi - install_system "${mirror}" "${suite}" "${arch}" "${plat}" "${chroot}" + install_system "${cmd_install_opt_m-}" "${suite}" \ + "${cmd_install_opt_a-}" "${cmd_install_opt_p-}" \ + "${chroot}" if [ "x${dev}" != 'x' ]; then block_umount "${chroot}" |