From 248dc21a54b85fd3c613252416eb309719569c2f Mon Sep 17 00:00:00 2001
From: Adam Stephens <adam@valkor.net>
Date: Fri, 29 Mar 2024 22:27:22 -0400
Subject: [PATCH] treewide: fix renamed incus container tests

---
 .../linux/lxcfs/default.nix => by-name/lx/lxcfs/package.nix} | 5 +++++
 pkgs/os-specific/linux/lxc/default.nix                       | 4 ++--
 pkgs/tools/virtualization/distrobuilder/default.nix          | 4 ++--
 3 files changed, 9 insertions(+), 4 deletions(-)
 rename pkgs/{os-specific/linux/lxcfs/default.nix => by-name/lx/lxcfs/package.nix} (89%)

diff --git a/pkgs/os-specific/linux/lxcfs/default.nix b/pkgs/by-name/lx/lxcfs/package.nix
similarity index 89%
rename from pkgs/os-specific/linux/lxcfs/default.nix
rename to pkgs/by-name/lx/lxcfs/package.nix
index 00c7f6f5edbd..07dec2a8dc8f 100644
--- a/pkgs/os-specific/linux/lxcfs/default.nix
+++ b/pkgs/by-name/lx/lxcfs/package.nix
@@ -63,6 +63,11 @@ stdenv.mkDerivation rec {
   passthru.tests = {
     incus-container-old-init = nixosTests.incus.container-old-init;
     incus-container-new-init = nixosTests.incus.container-new-init;
+  passthru = {
+    tests = {
+      incus-container-legacy-init = nixosTests.incus.container-legacy-init;
+      incus-container-systemd-init = nixosTests.incus.container-systemd-init;
+    };
   };
 
   meta = {
diff --git a/pkgs/os-specific/linux/lxc/default.nix b/pkgs/os-specific/linux/lxc/default.nix
index 4026784f92a4..e525c9c3f5f7 100644
--- a/pkgs/os-specific/linux/lxc/default.nix
+++ b/pkgs/os-specific/linux/lxc/default.nix
@@ -63,8 +63,8 @@ stdenv.mkDerivation rec {
 
   passthru = {
     tests = {
-      incus-old-init = nixosTests.incus.container-old-init;
-      incus-new-init = nixosTests.incus.container-new-init;
+      incus-legacy-init = nixosTests.incus.container-legacy-init;
+      incus-systemd-init = nixosTests.incus.container-systemd-init;
     };
     updateScript = nix-update-script {
       extraArgs = [
diff --git a/pkgs/tools/virtualization/distrobuilder/default.nix b/pkgs/tools/virtualization/distrobuilder/default.nix
index fb08c7110039..5ccf8070c3c9 100644
--- a/pkgs/tools/virtualization/distrobuilder/default.nix
+++ b/pkgs/tools/virtualization/distrobuilder/default.nix
@@ -52,8 +52,8 @@ buildGoModule rec {
 
   passthru = {
     tests = {
-      incus-old-init = nixosTests.incus.container-old-init;
-      incus-new-init = nixosTests.incus.container-new-init;
+      incus-legacy-init = nixosTests.incus.container-legacy-init;
+      incus-systemd-init = nixosTests.incus.container-systemd-init;
     };
 
     generator = callPackage ./generator.nix { inherit src version; };