removed double quoting from zpool statements

remove zfs-boot helper service, obsolete in OpenZFS 2.0

.github/workflows/shellcheck.yml

@@ -0,0 +1,11 @@
+name: shellcheck
+
+on: push
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Run shellcheck
+      run: ci/run_shellcheck.sh

README.md

@@ -1,6 +1,8 @@
 # zfs-hetzner-vm
 
-Scripts to install Debian 11, 10 or Ubuntu 18 with ZFS root on Hetzner root servers (virtual and dedicated).<br/>
+[![shellcheck](https://github.com/terem42/zfs-hetzner-vm/actions/workflows/shellcheck.yml/badge.svg)](https://github.com/terem42/zfs-hetzner-vm/actions/workflows/shellcheck.yml)
+
+Scripts to install Debian 11, 10 or Ubuntu 20, 18 with ZFS root on Hetzner root servers (virtual and dedicated).<br/>
 __WARNING:__ all data on the disk will be destroyed.
 
 ## How to use:

ci/run_shellcheck.sh

@@ -0,0 +1,25 @@
+#!/bin/bash
+
+set -o pipefail
+set -o errexit
+set -o nounset
+set -o errtrace
+shopt -s inherit_errexit
+
+# Always download the latest version:
+#
+# - it's fast and stable enough not to worry about it;
+# - the workflow is basically single-person, so there's no risk of a new dev encountering an error found
+#   by a new shellcheck version.
+
+mkdir -p /opt/shellcheck
+
+wget -qO- https://github.com/koalaman/shellcheck/releases/download/stable/shellcheck-stable.linux.x86_64.tar.xz \
+  | tar xJv -O shellcheck-stable/shellcheck \
+  > /opt/shellcheck/shellcheck
+
+chmod +x /opt/shellcheck/shellcheck
+
+/opt/shellcheck/shellcheck --version
+
+grep -lZP '^#!/bin/\w+sh' -R | xargs -0 /opt/shellcheck/shellcheck

hetzner-debian10-zfs-setup.sh

@@ -40,7 +40,7 @@ c_deb_security_repo=http://mirror.hetzner.de/debian/security
 
 c_default_zfs_arc_max_mb=250
 c_default_bpool_tweaks="-o ashift=12 -O compression=lz4"
-c_default_rpool_tweaks="-o ashift=12 -O acltype=posixacl -O compression=lz4 -O dnodesize=auto -O relatime=on -O xattr=sa -O normalization=formD"
+c_default_rpool_tweaks="-o ashift=12 -O acltype=posixacl -O compression=zstd-9 -O dnodesize=auto -O relatime=on -O xattr=sa -O normalization=formD"
 c_default_hostname=terem
 c_zfs_mount_dir=/mnt
 c_log_dir=$(dirname "$(mktemp)")/zfs-hetzner-vm
@@ -62,7 +62,9 @@ function print_step_info_header {
 ###############################################################################
 # ${FUNCNAME[1]}"
 
-  [[ "${1:-}" != "" ]] && echo -n " $1" || true
+  if [[ "${1:-}" != "" ]]; then
+    echo -n " $1" 
+  fi
 
   echo "
 ###############################################################################
@@ -106,7 +108,7 @@ This script will prepare the ZFS pools, then install and configure minimal Debia
 The script with minimal changes may be used on any other hosting provider  supporting KVM virtualization and offering Debian-based rescue system.
 In order to stop the procedure, hit Esc twice during dialogs (excluding yes/no ones), or Ctrl+C while any operation is running.
 '
-  dialog --ascii-lines --msgbox "$dialog_message" 30 100
+  dialog --msgbox "$dialog_message" 30 100
 }
 
 function store_os_distro_information {
@@ -141,13 +143,13 @@ function initial_load_debian_zed_cache {
 
   local success=0
 
-  if [[ ! -e /mnt/etc/zfs/zfs-list.cache/rpool ]] || [[ -e /mnt/etc/zfs/zfs-list.cache/rpool && (( $(ls -l /mnt/etc/zfs/zfs-list.cache/rpool 2> /dev/null | cut -d ' ' -f 5) == 0 )) ]]; then
+  if [[ ! -e /mnt/etc/zfs/zfs-list.cache/rpool ]] || [[ -e /mnt/etc/zfs/zfs-list.cache/rpool && (( $(find /mnt/etc/zfs/zfs-list.cache/rpool -type f -printf '%s' 2> /dev/null) == 0 )) ]]; then
     chroot_execute "zfs set canmount=noauto rpool"
 
     SECONDS=0
 
     while (( SECONDS++ <= 120 )); do
-      if [[ -e /mnt/etc/zfs/zfs-list.cache/rpool ]] && (( "$(ls -l /mnt/etc/zfs/zfs-list.cache/rpool | cut -d ' ' -f 5)" > 0 )); then
+      if [[ -e /mnt/etc/zfs/zfs-list.cache/rpool ]] && (( $(find /mnt/etc/zfs/zfs-list.cache/rpool -type f -printf '%s' 2> /dev/null) > 0 )); then
         success=1
         break
       else
@@ -210,7 +212,7 @@ LOG
 
 If you think this is a bug, please open an issue on https://github.com/terem42/zfs-hetzner-vm/issues, and attach the file `'"$c_disks_log"'`.
 '
-    dialog --ascii-lines --msgbox "$dialog_message" 30 100
+    dialog --msgbox "$dialog_message" 30 100
 
     exit 1
   fi
@@ -239,7 +241,7 @@ function select_disks {
 
 Devices with mounted partitions, cdroms, and removable devices are not displayed!
 "
-    mapfile -t v_selected_disks < <(dialog --ascii-lines --separate-output --checklist "$dialog_message" 30 100 $((${#menu_entries_option[@]} / 3)) "${menu_entries_option[@]}" 3>&1 1>&2 2>&3)
+    mapfile -t v_selected_disks < <(dialog --separate-output --checklist "$dialog_message" 30 100 $((${#menu_entries_option[@]} / 3)) "${menu_entries_option[@]}" 3>&1 1>&2 2>&3)
 
     if [[ ${#v_selected_disks[@]} -gt 0 ]]; then
       break
@@ -256,7 +258,7 @@ function ask_swap_size {
   local swap_size_invalid_message=
 
   while [[ ! $v_swap_size =~ ^[0-9]+$ ]]; do
-    v_swap_size=$(dialog --ascii-lines --inputbox "${swap_size_invalid_message}Enter the swap size in GiB (0 for no swap):" 30 100 2 3>&1 1>&2 2>&3)
+    v_swap_size=$(dialog --inputbox "${swap_size_invalid_message}Enter the swap size in GiB (0 for no swap):" 30 100 2 3>&1 1>&2 2>&3)
 
     swap_size_invalid_message="Invalid swap size! "
   done
@@ -271,7 +273,7 @@ function ask_free_tail_space {
   local tail_space_invalid_message=
 
   while [[ ! $v_free_tail_space =~ ^[0-9]+$ ]]; do
-    v_free_tail_space=$(dialog --ascii-lines --inputbox "${tail_space_invalid_message}Enter the space to leave at the end of each disk (0 for none):" 30 100 0 3>&1 1>&2 2>&3)
+    v_free_tail_space=$(dialog --inputbox "${tail_space_invalid_message}Enter the space to leave at the end of each disk (0 for none):" 30 100 0 3>&1 1>&2 2>&3)
 
     tail_space_invalid_message="Invalid size! "
   done
@@ -286,7 +288,7 @@ function ask_zfs_arc_max_size {
   local zfs_arc_max_invalid_message=
 
   while [[ ! $v_zfs_arc_max_mb =~ ^[0-9]+$ ]]; do
-    v_zfs_arc_max_mb=$(dialog --ascii-lines --inputbox "${zfs_arc_max_invalid_message}Enter ZFS ARC cache max size in Mb (minimum 64Mb, enter 0 for ZFS default value, the default will take up to 50% of memory):" 30 100 "$c_default_zfs_arc_max_mb" 3>&1 1>&2 2>&3)
+    v_zfs_arc_max_mb=$(dialog --inputbox "${zfs_arc_max_invalid_message}Enter ZFS ARC cache max size in Mb (minimum 64Mb, enter 0 for ZFS default value, the default will take up to 50% of memory):" 30 100 "$c_default_zfs_arc_max_mb" 3>&1 1>&2 2>&3)
 
     zfs_arc_max_invalid_message="Invalid size! "
   done
@@ -302,14 +304,14 @@ function ask_pool_names {
   local bpool_name_invalid_message=
 
   while [[ ! $v_bpool_name =~ ^[a-z][a-zA-Z_:.-]+$ ]]; do
-    v_bpool_name=$(dialog --ascii-lines --inputbox "${bpool_name_invalid_message}Insert the name for the boot pool" 30 100 bpool 3>&1 1>&2 2>&3)
+    v_bpool_name=$(dialog --inputbox "${bpool_name_invalid_message}Insert the name for the boot pool" 30 100 bpool 3>&1 1>&2 2>&3)
 
     bpool_name_invalid_message="Invalid pool name! "
   done
   local rpool_name_invalid_message=
 
   while [[ ! $v_rpool_name =~ ^[a-z][a-zA-Z_:.-]+$ ]]; do
-    v_rpool_name=$(dialog --ascii-lines --inputbox "${rpool_name_invalid_message}Insert the name for the root pool" 30 100 rpool 3>&1 1>&2 2>&3)
+    v_rpool_name=$(dialog --inputbox "${rpool_name_invalid_message}Insert the name for the root pool" 30 100 rpool 3>&1 1>&2 2>&3)
 
     rpool_name_invalid_message="Invalid pool name! "
   done
@@ -321,8 +323,8 @@ function ask_pool_tweaks {
   # shellcheck disable=SC2119
   print_step_info_header
 
-  v_bpool_tweaks=$(dialog --ascii-lines --inputbox "Insert the tweaks for the boot pool" 30 100 -- "$c_default_bpool_tweaks" 3>&1 1>&2 2>&3)
-  v_rpool_tweaks=$(dialog --ascii-lines --inputbox "Insert the tweaks for the root pool" 30 100 -- "$c_default_rpool_tweaks" 3>&1 1>&2 2>&3)
+  v_bpool_tweaks=$(dialog --inputbox "Insert the tweaks for the boot pool" 30 100 -- "$c_default_bpool_tweaks" 3>&1 1>&2 2>&3)
+  v_rpool_tweaks=$(dialog --inputbox "Insert the tweaks for the root pool" 30 100 -- "$c_default_rpool_tweaks" 3>&1 1>&2 2>&3)
 
   print_variables v_bpool_tweaks v_rpool_tweaks
 }
@@ -337,8 +339,8 @@ function ask_root_password {
   local password_repeat=-
 
   while [[ "$v_root_password" != "$password_repeat" || "$v_root_password" == "" ]]; do
-    v_root_password=$(dialog --ascii-lines --passwordbox "${password_invalid_message}Please enter the root account password (can't be empty):" 30 100 3>&1 1>&2 2>&3)
-    password_repeat=$(dialog --ascii-lines --passwordbox "Please repeat the password:" 30 100 3>&1 1>&2 2>&3)
+    v_root_password=$(dialog --passwordbox "${password_invalid_message}Please enter the root account password (can't be empty):" 30 100 3>&1 1>&2 2>&3)
+    password_repeat=$(dialog --passwordbox "Please repeat the password:" 30 100 3>&1 1>&2 2>&3)
 
     password_invalid_message="Passphrase empty, or not matching! "
   done
@@ -348,7 +350,7 @@ function ask_root_password {
 function ask_encryption {
   print_step_info_header
 
-  if dialog --ascii-lines --yesno 'Do you want to encrypt the root pool?' 30 100; then
+  if dialog --defaultno --yesno 'Do you want to encrypt the root pool?' 30 100; then
     v_encrypt_rpool=1
   fi
   set +x
@@ -356,8 +358,8 @@ function ask_encryption {
     local passphrase_invalid_message=
     local passphrase_repeat=-
     while [[ "$v_passphrase" != "$passphrase_repeat" || ${#v_passphrase} -lt 8 ]]; do
-      v_passphrase=$(dialog --ascii-lines --passwordbox "${passphrase_invalid_message}Please enter the passphrase for the root pool (8 chars min.):" 30 100 3>&1 1>&2 2>&3)
-      passphrase_repeat=$(dialog --ascii-lines --passwordbox "Please repeat the passphrase:" 30 100 3>&1 1>&2 2>&3)
+      v_passphrase=$(dialog --passwordbox "${passphrase_invalid_message}Please enter the passphrase for the root pool (8 chars min.):" 30 100 3>&1 1>&2 2>&3)
+      passphrase_repeat=$(dialog --passwordbox "Please repeat the passphrase:" 30 100 3>&1 1>&2 2>&3)
 
       passphrase_invalid_message="Passphrase too short, or not matching! "
     done
@@ -368,7 +370,7 @@ function ask_encryption {
 function ask_zfs_experimental {
   print_step_info_header
 
-  if dialog --ascii-lines --yesno 'Do you want to use experimental zfs module build?' 30 100; then
+  if dialog --defaultno --yesno 'Do you want to use experimental zfs module build?' 30 100; then
     v_zfs_experimental=1
   fi
 }
@@ -380,7 +382,7 @@ function ask_hostname {
   local hostname_invalid_message=
 
   while [[ ! $v_hostname =~ ^[a-z][a-zA-Z_:.-]+$ ]]; do
-    v_hostname=$(dialog --ascii-lines --inputbox "${hostname_invalid_message}Set the host name" 30 100 "$c_default_hostname" 3>&1 1>&2 2>&3)
+    v_hostname=$(dialog --inputbox "${hostname_invalid_message}Set the host name" 30 100 "$c_default_hostname" 3>&1 1>&2 2>&3)
 
     hostname_invalid_message="Invalid host name! "
   done
@@ -432,8 +434,7 @@ function unmount_and_export_fs {
   echo "===========exporting zfs pools============="
   set +e
   while (( zpools_exported == 99 )) && (( SECONDS++ <= 60 )); do    
-    zpool export -a 2> /dev/null
-    if [[ $? == 0 ]]; then
+    if zpool export -a 2> /dev/null; then
       zpools_exported=1
       echo "all zfs pools were succesfully exported"
       break;
@@ -450,6 +451,7 @@ function unmount_and_export_fs {
 
 #################### MAIN ################################
 export LC_ALL=en_US.UTF-8
+export NCURSES_NO_UTF8_ACS=1
 
 check_prerequisites
 
@@ -491,10 +493,14 @@ done
 
 echo "======= installing zfs on rescue system =========="
   echo "zfs-dkms zfs-dkms/note-incompatible-licenses note true" | debconf-set-selections
-
+  apt-get install --yes software-properties-common
+  apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 8CF63AD3F06FC659
+  add-apt-repository 'deb http://ppa.launchpad.net/jonathonf/zfs/ubuntu focal main'
   apt update
-  apt install --yes -t buster-backports libelf-dev zfs-dkms
-  modprobe zfs
+  apt install --yes zfs-dkms zfsutils-linux
+  add-apt-repository -r 'deb http://ppa.launchpad.net/jonathonf/zfs/ubuntu focal main'
+  apt update
+  find /usr/local/sbin/ -type l -exec rm {} +
   zfs --version
 
 echo "======= partitioning the disk =========="
@@ -506,7 +512,7 @@ echo "======= partitioning the disk =========="
   fi
 
   for selected_disk in "${v_selected_disks[@]}"; do
-    wipefs --all "$selected_disk"
+    wipefs --all --force "$selected_disk"
     sgdisk -a1 -n1:24K:+1000K            -t1:EF02 "$selected_disk"
     sgdisk -n2:0:+512M                   -t2:BF01 "$selected_disk" # Boot pool
     sgdisk -n3:0:"$tail_space_parameter" -t3:BF01 "$selected_disk" # Root pool
@@ -535,12 +541,16 @@ echo "======= create zfs pools and datasets =========="
     pools_mirror_option=
   fi
 
+# shellcheck disable=SC2086
 zpool create \
-  $v_bpool_tweaks -O canmount=off -O devices=off \
+  "$v_bpool_tweaks" -O canmount=off -O devices=off \
+  -o cachefile=/etc/zfs/zpool.cache \
   -O mountpoint=/boot -R $c_zfs_mount_dir -f \
   $v_bpool_name $pools_mirror_option "${bpool_disks_partitions[@]}"
 
+# shellcheck disable=SC2086
 echo -n "$v_passphrase" | zpool create \
+  -o cachefile=/etc/zfs/zpool.cache \
   $v_rpool_tweaks \
   "${encryption_options[@]}" \
   -O mountpoint=/ -R $c_zfs_mount_dir -f \
@@ -723,25 +733,8 @@ chroot_execute "dpkg-reconfigure openssh-server -f noninteractive"
 echo "======= set root password =========="
 chroot_execute "echo root:$(printf "%q" "$v_root_password") | chpasswd"
 
-echo "======= setting up zfs services =========="
-chroot_execute "cat > /etc/systemd/system/zfs-import-bpool.service <<UNIT
-[Unit]
-DefaultDependencies=no
-Before=zfs-import-scan.service
-Before=zfs-import-cache.service
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStartPre=/bin/sh -c '[ -f /etc/zfs/zpool.cache ] && mv /etc/zfs/zpool.cache /etc/zfs/preboot_zpool.cache || true'
-ExecStart=/sbin/zpool import -N -o cachefile=none -d /dev/disk/by-id $v_bpool_name
-ExecStartPost=/bin/sh -c '[ -f /etc/zfs/preboot_zpool.cache ] && mv /etc/zfs/preboot_zpool.cache /etc/zfs/zpool.cache || true'
-
-[Install]
-WantedBy=zfs-import.target
-UNIT"
-
-chroot_execute "systemctl enable zfs-import-bpool.service"
+echo "======= setting up zfs cache =========="
+cp /etc/zfs/zpool.cache /mnt/etc/zfs/zpool.cache
 
 echo "========setting up zfs module parameters========"
 chroot_execute "echo options zfs zfs_arc_max=$((v_zfs_arc_max_mb * 1024 * 1024)) >> /etc/modprobe.d/zfs.conf"
@@ -784,18 +777,6 @@ if [[ $v_encrypt_rpool == "1" ]]; then
   rm -rf "$c_zfs_mount_dir/etc/dropbear-initramfs/dropbear_dss_host_key"
 fi 
 
-#cd "$c_zfs_mount_dir/root"
-#wget http://ftp.de.debian.org/debian/pool/main/libt/libtommath/libtommath1_1.1.0-3_amd64.deb
-#wget http://ftp.de.debian.org/debian/pool/main/d/dropbear/dropbear-bin_2018.76-5_amd64.deb
-#wget http://ftp.de.debian.org/debian/pool/main/d/dropbear/dropbear-initramfs_2018.76-5_all.deb
-
-#chroot_execute "dpkg -i /root/libtommath1_1.1.0-3_amd64.deb"
-#chroot_execute "dpkg -i /root/dropbear-bin_2018.76-5_amd64.deb"
-#chroot_execute "dpkg -i /root/dropbear-initramfs_2018.76-5_all.deb"
-
-#rm $c_zfs_mount_dir/root/*.deb
-#cd /root
-
 echo "============setup root prompt============"
 cat > "$c_zfs_mount_dir/root/.bashrc" <<CONF
 export PS1='\[\033[01;31m\]\u\[\033[01;33m\]@\[\033[01;32m\]\h \[\033[01;33m\]\w \[\033[01;35m\]\$ \[\033[00m\]'
@@ -807,8 +788,31 @@ CONF
 echo "========running packages upgrade==========="
 chroot_execute "apt upgrade --yes"
 
-#echo "===========add static route to initramfs via hook to add default routes due to  initramfs DHCP bug ========="
-# removed
+echo "===========add static route to initramfs via hook to add default routes for Hetzner due to Debian/Ubuntu initramfs DHCP bug ========="
+mkdir -p "$c_zfs_mount_dir/usr/share/initramfs-tools/scripts/init-premount"
+cat > "$c_zfs_mount_dir/usr/share/initramfs-tools/scripts/init-premount/static-route" <<'CONF'
+#!/bin/sh
+PREREQ=""
+prereqs()
+{
+    echo "$PREREQ"
+}
+
+case $1 in
+prereqs)
+    prereqs
+    exit 0
+    ;;
+esac
+
+. /scripts/functions
+# Begin real processing below this line
+
+configure_networking
+
+ip route add 172.31.1.1/255.255.255.255 dev ens3
+ip route add default via 172.31.1.1 dev ens3
+CONF
 
 echo "======= update initramfs =========="
 chroot_execute "update-initramfs -u -k all"
@@ -825,7 +829,7 @@ fi
 
 echo "======= setting mountpoints =========="
 chroot_execute "zfs set mountpoint=legacy $v_bpool_name/BOOT/debian"
-chroot_execute "echo $v_bpool_name/BOOT/debian /boot zfs nodev,relatime,x-systemd.requires=zfs-import-bpool.service 0 0 > /etc/fstab"
+chroot_execute "echo $v_bpool_name/BOOT/debian /boot zfs nodev,relatime,x-systemd.requires=zfs-mount.service,x-systemd.device-timeout=10 0 0 > /etc/fstab"
 
 chroot_execute "zfs set mountpoint=legacy $v_rpool_name/var/log"
 chroot_execute "echo $v_rpool_name/var/log /var/log zfs nodev,relatime 0 0 >> /etc/fstab"
@@ -837,7 +841,9 @@ chroot_execute "zfs set mountpoint=legacy $v_rpool_name/tmp"
 chroot_execute "echo $v_rpool_name/tmp /tmp zfs nodev,relatime 0 0 >> /etc/fstab"
 
 echo "========= add swap, if defined"
-[[ $v_swap_size -gt 0 ]] && chroot_execute "echo /dev/zvol/$v_rpool_name/swap none swap discard 0 0 >> /etc/fstab" || true
+if [[ $v_swap_size -gt 0 ]]; then
+  chroot_execute "echo /dev/zvol/$v_rpool_name/swap none swap discard 0 0 >> /etc/fstab"
+fi
 chroot_execute "echo RESUME=none > /etc/initramfs-tools/conf.d/resume"
 
 echo "======= unmounting filesystems and zfs pools =========="

hetzner-debian11-zfs-setup.sh

@@ -62,7 +62,10 @@ function print_step_info_header {
 ###############################################################################
 # ${FUNCNAME[1]}"
 
-  [[ "${1:-}" != "" ]] && echo -n " $1" || true
+  if [[ "${1:-}" != "" ]]; then
+    echo -n " $1" 
+  fi
+
 
   echo "
 ###############################################################################
@@ -141,13 +144,13 @@ function initial_load_debian_zed_cache {
 
   local success=0
 
-  if [[ ! -e /mnt/etc/zfs/zfs-list.cache/rpool ]] || [[ -e /mnt/etc/zfs/zfs-list.cache/rpool && (( $(ls -l /mnt/etc/zfs/zfs-list.cache/rpool 2> /dev/null | cut -d ' ' -f 5) == 0 )) ]]; then
+  if [[ ! -e /mnt/etc/zfs/zfs-list.cache/rpool ]] || [[ -e /mnt/etc/zfs/zfs-list.cache/rpool && (( $(find /mnt/etc/zfs/zfs-list.cache/rpool -type f -printf '%s' 2> /dev/null) == 0 )) ]]; then  
     chroot_execute "zfs set canmount=noauto rpool"
 
     SECONDS=0
 
     while (( SECONDS++ <= 120 )); do
-      if [[ -e /mnt/etc/zfs/zfs-list.cache/rpool ]] && (( "$(ls -l /mnt/etc/zfs/zfs-list.cache/rpool | cut -d ' ' -f 5)" > 0 )); then
+      if [[ -e /mnt/etc/zfs/zfs-list.cache/rpool ]] && (( $(find /mnt/etc/zfs/zfs-list.cache/rpool -type f -printf '%s' 2> /dev/null) > 0 )); then
         success=1
         break
       else
@@ -432,8 +435,7 @@ function unmount_and_export_fs {
   echo "===========exporting zfs pools============="
   set +e
   while (( zpools_exported == 99 )) && (( SECONDS++ <= 60 )); do    
-    zpool export -a 2> /dev/null
-    if [[ $? == 0 ]]; then
+    if zpool export -a 2> /dev/null; then
       zpools_exported=1
       echo "all zfs pools were succesfully exported"
       break;
@@ -492,27 +494,14 @@ done
 
 echo "======= installing zfs on rescue system =========="
   echo "zfs-dkms zfs-dkms/note-incompatible-licenses note true" | debconf-set-selections
-  if [[ $v_zfs_experimental == "1" ]]; then
-    apt install --yes man wget curl software-properties-common nano htop gnupg
-    wget -O - https://terem42.github.io/zfs-debian/apt_pub.gpg | apt-key add -
-    add-apt-repository 'deb https://terem42.github.io/zfs-debian/public zfs-debian-experimental main'
-    apt update
-    apt install --yes libelf-dev
-    apt install -t zfs-debian-experimental --yes zfs-dkms zfsutils-linux
-  else
-    cd "$(mktemp -d)"
-    wget "$(curl -Ls https://api.github.com/repos/openzfs/zfs/releases/latest| grep "browser_download_url.*tar.gz"|grep -E "tar.gz\"$"| cut -d '"' -f 4)"
-    apt update
-    apt install libssl-dev uuid-dev zlib1g-dev libblkid-dev -y
-    tar xfv zfs*.tar.gz
-    rm *.tar.gz
-    cd zfs*
-    ./configure
-    make -j "$(nproc)"
-    make install
-    ldconfig
-    modprobe zfs
-  fi
+  apt-get install --yes software-properties-common
+  apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 8CF63AD3F06FC659
+  add-apt-repository 'deb http://ppa.launchpad.net/jonathonf/zfs/ubuntu focal main'
+  apt update
+  apt install --yes zfs-dkms zfsutils-linux
+  add-apt-repository -r 'deb http://ppa.launchpad.net/jonathonf/zfs/ubuntu focal main'
+  apt update
+  find /usr/local/sbin/ -type l -exec rm {} +
   zfs --version
 
 echo "======= partitioning the disk =========="
@@ -553,13 +542,17 @@ echo "======= create zfs pools and datasets =========="
     pools_mirror_option=
   fi
 
+# shellcheck disable=SC2086
 zpool create \
   $v_bpool_tweaks -O canmount=off -O devices=off \
+  -o cachefile=/etc/zfs/zpool.cache \
   -O mountpoint=/boot -R $c_zfs_mount_dir -f \
   $v_bpool_name $pools_mirror_option "${bpool_disks_partitions[@]}"
 
+# shellcheck disable=SC2086
 echo -n "$v_passphrase" | zpool create \
   $v_rpool_tweaks \
+  -o cachefile=/etc/zfs/zpool.cache \
   "${encryption_options[@]}" \
   -O mountpoint=/ -R $c_zfs_mount_dir -f \
   $v_rpool_name $pools_mirror_option "${rpool_disks_partitions[@]}"
@@ -741,25 +734,9 @@ chroot_execute "dpkg-reconfigure openssh-server -f noninteractive"
 echo "======= set root password =========="
 chroot_execute "echo root:$(printf "%q" "$v_root_password") | chpasswd"
 
-echo "======= setting up zfs services =========="
-chroot_execute "cat > /etc/systemd/system/zfs-import-bpool.service <<UNIT
-[Unit]
-DefaultDependencies=no
-Before=zfs-import-scan.service
-Before=zfs-import-cache.service
+echo "======= setting up zfs cache =========="
 
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStartPre=/bin/sh -c '[ -f /etc/zfs/zpool.cache ] && mv /etc/zfs/zpool.cache /etc/zfs/preboot_zpool.cache || true'
-ExecStart=/sbin/zpool import -N -o cachefile=none -d /dev/disk/by-id $v_bpool_name
-ExecStartPost=/bin/sh -c '[ -f /etc/zfs/preboot_zpool.cache ] && mv /etc/zfs/preboot_zpool.cache /etc/zfs/zpool.cache || true'
-
-[Install]
-WantedBy=zfs-import.target
-UNIT"
-
-chroot_execute "systemctl enable zfs-import-bpool.service"
+cp /etc/zfs/zpool.cache /mnt/etc/zfs/zpool.cache
 
 echo "========setting up zfs module parameters========"
 chroot_execute "echo options zfs zfs_arc_max=$((v_zfs_arc_max_mb * 1024 * 1024)) >> /etc/modprobe.d/zfs.conf"
@@ -857,7 +834,7 @@ fi
 
 echo "======= setting mountpoints =========="
 chroot_execute "zfs set mountpoint=legacy $v_bpool_name/BOOT/debian"
-chroot_execute "echo $v_bpool_name/BOOT/debian /boot zfs nodev,relatime,x-systemd.requires=zfs-import-bpool.service 0 0 > /etc/fstab"
+chroot_execute "echo $v_bpool_name/BOOT/debian /boot zfs nodev,relatime,x-systemd.requires=zfs-mount.service,x-systemd.device-timeout=10 0 0 > /etc/fstab"
 
 chroot_execute "zfs set mountpoint=legacy $v_rpool_name/var/log"
 chroot_execute "echo $v_rpool_name/var/log /var/log zfs nodev,relatime 0 0 >> /etc/fstab"
@@ -869,7 +846,10 @@ chroot_execute "zfs set mountpoint=legacy $v_rpool_name/tmp"
 chroot_execute "echo $v_rpool_name/tmp /tmp zfs nodev,relatime 0 0 >> /etc/fstab"
 
 echo "========= add swap, if defined"
-[[ $v_swap_size -gt 0 ]] && chroot_execute "echo /dev/zvol/$v_rpool_name/swap none swap discard 0 0 >> /etc/fstab" || true
+if [[ $v_swap_size -gt 0 ]]; then
+  chroot_execute "echo /dev/zvol/$v_rpool_name/swap none swap discard 0 0 >> /etc/fstab"
+fi
+
 chroot_execute "echo RESUME=none > /etc/initramfs-tools/conf.d/resume"
 
 echo "======= unmounting filesystems and zfs pools =========="

hetzner-ubuntu18-zfs-setup.sh

@@ -40,7 +40,7 @@ c_deb_security_repo=http://mirror.hetzner.de/ubuntu/security
 
 c_default_zfs_arc_max_mb=250
 c_default_bpool_tweaks="-o ashift=12 -O compression=lz4"
-c_default_rpool_tweaks="-o ashift=12 -O acltype=posixacl -O compression=lz4 -O dnodesize=auto -O relatime=on -O xattr=sa -O normalization=formD"
+c_default_rpool_tweaks="-o ashift=12 -O acltype=posixacl -O compression=zstd-9 -O dnodesize=auto -O relatime=on -O xattr=sa -O normalization=formD"
 c_default_hostname=terem
 c_zfs_mount_dir=/mnt
 c_log_dir=$(dirname "$(mktemp)")/zfs-hetzner-vm
@@ -62,7 +62,9 @@ function print_step_info_header {
 ###############################################################################
 # ${FUNCNAME[1]}"
 
-  [[ "${1:-}" != "" ]] && echo -n " $1" || true
+  if [[ "${1:-}" != "" ]]; then
+    echo -n " $1" 
+  fi
 
   echo "
 ###############################################################################
@@ -106,7 +108,7 @@ This script will prepare the ZFS pools, then install and configure minimal Ubunt
 The script with minimal changes may be used on any other hosting provider  supporting KVM virtualization and offering Debian-based rescue system.
 In order to stop the procedure, hit Esc twice during dialogs (excluding yes/no ones), or Ctrl+C while any operation is running.
 '
-  dialog --ascii-lines --msgbox "$dialog_message" 30 100
+  dialog --msgbox "$dialog_message" 30 100
 }
 
 function store_os_distro_information {
@@ -175,7 +177,7 @@ LOG
 
 If you think this is a bug, please open an issue on https://github.com/terem42/zfs-hetzner-vm/issues, and attach the file `'"$c_disks_log"'`.
 '
-    dialog --ascii-lines --msgbox "$dialog_message" 30 100
+    dialog --msgbox "$dialog_message" 30 100
 
     exit 1
   fi
@@ -204,7 +206,7 @@ function select_disks {
 
 Devices with mounted partitions, cdroms, and removable devices are not displayed!
 "
-    mapfile -t v_selected_disks < <(dialog --ascii-lines --separate-output --checklist "$dialog_message" 30 100 $((${#menu_entries_option[@]} / 3)) "${menu_entries_option[@]}" 3>&1 1>&2 2>&3)
+    mapfile -t v_selected_disks < <(dialog --separate-output --checklist "$dialog_message" 30 100 $((${#menu_entries_option[@]} / 3)) "${menu_entries_option[@]}" 3>&1 1>&2 2>&3)
 
     if [[ ${#v_selected_disks[@]} -gt 0 ]]; then
       break
@@ -221,7 +223,7 @@ function ask_swap_size {
   local swap_size_invalid_message=
 
   while [[ ! $v_swap_size =~ ^[0-9]+$ ]]; do
-    v_swap_size=$(dialog --ascii-lines --inputbox "${swap_size_invalid_message}Enter the swap size in GiB (0 for no swap):" 30 100 2 3>&1 1>&2 2>&3)
+    v_swap_size=$(dialog --inputbox "${swap_size_invalid_message}Enter the swap size in GiB (0 for no swap):" 30 100 2 3>&1 1>&2 2>&3)
 
     swap_size_invalid_message="Invalid swap size! "
   done
@@ -236,7 +238,7 @@ function ask_free_tail_space {
   local tail_space_invalid_message=
 
   while [[ ! $v_free_tail_space =~ ^[0-9]+$ ]]; do
-    v_free_tail_space=$(dialog --ascii-lines --inputbox "${tail_space_invalid_message}Enter the space to leave at the end of each disk (0 for none):" 30 100 0 3>&1 1>&2 2>&3)
+    v_free_tail_space=$(dialog --inputbox "${tail_space_invalid_message}Enter the space to leave at the end of each disk (0 for none):" 30 100 0 3>&1 1>&2 2>&3)
 
     tail_space_invalid_message="Invalid size! "
   done
@@ -251,7 +253,7 @@ function ask_zfs_arc_max_size {
   local zfs_arc_max_invalid_message=
 
   while [[ ! $v_zfs_arc_max_mb =~ ^[0-9]+$ ]]; do
-    v_zfs_arc_max_mb=$(dialog --ascii-lines --inputbox "${zfs_arc_max_invalid_message}Enter ZFS ARC cache max size in Mb (minimum 64Mb, enter 0 for ZFS default value, the default will take up to 50% of memory):" 30 100 "$c_default_zfs_arc_max_mb" 3>&1 1>&2 2>&3)
+    v_zfs_arc_max_mb=$(dialog --inputbox "${zfs_arc_max_invalid_message}Enter ZFS ARC cache max size in Mb (minimum 64Mb, enter 0 for ZFS default value, the default will take up to 50% of memory):" 30 100 "$c_default_zfs_arc_max_mb" 3>&1 1>&2 2>&3)
 
     zfs_arc_max_invalid_message="Invalid size! "
   done
@@ -267,14 +269,14 @@ function ask_pool_names {
   local bpool_name_invalid_message=
 
   while [[ ! $v_bpool_name =~ ^[a-z][a-zA-Z_:.-]+$ ]]; do
-    v_bpool_name=$(dialog --ascii-lines --inputbox "${bpool_name_invalid_message}Insert the name for the boot pool" 30 100 bpool 3>&1 1>&2 2>&3)
+    v_bpool_name=$(dialog --inputbox "${bpool_name_invalid_message}Insert the name for the boot pool" 30 100 bpool 3>&1 1>&2 2>&3)
 
     bpool_name_invalid_message="Invalid pool name! "
   done
   local rpool_name_invalid_message=
 
   while [[ ! $v_rpool_name =~ ^[a-z][a-zA-Z_:.-]+$ ]]; do
-    v_rpool_name=$(dialog --ascii-lines --inputbox "${rpool_name_invalid_message}Insert the name for the root pool" 30 100 rpool 3>&1 1>&2 2>&3)
+    v_rpool_name=$(dialog --inputbox "${rpool_name_invalid_message}Insert the name for the root pool" 30 100 rpool 3>&1 1>&2 2>&3)
 
     rpool_name_invalid_message="Invalid pool name! "
   done
@@ -286,8 +288,8 @@ function ask_pool_tweaks {
   # shellcheck disable=SC2119
   print_step_info_header
 
-  v_bpool_tweaks=$(dialog --ascii-lines --inputbox "Insert the tweaks for the boot pool" 30 100 -- "$c_default_bpool_tweaks" 3>&1 1>&2 2>&3)
-  v_rpool_tweaks=$(dialog --ascii-lines --inputbox "Insert the tweaks for the root pool" 30 100 -- "$c_default_rpool_tweaks" 3>&1 1>&2 2>&3)
+  v_bpool_tweaks=$(dialog --inputbox "Insert the tweaks for the boot pool" 30 100 -- "$c_default_bpool_tweaks" 3>&1 1>&2 2>&3)
+  v_rpool_tweaks=$(dialog --inputbox "Insert the tweaks for the root pool" 30 100 -- "$c_default_rpool_tweaks" 3>&1 1>&2 2>&3)
 
   print_variables v_bpool_tweaks v_rpool_tweaks
 }
@@ -302,8 +304,8 @@ function ask_root_password {
   local password_repeat=-
 
   while [[ "$v_root_password" != "$password_repeat" || "$v_root_password" == "" ]]; do
-    v_root_password=$(dialog --ascii-lines --passwordbox "${password_invalid_message}Please enter the root account password (can't be empty):" 30 100 3>&1 1>&2 2>&3)
-    password_repeat=$(dialog --ascii-lines --passwordbox "Please repeat the password:" 30 100 3>&1 1>&2 2>&3)
+    v_root_password=$(dialog --passwordbox "${password_invalid_message}Please enter the root account password (can't be empty):" 30 100 3>&1 1>&2 2>&3)
+    password_repeat=$(dialog --passwordbox "Please repeat the password:" 30 100 3>&1 1>&2 2>&3)
 
     password_invalid_message="Passphrase empty, or not matching! "
   done
@@ -313,7 +315,7 @@ function ask_root_password {
 function ask_encryption {
   print_step_info_header
 
-  if dialog --ascii-lines --yesno 'Do you want to encrypt the root pool?' 30 100; then
+  if dialog --defaultno --yesno 'Do you want to encrypt the root pool?' 30 100; then
     v_encrypt_rpool=1
   fi
   set +x
@@ -321,8 +323,8 @@ function ask_encryption {
     local passphrase_invalid_message=
     local passphrase_repeat=-
     while [[ "$v_passphrase" != "$passphrase_repeat" || ${#v_passphrase} -lt 8 ]]; do
-      v_passphrase=$(dialog --ascii-lines --passwordbox "${passphrase_invalid_message}Please enter the passphrase for the root pool (8 chars min.):" 30 100 3>&1 1>&2 2>&3)
-      passphrase_repeat=$(dialog --ascii-lines --passwordbox "Please repeat the passphrase:" 30 100 3>&1 1>&2 2>&3)
+      v_passphrase=$(dialog --passwordbox "${passphrase_invalid_message}Please enter the passphrase for the root pool (8 chars min.):" 30 100 3>&1 1>&2 2>&3)
+      passphrase_repeat=$(dialog --passwordbox "Please repeat the passphrase:" 30 100 3>&1 1>&2 2>&3)
 
       passphrase_invalid_message="Passphrase too short, or not matching! "
     done
@@ -333,7 +335,7 @@ function ask_encryption {
 function ask_zfs_experimental {
   print_step_info_header
 
-  if dialog --ascii-lines --yesno 'Do you want to use experimental zfs module build?' 30 100; then
+  if dialog --defaultno --yesno 'Do you want to use experimental zfs module build?' 30 100; then
     v_zfs_experimental=1
   fi
 }
@@ -345,7 +347,7 @@ function ask_hostname {
   local hostname_invalid_message=
 
   while [[ ! $v_hostname =~ ^[a-z][a-zA-Z_:.-]+$ ]]; do
-    v_hostname=$(dialog --ascii-lines --inputbox "${hostname_invalid_message}Set the host name" 30 100 "$c_default_hostname" 3>&1 1>&2 2>&3)
+    v_hostname=$(dialog --inputbox "${hostname_invalid_message}Set the host name" 30 100 "$c_default_hostname" 3>&1 1>&2 2>&3)
 
     hostname_invalid_message="Invalid host name! "
   done
@@ -399,8 +401,8 @@ function unmount_and_export_fs {
   echo "===========exporting zfs pools============="
   set +e
   while (( zpools_exported == 99 )) && (( SECONDS++ <= 60 )); do
-    zpool export -a 2> /dev/null
-    if [[ $? == 0 ]]; then
+    
+    if zpool export -a 2> /dev/null; then
       zpools_exported=1
       echo "all zfs pools were succesfully exported"
       break;
@@ -459,10 +461,14 @@ done
 
 echo "======= installing zfs on rescue system =========="
   echo "zfs-dkms zfs-dkms/note-incompatible-licenses note true" | debconf-set-selections
-
+  apt-get install --yes software-properties-common
+  apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 8CF63AD3F06FC659
+  add-apt-repository 'deb http://ppa.launchpad.net/jonathonf/zfs/ubuntu focal main'
   apt update
-  apt install --yes -t buster-backports libelf-dev zfs-dkms
-  modprobe zfs
+  apt install --yes zfs-dkms zfsutils-linux
+  add-apt-repository -r 'deb http://ppa.launchpad.net/jonathonf/zfs/ubuntu focal main'
+  apt update
+  find /usr/local/sbin/ -type l -exec rm {} +
   zfs --version
 
 echo "======= partitioning the disk =========="
@@ -474,7 +480,7 @@ echo "======= partitioning the disk =========="
   fi
 
   for selected_disk in "${v_selected_disks[@]}"; do
-    wipefs --all "$selected_disk"
+    wipefs --all --force "$selected_disk"
     sgdisk -a1 -n1:24K:+1000K            -t1:EF02 "$selected_disk"
     sgdisk -n2:0:+512M                   -t2:BF01 "$selected_disk" # Boot pool
     sgdisk -n3:0:"$tail_space_parameter" -t3:BF01 "$selected_disk" # Root pool
@@ -503,13 +509,17 @@ echo "======= create zfs pools and datasets =========="
     pools_mirror_option=
   fi
 
+# shellcheck disable=SC2086
 zpool create \
   $v_bpool_tweaks -O canmount=off -O devices=off \
+  -o cachefile=/etc/zfs/zpool.cache \
   -O mountpoint=/boot -R $c_zfs_mount_dir -f \
   $v_bpool_name $pools_mirror_option "${bpool_disks_partitions[@]}"
 
+# shellcheck disable=SC2086
 echo -n "$v_passphrase" | zpool create \
   $v_rpool_tweaks \
+  -o cachefile=/etc/zfs/zpool.cache \
   "${encryption_options[@]}" \
   -O mountpoint=/ -R $c_zfs_mount_dir -f \
   $v_rpool_name $pools_mirror_option "${rpool_disks_partitions[@]}"
@@ -675,26 +685,23 @@ if [[ $v_kernel_variant == "-virtual" ]]; then
   chroot_execute "DEBIAN_FRONTEND=noninteractive apt install --yes linux-image-extra-virtual-hwe-18.04"
 fi
 
-
 echo "======= installing aux packages =========="
 chroot_execute "apt install --yes man wget curl software-properties-common nano htop gnupg"
 chroot_execute "systemctl disable thermald"
 
 echo "======= installing zfs packages =========="
+chroot_execute 'echo "zfs-dkms zfs-dkms/note-incompatible-licenses note true" | debconf-set-selections'
+
 if [[ $v_zfs_experimental == "1" ]]; then
   chroot_execute "wget -O - https://terem42.github.io/zfs-debian/apt_pub.gpg | apt-key add -"
   chroot_execute "add-apt-repository 'deb https://terem42.github.io/zfs-debian/public zfs-debian-experimental main'"
   chroot_execute "apt update"
-else
-  chroot_execute "add-apt-repository --yes ppa:jonathonf/zfs"
-fi
-chroot_execute 'echo "zfs-dkms zfs-dkms/note-incompatible-licenses note true" | debconf-set-selections'
-
-if [[ $v_zfs_experimental == "1" ]]; then
   chroot_execute "apt install -t zfs-debian-experimental --yes zfs-initramfs zfs-dkms zfsutils-linux"
 else
+  chroot_execute "add-apt-repository --yes ppa:jonathonf/zfs"
   chroot_execute "apt install --yes zfs-initramfs zfs-dkms zfsutils-linux"
 fi
+
 echo "======= installing OpenSSH and network tooling =========="
 chroot_execute "apt install --yes openssh-server net-tools"
 
@@ -709,25 +716,8 @@ chroot_execute "dpkg-reconfigure openssh-server -f noninteractive"
 echo "======= set root password =========="
 chroot_execute "echo root:$(printf "%q" "$v_root_password") | chpasswd"
 
-echo "======= setting up zfs services =========="
-chroot_execute "cat > /etc/systemd/system/zfs-import-bpool.service <<UNIT
-[Unit]
-DefaultDependencies=no
-Before=zfs-import-scan.service
-Before=zfs-import-cache.service
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStartPre=/bin/sh -c '[ -f /etc/zfs/zpool.cache ] && mv /etc/zfs/zpool.cache /etc/zfs/preboot_zpool.cache || true'
-ExecStart=/sbin/zpool import -N -o cachefile=none $v_bpool_name
-ExecStartPost=/bin/sh -c '[ -f /etc/zfs/preboot_zpool.cache ] && mv /etc/zfs/preboot_zpool.cache /etc/zfs/zpool.cache || true'
-
-[Install]
-WantedBy=zfs-import.target
-UNIT"
-
-chroot_execute "systemctl enable zfs-import-bpool.service"
+echo "======= setting up zfs cache =========="
+cp /etc/zfs/zpool.cache /mnt/etc/zfs/zpool.cache
 
 echo "========setting up zfs module parameters========"
 chroot_execute "echo options zfs zfs_arc_max=$((v_zfs_arc_max_mb * 1024 * 1024)) >> /etc/modprobe.d/zfs.conf"
@@ -832,7 +822,7 @@ chroot_execute "zfs set canmount=noauto rpool"
 
 echo "======= setting mountpoints =========="
 chroot_execute "zfs set mountpoint=legacy $v_bpool_name/BOOT/ubuntu"
-chroot_execute "echo $v_bpool_name/BOOT/ubuntu /boot zfs nodev,relatime,x-systemd.requires=zfs-import-bpool.service 0 0 > /etc/fstab"
+chroot_execute "echo $v_bpool_name/BOOT/ubuntu /boot zfs nodev,relatime,x-systemd.requires=zfs-mount.service,x-systemd.device-timeout=10 0 0 > /etc/fstab"
 
 chroot_execute "zfs set mountpoint=legacy $v_rpool_name/var/log"
 chroot_execute "echo $v_rpool_name/var/log /var/log zfs nodev,relatime 0 0 >> /etc/fstab"
@@ -844,7 +834,10 @@ chroot_execute "zfs set mountpoint=legacy $v_rpool_name/tmp"
 chroot_execute "echo $v_rpool_name/tmp /tmp zfs nodev,relatime 0 0 >> /etc/fstab"
 
 echo "========= add swap, if defined"
-[[ $v_swap_size -gt 0 ]] && chroot_execute "echo /dev/zvol/$v_rpool_name/swap none swap discard 0 0 >> /etc/fstab" || true
+if [[ $v_swap_size -gt 0 ]]; then
+  chroot_execute "echo /dev/zvol/$v_rpool_name/swap none swap discard 0 0 >> /etc/fstab"
+fi
+
 chroot_execute "echo RESUME=none > /etc/initramfs-tools/conf.d/resume"
 
 echo "======= unmounting filesystems and zfs pools =========="

hetzner-ubuntu20-zfs-setup.sh

@@ -40,7 +40,7 @@ c_deb_security_repo=http://mirror.hetzner.de/ubuntu/security
 
 c_default_zfs_arc_max_mb=250
 c_default_bpool_tweaks="-o ashift=12 -O compression=lz4"
-c_default_rpool_tweaks="-o ashift=12 -O acltype=posixacl -O compression=lz4 -O dnodesize=auto -O relatime=on -O xattr=sa -O normalization=formD"
+c_default_rpool_tweaks="-o ashift=12 -O acltype=posixacl -O compression=zstd-9 -O dnodesize=auto -O relatime=on -O xattr=sa -O normalization=formD"
 c_default_hostname=terem
 c_zfs_mount_dir=/mnt
 c_log_dir=$(dirname "$(mktemp)")/zfs-hetzner-vm
@@ -62,7 +62,9 @@ function print_step_info_header {
 ###############################################################################
 # ${FUNCNAME[1]}"
 
-  [[ "${1:-}" != "" ]] && echo -n " $1" || true
+  if [[ "${1:-}" != "" ]]; then
+    echo -n " $1" 
+  fi
 
   echo "
 ###############################################################################
@@ -313,7 +315,7 @@ function ask_root_password {
 function ask_encryption {
   print_step_info_header
 
-  if dialog --yesno 'Do you want to encrypt the root pool?' 30 100; then
+  if dialog --defaultno --yesno 'Do you want to encrypt the root pool?' 30 100; then
     v_encrypt_rpool=1
   fi
   set +x
@@ -333,7 +335,7 @@ function ask_encryption {
 function ask_zfs_experimental {
   print_step_info_header
 
-  if dialog --yesno 'Do you want to use experimental zfs module build?' 30 100; then
+  if dialog --defaultno --yesno 'Do you want to use experimental zfs module build?' 30 100; then
     v_zfs_experimental=1
   fi
 }
@@ -399,8 +401,8 @@ function unmount_and_export_fs {
   echo "===========exporting zfs pools============="
   set +e
   while (( zpools_exported == 99 )) && (( SECONDS++ <= 60 )); do
-    zpool export -a 2> /dev/null
-    if [[ $? == 0 ]]; then
+    
+    if zpool export -a 2> /dev/null; then
       zpools_exported=1
       echo "all zfs pools were succesfully exported"
       break;
@@ -459,20 +461,14 @@ done
 
 echo "======= installing zfs on rescue system =========="
   echo "zfs-dkms zfs-dkms/note-incompatible-licenses note true" | debconf-set-selections
-
-  cd "$(mktemp -d)"
-  wget "$(curl -Ls https://api.github.com/repos/openzfs/zfs/releases/latest| grep "browser_download_url.*tar.gz"|grep -E "tar.gz\"$"| cut -d '"' -f 4)"
+  apt-get install --yes software-properties-common
+  apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 8CF63AD3F06FC659
+  add-apt-repository 'deb http://ppa.launchpad.net/jonathonf/zfs/ubuntu focal main'
   apt update
-  apt install libssl-dev uuid-dev zlib1g-dev libblkid-dev -y
-  tar xfv zfs*.tar.gz
-  rm *.tar.gz
-  cd zfs*
-  ./configure
-  make -j "$(nproc)"
-  make install
-  ldconfig
-  modprobe zfs
-
+  apt install --yes zfs-dkms zfsutils-linux
+  add-apt-repository -r 'deb http://ppa.launchpad.net/jonathonf/zfs/ubuntu focal main'
+  apt update
+  find /usr/local/sbin/ -type l -exec rm {} +
   zfs --version
 
 echo "======= partitioning the disk =========="
@@ -513,13 +509,17 @@ echo "======= create zfs pools and datasets =========="
     pools_mirror_option=
   fi
 
+# shellcheck disable=SC2086
 zpool create \
   $v_bpool_tweaks -O canmount=off -O devices=off \
+  -o cachefile=/etc/zfs/zpool.cache \
   -O mountpoint=/boot -R $c_zfs_mount_dir -f \
   $v_bpool_name $pools_mirror_option "${bpool_disks_partitions[@]}"
 
+# shellcheck disable=SC2086
 echo -n "$v_passphrase" | zpool create \
   $v_rpool_tweaks \
+  -o cachefile=/etc/zfs/zpool.cache \
   "${encryption_options[@]}" \
   -O mountpoint=/ -R $c_zfs_mount_dir -f \
   $v_rpool_name $pools_mirror_option "${rpool_disks_partitions[@]}"
@@ -691,25 +691,18 @@ chroot_execute "apt install --yes man-db wget curl software-properties-common na
 chroot_execute "systemctl disable thermald"
 
 echo "======= installing zfs packages =========="
+chroot_execute 'echo "zfs-dkms zfs-dkms/note-incompatible-licenses note true" | debconf-set-selections'
+
 if [[ $v_zfs_experimental == "1" ]]; then
   chroot_execute "wget -O - https://terem42.github.io/zfs-debian/apt_pub.gpg | apt-key add -"
   chroot_execute "add-apt-repository 'deb https://terem42.github.io/zfs-debian/public zfs-debian-experimental main'"
   chroot_execute "apt update"
-else
-  echo "======= installing OpenZFS 2.0 stable package from Debian 10 backports zfs packages =========="
-  chroot_execute "apt-key adv --recv-key --keyserver keyserver.ubuntu.com 648ACFD622F3D138"
-  chroot_execute "sudo apt-key adv --recv-key --keyserver keyserver.ubuntu.com 0E98404D386FA1D9"
-  chroot_execute "add-apt-repository 'deb http://deb.debian.org/debian buster-backports main contrib non-free'"
-  chroot_execute "apt install -t buster-backports --yes zfs-dkms zfsutils-linux zfs-initramfs"
-  chroot_execute "add-apt-repository -r 'deb http://deb.debian.org/debian buster-backports main contrib non-free'"
-fi
-chroot_execute 'echo "zfs-dkms zfs-dkms/note-incompatible-licenses note true" | debconf-set-selections'
-
-if [[ $v_zfs_experimental == "1" ]]; then
   chroot_execute "apt install -t zfs-debian-experimental --yes zfs-initramfs zfs-dkms zfsutils-linux"
 else
+  chroot_execute "add-apt-repository --yes ppa:jonathonf/zfs"
   chroot_execute "apt install --yes zfs-initramfs zfs-dkms zfsutils-linux"
 fi
+
 echo "======= installing OpenSSH and network tooling =========="
 chroot_execute "apt install --yes openssh-server net-tools"
 
@@ -724,25 +717,8 @@ chroot_execute "dpkg-reconfigure openssh-server -f noninteractive"
 echo "======= set root password =========="
 chroot_execute "echo root:$(printf "%q" "$v_root_password") | chpasswd"
 
-echo "======= setting up zfs services =========="
-chroot_execute "cat > /etc/systemd/system/zfs-import-bpool.service <<UNIT
-[Unit]
-DefaultDependencies=no
-Before=zfs-import-scan.service
-Before=zfs-import-cache.service
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStartPre=/bin/sh -c '[ -f /etc/zfs/zpool.cache ] && mv /etc/zfs/zpool.cache /etc/zfs/preboot_zpool.cache || true'
-ExecStart=/sbin/zpool import -N -o cachefile=none $v_bpool_name
-ExecStartPost=/bin/sh -c '[ -f /etc/zfs/preboot_zpool.cache ] && mv /etc/zfs/preboot_zpool.cache /etc/zfs/zpool.cache || true'
-
-[Install]
-WantedBy=zfs-import.target
-UNIT"
-
-chroot_execute "systemctl enable zfs-import-bpool.service"
+echo "======= setting up zfs cache =========="
+cp /etc/zfs/zpool.cache /mnt/etc/zfs/zpool.cache
 
 echo "========setting up zfs module parameters========"
 chroot_execute "echo options zfs zfs_arc_max=$((v_zfs_arc_max_mb * 1024 * 1024)) >> /etc/modprobe.d/zfs.conf"
@@ -847,7 +823,7 @@ chroot_execute "zfs set canmount=noauto rpool"
 
 echo "======= setting mountpoints =========="
 chroot_execute "zfs set mountpoint=legacy $v_bpool_name/BOOT/ubuntu"
-chroot_execute "echo $v_bpool_name/BOOT/ubuntu /boot zfs nodev,relatime,x-systemd.requires=zfs-import-bpool.service 0 0 > /etc/fstab"
+chroot_execute "echo $v_bpool_name/BOOT/ubuntu /boot zfs nodev,relatime,x-systemd.requires=zfs-mount.service,x-systemd.device-timeout=10 0 0 > /etc/fstab"
 
 chroot_execute "zfs set mountpoint=legacy $v_rpool_name/var/log"
 chroot_execute "echo $v_rpool_name/var/log /var/log zfs nodev,relatime 0 0 >> /etc/fstab"
@@ -859,7 +835,10 @@ chroot_execute "zfs set mountpoint=legacy $v_rpool_name/tmp"
 chroot_execute "echo $v_rpool_name/tmp /tmp zfs nodev,relatime 0 0 >> /etc/fstab"
 
 echo "========= add swap, if defined"
-[[ $v_swap_size -gt 0 ]] && chroot_execute "echo /dev/zvol/$v_rpool_name/swap none swap discard 0 0 >> /etc/fstab" || true
+if [[ $v_swap_size -gt 0 ]]; then
+  chroot_execute "echo /dev/zvol/$v_rpool_name/swap none swap discard 0 0 >> /etc/fstab"
+fi
+
 chroot_execute "echo RESUME=none > /etc/initramfs-tools/conf.d/resume"
 
 echo "======= unmounting filesystems and zfs pools =========="