From 1970b95b689b4031c51f551793f8f6f3e111a5d6 Mon Sep 17 00:00:00 2001
From: nikstur <nikstur@outlook.com>
Date: Thu, 26 Jan 2023 01:16:09 +0100
Subject: [PATCH 1/2] tool: remove bootspec.json

This fixture is not necessary anymore as we have enough integration
tests.
---
 rust/tool/bootspec.json | 23 -----------------------
 1 file changed, 23 deletions(-)
 delete mode 100644 rust/tool/bootspec.json

diff --git a/rust/tool/bootspec.json b/rust/tool/bootspec.json
deleted file mode 100644
index 010f446..0000000
--- a/rust/tool/bootspec.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "v1": {
-    "init": "/run/current-system/init",
-    "initrd": "/run/current-system/initrd",
-    "kernel": "/run/current-system/kernel",
-    "kernelParams": [
-      "amd_iommu=on",
-      "amd_iommu=pt",
-      "iommu=pt",
-      "kvm.ignore_msrs=1",
-      "kvm.report_ignored_msrs=0",
-      "udev.log_priority=3",
-      "systemd.unified_cgroup_hierarchy=1",
-      "loglevel=4"
-    ],
-    "label": "LanzaOS",
-    "toplevel": "/run/current-system",
-    "specialisation": {},
-    "extensions": {
-      "lanzaboote": { "osRelease": "/etc/os-release" }
-    }
-  }
-}

From efa2410292ef4e84b8b225820331f78ca7858a8b Mon Sep 17 00:00:00 2001
From: nikstur <nikstur@outlook.com>
Date: Thu, 26 Jan 2023 01:17:18 +0100
Subject: [PATCH 2/2] treewide: move uefi-keys into test fixtures

To clean up the repository move the uefi keys (`pki/`) to
`nix/tests/fixtures/uefi-keys`.
---
 {pki => nix/tests/fixtures/uefi-keys}/GUID             | 0
 {pki => nix/tests/fixtures/uefi-keys}/keys/KEK/KEK.key | 0
 {pki => nix/tests/fixtures/uefi-keys}/keys/KEK/KEK.pem | 0
 {pki => nix/tests/fixtures/uefi-keys}/keys/PK/PK.key   | 0
 {pki => nix/tests/fixtures/uefi-keys}/keys/PK/PK.pem   | 0
 {pki => nix/tests/fixtures/uefi-keys}/keys/db/db.key   | 0
 {pki => nix/tests/fixtures/uefi-keys}/keys/db/db.pem   | 0
 nix/tests/lanzaboote.nix                               | 2 +-
 8 files changed, 1 insertion(+), 1 deletion(-)
 rename {pki => nix/tests/fixtures/uefi-keys}/GUID (100%)
 rename {pki => nix/tests/fixtures/uefi-keys}/keys/KEK/KEK.key (100%)
 rename {pki => nix/tests/fixtures/uefi-keys}/keys/KEK/KEK.pem (100%)
 rename {pki => nix/tests/fixtures/uefi-keys}/keys/PK/PK.key (100%)
 rename {pki => nix/tests/fixtures/uefi-keys}/keys/PK/PK.pem (100%)
 rename {pki => nix/tests/fixtures/uefi-keys}/keys/db/db.key (100%)
 rename {pki => nix/tests/fixtures/uefi-keys}/keys/db/db.pem (100%)

diff --git a/pki/GUID b/nix/tests/fixtures/uefi-keys/GUID
similarity index 100%
rename from pki/GUID
rename to nix/tests/fixtures/uefi-keys/GUID
diff --git a/pki/keys/KEK/KEK.key b/nix/tests/fixtures/uefi-keys/keys/KEK/KEK.key
similarity index 100%
rename from pki/keys/KEK/KEK.key
rename to nix/tests/fixtures/uefi-keys/keys/KEK/KEK.key
diff --git a/pki/keys/KEK/KEK.pem b/nix/tests/fixtures/uefi-keys/keys/KEK/KEK.pem
similarity index 100%
rename from pki/keys/KEK/KEK.pem
rename to nix/tests/fixtures/uefi-keys/keys/KEK/KEK.pem
diff --git a/pki/keys/PK/PK.key b/nix/tests/fixtures/uefi-keys/keys/PK/PK.key
similarity index 100%
rename from pki/keys/PK/PK.key
rename to nix/tests/fixtures/uefi-keys/keys/PK/PK.key
diff --git a/pki/keys/PK/PK.pem b/nix/tests/fixtures/uefi-keys/keys/PK/PK.pem
similarity index 100%
rename from pki/keys/PK/PK.pem
rename to nix/tests/fixtures/uefi-keys/keys/PK/PK.pem
diff --git a/pki/keys/db/db.key b/nix/tests/fixtures/uefi-keys/keys/db/db.key
similarity index 100%
rename from pki/keys/db/db.key
rename to nix/tests/fixtures/uefi-keys/keys/db/db.key
diff --git a/pki/keys/db/db.pem b/nix/tests/fixtures/uefi-keys/keys/db/db.pem
similarity index 100%
rename from pki/keys/db/db.pem
rename to nix/tests/fixtures/uefi-keys/keys/db/db.pem
diff --git a/nix/tests/lanzaboote.nix b/nix/tests/lanzaboote.nix
index 2ec5b96..13aae45 100644
--- a/nix/tests/lanzaboote.nix
+++ b/nix/tests/lanzaboote.nix
@@ -26,7 +26,7 @@ let
       boot.lanzaboote = {
         enable = true;
         enrollKeys = lib.mkDefault true;
-        pkiBundle = ../../pki;
+        pkiBundle = ./fixtures/uefi-keys;
       };
     };
   };