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

make ADDITIONAL_PACKAGES an bash array

This commit is contained in:
oddlama 2020-04-25 15:24:24 +02:00
parent f2909a7c72
commit 9439c07b28
No known key found for this signature in database
GPG Key ID: 88EA325D51D53908
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
scripts/config.sh
View File

@ -38,8 +38,9 @@ create_default_disk_layout swap=8GiB /dev/sdX
# but create two raid0s for all swap partitions and all root partitions # but create two raid0s for all swap partitions and all root partitions
# respectively. Create luks on the root raid. # respectively. Create luks on the root raid.
# Hint: You will get N times the swap amount, so be sure to divide beforehand. # Hint: You will get N times the swap amount, so be sure to divide beforehand.
#create_raid0_luks_layout swap=4GiB /dev/sd{X,Y} #create_raid0_luks_layout swap=4GiB /dev/sd{X,Y} # EFI
#create_raid0_luks_layout swap=0 type=bios /dev/sd{X,Y} #create_raid0_luks_layout swap=4GiB type=bios /dev/sd{X,Y} # BIOS
#create_raid0_luks_layout swap=0 type=bios /dev/sd{X,Y} # BIOS no swap
################################################ ################################################
# System configuration # System configuration
@ -91,8 +92,8 @@ STAGE3_BASENAME="stage3-$GENTOO_ARCH-hardened+nomultilib"
################################################ ################################################
# Additional (optional) configuration # Additional (optional) configuration
# List of additional packages to install (will be directly passed to emerge) # Array of additional packages to install
ADDITIONAL_PACKAGES="app-editors/neovim" ADDITIONAL_PACKAGES=("app-editors/neovim")
# Install and enable dhcpcd # Install and enable dhcpcd
INSTALL_DHCPCD=true INSTALL_DHCPCD=true
# Install and configure sshd (a reasonably secure config is provided, which # Install and configure sshd (a reasonably secure config is provided, which

4
scripts/main.sh
View File

@ -329,10 +329,10 @@ main_install_gentoo_in_chroot() {
fi fi
# Install additional packages, if any. # Install additional packages, if any.
if [[ -n $ADDITIONAL_PACKAGES ]]; then if [[ ${#ADDITIONAL_PACKAGES[@]} -gt 0 ]]; then
einfo "Installing additional packages" einfo "Installing additional packages"
# shellcheck disable=SC2086 # shellcheck disable=SC2086
try emerge --verbose --autounmask-continue=y -- $ADDITIONAL_PACKAGES try emerge --verbose --autounmask-continue=y -- "${ADDITIONAL_PACKAGES[@]}"
fi fi
if ask "Do you want to assign a root password now?"; then if ask "Do you want to assign a root password now?"; then