{modules/boot,pkgs/tails-iso}: Actually use an iso in `fromiso=`

2 files changed, 10 insertions, 7 deletions

diff --git a/modules/by-name/bo/boot/module.nix b/modules/by-name/bo/boot/module.nix
index 9634edbc..2667b385 100644
--- a/modules/by-name/bo/boot/module.nix
+++ b/modules/by-name/bo/boot/module.nix
@@ -22,7 +22,7 @@
   tails = let
     tailsPrefix = "/EFI/tails";
   in {
-    root = "${tailsPrefix}/filesystem.squashfs";
+    root = "${tailsPrefix}/tails.iso";
     initrd = "${tailsPrefix}/initrd.img";
     vmlinuz = "${tailsPrefix}/vmlinuz-linux";
   };
@@ -199,8 +199,8 @@ in {
           };
 
           extraFiles = {
-            "${tails.root}" = "${iso}/live/filesystem.squashfs";
-            "${tails.vmlinuz}" = "${iso}/live/vmlinuz";
+            "${tails.root}" = "${iso}/tails.iso";
+            "${tails.vmlinuz}" = "${iso}/live/vmlinuz-linux";
             "${tails.initrd}" = "${iso}/live/initrd.img";
           };
         };
diff --git a/pkgs/by-name/ta/tails-iso/package.nix b/pkgs/by-name/ta/tails-iso/package.nix
index b74e4023..87bfd0b2 100644
--- a/pkgs/by-name/ta/tails-iso/package.nix
+++ b/pkgs/by-name/ta/tails-iso/package.nix
@@ -16,7 +16,7 @@
   files = builtins.fromJSON (builtins.readFile (./files.json));
 
   checked_iso = stdenv.mkDerivation (finalAttrs: {
-    pname = "tails-iso";
+    pname = "raw-tails-iso";
     version = "amd64-${files.version}";
 
     srcs = [
@@ -61,7 +61,8 @@
   });
 in
   stdenv.mkDerivation {
-    name = "live_iso_boot_entry";
+    pname = "tails-iso-package";
+    inherit (checked_iso) version;
 
     src = checked_iso;
 
@@ -81,8 +82,10 @@ in
     };
 
     installPhase = ''
+      install -D "$src" "$out/tails.iso"
+      install -D ./iso/live/vmlinuz "$out/live/vmlinuz-linux"
       install -D ./iso/live/initrd.img "$out/live/initrd.img"
-      install -D ./iso/live/vmlinuz "$out/live/vmlinuz"
-      install -D ./iso/live/filesystem.squashfs "$out/live/filesystem.squashfs"
+
+      chmod --recursive -x $out/tails.iso $out/live/*
     '';
   }