diff options
| author | Adam C. Stephens <2071575+adamcstephens@users.noreply.github.com> | 2024-02-21 22:29:04 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-21 22:29:04 -0500 |
| commit | f8131a5a2c4e49b599cfc8a0a114dd5905ae21a0 (patch) | |
| tree | b32eb1d18464561a4a58c2d48128f72dca1b6380 /nixos/tests | |
| parent | 0472f3c9c5618c9675fc8dcc9e6ea484a5590d6d (diff) | |
| parent | c607e70f7053e96e21b045fe1f47c57356c96341 (diff) | |
Merge pull request #290288 from mkg20001/lxc-initrd-fix
nixos/lxc-container: link to prepare-root when boot.initrd.systemd.enable is on
Diffstat (limited to 'nixos/tests')
| -rw-r--r-- | nixos/tests/incus/container.nix | 4 | ||||
| -rw-r--r-- | nixos/tests/incus/default.nix | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/nixos/tests/incus/container.nix b/nixos/tests/incus/container.nix index 0e65cc1e15294..0f42d16f133d6 100644 --- a/nixos/tests/incus/container.nix +++ b/nixos/tests/incus/container.nix @@ -1,11 +1,11 @@ -import ../make-test-python.nix ({ pkgs, lib, ... } : +import ../make-test-python.nix ({ pkgs, lib, extra ? {}, ... } : let releases = import ../../release.nix { configuration = { # Building documentation makes the test unnecessarily take a longer time: documentation.enable = lib.mkForce false; - }; + } // extra; }; container-image-metadata = releases.lxdContainerMeta.${pkgs.stdenv.hostPlatform.system}; diff --git a/nixos/tests/incus/default.nix b/nixos/tests/incus/default.nix index c8e53774599b0..ff36fe9d67308 100644 --- a/nixos/tests/incus/default.nix +++ b/nixos/tests/incus/default.nix @@ -5,7 +5,11 @@ handleTestOn, }: { - container = import ./container.nix { inherit system pkgs; }; + container-old-init = import ./container.nix { inherit system pkgs; }; + container-new-init = import ./container.nix { inherit system pkgs; extra = { + # Enable new systemd init + boot.initrd.systemd.enable = true; + }; }; lxd-to-incus = import ./lxd-to-incus.nix { inherit system pkgs; }; preseed = import ./preseed.nix { inherit system pkgs; }; socket-activated = import ./socket-activated.nix { inherit system pkgs; }; |