From 4b286b878a8295c13d7478debee52ed2c0ba6169 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Guillaume=20L=C3=A9vy?= <glevy@crans.org>
Date: Thu, 11 Jun 2026 17:39:06 +0200
Subject: [PATCH] Set de forceImportRoot hors du default dans /iso

---
 hosts/iso/default.nix            | 1 +
 hosts/physiques/thot/default.nix | 6 ++++--
 modules/default.nix              | 5 +++--
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/hosts/iso/default.nix b/hosts/iso/default.nix
index 0933dcc..f47e339 100644
--- a/hosts/iso/default.nix
+++ b/hosts/iso/default.nix
@@ -20,6 +20,7 @@
     kernelParams = [ "console=ttyS0,115200" ];
     kernelPackages = pkgs.linuxPackages_latest;
     supportedFilesystems = lib.mkForce [ "btrfs" "vfat" "zfs"];
+    zfs.forceImportRoot = lib.mkDefault false;
   };
 
   services.openssh = {
diff --git a/hosts/physiques/thot/default.nix b/hosts/physiques/thot/default.nix
index ba780fa..80d4f99 100644
--- a/hosts/physiques/thot/default.nix
+++ b/hosts/physiques/thot/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ lib, pkgs, ... }:
 
 {
   imports = [
@@ -27,7 +27,9 @@
         "head"
         "backups"
       ];
-      forceImportAll = true;
+      forceImportAll = lib.mkForce true;
+      # Ajouté suite au passage en 26.05 par souci de cohérence
+      forceImportRoot = lib.mkForce true;
     };
   };
 
diff --git a/modules/default.nix b/modules/default.nix
index ef7599e..be2ac91 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -1,4 +1,4 @@
-{ ... }:
+{ lib, ... }:
 
 {
   imports = [
@@ -26,5 +26,6 @@
   };
 
   # Recommandé depuis le passage à 26.05
-  boot.zfs.forceImportRoot = false;
+  boot.zfs.forceImportAll = lib.mkDefault false;
+  boot.zfs.forceImportRoot = lib.mkDefault false;
 }