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

Merge pull request #96 from thiblizz/patch-4 

fix: minor typos
This commit is contained in:
oddlama 2023-10-15 14:18:51 +02:00 committed by GitHub
parent b2880b08f3 b15f89eec1
commit dfabf41185
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
README.md
View File

@ -142,7 +142,7 @@ Only certain VPS hosters may require you to use BIOS still (time to write to the
Don't install a bootloader when this script is done, except you absolutely need one. Don't install a bootloader when this script is done, except you absolutely need one.
The kernel can directly be booted by EFI without need for a bootloader. The kernel can directly be booted by EFI without need for a bootloader.
By default, this script will use efibootmgr to add a bootentry directly to your "mainboard's bootselect" (typically F12). By default, this script will use efibootmgr to add a bootentry directly to your "mainboard's bootselect" (typically F12).
Nowadays, there's just no reason use GRUB, syslinux, or similar bootloaders by default. Nowadays, there's just no reason to use GRUB, syslinux, or similar bootloaders by default.
They only add additional time to your boot, and even dualbooting Windows works just fine without one. They only add additional time to your boot, and even dualbooting Windows works just fine without one.
Only if you require frequent editing of kernel parameters, or want kernel autodiscovery from attached media Only if you require frequent editing of kernel parameters, or want kernel autodiscovery from attached media
you might want to consider using one of these. For the average (advanced) user this isn't necessary. you might want to consider using one of these. For the average (advanced) user this isn't necessary.
@ -153,7 +153,7 @@ If you want to add more boot options or want to learn about efibootmgr, refer to
I recommend using a modern file system like ZFS, both on desktops and servers. I recommend using a modern file system like ZFS, both on desktops and servers.
It provides transparent block-level compression, instant snapshots and full-disk encryption. It provides transparent block-level compression, instant snapshots and full-disk encryption.
Generally encrypting your root fs doesn't cost you anything and protects your data in case you lose your device. Generally, encrypting your root fs doesn't cost you anything and protects your data in case you lose your device.
#### Systemd vs OpenRC #### Systemd vs OpenRC
@ -171,7 +171,7 @@ Make of this what you will, both have their own quirks. Choose your poison.
#### Miscellaneous #### Miscellaneous
- Use the newer iwd for WIFI instead of wpa_supplicant - Use the newer iwd for WiFi instead of wpa_supplicant
- (If systemd) Use timers instead of cron jobs - (If systemd) Use timers instead of cron jobs
## Troubleshooting and FAQ ## Troubleshooting and FAQ
@ -193,7 +193,7 @@ you can use the installer to chroot into an existing system. Run `./install --he
#### Q: ZFS cannot be installed in the chroot due to an unsupported kernel version #### Q: ZFS cannot be installed in the chroot due to an unsupported kernel version
**A:** The newest stable ZFS module may requires a kernel version that is newer than what is provided on gentoo stable. **A:** The newest stable ZFS module may require a kernel version that is newer than what is provided on gentoo stable.
If you encounter this problem, you might be able to fix the problem by switching to testing by dropping to a shell temporarily: If you encounter this problem, you might be able to fix the problem by switching to testing by dropping to a shell temporarily:
``` ```

10
configure vendored
View File

@ -382,7 +382,7 @@ function load_config() {
# shellcheck disable=SC1090 # shellcheck disable=SC1090
source "$1" || die "Could not load given configuration." source "$1" || die "Could not load given configuration."
# After loading a config no unsaved changes exist. # After loading a config, no unsaved changes exist.
UNSAVED_CHANGES=false UNSAVED_CHANGES=false
} }
@ -921,7 +921,7 @@ function PARTITIONING_BOOT_TYPE_help() { echo "Select whether to use EFI or BIO
function PARTITIONING_BOOT_TYPE_menu() { function PARTITIONING_BOOT_TYPE_menu() {
if menu_radiolist_labeled \ if menu_radiolist_labeled \
"Select boot type" \ "Select boot type" \
"Select whether your want to use EFI or BIOS boot.$(on_off_str "$HAS_EFI_SUPPORT" "" " \Z1$EFI_UNSUPPORTED_MESSAGE\Zn")" \ "Select whether you want to use EFI or BIOS boot.$(on_off_str "$HAS_EFI_SUPPORT" "" " \Z1$EFI_UNSUPPORTED_MESSAGE\Zn")" \
"$PARTITIONING_BOOT_TYPE" \ "$PARTITIONING_BOOT_TYPE" \
"${PARTITIONING_BOOT_TYPES[@]}" "${PARTITIONING_BOOT_TYPES[@]}"
then then
@ -1268,7 +1268,7 @@ function KEYMAP_INITRAMFS_menu() {
function LOCALES_tag() { echo "Locales"; } function LOCALES_tag() { echo "Locales"; }
function LOCALES_label() { echo "$N_LOCALES selected"; } function LOCALES_label() { echo "$N_LOCALES selected"; }
function LOCALES_show() { return 0; } function LOCALES_show() { return 0; }
function LOCALES_help() { echo "The locales to generate for the new system. Be careful that the syntax for locales is a different from the resulting name of the genereated locales of locale-gen. For example the locale 'en_US.utf8' is enabled via 'en_US.UTF-8 UTF-8')."; } function LOCALES_help() { echo "The locales to generate for the new system. Be careful that the syntax for locales is a different from the resulting name of the generated locales of locale-gen. For example, the locale 'en_US.utf8' is enabled via 'en_US.UTF-8 UTF-8')."; }
function LOCALES_menu() { function LOCALES_menu() {
if menu_splitlist "Select locales" "Select which locales to generate." "$SELECTED_LOCALES" "${SUPPORTED_LOCALES[@]}"; then if menu_splitlist "Select locales" "Select which locales to generate." "$SELECTED_LOCALES" "${SUPPORTED_LOCALES[@]}"; then
SELECTED_LOCALES="$dialog_out" SELECTED_LOCALES="$dialog_out"
@ -1372,11 +1372,11 @@ function SYSTEMD_NETWORKD_GATEWAY_menu() {
function STAGE3_VARIANT_tag() { echo "Stage3 variant & Init system"; } function STAGE3_VARIANT_tag() { echo "Stage3 variant & Init system"; }
function STAGE3_VARIANT_label() { echo "($STAGE3_VARIANT)"; } function STAGE3_VARIANT_label() { echo "($STAGE3_VARIANT)"; }
function STAGE3_VARIANT_show() { return 0; } function STAGE3_VARIANT_show() { return 0; }
function STAGE3_VARIANT_help() { echo "Select which stage3 tarball to use. Implicitly determines whether systemd or OpenRC is used. Not all stage3 variants have been tested with this installer. The basic installation process is always the same, but due to complex profiles, unexpected blockers may arise when emerge is called. Stick to the basic choices and change after bootstraping, unless you know how to invervene while installing."; } function STAGE3_VARIANT_help() { echo "Select which stage3 tarball to use. Implicitly determines whether systemd or OpenRC is used. Not all stage3 variants have been tested with this installer. The basic installation process is always the same, but due to complex profiles, unexpected blockers may arise when emerge is called. Stick to the basic choices and change after bootstrapping, unless you know how to intervene while installing."; }
function STAGE3_VARIANT_menu() { function STAGE3_VARIANT_menu() {
if menu_radiolist_labeled \ if menu_radiolist_labeled \
"Select stage3 variant" \ "Select stage3 variant" \
"Select the base stage3 tarball variant to use for bootstrapping the system. Implicitly determines whether systemd or OpenRC is used. Not all stage3 variants have been tested with this installer. The basic installation process is always the same, but due to complex profiles, unexpected blockers may arise when emerge is called. Stick to the basic choices and change after bootstraping, unless you know how to invervene while installing." \ "Select the base stage3 tarball variant to use for bootstrapping the system. Implicitly determines whether systemd or OpenRC is used. Not all stage3 variants have been tested with this installer. The basic installation process is always the same, but due to complex profiles, unexpected blockers may arise when emerge is called. Stick to the basic choices and change after bootstrapping, unless you know how to intervene while installing." \
"$STAGE3_VARIANT" \ "$STAGE3_VARIANT" \
"${ALL_STAGE3_VARIANTS[@]}" "${ALL_STAGE3_VARIANTS[@]}"
then then

8
gentoo.conf.example
View File

@ -191,7 +191,7 @@ LOCALES=""
# list entries (e.g. .UTF-8 vs .utf8). See `locale -a` for all available locales. # list entries (e.g. .UTF-8 vs .utf8). See `locale -a` for all available locales.
# Although `locale -a` lists the suffix in lower case without any hyphens, it is best to always use UTF-8 in preference to utf8. # Although `locale -a` lists the suffix in lower case without any hyphens, it is best to always use UTF-8 in preference to utf8.
LOCALE="C.UTF-8" LOCALE="C.UTF-8"
# For a german system you could use: # For a German system you could use:
# LOCALES=" # LOCALES="
# de_DE.UTF-8 UTF-8 # de_DE.UTF-8 UTF-8
# de_DE ISO-8859-1 # de_DE ISO-8859-1
@ -204,7 +204,7 @@ LOCALE="C.UTF-8"
# Network configuration # Network configuration
# The following network configuration only applies to systemd # The following network configuration only applies to systemd
# configurations and will otherwise be ignore. All openrc based # configurations and will otherwise be ignored. All OpenRC based
# configurations always just starts dhcpcd. # configurations always just starts dhcpcd.
# Enable systemd-networkd to configure internet # Enable systemd-networkd to configure internet
@ -242,7 +242,7 @@ GENTOO_MIRROR="https://mirror.eu.oneandone.net/linux/distributions/gentoo/gentoo
GENTOO_ARCH="amd64" GENTOO_ARCH="amd64"
# The stage3 tarball variant to use. Determines whether systemd # The stage3 tarball variant to use. Determines whether systemd
# or openrc is used based on whether "systemd" is contained in this string. # or OpenRC is used based on whether "systemd" is contained in this string.
STAGE3_VARIANT="systemd" STAGE3_VARIANT="systemd"
# The stage3 tarball to download and bootstrap # The stage3 tarball to download and bootstrap
STAGE3_BASENAME="stage3-$GENTOO_ARCH-$STAGE3_VARIANT" STAGE3_BASENAME="stage3-$GENTOO_ARCH-$STAGE3_VARIANT"
@ -256,7 +256,7 @@ MUSL=$([[ $STAGE3_VARIANT == *musl* ]] && echo "true" || echo "false")
# to /etc/portage/make.conf to enable packages in testing. # to /etc/portage/make.conf to enable packages in testing.
USE_PORTAGE_TESTING=true USE_PORTAGE_TESTING=true
# If set to true, the best best gentoo mirrors will be selected # If set to true, the best gentoo mirrors will be selected
# automatically by app-portage/mirrorselect # automatically by app-portage/mirrorselect
SELECT_MIRRORS=true SELECT_MIRRORS=true

2
install
View File

@ -104,7 +104,7 @@ if [[ -z "$ACTION" ]]; then
# Default if configuration exists: Run installer # Default if configuration exists: Run installer
ACTION="install" ACTION="install"
else else
# Default if configuration does not exists: Run configurator, and exit afterwards. # Default if configuration does not exist: Run configurator, and exit afterwards.
echo "You have not created a gentoo.conf. Starting configurator instead of installing." echo "You have not created a gentoo.conf. Starting configurator instead of installing."
exec "$GENTOO_INSTALL_REPO_DIR/configure" "$CONFIG" exec "$GENTOO_INSTALL_REPO_DIR/configure" "$CONFIG"
fi fi

4
scripts/utils.sh
View File

@ -417,8 +417,8 @@ function check_wanted_programs() {
&& need_zfs=true && need_zfs=true
if [[ -v "pacman_packages[$program]" ]]; then if [[ -v "pacman_packages[$program]" ]]; then
# Assignments to the empty string are explcitly ignored, # Assignments to the empty string are explicitly ignored,
# as for example zfs needs to be handeled separately. # as for example, zfs needs to be handled separately.
[[ -n "${pacman_packages[$program]}" ]] \ [[ -n "${pacman_packages[$program]}" ]] \
&& packages+=("${pacman_packages[$program]}") && packages+=("${pacman_packages[$program]}")
else else