From 88c99e1d39160366ee8d0933a93842a276ca4679 Mon Sep 17 00:00:00 2001
From: Felix Richter <makefu@users.noreply.github.com>
Date: Wed, 14 Jun 2023 22:19:02 +0200
Subject: [PATCH 1/3] zfs: always force creation of zpool

---
 lib/types/zpool.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/types/zpool.nix b/lib/types/zpool.nix
index 3ec59df..2733e8f 100644
--- a/lib/types/zpool.nix
+++ b/lib/types/zpool.nix
@@ -64,7 +64,7 @@
       inherit config options;
       default = _: ''
         readarray -t zfs_devices < <(cat "$disko_devices_dir"/zfs_${config.name})
-        zpool create ${config.name} \
+        zpool create -f ${config.name} \
           -R ${config.mountRoot} ${config.mode} \
           ${lib.concatStringsSep " " (lib.mapAttrsToList (n: v: "-o ${n}=${v}") config.options)} \
           ${lib.concatStringsSep " " (lib.mapAttrsToList (n: v: "-O ${n}=${v}") config.rootFsOptions)} \

From 44f5dba12dce612f6b907ed09bd781d80ebc78ff Mon Sep 17 00:00:00 2001
From: Yan Minari <yangm97@gmail.com>
Date: Thu, 15 Jun 2023 16:48:52 -0300
Subject: [PATCH 2/3] feat: create zfs parent datasets

---
 lib/types/zfs_fs.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/types/zfs_fs.nix b/lib/types/zfs_fs.nix
index 6c53852..0c5e96b 100644
--- a/lib/types/zfs_fs.nix
+++ b/lib/types/zfs_fs.nix
@@ -41,8 +41,9 @@
       # -u prevents mounting newly created datasets, which is
       # important to prevent accidental shadowing of mount points
       # since (create order != mount order)
+      # -p creates parents automatically
       default = { zpool }: ''
-        zfs create -u ${zpool}/${config.name} \
+        zfs create -up ${zpool}/${config.name} \
           ${lib.concatStringsSep " " (lib.mapAttrsToList (n: v: "-o ${n}=${v}") config.options)}
       '';
     };

From 0a3d694a398c919c5266e4ddbb91812f320f8ac6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 16 Jun 2023 13:40:36 +0200
Subject: [PATCH 3/3] mergify: switch to rebase

---
 .mergify.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.mergify.yml b/.mergify.yml
index 8ec87e2..b08e465 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -33,6 +33,7 @@ defaults:
   actions:
     queue:
       allow_merging_configuration_change: true
+      method: rebase
 pull_request_rules:
   - name: merge using the merge queue
     conditions: