diff options
Diffstat (limited to '')
| -rw-r--r-- | modules/by-name/bo/boot/module.nix | 46 | ||||
| -rw-r--r-- | pkgs/by-name/ta/tails-iso/package.nix | 11 |
2 files changed, 34 insertions, 23 deletions
diff --git a/modules/by-name/bo/boot/module.nix b/modules/by-name/bo/boot/module.nix index 9634edbc..4dc9130a 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"; }; @@ -38,22 +38,30 @@ ## 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" + # "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 ++ [ @@ -199,8 +207,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/* ''; } |