diff --git a/setup.sh b/setup.sh index 407fc5f..89e0249 100644 --- a/setup.sh +++ b/setup.sh @@ -46,8 +46,15 @@ function install_pkgs () { pacman -S --needed --noconfirm "${@}" } -function prepare_zfsbootmenu_efi_bin_pkg () { +function install_zfs () { #1.5 + declare reset_colors='\033[0m' + curl -s 'https://raw.githubusercontent.com/eoli3n/archiso-zfs/master/init' | bash + printf -- "${reset_colors}" +} + +function prepare_zfsbootmenu_efi_bin_pkg () { + #1.6 # Our Arch Linux will use prebuilt ZFSBootMenu UEFI image files for ease # of use. We'd like to install them from within our chroot but the AUR # package 'zfsbootmenu-efi-bin' that we're using currently (Friday, @@ -95,13 +102,6 @@ function prepare_zfsbootmenu_efi_bin_pkg () { rm -rf "${git_zbm_efi_bin_dir}" } -function install_zfs () { - #1.6 - declare reset_colors='\033[0m' - curl -s 'https://raw.githubusercontent.com/eoli3n/archiso-zfs/master/init' | bash - printf -- "${reset_colors}" -} - function get_partitions () { declare partitions_json partitions_json="$(lsblk --output PATH,PARTTYPE --json --tree)" || return 1 @@ -758,8 +758,8 @@ function main () { resize_cow_space #1.2 update_pacman_db #1.3 install_pkgs 'base-devel' 'git' 'jq' #1.4 - prepare_zfsbootmenu_efi_bin_pkg #1.5 - install_zfs #1.6 + install_zfs #1.5 + prepare_zfsbootmenu_efi_bin_pkg #1.6 setup_zpool #1.7 mount_system #1.8 copy_zpool_cache #1.9