Bump to openzfs 2.2.6

12 files changed, 172 insertions, 189 deletions

diff --git a/.gitignore b/.gitignore
index d1d1e5d..51fe872 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /zfs-linux-*.tar
 /zfs/
 /git-push-public.sh
+/make-all.log
diff --git a/README.md b/README.md
index 65a5717..a75dc99 100644
--- a/README.md
+++ b/README.md
@@ -2,28 +2,43 @@
 
 [Original document location](https://jausoft.com/cgit/openzfs/openzfs_build_env.git/about/).
 
-Current environment covers [OpenZFS](https://openzfs.github.io/openzfs-docs/) 
-for GNU/Linux version [2.1.11](https://github.com/openzfs/zfs/releases/tag/zfs-2.1.11).
+Current environment covers [OpenZFS](https://openzfs.github.io/openzfs-docs/)
+for GNU/Linux version [2.2.6](https://github.com/openzfs/zfs/releases/tag/zfs-2.2.6).
+
+Also available are branches with [Debian build fixes](git://jausoft.com/srv/scm/openzfs/zfs.git).
 
 ## Debian Dependencies
 
-Install build dependencies, tested with Debian 11 and 12.
+Install build dependencies, tested with Debian 12
+following [OpenZFS's Building ZFS](https://openzfs.github.io/openzfs-docs/Developer%20Resources/Building%20ZFS.html).
 
 ```bash
-apt install build-essential autoconf automake libtool gawk alien fakeroot dkms libblkid-dev uuid-dev libudev-dev libssl-dev zlib1g-dev libaio-dev libattr1-dev libelf-dev linux-headers-generic python3 python3-dev python3-setuptools python3-cffi libffi-dev python3-packaging git libcurl4-openssl-dev
+sudo apt install alien autoconf automake build-essential debhelper-compat dh-autoreconf dh-dkms dh-python dkms fakeroot gawk git libaio-dev libattr1-dev libblkid-dev libcurl4-openssl-dev libelf-dev libffi-dev libpam0g-dev libssl-dev libtirpc-dev libtool libudev-dev linux-headers-generic parallel po-debconf python3 python3-all-dev python3-cffi python3-dev python3-packaging python3-setuptools python3-sphinx uuid-dev zlib1g-dev
 
 apt install linux-headers-amd64 libselinux-dev parted lsscsi wget ksh gdebi python3-distutils
 ```
 
 
+
 ## Pull sources
 
+### OpenZFS Source
 Fetching the [original sources](https://github.com/openzfs/zfs).
 
 ```bash
 git clone https://github.com/openzfs/zfs
 cd zfs
-git checkout -b b_zfs-2.1.11 zfs-2.1.11
+git checkout -b b_zfs-2.2.6 zfs-2.2.6
+cd ..
+```
+
+### With Debian Build Fix
+Fetching the [jausoft branch](git://jausoft.com/srv/scm/openzfs/zfs.git)
+
+```bash
+git clone git://jausoft.com/srv/scm/openzfs/zfs.git
+cd zfs
+git checkout -b b_zfs_2.2.6 --track origin/b_zfs_2.2.6
 cd ..
 ```
 
@@ -35,11 +50,10 @@ The following is captured within `make-all.sh` script.
 mkdir -p build
 
 cd zfs
+git clean -d -f -x
 # select branch/tag ..
 ./autogen.sh
-# ./configure --with-config=srpm
 ./configure --enable-systemd
-# make pkg-utils deb-dkms
 make -j$(nproc)
 make -j1 deb-utils deb-dkms
 mv *.tar.gz *.deb ../build
@@ -65,9 +79,10 @@ Documented shell script `rescue/chroot_zfs.sh` shows how-to
 - shows three typical recovery tasks
   - update-initramfs -u -k all
   - update-grub
-  - grub-install /dev/disk/by-id/your_boot_root_device
+  - grub-install /dev/disk/by-id/your\_boot\_root\_device
+    - perhaps repeat this for all your ZFS pool devices
 
-## ZFS Compatibility Settings 
+## ZFS Compatibility Settings
 
 Following compatibility feature sets have been tested
 
diff --git a/make-all.sh b/make-all.sh
index 7f89186..2aa0123 100755
--- a/make-all.sh
+++ b/make-all.sh
@@ -1,18 +1,79 @@
 #!/bin/sh
 
-mkdir -p build
-
-cd zfs
-# select branch/tag ..
-./autogen.sh
-# ./configure --with-config=srpm
-./configure --enable-systemd
-# make pkg-utils deb-dkms
-make -j$(nproc)
-make -j1 deb-utils deb-dkms
-mv *.tar.gz *.deb ../build
-make clean
-rm -f *.rpm
-cd ..
+sdir=`dirname $(readlink -f $0)`
+rootdir=`dirname $sdir`
+bname=`basename $0 .sh`
+
+if [ ! -d zfs ] ; then
+    echo "Populate zfs subdir from openzfs git repo, see README.md"
+    exit 1
+fi
+
+do_build()
+{
+    rm -rf build
+    mkdir -p build
+
+    cd zfs
+    git clean -d -f -x
+    # select branch/tag ..
+    echo
+    echo "MAKE ZFS: autogen"
+    echo
+    ./autogen.sh
+    if [ $? -ne 0 ] ; then
+        echo "MAKE ZFS: Error autogen"
+        return 1
+    fi
+
+    echo
+    echo "MAKE ZFS: configure"
+    echo
+    DEBUG_ON_OPTS="--enable-debug --enable-debuginfo --enable-debug-kmem --enable-debug-kmem-tracking"
+    DEBUG_OFF_OPTS="--disable-debug --disable-debuginfo --disable-debug-kmem --disable-debug-kmem-tracking"
+    ./configure --enable-systemd ${DEBUG_OFF_OPTS}
+    if [ $? -ne 0 ] ; then
+        echo "MAKE ZFS: Error configure"
+        return 1
+    fi
+
+    echo
+    echo "MAKE ZFS: build"
+    echo
+    make -j$(nproc)
+    if [ $? -ne 0 ] ; then
+        echo "MAKE ZFS: Error build"
+        return 1
+    fi
+
+    echo
+    echo "MAKE ZFS: build debian packages"
+    echo
+    #rm -f contrib/bash_completion.d/zpool
+    #make -j1 native-deb
+    make -j1 deb
+    if [ $? -ne 0 ] ; then
+        echo "MAKE ZFS: Error native-deb"
+        return 1
+    fi
+
+    echo
+    echo "MAKE ZFS: move packages"
+    echo
+    mv *.tar.gz *.deb ../build
+    echo
+    echo "MAKE ZFS: clean"
+    echo
+    make clean
+
+    echo
+    echo "MAKE ZFS: done"
+    echo
+    cd ..
+    mv *.tar.gz *.deb openzfs*.buildinfo openzfs*.changes ./build
+}
+
+echo "Logging to $bname.log"
+do_build 2>&1 | tee $bname.log
 
 
diff --git a/rescue/chroot_zfs.sh b/rescue/chroot_zfs.sh
index 1a3b417..cd700a7 100644
--- a/rescue/chroot_zfs.sh
+++ b/rescue/chroot_zfs.sh
@@ -4,8 +4,8 @@
 #
 # Perform zfs auto import w/ temp root on /mnt
 #
-# - without force: zfs import -a -R /mnt
-# - with force: zfs import -a -f -R /mnt
+# - without force: zpool import -a -R /mnt
+# - with force: zpool import -a -f -R /mnt
 #
 
 # bind the special devices and pipes to zfs realm
@@ -19,8 +19,8 @@ mount --bind /proc/ /mnt/proc/
 # chroot /mnt
 #
 
-# Potentially you might need to 
-# 
+# Potentially you might need to
+#
 # - update-initramfs -u -k all
 # - update-grub
 # - grub-install /dev/disk/by-id/your_boot_root_device
diff --git a/scripts/zfs-2.0.5-1-install-debian11-amd64.sh b/scripts/zfs-2.0.5-1-install-debian11-amd64.sh
deleted file mode 100644
index 38b01f8..0000000
--- a/scripts/zfs-2.0.5-1-install-debian11-amd64.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#! /bin/sh
-
-ZFSDEBDIR=`readlink -f ./zfs-linux-2.0.5-1-debian11-amd64`
-
-#skipped:
-# libzfs4-devel_2.0.5-1_amd64.deb
-# python3-pyzfs_2.0.5-1_amd64.deb
-# zfs-dracut_2.0.5-1_amd64.deb
-# zfs-test_2.0.5-1_amd64.deb
-# zfs-2.0.5.tar.gz
-
-#apt-get install libnvpair1 libuutil1 libzpool2 libzfs2
-dpkg -i $ZFSDEBDIR/libuutil3_2.0.5-1_amd64.deb
-dpkg -i $ZFSDEBDIR/libnvpair3_2.0.5-1_amd64.deb
-dpkg -i $ZFSDEBDIR/libzfs4_2.0.5-1_amd64.deb
-dpkg -i $ZFSDEBDIR/libzpool4_2.0.5-1_amd64.deb
-#apt-get install zfs-dkms zfs zfs-initramfs
-dpkg -i $ZFSDEBDIR/zfs-dkms_2.0.5-1_amd64.deb
-dpkg -i $ZFSDEBDIR/zfs_2.0.5-1_amd64.deb
-dpkg -i $ZFSDEBDIR/zfs-initramfs_2.0.5-1_amd64.deb
-
-apt-mark manual zfs-initramfs zfs zfs-dkms libzfs2 libzfs4 libzpool2 libzpool4 libuutil1 libuutil3 libnvpair1 libnvpair3
-
-# 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
-
diff --git a/scripts/zfs-2.1.0-1-install-debian11-amd64.sh b/scripts/zfs-2.1.0-1-install-debian11-amd64.sh
deleted file mode 100644
index 7f56757..0000000
--- a/scripts/zfs-2.1.0-1-install-debian11-amd64.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#! /bin/sh
-
-ZFSDEBDIR=`readlink -f ./zfs-linux-2.1.0-1-debian11-amd64`
-
-#skipped:
-# libzfs5-devel_2.1.0-1_amd64.deb
-# python3-pyzfs_2.1.0-1_amd64.deb
-# zfs-dracut_2.1.0-1_amd64.deb
-# zfs-test_2.1.0-1_amd64.deb
-# zfs-2.1.0.tar.gz
-
-#apt-get install libnvpair1 libuutil1 libzpool2 libzfs2
-dpkg -i $ZFSDEBDIR/libuutil3_2.1.0-1_amd64.deb
-dpkg -i $ZFSDEBDIR/libnvpair3_2.1.0-1_amd64.deb
-dpkg -i $ZFSDEBDIR/libzfs5_2.1.0-1_amd64.deb
-dpkg -i $ZFSDEBDIR/libzpool5_2.1.0-1_amd64.deb
-#apt-get install zfs-dkms zfs zfs-initramfs
-dpkg -i $ZFSDEBDIR/zfs-dkms_2.1.0-1_amd64.deb
-dpkg -i $ZFSDEBDIR/zfs_2.1.0-1_amd64.deb
-dpkg -i $ZFSDEBDIR/zfs-initramfs_2.1.0-1_amd64.deb
-
-apt-mark manual zfs-initramfs zfs zfs-dkms libzfs2 libzfs4 libzfs5 libzpool2 libzpool4 libzpool5 libuutil1 libuutil3 libnvpair1 libnvpair3
-
-# 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
-
diff --git a/scripts/zfs-2.1.11-1-install-debian12-amd64.sh b/scripts/zfs-2.1.11-1-install-debian12-amd64.sh
deleted file mode 100644
index f0643a6..0000000
--- a/scripts/zfs-2.1.11-1-install-debian12-amd64.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-#! /bin/sh
-
-ZFSDEBDIR=`readlink -f ./zfs-linux-2.1.11-1-debian12-amd64`
-
-#skipped:
-# libzfs5-devel_2.1.11-1_amd64.deb
-# python3-pyzfs_2.1.11-1_amd64.deb
-# zfs-dracut_2.1.11-1_amd64.deb
-# zfs-test_2.1.11-1_amd64.deb
-# zfs-2.1.11.tar.gz
-
-if [ -e /etc/default/zfs ] ; then
-    cp -a /etc/default/zfs /etc/default/zfs.cpy
-fi
-
-#apt-get install libnvpair1 libuutil1 libzpool2 libzfs2
-dpkg -i $ZFSDEBDIR/libuutil3_2.1.11-1_amd64.deb
-dpkg -i $ZFSDEBDIR/libnvpair3_2.1.11-1_amd64.deb
-dpkg -i $ZFSDEBDIR/libzfs5_2.1.11-1_amd64.deb
-dpkg -i $ZFSDEBDIR/libzpool5_2.1.11-1_amd64.deb
-#apt-get install zfs-dkms zfs zfs-initramfs
-dpkg -i $ZFSDEBDIR/zfs-dkms_2.1.11-1_amd64.deb
-dpkg -i $ZFSDEBDIR/zfs_2.1.11-1_amd64.deb
-dpkg -i $ZFSDEBDIR/zfs-initramfs_2.1.11-1_amd64.deb
-
-# apt-mark manual zfs-initramfs zfs zfs-dkms libzfs2 libzfs4 libzfs5 libzpool2 libzpool4 libzpool5 libuutil1 libuutil3 libnvpair1 libnvpair3
-apt-mark manual zfs-initramfs zfs zfs-dkms libzfs2 libzfs4 libzfs5 libzpool2 libzpool5 libuutil1 libuutil3 libnvpair1 libnvpair3
-
-# 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
-
diff --git a/scripts/zfs-2.1.6-1-install-debian11-amd64.sh b/scripts/zfs-2.1.6-1-install-debian11-amd64.sh
deleted file mode 100644
index 30644a3..0000000
--- a/scripts/zfs-2.1.6-1-install-debian11-amd64.sh
+++ /dev/null
@@ -1,35 +0,0 @@
-#! /bin/sh
-
-ZFSDEBDIR=`readlink -f ./zfs-linux-2.1.6-1-debian11-amd64`
-
-#skipped:
-# libzfs5-devel_2.1.0-1_amd64.deb
-# python3-pyzfs_2.1.0-1_amd64.deb
-# zfs-dracut_2.1.0-1_amd64.deb
-# zfs-test_2.1.0-1_amd64.deb
-# zfs-2.1.0.tar.gz
-
-if [ -e /etc/default/zfs ] ; then
-    cp -a /etc/default/zfs /etc/default/zfs.cpy
-fi
-
-#apt-get install libnvpair1 libuutil1 libzpool2 libzfs2
-dpkg -i $ZFSDEBDIR/libuutil3_2.1.6-1_amd64.deb
-dpkg -i $ZFSDEBDIR/libnvpair3_2.1.6-1_amd64.deb
-dpkg -i $ZFSDEBDIR/libzfs5_2.1.6-1_amd64.deb
-dpkg -i $ZFSDEBDIR/libzpool5_2.1.6-1_amd64.deb
-#apt-get install zfs-dkms zfs zfs-initramfs
-dpkg -i $ZFSDEBDIR/zfs-dkms_2.1.6-1_amd64.deb
-dpkg -i $ZFSDEBDIR/zfs_2.1.6-1_amd64.deb
-dpkg -i $ZFSDEBDIR/zfs-initramfs_2.1.6-1_amd64.deb
-
-apt-mark manual zfs-initramfs zfs zfs-dkms libzfs2 libzfs4 libzfs5 libzpool2 libzpool4 libzpool5 libuutil1 libuutil3 libnvpair1 libnvpair3
-
-# 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
-
diff --git a/scripts/zfs-2.1.6-1-install-debian12-amd64.sh b/scripts/zfs-2.2.4-1-install-debian11-amd64.sh
index cdd9bc5..2e77b7f 100644
--- a/scripts/zfs-2.1.6-1-install-debian12-amd64.sh
+++ b/scripts/zfs-2.2.4-1-install-debian11-amd64.sh
@@ -1,32 +1,31 @@
 #! /bin/sh
 
-ZFSDEBDIR=`readlink -f ./zfs-linux-2.1.6-1-debian12-amd64`
+ZFSDEBDIR=`readlink -f ./zfs-linux-2.2.4-1-debian11-amd64`
 
 #skipped:
-# libzfs5-devel_2.1.0-1_amd64.deb
-# python3-pyzfs_2.1.0-1_amd64.deb
-# zfs-dracut_2.1.0-1_amd64.deb
-# zfs-test_2.1.0-1_amd64.deb
-# zfs-2.1.0.tar.gz
+# libzfs5-devel_2.2.4-1_amd64.deb
+# python3-pyzfs_2.2.4-1_amd64.deb
+# zfs-dracut_2.2.4-1_amd64.deb
+# zfs-test_2.2.4-1_amd64.deb
+# zfs-2.2.4.tar.gz
 
 if [ -e /etc/default/zfs ] ; then
     cp -a /etc/default/zfs /etc/default/zfs.cpy
 fi
 
 #apt-get install libnvpair1 libuutil1 libzpool2 libzfs2
-dpkg -i $ZFSDEBDIR/libuutil3_2.1.6-1_amd64.deb
-dpkg -i $ZFSDEBDIR/libnvpair3_2.1.6-1_amd64.deb
-dpkg -i $ZFSDEBDIR/libzfs5_2.1.6-1_amd64.deb
-dpkg -i $ZFSDEBDIR/libzpool5_2.1.6-1_amd64.deb
+dpkg -i $ZFSDEBDIR/libuutil3_2.2.4-1_amd64.deb
+dpkg -i $ZFSDEBDIR/libnvpair3_2.2.4-1_amd64.deb
+dpkg -i $ZFSDEBDIR/libzfs5_2.2.4-1_amd64.deb
+dpkg -i $ZFSDEBDIR/libzpool5_2.2.4-1_amd64.deb
 #apt-get install zfs-dkms zfs zfs-initramfs
-dpkg -i $ZFSDEBDIR/zfs-dkms_2.1.6-1_amd64.deb
-dpkg -i $ZFSDEBDIR/zfs_2.1.6-1_amd64.deb
-dpkg -i $ZFSDEBDIR/zfs-initramfs_2.1.6-1_amd64.deb
+dpkg -i $ZFSDEBDIR/zfs-dkms_2.2.4-1_amd64.deb
+dpkg -i $ZFSDEBDIR/zfs_2.2.4-1_amd64.deb
+dpkg -i $ZFSDEBDIR/zfs-initramfs_2.2.4-1_amd64.deb
 
 # apt-mark manual zfs-initramfs zfs zfs-dkms libzfs2 libzfs4 libzfs5 libzpool2 libzpool4 libzpool5 libuutil1 libuutil3 libnvpair1 libnvpair3
 apt-mark manual zfs-initramfs zfs zfs-dkms libzfs2 libzfs4 libzfs5 libzpool2 libzpool5 libuutil1 libuutil3 libnvpair1 libnvpair3
 
-
 # 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
diff --git a/scripts/zfs-2.1.11-1-install-debian11-amd64.sh b/scripts/zfs-2.2.4-1-install-debian12-amd64.sh
index ee0159d..f0fa32b 100644
--- a/scripts/zfs-2.1.11-1-install-debian11-amd64.sh
+++ b/scripts/zfs-2.2.4-1-install-debian12-amd64.sh
@@ -1,27 +1,27 @@
 #! /bin/sh
 
-ZFSDEBDIR=`readlink -f ./zfs-linux-2.1.11-1-debian11-amd64`
+ZFSDEBDIR=`readlink -f ./zfs-linux-2.2.4-1-debian12-amd64`
 
 #skipped:
-# libzfs5-devel_2.1.11-1_amd64.deb
-# python3-pyzfs_2.1.11-1_amd64.deb
-# zfs-dracut_2.1.11-1_amd64.deb
-# zfs-test_2.1.11-1_amd64.deb
-# zfs-2.1.11.tar.gz
+# libzfs5-devel_2.2.4-1_amd64.deb
+# python3-pyzfs_2.2.4-1_amd64.deb
+# zfs-dracut_2.2.4-1_amd64.deb
+# zfs-test_2.2.4-1_amd64.deb
+# zfs-2.2.4.tar.gz
 
 if [ -e /etc/default/zfs ] ; then
     cp -a /etc/default/zfs /etc/default/zfs.cpy
 fi
 
 #apt-get install libnvpair1 libuutil1 libzpool2 libzfs2
-dpkg -i $ZFSDEBDIR/libuutil3_2.1.11-1_amd64.deb
-dpkg -i $ZFSDEBDIR/libnvpair3_2.1.11-1_amd64.deb
-dpkg -i $ZFSDEBDIR/libzfs5_2.1.11-1_amd64.deb
-dpkg -i $ZFSDEBDIR/libzpool5_2.1.11-1_amd64.deb
+dpkg -i $ZFSDEBDIR/libuutil3_2.2.4-1_amd64.deb
+dpkg -i $ZFSDEBDIR/libnvpair3_2.2.4-1_amd64.deb
+dpkg -i $ZFSDEBDIR/libzfs5_2.2.4-1_amd64.deb
+dpkg -i $ZFSDEBDIR/libzpool5_2.2.4-1_amd64.deb
 #apt-get install zfs-dkms zfs zfs-initramfs
-dpkg -i $ZFSDEBDIR/zfs-dkms_2.1.11-1_amd64.deb
-dpkg -i $ZFSDEBDIR/zfs_2.1.11-1_amd64.deb
-dpkg -i $ZFSDEBDIR/zfs-initramfs_2.1.11-1_amd64.deb
+dpkg -i $ZFSDEBDIR/zfs-dkms_2.2.4-1_amd64.deb
+dpkg -i $ZFSDEBDIR/zfs_2.2.4-1_amd64.deb
+dpkg -i $ZFSDEBDIR/zfs-initramfs_2.2.4-1_amd64.deb
 
 # apt-mark manual zfs-initramfs zfs zfs-dkms libzfs2 libzfs4 libzfs5 libzpool2 libzpool4 libzpool5 libuutil1 libuutil3 libnvpair1 libnvpair3
 apt-mark manual zfs-initramfs zfs zfs-dkms libzfs2 libzfs4 libzfs5 libzpool2 libzpool5 libuutil1 libuutil3 libnvpair1 libnvpair3
diff --git a/scripts/zfs-2.2.6-1-install-debian12-amd64.sh b/scripts/zfs-2.2.6-1-install-debian12-amd64.sh
new file mode 100644
index 0000000..7aca3db
--- /dev/null
+++ b/scripts/zfs-2.2.6-1-install-debian12-amd64.sh
@@ -0,0 +1,40 @@
+#! /bin/sh
+
+ZFSDEBDIR=`readlink -f ./zfs-linux-2.2.6-1-debian12-amd64`
+
+#skipped:
+# kmod-zfs-6.1.0-26-amd64_2.2.6-1_amd64.deb
+# kmod-zfs-devel-6.1.0-26-amd64_2.2.6-1_amd64.deb
+# kmod-zfs-devel_2.2.6-1_amd64.deb
+# libzfs5-devel_2.2.6-1_amd64.deb
+# python3-pyzfs_2.2.6-1_amd64.deb
+# zfs-dracut_2.2.6-1_amd64.deb
+# zfs-test_2.2.6-1_amd64.deb
+# zfs-2.2.6.tar.gz
+
+if [ -e /etc/default/zfs ] ; then
+    cp -a /etc/default/zfs /etc/default/zfs.cpy
+fi
+
+#apt-get install libnvpair1 libuutil1 libzpool2 libzfs2
+dpkg -i $ZFSDEBDIR/libuutil3_2.2.6-1_amd64.deb
+dpkg -i $ZFSDEBDIR/libnvpair3_2.2.6-1_amd64.deb
+dpkg -i $ZFSDEBDIR/libzfs5_2.2.6-1_amd64.deb
+dpkg -i $ZFSDEBDIR/libzpool5_2.2.6-1_amd64.deb
+#apt-get install zfs-dkms zfs zfs-initramfs
+dpkg -i $ZFSDEBDIR/zfs-dkms_2.2.6-1_amd64.deb
+dpkg -i $ZFSDEBDIR/zfs_2.2.6-1_amd64.deb
+dpkg -i $ZFSDEBDIR/pam-zfs-key_2.2.6-1_amd64.deb
+dpkg -i $ZFSDEBDIR/zfs-initramfs_2.2.6-1_amd64.deb
+
+# apt-mark manual zfs-initramfs zfs zfs-dkms libzfs2 libzfs4 libzfs5 libzpool2 libzpool4 libzpool5 libuutil1 libuutil3 libnvpair1 libnvpair3
+apt-mark manual zfs-initramfs zfs pam-zfs-key zfs-dkms libzfs2 libzfs4 libzfs5 libzpool2 libzpool5 libuutil1 libuutil3 libnvpair1 libnvpair3
+
+# 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
+
diff --git a/scripts/zfs-remove.sh b/scripts/zfs-remove.sh
index 08aff08..1268c1f 100644
--- a/scripts/zfs-remove.sh
+++ b/scripts/zfs-remove.sh
@@ -3,7 +3,7 @@ if [ -e /etc/default/zfs ] ; then
     cp -a /etc/default/zfs /etc/default/zfs.cpy
 fi
 
-dpkg -r --force-all zfs-initramfs zfs zfs-dkms libzpool4 libzpool5 libzfs4 libzfs5 libnvpair3 libuutil3 
-dpkg -P --force-all zfs-initramfs zfs zfs-dkms libzpool4 libzpool5 libzfs4 libzfs5 libnvpair3 libuutil3 
+dpkg -r --force-all zfs-initramfs zfs pam-zfs-key zfs-dkms libzpool4 libzpool5 libzfs4 libzfs5 libnvpair3 libuutil3
+dpkg -P --force-all zfs-initramfs zfs pam-zfs-key zfs-dkms libzpool4 libzpool5 libzfs4 libzfs5 libnvpair3 libuutil3
 
 #dpkg -r grub-common grub-pc grub-pc-bin grub2-common