manuel
/
gentoo-install
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore: update DIGEST process to reflect upstream name changes

This commit is contained in:
oddlama 2022-02-28 17:38:04 +01:00
parent 871f962bca
commit 02db85b545
No known key found for this signature in database
GPG Key ID: 14EFE510775FE39A
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure vendored
View File

@ -364,7 +364,7 @@ function load_default_config() {
GENTOO_MIRROR="https://mirror.eu.oneandone.net/linux/distributions/gentoo/gentoo" GENTOO_MIRROR="https://mirror.eu.oneandone.net/linux/distributions/gentoo/gentoo"
GENTOO_ARCH="amd64" GENTOO_ARCH="amd64"
SELECT_MIRRORS=true SELECT_MIRRORS=false
SELECT_MIRRORS_LARGE_FILE=false SELECT_MIRRORS_LARGE_FILE=false
ADDITIONAL_PACKAGES=() ADDITIONAL_PACKAGES=()

10
scripts/functions.sh
View File

@ -792,7 +792,7 @@ function download_stage3() {
else else
einfo "Downloading $STAGE3_BASENAME tarball" einfo "Downloading $STAGE3_BASENAME tarball"
download "$STAGE3_RELEASES/${CURRENT_STAGE3}" "${CURRENT_STAGE3}" download "$STAGE3_RELEASES/${CURRENT_STAGE3}" "${CURRENT_STAGE3}"
download "$STAGE3_RELEASES/${CURRENT_STAGE3}.DIGESTS.asc" "${CURRENT_STAGE3}.DIGESTS.asc" download "$STAGE3_RELEASES/${CURRENT_STAGE3}.asc" "${CURRENT_STAGE3}.asc"
# Import gentoo keys # Import gentoo keys
einfo "Importing gentoo gpg key" einfo "Importing gentoo gpg key"
@ -803,14 +803,14 @@ function download_stage3() {
|| die "Could not import gentoo gpg key" || die "Could not import gentoo gpg key"
# Verify DIGESTS signature # Verify DIGESTS signature
einfo "Verifying DIGEST.asc signature" einfo "Verifying tarball signature"
gpg --quiet --verify "${CURRENT_STAGE3}.DIGESTS.asc" \ gpg --quiet --verify "${CURRENT_STAGE3}.asc" \
|| die "Signature of '${CURRENT_STAGE3}.DIGESTS.asc' invalid!" || die "Signature of '${CURRENT_STAGE3}.asc' invalid!"
# Check hashes # Check hashes
einfo "Verifying tarball integrity" einfo "Verifying tarball integrity"
# Replace any absolute paths in the digest file with just the stage3 basename, so it will be found by rhash # Replace any absolute paths in the digest file with just the stage3 basename, so it will be found by rhash
rhash -P --check <(grep -B 1 'tar.xz$' "${CURRENT_STAGE3}.DIGESTS.asc" | sed -e 's/ .*stage3-/ stage3-/') \ rhash -P --check <(grep -B 1 'tar.xz$' "${CURRENT_STAGE3}.DIGESTS" | sed -e 's/ .*stage3-/ stage3-/') \
|| die "Checksum mismatch!" || die "Checksum mismatch!"
# Create verification file in case the script is restarted # Create verification file in case the script is restarted

2
scripts/main.sh
View File

@ -90,6 +90,8 @@ function configure_portage() {
einfo "Adding ~$GENTOO_ARCH to ACCEPT_KEYWORDS" einfo "Adding ~$GENTOO_ARCH to ACCEPT_KEYWORDS"
echo "ACCEPT_KEYWORDS=\"~$GENTOO_ARCH\"" >> /etc/portage/make.conf \ echo "ACCEPT_KEYWORDS=\"~$GENTOO_ARCH\"" >> /etc/portage/make.conf \
|| die "Could not modify /etc/portage/make.conf" || die "Could not modify /etc/portage/make.conf"
chmod 644 /etc/portage/make.conf \
|| die "Could not chmod 644 /etc/portage/make.conf"
fi fi
} }