.gitignore

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

setup.sh

@@ -451,12 +451,7 @@ function install_pkgs () {
 function install_zfs () {
     #1.6
     declare reset_colors='\033[0m'
-    if modinfo 'zfs' &>/dev/null; then
+    curl -s 'https://raw.githubusercontent.com/eoli3n/archiso-zfs/master/init' | bash
-        >&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}"
 }
 
@@ -1305,10 +1300,6 @@ 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
@@ -1355,9 +1346,6 @@ 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 () {