From 77457be910d6e89b64799904e0b20c22ebc46400 Mon Sep 17 00:00:00 2001
From: Peter Jung <admin@ptr1337.dev>
Date: Fri, 6 May 2022 20:31:14 +0200
Subject: [PATCH] maybe zfs-fix

---
 archiso/airootfs/etc/environment                             | 1 +
 archiso/airootfs/etc/mkinitcpio.conf                         | 2 +-
 archiso/airootfs/etc/systemd/system/zfs-import-cache.service | 1 +
 archiso/airootfs/etc/systemd/system/zfs-import.target        | 1 +
 archiso/airootfs/etc/systemd/system/zfs-mount.service        | 1 +
 archiso/airootfs/etc/systemd/system/zfs.target               | 1 +
 archiso/packages.x86_64                                      | 1 +
 7 files changed, 7 insertions(+), 1 deletion(-)
 create mode 120000 archiso/airootfs/etc/systemd/system/zfs-import-cache.service
 create mode 120000 archiso/airootfs/etc/systemd/system/zfs-import.target
 create mode 120000 archiso/airootfs/etc/systemd/system/zfs-mount.service
 create mode 120000 archiso/airootfs/etc/systemd/system/zfs.target

diff --git a/archiso/airootfs/etc/environment b/archiso/airootfs/etc/environment
index f3efa0a..b40c14d 100644
--- a/archiso/airootfs/etc/environment
+++ b/archiso/airootfs/etc/environment
@@ -1,2 +1,3 @@
 EDITOR=vim
 QT_QPA_PLATFORMTHEME=qt5ct
+ZPOOL_VDEV_NAME_PATH=1
diff --git a/archiso/airootfs/etc/mkinitcpio.conf b/archiso/airootfs/etc/mkinitcpio.conf
index 9f5397c..3b9e197 100644
--- a/archiso/airootfs/etc/mkinitcpio.conf
+++ b/archiso/airootfs/etc/mkinitcpio.conf
@@ -49,7 +49,7 @@ FILES=()
 #
 ##   NOTE: If you have /usr on a separate partition, you MUST include the
 #    usr, fsck and shutdown hooks.
-HOOKS=(base udev modconf memdisk archiso archiso_loop_mnt archiso_pxe_common archiso_pxe_nbd archiso_pxe_http archiso_pxe_nfs archiso_kms block filesystems keyboard)
+HOOKS=(base udev modconf memdisk archiso archiso_loop_mnt archiso_pxe_common archiso_pxe_nbd archiso_pxe_http archiso_pxe_nfs archiso_kms block filesystems keyboard zfs)
 
 # COMPRESSION
 # Use this to compress the initramfs image. By default, gzip compression
diff --git a/archiso/airootfs/etc/systemd/system/zfs-import-cache.service b/archiso/airootfs/etc/systemd/system/zfs-import-cache.service
new file mode 120000
index 0000000..4e5d50a
--- /dev/null
+++ b/archiso/airootfs/etc/systemd/system/zfs-import-cache.service
@@ -0,0 +1 @@
+/usr/lib/systemd/system/zfs-import-cache.service
\ No newline at end of file
diff --git a/archiso/airootfs/etc/systemd/system/zfs-import.target b/archiso/airootfs/etc/systemd/system/zfs-import.target
new file mode 120000
index 0000000..849e85d
--- /dev/null
+++ b/archiso/airootfs/etc/systemd/system/zfs-import.target
@@ -0,0 +1 @@
+/usr/lib/systemd/system/zfs-import.target
\ No newline at end of file
diff --git a/archiso/airootfs/etc/systemd/system/zfs-mount.service b/archiso/airootfs/etc/systemd/system/zfs-mount.service
new file mode 120000
index 0000000..0d15a72
--- /dev/null
+++ b/archiso/airootfs/etc/systemd/system/zfs-mount.service
@@ -0,0 +1 @@
+/usr/lib/systemd/system/zfs-mount.service
\ No newline at end of file
diff --git a/archiso/airootfs/etc/systemd/system/zfs.target b/archiso/airootfs/etc/systemd/system/zfs.target
new file mode 120000
index 0000000..1969637
--- /dev/null
+++ b/archiso/airootfs/etc/systemd/system/zfs.target
@@ -0,0 +1 @@
+/usr/lib/systemd/system/zfs.target
\ No newline at end of file
diff --git a/archiso/packages.x86_64 b/archiso/packages.x86_64
index 1116004..a6255b8 100644
--- a/archiso/packages.x86_64
+++ b/archiso/packages.x86_64
@@ -195,6 +195,7 @@ xorg-apps
 # zfs support(not working)
 zfs-dkms
 zfs-utils
+linux-cachyos-zfs
 
 wget