diff options
author | Patrick McDermott <patrick.mcdermott@libiquity.com> | 2021-01-16 05:32:58 (EST) |
---|---|---|
committer | Patrick McDermott <patrick.mcdermott@libiquity.com> | 2021-01-16 05:42:04 (EST) |
commit | 1aae68486f7418cfda3cea8421a96d318be506fb (patch) | |
tree | b0450dc54b9406101db770ad847d6bfda97b5184 /src/install.sh | |
parent | 45e8fd75c621899365406141d9b9fe0aab0183e0 (diff) |
profile: Simplify function parameters
Save mirror and suite arguments in profile_prepare_install(), then use
them in other profile functions.
Diffstat (limited to 'src/install.sh')
-rw-r--r-- | src/install.sh | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/install.sh b/src/install.sh index c5d3a5a..975845b 100644 --- a/src/install.sh +++ b/src/install.sh @@ -129,7 +129,7 @@ install_find_pkgs() fi pkgs_fd=${FD} - if cert_url="$(profile_get_cert_url "${mirror}")"; then + if cert_url="$(profile_get_cert_url)"; then # This is a hack to generate a fake certificate with some valid # (but incorrect) key and the mirror-specific certificate URL to # make opkg-cert download and verify the actual certificate. @@ -175,7 +175,7 @@ install_find_pkgs() _install_md5sum_cb _install_sha256sum_cb \ >&${pkgs_fd} done <<-EOF - $(profile_feeds "${mirror}" "${arch}" "${plat}" "${suite}") + $(profile_feeds "${arch}" "${plat}") EOF printf '\ndest root /\n' >&${opkg_conf_fd} @@ -339,8 +339,7 @@ install_system() fi profile_prepare_install "${mirror}" "${suite}" - if ! profile_validate_archplat "${mirror}" "${arch}" "${plat}" \ - "${suite}"; then + if ! profile_validate_archplat "${arch}" "${plat}"; then error "$(get_msg 'install_bad_archplat')" "${arch}" "${plat}" return 1 fi |