diff options
| author | Karel Kočí <cynerd@email.cz> | 2022-07-19 14:31:16 +0200 |
|---|---|---|
| committer | Karel Kočí <cynerd@email.cz> | 2022-07-19 14:31:16 +0200 |
| commit | a914d97e00e10ae387f852955618cb1be3fe1dd0 (patch) | |
| tree | 6bd3a48dc198896ed034d94976021adc67838420 | |
| parent | 12747ad801b7f4cf90a1716db5547bb0fb3b72a0 (diff) | |
| download | nixturris-a914d97e00e10ae387f852955618cb1be3fe1dd0.tar.gz nixturris-a914d97e00e10ae387f852955618cb1be3fe1dd0.tar.bz2 nixturris-a914d97e00e10ae387f852955618cb1be3fe1dd0.zip | |
nixos: fix tarball content
| -rw-r--r-- | flake.lock | 6 | ||||
| -rw-r--r-- | nixos/modules/turris-tarball.nix | 28 |
2 files changed, 17 insertions, 17 deletions
@@ -16,11 +16,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1657975505, - "narHash": "sha256-juMbw+GY2ycTrg3QbdFfEQs6P3FJeoYEv8aMVl2EZsg=", + "lastModified": 1658150454, + "narHash": "sha256-dhyOQvRT8oYWN0SwsNyujohBsJqwF5W7fnhEcfgBk7E=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d6df226c53d46821bd4773bd7ec3375f30238edb", + "rev": "3110964916469ad6ed9fea72a0a3119a0959a14e", "type": "github" }, "original": { diff --git a/nixos/modules/turris-tarball.nix b/nixos/modules/turris-tarball.nix index 5a1f672..87c4fb9 100644 --- a/nixos/modules/turris-tarball.nix +++ b/nixos/modules/turris-tarball.nix @@ -43,19 +43,6 @@ let } ''; }; - system.extraSystemBuilderCmds = '' - mkdir -p $out/boot/extlinux - cat >$out/boot/extlinux/extlinux.conf <<EOF - DEFAULT nixos-default - TIMEOUT 0 - LABEL nixos-default - MENU LABEL NixOS - Default - LINUX /run/current-system/kernel - FDTDIR /run/current-system/dtbs - INITRD /run/current-system/initrd - APPEND init=${config.system.build.toplevel}/init ${builtins.toString config.boot.kernelParams} - EOF - ''; }]; }; @@ -65,7 +52,20 @@ in { contents = [ { source = "${tarballVariant.config.system.build.toplevel}/."; - target = "./"; + target = "./run/current-system"; + } + { + source = pkgs.writeText "tarball-extlinux" '' + DEFAULT nixturris-tarball + TIMEOUT 0 + LABEL nixturris-tarball + MENU LABEL NixOS Turris - Tarball + LINUX /run/current-system/kernel + FDTDIR /run/current-system/dtbs + INITRD /run/current-system/initrd + APPEND init=${config.system.build.toplevel}/init ${builtins.toString config.boot.kernelParams} + ''; + target = "./boot/extlinux/extlinux.conf"; } ]; |