From a455d592b4259a73219026e777e11ecb28783de2 Mon Sep 17 00:00:00 2001
From: Simon Gardling <titaniumtown@proton.me>
Date: Fri, 24 Oct 2025 13:46:22 -0400
Subject: [PATCH] zfs_ensure_mounted: cleanup test

---
 tests/zfs.nix | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/tests/zfs.nix b/tests/zfs.nix
index aeb4052..f82e3f2 100644
--- a/tests/zfs.nix
+++ b/tests/zfs.nix
@@ -30,27 +30,22 @@ testPkgs.testers.runNixOSTest {
         emptyDiskImages = [
           4096
         ];
-        useBootLoader = true;
-        useEFIBoot = true;
       };
-      boot.loader.systemd-boot.enable = true;
-      boot.loader.timeout = 0;
-      boot.loader.efi.canTouchEfiVariables = true;
       networking.hostId = "deadbeef";
       boot.kernelPackages = config.boot.kernelPackages;
       boot.zfs.package = config.boot.zfs.package;
       boot.supportedFilesystems = [ "zfs" ];
 
-      environment.systemPackages = [
-        pkgs.parted
-        pkgs.ensureZfsMounts
+      environment.systemPackages = with pkgs; [
+        parted
+        ensureZfsMounts
       ];
 
       systemd.services.foobar = {
         serviceConfig = {
           Type = "oneshot";
           RemainAfterExit = true;
-          ExecStart = "${lib.getExe pkgs.bash} -c \"true\"";
+          ExecStart = lib.getExe pkgs.bash;
         };
       };
 
@@ -58,7 +53,7 @@ testPkgs.testers.runNixOSTest {
         serviceConfig = {
           Type = "oneshot";
           RemainAfterExit = true;
-          ExecStart = "${lib.getExe pkgs.bash} -c \"true\"";
+          ExecStart = lib.getExe pkgs.bash;
         };
       };
     };