2 files changed, 77 insertions, 38 deletions

diff --git a/modules/by-name/bo/boot/module.nix b/modules/by-name/bo/boot/module.nix
index b8c90d89..4dc9130a 100644
--- a/modules/by-name/bo/boot/module.nix
+++ b/modules/by-name/bo/boot/module.nix
@@ -19,37 +19,73 @@
 }: let
   cfg = config.soispha.boot;
 
-  tailsPrefix = "EFI/tails";
+  tails = let
+    tailsPrefix = "/EFI/tails";
+  in {
+    root = "${tailsPrefix}/tails.iso";
+    initrd = "${tailsPrefix}/initrd.img";
+    vmlinuz = "${tailsPrefix}/vmlinuz-linux";
+  };
+
   iso = pkgs.tails-iso;
 
-  iso_options = [
-    "initrd=/${tailsPrefix}/initrd.img"
-    "boot=live"
-    "config"
-    "live-media=removable"
-    "nopersistence"
-    "noprompt"
-    "timezone=Etc/UTC"
-    "splash"
-    "noautologin"
-    "module=Tails"
-    "slab_nomerge"
-    "slub_debug=FZ"
-    "mce=0"
-    "vsyscall=none"
-    "init_on_free=1"
-    "mds=full,nosmt"
-    "page_alloc.shuffle=1"
-    "randomize_kstack_offset=on"
-    "efi_pstore.pstore_disable=1"
-    "erst_disable"
-    "spec_store_bypass_disable=on"
-    "systemd.condition_needs_update=no"
-    "quiet"
+  # From:
+  # - The extracted ISO's boot dir
+  # - Reverse engineered from:
+  #     - `<tails iso squashfs>/usr/share/initramfs-tools/init`
+  #     - `<tails iso squashfs>/usr/lib/live/boot/`
+  iso_options =
+    ## General options?
+    [
+      "initrd=${tails.initrd}"
+      # "noprompt"
+      # "timezone=Etc/UTC"
+      # "config"
+      # "noautologin"
+      # "slab_nomerge"
+      # "slub_debug=FZ"
+      # "mce=0"
+      # "vsyscall=none"
+      # "init_on_free=1"
+      # "mds=full,nosmt"
+      # "page_alloc.shuffle=1"
+      # "randomize_kstack_offset=on"
+      # "efi_pstore.pstore_disable=1"
+      # "erst_disable"
+      # "spec_store_bypass_disable=on"
+      # "systemd.condition_needs_update=no"
+    ]
+    ## Systemd log options
+    ++ [
+      "systemd.log_level=debug"
+      "systemd.log_target=console"
+      "console=tty1"
+      "systemd.journald.forward_to_console=1"
+      "systemd.unit=rescue.target"
+    ]
+    ## Options for the first `init` script
+    ++ [
+      # Use the `*-live` scripts
+      "boot=live"
 
-    "rootflags=loop"
-    "root=/${tailsPrefix}/filesystem.squashfs"
-  ];
+      # "splash"
+      "plymouth.enable=0"
+
+      # "quiet"
+      "debug"
+    ]
+    ## Options for the `*-live` `init` scripts
+    ++ [
+      "module=Tails"
+
+      # TODO: RO-makes the fromiso not work <2026-06-08>
+      # "live-boot.read-only=/dev/nvme0*"
+
+      # Don't store things persistently
+      "nopersistence"
+
+      "fromiso=/dev/nvme0n1p1/${tails.root}"
+    ];
 in {
   options.soispha.boot = {
     enable = lib.mkEnableOption "Bootloader configuration";
@@ -143,7 +179,7 @@ in {
                   systemdCfg.extraFiles
                 )}
 
-                ${lib.getExe pkgs.sbctl} sign "${bootMountPoint}/${tailsPrefix}/vmlinuz-linux"
+                ${lib.getExe pkgs.sbctl} sign "${bootMountPoint}/${tails.vmlinuz}"
 
                 ${concatStrings (
                   mapAttrsToList (n: v: ''
@@ -164,16 +200,16 @@ in {
           extraEntries = {
             "live.conf" = ''
               title Tails ${iso.passthru.version} Live ISO
-              linux /${tailsPrefix}/vmlinuz
-              initrd /${tailsPrefix}/initrd.img
+              linux ${tails.vmlinuz}
+              initrd ${tails.initrd}
               options ${builtins.concatStringsSep " " iso_options}
             '';
           };
 
           extraFiles = {
-            "/${tailsPrefix}/filesystem.squashfs" = "${iso}/live/filesystem.squashfs";
-            "/${tailsPrefix}/vmlinuz" = "${iso}/live/vmlinuz";
-            "/${tailsPrefix}/initrd.img" = "${iso}/live/initrd.img";
+            "${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/*
     '';
   }