lanzatool: remove v1 key

rust/lanzatool/bootspec.json

@@ -1,5 +1,4 @@
 {
-  "v1": {
   "init": "/run/current-system/init",
   "initrd": "/run/current-system/initrd",
   "kernel": "/run/current-system/kernel",
@@ -22,4 +21,3 @@
     "osRelease": "/etc/os-release"
   }
 }
-}

rust/lanzatool/src/bootspec.rs

@@ -2,14 +2,9 @@ use std::path::PathBuf;
 
 use serde::{Deserialize, Serialize};
 
-#[derive(Debug, Default, Serialize, Deserialize, PartialEq, Eq)]
-pub struct Bootspec {
-    pub v1: GenerationV1,
-}
-
 #[derive(Debug, Default, Serialize, Deserialize, PartialEq, Eq)]
 #[serde(rename_all = "camelCase")]
-pub struct GenerationV1 {
+pub struct Bootspec {
     /// Label for the system closure
     pub label: String,
     /// Path to kernel (bzImage) -- $toplevel/kernel

rust/lanzatool/src/install.rs

@@ -16,30 +16,29 @@ pub fn install(
 ) -> Result<()> {
     let bootspec_doc: Bootspec = serde_json::from_slice(&fs::read(bootspec)?)?;
 
-    let esp_paths = EspPaths::new(&bootspec_doc.v1.extension.esp);
+    let esp_paths = EspPaths::new(&bootspec_doc.extension.esp);
 
     let lanzaboote_image = pe::assemble_image(
         lanzaboote_stub,
-        &bootspec_doc.v1.extension.os_release,
-        &bootspec_doc.v1.kernel_params,
+        &bootspec_doc.extension.os_release,
+        &bootspec_doc.kernel_params,
         &esp_paths.kernel,
         &esp_paths.initrd,
     )
     .expect("Failed to assemble stub");
 
     let wrapped_initrd =
-        pe::wrap_initrd(initrd_stub, &bootspec_doc.v1.initrd).expect("Failed to assemble stub");
+        pe::wrap_initrd(initrd_stub, &bootspec_doc.initrd).expect("Failed to assemble stub");
 
     // Copy the files to the ESP
     fs::create_dir_all(&esp_paths.nixos)?;
-    fs::copy(bootspec_doc.v1.kernel, esp_paths.kernel)?;
+    fs::copy(bootspec_doc.kernel, esp_paths.kernel)?;
     fs::copy(wrapped_initrd, esp_paths.initrd)?;
 
     fs::create_dir_all(&esp_paths.linux)?;
     fs::copy(lanzaboote_image, esp_paths.lanzaboote_image)?;
 
     let systemd_boot = bootspec_doc
-        .v1
         .extension
         .systemd
         .join("lib/systemd/boot/efi/systemd-bootx64.efi");