Skip to content

Commit

Permalink
feat: always install linux-firmware (fixes #50)
Browse files Browse the repository at this point in the history
  • Loading branch information
oddlama committed Sep 28, 2022
1 parent 3e18167 commit 1975f75
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 1 deletion.
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,10 @@ to emerge. The critical commands will ask you what to do in case of a failure. I
problem you cannot solve, you might want to consider getting in contact with some experienced people
on [IRC](https://www.gentoo.org/get-involved/irc-channels/) or [Discord](https://discord.com/invite/gentoolinux).

If you need to enter an installed system in a chroot to fix something (e.g. after rebooting your live system),
you can always clone the installer, mount your main drive under `/mnt` and use `./install --chroot /mnt` to
just chroot into your system.

## Overview

The installer performs the following main steps (in roughly this order),
Expand Down
11 changes: 10 additions & 1 deletion scripts/main.sh
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ function configure_portage() {
touch_or_die 0644 "/etc/portage/package.use/zz-autounmask"
mkdir_or_die 0755 "/etc/portage/package.keywords"
touch_or_die 0644 "/etc/portage/package.keywords/zz-autounmask"
touch_or_die 0644 "/etc/portage/package.license"

if [[ $SELECT_MIRRORS == "true" ]]; then
einfo "Temporarily installing mirrorselect"
Expand Down Expand Up @@ -274,6 +275,11 @@ function install_kernel() {
else
install_kernel_bios
fi

einfo "Installing linux-firmware"
echo "sys-kernel/linux-firmware linux-fw-redistributable no-source-code" >> /etc/portage/package.license \
|| die "Could not write to /etc/portage/package.license"
try emerge --verbose linux-firmware
}

function add_fstab_entry() {
Expand Down Expand Up @@ -382,6 +388,8 @@ EOF
try emerge --verbose sys-fs/btrfs-progs
fi

try emerge --verbose dev-vcs/git

# Install zfs kernel module and tools if we used zfs
if [[ $USED_ZFS == "true" ]]; then
einfo "Installing zfs"
Expand Down Expand Up @@ -469,7 +477,8 @@ EOF
einfo "Gentoo installation complete."
[[ $USED_LUKS == "true" ]] \
&& einfo "A backup of your luks headers can be found at '$LUKS_HEADER_BACKUP_DIR', in case you want to have a backup."
einfo "You may now reboot your system."
einfo "You may now reboot your system or execute ./install --chroot $ROOT_MOUNTPOINT to enter your system in a chroot."
einfo "Chrooting in this way is always possible in case you need to fix something after rebooting."
}

function main_install() {
Expand Down

1 comment on commit 1975f75

@min-xu-ai
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Awesome!

Please sign in to comment.