From e9602491df010329c51c6af27aeb06dd38487649 Mon Sep 17 00:00:00 2001 From: hygienic-books Date: Fri, 20 Oct 2023 17:43:46 +0200 Subject: [PATCH] feat(os): Install base-devel and git before we chroot (#3) --- setup.sh | 54 +++++++++++++++++++++++++++--------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/setup.sh b/setup.sh index 74ae35c..a65180c 100644 --- a/setup.sh +++ b/setup.sh @@ -705,39 +705,39 @@ function umount_all () { function finalize_os_setup () { #1.15 - set_root_pw #2.1 - configure_networking #2.2 - configure_dns #2.3 - configure_reflector #2.4 - configure_zfs #2.5 - configure_zfs_mount_gen #2.6 - configure_zfsbootmenu #2.7 - gen_zfsbootmenu #2.8 - add_zbm_to_efi #2.9 - umount_all #2.10 + set_root_pw #2.1 + configure_networking #2.2 + configure_dns #2.3 + configure_reflector #2.4 + configure_zfs #2.5 + configure_zfs_mount_gen #2.6 + configure_zfsbootmenu #2.7 + gen_zfsbootmenu #2.8 + add_zbm_to_efi #2.9 + umount_all #2.10 } function main () { if we_are_changerooted; then - install_os_in_chroot #1.16 + install_os_in_chroot #1.16 else - set_ntp #1.1 - update_pacman_db #1.2 - install_pkgs 'jq' #1.3 - install_zfs #1.4 - setup_zpool #1.4 - mount_system #1.5 - copy_zpool_cache #1.6 - install_archlinux #1.7 - gen_fstab #1.8 - set_hostname #1.9 - set_locale #1.10 - add_zfs_hook_to_initramfs #1.11 - set_initramfs_build_list #1.12 - add_zfs_files_to_new_os #1.13 - enter_chroot #1.14 + set_ntp #1.1 + update_pacman_db #1.2 + install_pkgs 'base-devel' 'git' 'jq' #1.3 + install_zfs #1.4 + setup_zpool #1.4 + mount_system #1.5 + copy_zpool_cache #1.6 + install_archlinux #1.7 + gen_fstab #1.8 + set_hostname #1.9 + set_locale #1.10 + add_zfs_hook_to_initramfs #1.11 + set_initramfs_build_list #1.12 + add_zfs_files_to_new_os #1.13 + enter_chroot #1.14 # We're done in chroot - finalize_os_setup #1.15 + finalize_os_setup #1.15 fi }