diff options
author | Marius Bakke <mbakke@fastmail.com> | 2019-07-02 20:18:16 +0200 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2019-07-02 20:18:16 +0200 |
commit | 4fb916551579d336ebea0dbe968314febb3a99d4 (patch) | |
tree | 2e101d05ece8408869e6dcad387efb39717f5726 /etc/guix-install.sh | |
parent | 6661b025a6c58be6572fc66c5db1073f56af30b0 (diff) | |
parent | 30484be05d9e318e89e12f40a55c65766cec700a (diff) | |
download | guix-4fb916551579d336ebea0dbe968314febb3a99d4.tar guix-4fb916551579d336ebea0dbe968314febb3a99d4.tar.gz |
Merge branch 'staging' into core-updates
Diffstat (limited to 'etc/guix-install.sh')
-rwxr-xr-x | etc/guix-install.sh | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/etc/guix-install.sh b/etc/guix-install.sh index a0777c8bfe..aa95cb4e20 100755 --- a/etc/guix-install.sh +++ b/etc/guix-install.sh @@ -104,7 +104,7 @@ chk_require() gpg --list-keys ${OPENPGP_SIGNING_KEY_ID} >/dev/null 2>&1 || ( _err "${ERR}Missing OpenPGP public key. Fetch it with this command:" - echo " gpg --keyserver pool.sks-keyservers.net --recv-keys ${OPENPGP_SIGNING_KEY_ID}" + echo " wget https://sv.gnu.org/people/viewgpg.php?user_id=15145 -qO - | gpg --import -" exit 1 ) } @@ -362,13 +362,11 @@ sys_enable_guix_daemon() } sys_authorize_build_farms() -{ # authorize the public keys of the two build farms +{ # authorize the public key of the build farm while true; do - read -p "Permit downloading pre-built package binaries from the project's build farms? (yes/no) " yn + read -p "Permit downloading pre-built package binaries from the project's build farm? (yes/no) " yn case $yn in - [Yy]*) guix archive --authorize < "${ROOT_HOME}/.config/guix/current/share/guix/hydra.gnu.org.pub" && - _msg "${PAS}Authorized public key for hydra.gnu.org"; - guix archive --authorize < "${ROOT_HOME}/.config/guix/current/share/guix/ci.guix.gnu.org.pub" && + [Yy]*) guix archive --authorize < "${ROOT_HOME}/.config/guix/current/share/guix/ci.guix.gnu.org.pub" && _msg "${PAS}Authorized public key for ci.guix.gnu.org"; break;; [Nn]*) _msg "${INF}Skipped authorizing build farm public keys" |