From eafead23ae99ef8d9cd8f3f22636c64dcd7d17e1 Mon Sep 17 00:00:00 2001
From: dantefromhell <90508808+dantefromhell@users.noreply.github.com>
Date: Mon, 22 May 2023 00:01:53 +0000
Subject: [PATCH 1/2] Add zfs packages

ZFS related binaries like `zpool`, `zfs` and `zdb` were missing from the kexec image.

This PR fixes the following issues I encountered during testing in the OVH "Public Cloud":

- Machines pre-installed with Debian 11 print error `zdb: command not found` during `disk-deactivate` when trying to remove `/dev/sda14`

- Trying to create a simple zpool + zfs dataset that is mounted as `/` fails with `zpool: command not found`
On OVH machines the installer would print an error being unable to locate the `zdb` binary,
---
 nix/noninteractive.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nix/noninteractive.nix b/nix/noninteractive.nix
index bcdad55..fabe6a7 100644
--- a/nix/noninteractive.nix
+++ b/nix/noninteractive.nix
@@ -21,6 +21,7 @@
   environment.defaultPackages = lib.mkForce [ 
     pkgs.rsync 
     pkgs.parted
+    pkgs.zfs
   ];
 
   # zfs support is accidentally disabled by excluding base.nix, re-enable it

From 2ba17f37dd4594fcce4fec256358a29d592cca02 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Thu, 8 Jun 2023 01:06:55 +0000
Subject: [PATCH 2/2] flake.lock: Update
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Flake lock file updates:

• Updated input 'disko':
    'github:nix-community/disko/2a59f5cf641607dbecb0cfec3ae32247e4aeb311' (2023-05-08)
  → 'github:nix-community/disko/f1178c6e72b7d8ab2b55990397969324822275eb' (2023-06-07)
• Updated input 'disko/nixpkgs':
    'github:NixOS/nixpkgs/eb751d65225ec53de9cf3d88acbf08d275882389' (2023-05-07)
  → 'github:NixOS/nixpkgs/2e56a850786211972d99d2bb39665a9b5a1801d6' (2023-06-04)
• Updated input 'nixos-2211':
    'github:NixOS/nixpkgs/2eb0795720849ae19c068e39b17362d3ebcd585c' (2023-05-15)
  → 'github:NixOS/nixpkgs/51d9b86c045e8b1f7a4b4ff106c7d83b3a6f53c7' (2023-06-07)
• Updated input 'nixos-unstable':
    'github:NixOS/nixpkgs/8fb30f6066a87a91c21241f1993a26ff57005486' (2023-05-14)
  → 'github:NixOS/nixpkgs/32d8e07a8ea673bc9b8c0f8106fb0b776c6ea6a8' (2023-06-07)
---
 flake.lock | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/flake.lock b/flake.lock
index 404d8c1..9cafc67 100644
--- a/flake.lock
+++ b/flake.lock
@@ -5,11 +5,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1683508929,
-        "narHash": "sha256-AqkIrwewCL8+zlkqhNxheF+kOfyakzZDk43SqRTIqRE=",
+        "lastModified": 1686150639,
+        "narHash": "sha256-QHorMn3tgvCE0BM4QlNb/7vuquz11cS2ke1GSfmgiPo=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "2a59f5cf641607dbecb0cfec3ae32247e4aeb311",
+        "rev": "f1178c6e72b7d8ab2b55990397969324822275eb",
         "type": "github"
       },
       "original": {
@@ -20,11 +20,11 @@
     },
     "nixos-2211": {
       "locked": {
-        "lastModified": 1684141842,
-        "narHash": "sha256-sbdzOwBDcyzz/Dr1ztdF+tElMyM/cgx+4XxVgz+NLRM=",
+        "lastModified": 1686174588,
+        "narHash": "sha256-3TWcRhBeCzW+sWZbusLkWdL2wTmwIPt3E0TyA43BkRA=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "2eb0795720849ae19c068e39b17362d3ebcd585c",
+        "rev": "51d9b86c045e8b1f7a4b4ff106c7d83b3a6f53c7",
         "type": "github"
       },
       "original": {
@@ -36,11 +36,11 @@
     },
     "nixos-unstable": {
       "locked": {
-        "lastModified": 1684106623,
-        "narHash": "sha256-Fxw/lWpx+Cr1sJQ+1msdPBnrRuO0ll1eT48+ym0oqDg=",
+        "lastModified": 1686131476,
+        "narHash": "sha256-d/VZjsgW7dBwqN77EcQ4HqQifpATkT5WnCvYbovIhf0=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "8fb30f6066a87a91c21241f1993a26ff57005486",
+        "rev": "32d8e07a8ea673bc9b8c0f8106fb0b776c6ea6a8",
         "type": "github"
       },
       "original": {
@@ -52,11 +52,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1683442750,
-        "narHash": "sha256-IiJ0WWW6OcCrVFl1ijE+gTaP0ChFfV6dNkJR05yStmw=",
+        "lastModified": 1685894048,
+        "narHash": "sha256-QKqv1QS+22k9oxncj1AnAxeqS5jGnQiUW3Jq3B+dI1w=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "eb751d65225ec53de9cf3d88acbf08d275882389",
+        "rev": "2e56a850786211972d99d2bb39665a9b5a1801d6",
         "type": "github"
       },
       "original": {