From e09f967bc3a1796f876171331308bcc5532fc7f6 Mon Sep 17 00:00:00 2001 From: Tom Herbers Date: Wed, 6 May 2026 01:55:43 +0200 Subject: [PATCH] nixos/incus-image: disable cloneConfig module The cloneConfig module can prevent the incus-create-nixos-config.service from running because it will already have generated a configuration.nix. Also modifies the test to hopefully catch that. Fixes 0f363a1cb4f1a29a95f94c27ca22e4bcca93224f --- nixos/maintainers/scripts/incus/incus-container-image.nix | 3 +++ .../maintainers/scripts/incus/incus-virtual-machine-image.nix | 3 +++ nixos/tests/incus/incus-tests-module.nix | 1 + 3 files changed, 7 insertions(+) diff --git a/nixos/maintainers/scripts/incus/incus-container-image.nix b/nixos/maintainers/scripts/incus/incus-container-image.nix index 989f583307fe..8007e5cad018 100644 --- a/nixos/maintainers/scripts/incus/incus-container-image.nix +++ b/nixos/maintainers/scripts/incus/incus-container-image.nix @@ -32,6 +32,9 @@ }; }; + # Disable the cloneConfig module. We have our own Service to generate a configuration.nix. + installer.cloneConfig = false; + networking = { dhcpcd.enable = false; useDHCP = false; diff --git a/nixos/maintainers/scripts/incus/incus-virtual-machine-image.nix b/nixos/maintainers/scripts/incus/incus-virtual-machine-image.nix index f06b43dc2675..e7d93a69094e 100644 --- a/nixos/maintainers/scripts/incus/incus-virtual-machine-image.nix +++ b/nixos/maintainers/scripts/incus/incus-virtual-machine-image.nix @@ -32,6 +32,9 @@ }; }; + # Disable the cloneConfig module. We have our own Service to generate a configuration.nix. + installer.cloneConfig = false; + # Network networking = { dhcpcd.enable = false; diff --git a/nixos/tests/incus/incus-tests-module.nix b/nixos/tests/incus/incus-tests-module.nix index 69b0d3c13825..005317e02e72 100644 --- a/nixos/tests/incus/incus-tests-module.nix +++ b/nixos/tests/incus/incus-tests-module.nix @@ -164,6 +164,7 @@ in with subtest("[${image_id}] default configuration.nix is created on first boot"): server.succeed(f"incus exec {instance_name} -- test -f /etc/nixos/configuration.nix") + server.succeed(f"incus exec {instance_name} -- grep -q 'default incus configuration' /etc/nixos/configuration.nix") with subtest("[${image_id}] configuration.nix create service does not overwrite existing config"): server.succeed(f"incus exec {instance_name} -- systemctl restart incus-create-nixos-config.service")