From 87e82b7336e31a1f3629d7cd9cda62aed5749270 Mon Sep 17 00:00:00 2001
From: terem42 <9478806+terem42@users.noreply.github.com>
Date: Wed, 4 Oct 2023 13:40:12 +0200
Subject: [PATCH] updated wih testing

---
 apt_from_deb_testing.sh       | 14 ++++++++++++++
 hetzner-debian12-zfs-setup.sh | 16 +++++++++++++---
 2 files changed, 27 insertions(+), 3 deletions(-)
 create mode 100644 apt_from_deb_testing.sh

diff --git a/apt_from_deb_testing.sh b/apt_from_deb_testing.sh
new file mode 100644
index 0000000..adffe0c
--- /dev/null
+++ b/apt_from_deb_testing.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+apt update
+apt install --yes dpkg-dev dkms linux-headers-generic linux-image-generic
+rm "$(which zfs)"
+export PATH=$PATH:/usr/sbin
+echo -e "deb http://deb.debian.org/debian/ testing main contrib non-free\ndeb http://deb.debian.org/debian/ testing main contrib non-free\n" >/etc/apt/sources.list.d/bookworm-testing.list
+echo -e "Package: src:zfs-linux\nPin: release n=testing\nPin-Priority: 990\n" > /etc/apt/preferences.d/90_zfs
+apt update
+apt install -t testing zfs-dkms zfsutils-linux
+rm /etc/apt/sources.list.d/bookworm-testing.list
+rm /etc/apt/preferences.d/90_zfs
+apt update
+
diff --git a/hetzner-debian12-zfs-setup.sh b/hetzner-debian12-zfs-setup.sh
index d0b0278..8b55f9e 100644
--- a/hetzner-debian12-zfs-setup.sh
+++ b/hetzner-debian12-zfs-setup.sh
@@ -497,9 +497,19 @@ 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
-  echo "y" | zfs
-  zfs --version
-
+#  echo "y" | zfs
+#  zfs --version
+  apt update
+  apt install --yes dpkg-dev dkms linux-headers-generic linux-image-generic
+  rm "$(which zfs)"
+  export PATH=$PATH:/usr/sbin
+  echo -e "deb http://deb.debian.org/debian/ testing main contrib non-free\ndeb http://deb.debian.org/debian/ testing main contrib non-free\n" >/etc/apt/sources.list.d/bookworm-testing.list
+  echo -e "Package: src:zfs-linux\nPin: release n=testing\nPin-Priority: 990\n" > /etc/apt/preferences.d/90_zfs
+  apt update
+  apt install -t testing zfs-dkms zfsutils-linux
+  rm /etc/apt/sources.list.d/bookworm-testing.list
+  rm /etc/apt/preferences.d/90_zfs
+  apt update
 echo "======= partitioning the disk =========="
 
   if [[ $v_free_tail_space -eq 0 ]]; then