diff --git a/images/sd-image-orange-pi-aarch64.nix b/images/sd-image-orange-pi-aarch64.nix index a9b26a87..8a38d336 100644 --- a/images/sd-image-orange-pi-aarch64.nix +++ b/images/sd-image-orange-pi-aarch64.nix @@ -37,5 +37,6 @@ in security.sudo.wheelNeedsPassword = false; + boot.zfs.forceImportRoot = false; system.stateVersion = "26.05"; } diff --git a/images/sd-image-raspberry-pi-aarch64.nix b/images/sd-image-raspberry-pi-aarch64.nix index 20b2abff..a3bd4d19 100644 --- a/images/sd-image-raspberry-pi-aarch64.nix +++ b/images/sd-image-raspberry-pi-aarch64.nix @@ -21,13 +21,11 @@ in name = "raspberry-pi"; }; - boot.kernelParams = [ - "console=ttyS1,115200n8" - ]; - - boot.kernelModules = [ - "bcm2835-v4l2" - ]; + boot = { + kernelParams = [ "console=ttyS1,115200n8" ]; + kernelModules = [ "bcm2835-v4l2" ]; + zfs.forceImportRoot = false; + }; hardware.enableRedistributableFirmware = true; diff --git a/modules/common/default.nix b/modules/common/default.nix index 1cd9e811..90d54618 100644 --- a/modules/common/default.nix +++ b/modules/common/default.nix @@ -23,6 +23,7 @@ in config = { system.stateVersion = lib.mkDefault "25.05"; + boot.zfs.forceImportRoot = lib.mkDefault false; nix = { nixPath = [ "nixpkgs=${inputs.nixpkgs}" ]; # https://github.com/nix-community/nixd/blob/main/nixd/docs/configuration.md