From cc5d1a0e07e42e67287257c425b97087784af57c Mon Sep 17 00:00:00 2001
From: Jeroen Rijken <jeroen.rijken@xs4all.nl>
Date: Sat, 9 Jul 2022 14:43:19 +0200
Subject: [PATCH] Initramfs generation updates

---
 apparmor.d/profiles-m-r/mount-zfs | 4 ++++
 apparmor.d/profiles-s-z/zpool     | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/apparmor.d/profiles-m-r/mount-zfs b/apparmor.d/profiles-m-r/mount-zfs
index c79af21c..0f9cfb7b 100644
--- a/apparmor.d/profiles-m-r/mount-zfs
+++ b/apparmor.d/profiles-m-r/mount-zfs
@@ -24,12 +24,16 @@ profile mount-zfs @{exec_path} flags=(complain) {
   mount fstype=zfs -> @{MOUNTS}/*/,
   mount fstype=zfs -> /,
   mount fstype=zfs -> /*/,
+  mount fstype=zfs -> /tmp/zfsmnt.*/
+  mount fstype=zfs -> /tmp/zfsmnt.*/*/
 
   umount @{MOUNTDIRS}/,
   umount @{MOUNTS}/,
   umount @{MOUNTS}/*/,
   umount /,
   umount /*/,
+  umount fstype=zfs -> /tmp/zfsmnt.*/
+  mount fstype=zfs -> /tmp/zfsmnt.*/*/
 
   @{PROC}/@{pids}/mounts r,
 
diff --git a/apparmor.d/profiles-s-z/zpool b/apparmor.d/profiles-s-z/zpool
index b4d23646..5b0efb02 100644
--- a/apparmor.d/profiles-s-z/zpool
+++ b/apparmor.d/profiles-s-z/zpool
@@ -20,5 +20,9 @@ profile zpool @{exec_path} flags=(complain) {
   /etc/hostid r,
   @{PROC}/sys/kernel/spl/hostid r,
 
+  /run/blkid/blkid.tab wr,
+  /run/blkid/blkid.tab.old l,
+  /run/blkid/blkid.tab-* wrl,
+
   include if exists <local/zfs>
 }