From a914d97e00e10ae387f852955618cb1be3fe1dd0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= <cynerd@email.cz>
Date: Tue, 19 Jul 2022 14:31:16 +0200
Subject: nixos: fix tarball content

---
 flake.lock                       |  6 +++---
 nixos/modules/turris-tarball.nix | 28 ++++++++++++++--------------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/flake.lock b/flake.lock
index 6df7f2c..7f426ae 100644
--- a/flake.lock
+++ b/flake.lock
@@ -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";
       }
     ];
 
-- 
cgit v1.2.3