modules/boot: Make sure to use the same paths everywhere

1 files changed, 16 insertions, 9 deletions

diff --git a/modules/by-name/bo/boot/module.nix b/modules/by-name/bo/boot/module.nix
index b8c90d89..673faf70 100644
--- a/modules/by-name/bo/boot/module.nix
+++ b/modules/by-name/bo/boot/module.nix
@@ -19,11 +19,18 @@
 }: let
   cfg = config.soispha.boot;
 
-  tailsPrefix = "EFI/tails";
+  tails = let
+    tailsPrefix = "/EFI/tails";
+  in {
+    root = "${tailsPrefix}/filesystem.squashfs";
+    initrd = "${tailsPrefix}/initrd.img";
+    vmlinuz = "${tailsPrefix}/vmlinuz-linux";
+  };
+
   iso = pkgs.tails-iso;
 
   iso_options = [
-    "initrd=/${tailsPrefix}/initrd.img"
+    "initrd=${tails.initrd}"
     "boot=live"
     "config"
     "live-media=removable"
@@ -48,7 +55,7 @@
     "quiet"
 
     "rootflags=loop"
-    "root=/${tailsPrefix}/filesystem.squashfs"
+    "root=${tails.root}"
   ];
 in {
   options.soispha.boot = {
@@ -143,7 +150,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 +171,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}/live/filesystem.squashfs";
+            "${tails.vmlinuz}" = "${iso}/live/vmlinuz";
+            "${tails.initrd}" = "${iso}/live/initrd.img";
           };
         };