Merge branch 'master' into zfs-linux-0.8.4

4 files changed, 40 insertions, 8 deletions

diff --git a/README.txt b/README.txt
index 20bd2bb..80cd120 100644
--- a/README.txt
+++ b/README.txt
@@ -5,8 +5,8 @@
 # a Debian ZFS Live ISO or USB image.
 #
 # ZFS on Linux https://zfsonlinux.org/
-# Using branch 0.8.4
-# Applied patch as commited to <https://jausoft.com/cgit/openzfs/zfs.git/log/?h=zfs-0.8.4-release>
+# Using branch 0.8.5
+# Applied patch as commited to <https://jausoft.com/cgit/openzfs/zfs.git/log/?h=zfs-0.8.5>
 #
 # Derived from: https://github.com/zfsonlinux/zfs/wiki/Debian-Buster-Root-on-ZFS
 #               https://github.com/zfsonlinux/zfs/wiki/Debian-Stretch-Root-on-ZFS
@@ -14,10 +14,13 @@
 # Binary debian packages within 
 # - zfs-linux-0.8.4-1-debian10-amd64
 # - zfs-linux-0.8.4-1-debian11-amd64
+# - zfs-linux-0.8.4-11-debian11-amd64
 #
 # have been produced using the contained zfs-linux-0.8.4-1-source.tar.gz
-# on debian11-amd64 and debian10-amd64, which use git sources from
+# or zfs-linux-0.8.4-11-source.tar.gz
+# on debian10-amd64 and debian11-amd64, which use git sources from
 # - https://jausoft.com/cgit/openzfs/zfs.git/log/?h=zfs-0.8.4-release
+# - https://jausoft.com/cgit/openzfs/zfs.git/log/?h=zfs-0.8.5
 # 
 # Assuming this packages is contained in its folder 'debian-zfs-live',
 # all scripts should be executed from within the 'debian-zfs-live/scripts' folder.
@@ -35,7 +38,7 @@
 # <settings00.sh start> (see detailed comments in file)
 #
 STRAPROOT=/data/debian11/debootstrap
-ZFSDEBDIR=`readlink -f ../zfs-linux-0.8.4-1-debian11-amd64`
+ZFSDEBDIR=`readlink -f ../zfs-linux-0.8.4-11-debian11-amd64`
 
 STRAPBALL_PLAIN=`readlink -f ../debian11-zfs-debootstrap.tar`
 STRAPBALL=`readlink -f ../debian11-zfs-debootstrap.tar.xz`
@@ -43,7 +46,7 @@ STRAPBALL=`readlink -f ../debian11-zfs-debootstrap.tar.xz`
 MYHOSTNAME="debian-zfs"
 MYUSERNAME="test01"
 
-KVERSION="5.7.0-1-amd64"
+KVERSION="5.8.0-2-amd64"
 LIVEROOT=/data/debian11/live_boot
 LIVECHROOT=$LIVEROOT/chroot
 
diff --git a/scripts/debootstrap02.sh b/scripts/debootstrap02.sh
index 2adf2ec..5539d31 100644
--- a/scripts/debootstrap02.sh
+++ b/scripts/debootstrap02.sh
@@ -56,7 +56,7 @@ apt-get install --yes \
 
 # Replace Debian ZFS packages and replace with vanilla latest release
 . ./zfs-bullseye-remove.sh
-. ./zfs-0.8.4-1-install-debian11.sh
+. ./zfs-0.8.4-11-install-debian11.sh
 cat apt-preferences.d-local-pin-init >> /etc/apt/preferences.d/local-pin-init
 apt-get update
 apt-get clean
diff --git a/scripts/settings00.sh b/scripts/settings00.sh
index b0c5159..707aec5 100644
--- a/scripts/settings00.sh
+++ b/scripts/settings00.sh
@@ -4,7 +4,7 @@
 # For Debian debootstrap tar ball
 #
 STRAPROOT=/data/debian11/debootstrap
-ZFSDEBDIR=`readlink -f ../zfs-linux-0.8.4-1-debian11-amd64`
+ZFSDEBDIR=`readlink -f ../zfs-linux-0.8.4-11-debian11-amd64`
 
 #
 # For All
@@ -18,7 +18,7 @@ MYUSERNAME="test01"
 #
 # For Debian ZFS Live Installation
 #
-KVERSION="5.7.0-1-amd64"
+KVERSION="5.8.0-2-amd64"
 LIVEROOT=/data/debian11/live_boot
 LIVECHROOT=$LIVEROOT/chroot
 LIVEIMAGE_BASENAME=debian11-zfs-live-amd64.iso
diff --git a/scripts/zfs-0.8.4-11-install-debian11.sh b/scripts/zfs-0.8.4-11-install-debian11.sh
new file mode 100644
index 0000000..d48de3b
--- /dev/null
+++ b/scripts/zfs-0.8.4-11-install-debian11.sh
@@ -0,0 +1,29 @@
+#! /bin/sh
+
+ZFSDEBDIR=`readlink -f ../zfs-linux-0.8.4-11-debian11-amd64`
+
+#skipped:
+# libzfs2-devel_0.8.4-1_amd64.deb
+# python3-pyzfs_0.8.4-1_amd64.deb
+# zfs-dracut_0.8.4-1_amd64.deb
+# zfs-test_0.8.4-1_amd64.deb
+
+#apt-get install libnvpair1 libuutil1 libzpool2 libzfs2
+dpkg -i $ZFSDEBDIR/libuutil1_0.8.4-11_amd64.deb
+dpkg -i $ZFSDEBDIR/libnvpair1_0.8.4-11_amd64.deb
+dpkg -i $ZFSDEBDIR/libzpool2_0.8.4-11_amd64.deb
+dpkg -i $ZFSDEBDIR/libzfs2_0.8.4-11_amd64.deb
+#apt-get install zfs-dkms zfs zfs-initramfs
+dpkg -i $ZFSDEBDIR/zfs-dkms_0.8.4-11_amd64.deb
+dpkg -i $ZFSDEBDIR/zfs_0.8.4-11_amd64.deb
+dpkg -i $ZFSDEBDIR/zfs-initramfs_0.8.4-11_amd64.deb
+
+apt-mark manual zfs-initramfs zfs zfs-dkms libzfs2 libzpool2 libuutil1 libnvpair1 dkms
+
+# FIX /etc/default/zfs
+# ZFS_INITRD_ADDITIONAL_DATASETS="$POOL/users $POOL/users/root $POOL/backup $POOL/data $POOL/services $POOL/projects"
+# and run: update-initramfs -u -k all
+
+##apt-get install grub-common grub-pc grub-pc-bin grub2-common
+# systemctl enable zfs-import-cache.service zfs-mount.service zfs-zed.service zfs-import.target zfs-volumes.target zfs.target
+# systemctl start zfs-import-cache.service zfs-mount.service zfs-zed.service zfs-import.target zfs-volumes.target zfs.target