Merge pull request '26-install-zfs-only-when-needed' (#27) from 26-install-zfs-only-when-needed into main

Reviewed-on: #27

.gitignore

@@ -1 +1,2 @@
 archzbm_settings.env
+.idea

setup.sh

@@ -429,19 +429,34 @@ function update_pacman_db () {
     systemctl start reflector
     # In an ISO and for the minimal number of packages we need we do not
     # care about partial upgrades
-    pacman -Syyuu --noconfirm
+    #
+    # Are we better off not attempting an upgrade inside the ISO?
+    # Let's try and find out.
+    # while ! pacman -Syyuu --needed --noconfirm --downloadonly; do
+    #     sleep 5
+    # done
+    # pacman -Syyuu --needed --noconfirm
+    pacman -Syy
 }
 
 function install_pkgs () {
     #1.5
     printf -- '%s\n' 'Installing packages ...'
+    while ! pacman -S --needed --noconfirm --downloadonly "${@}"; do
+        sleep 5
+    done
     pacman -S --needed --noconfirm "${@}"
 }
 
 function install_zfs () {
     #1.6
     declare reset_colors='\033[0m'
-    curl -s 'https://raw.githubusercontent.com/eoli3n/archiso-zfs/master/init' | bash
+    if modinfo 'zfs' &>/dev/null; then
+        >&3 printf -- '%s\n' \
+            'ZFS kernel module is loaded, no need to install ...'
+    else
+        curl -s 'https://raw.githubusercontent.com/eoli3n/archiso-zfs/master/init' | bash
+    fi
     printf -- "${reset_colors}"
 }
 
@@ -763,27 +778,29 @@ function install_archlinux () {
     #1.12
     pacman_dl_parallel
     pacman_dont_check_space
-    pacstrap /mnt              \
+    while ! pacstrap /mnt              \
-        base                   \
+                base                   \
-        base-devel             \
+                base-devel             \
-        linux                  \
+                linux                  \
-        linux-headers          \
+                linux-headers          \
-        linux-firmware         \
+                linux-firmware         \
-        amd-ucode              \
+                amd-ucode              \
-        efibootmgr             \
+                efibootmgr             \
-        vim                    \
+                vim                    \
-        git                    \
+                git                    \
-        iwd                    \
+                iwd                    \
-        networkmanager         \
+                networkmanager         \
-        network-manager-applet \
+                network-manager-applet \
-        dialog                 \
+                dialog                 \
-        os-prober              \
+                os-prober              \
-        reflector              \
+                reflector              \
-        bluez                  \
+                bluez                  \
-        bluez-utils            \
+                bluez-utils            \
-        man-db                 \
+                man-db                 \
-        xdg-utils              \
+                xdg-utils              \
-        xdg-user-dirs
+                xdg-user-dirs; do
+        sleep 5
+    done
 }
 
 function gen_fstab () {
@@ -1288,6 +1305,10 @@ function get_disks_with_one_efipart () {
 
 function install_os_in_chroot () {
     #2.2
+    dd if='/dev/zero' of='/swapfile' bs='1M' count='2048'
+    losetup '/dev/loop9' '/swapfile'
+    mkswap '/dev/loop9'
+    swapon '/dev/loop9'
     ### Reinit keyring
     # As keyring is initialized at boot, and copied to the install dir with pacstrap, and ntp is running
     # Time changed after keyring initialization, it leads to malfunction
@@ -1295,6 +1316,9 @@ function install_os_in_chroot () {
     rm -rf '/etc/pacman.d/gnupg'
     pacman-key --init
     pacman-key --populate archlinux
+    while ! pacman -S archlinux-keyring --noconfirm --downloadonly; do
+        sleep 5
+    done
     pacman -S archlinux-keyring --noconfirm
 
     locale-gen
@@ -1331,6 +1355,9 @@ function install_os_in_chroot () {
         add_syslinux_pacman_hook
     fi
     add_zbm_pacman_hook
+    swapoff '/dev/loop9'
+    losetup -d '/dev/loop9'
+    rm '/swapfile'
 }
 
 function set_root_pw () {