1 files changed, 63 insertions, 35 deletions

diff --git a/modules/by-name/bo/boot/module.nix b/modules/by-name/bo/boot/module.nix
index ebf58a97..2667b385 100644
--- a/modules/by-name/bo/boot/module.nix
+++ b/modules/by-name/bo/boot/module.nix
@@ -19,37 +19,65 @@
 }: let
   cfg = config.soispha.boot;
 
-  tailsPrefix = "EFI/tails";
-  iso = import ./tails_iso.nix {inherit pkgs;};
+  tails = let
+    tailsPrefix = "/EFI/tails";
+  in {
+    root = "${tailsPrefix}/tails.iso";
+    initrd = "${tailsPrefix}/initrd.img";
+    vmlinuz = "${tailsPrefix}/vmlinuz-linux";
+  };
 
-  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"
+  iso = pkgs.tails-iso;
 
-    "rootflags=loop"
-    "root=/${tailsPrefix}/filesystem.squashfs"
-  ];
+  # 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"
+    ]
+    ## Options for the first `init` script
+    ++ [
+      # Use the `*-live` scripts
+      "boot=live"
+
+      # "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 +171,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 +192,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";
           };
         };