From ae9ad231b5e48f6ea3bfd7f11027c89fc6726511 Mon Sep 17 00:00:00 2001
From: terem42 <9478806+terem42@users.noreply.github.com>
Date: Fri, 21 Apr 2023 12:18:42 +0200
Subject: [PATCH] updated scripts

---
 hetzner-debian10-zfs-setup.sh | 1 -
 hetzner-ubuntu18-zfs-setup.sh | 8 +-------
 hetzner-ubuntu20-zfs-setup.sh | 5 ++---
 3 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/hetzner-debian10-zfs-setup.sh b/hetzner-debian10-zfs-setup.sh
index d722525..1d81655 100644
--- a/hetzner-debian10-zfs-setup.sh
+++ b/hetzner-debian10-zfs-setup.sh
@@ -494,7 +494,6 @@ 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-get install --yes software-properties-common
   echo "y" | zfs
   zfs --version
 
diff --git a/hetzner-ubuntu18-zfs-setup.sh b/hetzner-ubuntu18-zfs-setup.sh
index 0651671..7fc38c7 100644
--- a/hetzner-ubuntu18-zfs-setup.sh
+++ b/hetzner-ubuntu18-zfs-setup.sh
@@ -462,13 +462,7 @@ 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 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 {} +
+  echo "y" | zfs
   zfs --version
 
 echo "======= partitioning the disk =========="
diff --git a/hetzner-ubuntu20-zfs-setup.sh b/hetzner-ubuntu20-zfs-setup.sh
index 10a1039..d739971 100644
--- a/hetzner-ubuntu20-zfs-setup.sh
+++ b/hetzner-ubuntu20-zfs-setup.sh
@@ -461,9 +461,8 @@ done
 
 echo "======= installing zfs on rescue system =========="
   echo "zfs-dkms zfs-dkms/note-incompatible-licenses note true" | debconf-set-selections
-  apt update
-  apt install -t bullseye-backports --yes zfs-dkms zfsutils-linux
-  find /usr/local/sbin/ -type l -exec rm {} +
+  apt-get install --yes software-properties-common
+  echo "y" | zfs
   zfs --version
 
 echo "======= partitioning the disk =========="