--- a/usr/local/sbin/tkldev-setup +++ b/usr/local/sbin/tkldev-setup @@ -317,7 +317,10 @@ wget -nc -nv "$IMAGES/bootstrap/$bootstrap_tar.hash" \ || fail "$bootstrap_tar.hash" if [[ -f "$BT_VERIFY" ]]; then - bootstrap_tar_path=$(dirname "$BOOTSTRAP_PATH/$bootstrap_tar") + bootstrap_key="$FAB_PATH/common/keys/tkl-$CODENAME-images.asc" + [[ -f "$bootstrap_key" ]] || fatal "Bootstrap verification key not found: $bootstrap_key" + gpg --import "$bootstrap_key" + bootstrap_tar_path="$(dirname "$BOOTSTRAP_PATH")/$bootstrap_tar" BT_DEBUG=$DEBUG $BT_VERIFY \ --force-gpg "$bootstrap_tar_path" "$bootstrap_tar_path.hash" else --- a/turnkey/buildtasks/config/common.cfg +++ b/turnkey/buildtasks/config/common.cfg @@ -4,7 +4,7 @@ export BT_PUBLISH_META="s3://${BUCKET}/metadata" export BT_PUBLISH_SCREENS="s3://${BUCKET}/screens" export BT_PUBLISH_PROFILES="s3://${BUCKET}/profiles" -export BT_GPGKEY=26147592087C0EDE42143B637761DEBABBCFBA7C +export BT_GPGKEY=DEE90D9970AE35D55B7C6C2DC6D254B76A9D9430 export BT_ISOS=/mnt/isos export BT_IMGS=/mnt/imgs export BT_QEMU=/mnt/qemu