1 files changed, 4 insertions, 23 deletions
diff --git a/modules/by-name/bo/boot/module.nix b/modules/by-name/bo/boot/module.nix
index 01c98d6e..6a0c0cf7 100644
--- a/modules/by-name/bo/boot/module.nix
+++ b/modules/by-name/bo/boot/module.nix
@@ -35,29 +35,8 @@ in {
     # this module.
     soispha.impermanence.directories = [
       "/var/lib/sbctl"
-      "/boot"
     ];
 
-    fileSystems = {
-      # Emulate XBOOTLDR for lanzaboote (see: https://github.com/nix-community/lanzaboote/issues/173#issuecomment-1532386210)
-      "/efi/EFI/Linux" = {
-        device = "/boot/EFI/Linux";
-        options = ["bind"];
-        fsType = "btrfs";
-      };
-      "/efi/EFI/nixos" = {
-        device = "/boot/EFI/nixos";
-        options = ["bind"];
-        fsType = "btrfs";
-      };
-
-      "/efi/${tailsPrefix}" = lib.mkIf cfg.enableIsoEntry {
-        device = "/boot/${tailsPrefix}";
-        options = ["bind"];
-        fsType = "btrfs";
-      };
-    };
-
     boot = {
       initrd = {
         kernelModules = ["nvme" "btrfs"];
@@ -134,6 +113,8 @@ in {
                   systemdCfg.extraFiles
                 )}
 
+                ${lib.getExe pkgs.sbctl} sign "${bootMountPoint}/${tailsPrefix}/vmlinuz-linux"
+
                 ${concatStrings (
                   mapAttrsToList (n: v: ''
                     ${install} -Dp "${pkgs.writeText n v}" "${bootMountPoint}/loader/entries/"${escapeShellArg n}
@@ -155,7 +136,7 @@ in {
               title Tails Live ISO
               linux /${tailsPrefix}/vmlinuz-linux
               initrd /${tailsPrefix}/initramfs-linux.img
-              options img_dev=${config.soispha.disks.disk} img_loop=/${tailsPrefix}/tails.iso copytoram
+              options root=/${tailsPrefix}/tails.iso
             '';
           };
 
@@ -170,7 +151,7 @@ in {
 
         efi = {
           canTouchEfiVariables = true;
-          efiSysMountPoint = "/efi";
+          efiSysMountPoint = "/boot";
         };
       };
     };