Unified · Split
| @@ -86,12 +86,6 @@ function configure_portage() { · 85 unmodified lines | ||
| 86 | 86 | try mirrorselect "${mirrorselect_params[@]}" |
| 87 | 87 | fi |
| 88 | 88 | |
| 89 | − if [[ $USE_PORTAGE_TESTING == "true" ]]; then | |
| 90 | − einfo "Adding ~$GENTOO_ARCH to ACCEPT_KEYWORDS" | |
| 91 | − echo "ACCEPT_KEYWORDS=\"~$GENTOO_ARCH\"" >> /etc/portage/make.conf \ | |
| 92 | − || die "Could not modify /etc/portage/make.conf" | |
| 93 | − fi | |
| 94 | − | |
| 95 | 89 | chmod 644 /etc/portage/make.conf \ |
| 96 | 90 | || die "Could not chmod 644 /etc/portage/make.conf" |
| 97 | 91 | } |
| @@ -429,6 +423,15 @@ EOF · 331 unmodified lines | ||
| 429 | 423 | ewarn "Root password cleared, set one as soon as possible!" |
| 430 | 424 | fi |
| 431 | 425 | |
| 426 | + # If configured, change to gentoo testing at the last moment. | |
| 427 | + # This is to ensure a smooth installation process. You can deal | |
| 428 | + # with the blockers after installation ;) | |
| 429 | + if [[ $USE_PORTAGE_TESTING == "true" ]]; then | |
| 430 | + einfo "Adding ~$GENTOO_ARCH to ACCEPT_KEYWORDS" | |
| 431 | + echo "ACCEPT_KEYWORDS=\"~$GENTOO_ARCH\"" >> /etc/portage/make.conf \ | |
| 432 | + || die "Could not modify /etc/portage/make.conf" | |
| 433 | + fi | |
| 434 | + | |
| 432 | 435 | einfo "Gentoo installation complete." |
| 433 | 436 | [[ $USED_LUKS == "true" ]] \ |
| 434 | 437 | && einfo "A backup of your luks headers can be found at '$LUKS_HEADER_BACKUP_DIR', in case you want to have a backup." |