diff options
| author | Karel Kočí <cynerd@email.cz> | 2022-07-19 17:08:18 +0200 |
|---|---|---|
| committer | Karel Kočí <cynerd@email.cz> | 2022-07-19 17:08:18 +0200 |
| commit | aea7e04bda37da24c660ff5ab220182dfbb8244f (patch) | |
| tree | ce825c0700774b847cf01645afbacd3592c937a3 | |
| parent | f943c6dc9969fd504387fa735b07439ea768b40c (diff) | |
| download | nixturris-aea7e04bda37da24c660ff5ab220182dfbb8244f.tar.gz nixturris-aea7e04bda37da24c660ff5ab220182dfbb8244f.tar.bz2 nixturris-aea7e04bda37da24c660ff5ab220182dfbb8244f.zip | |
nixos: fix invalid init
| -rw-r--r-- | nixos/modules/turris-defaults.nix | 4 | ||||
| -rw-r--r-- | nixos/modules/turris-tarball.nix | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/nixos/modules/turris-defaults.nix b/nixos/modules/turris-defaults.nix index ff2e141..9d7a19c 100644 --- a/nixos/modules/turris-defaults.nix +++ b/nixos/modules/turris-defaults.nix @@ -48,12 +48,12 @@ in { boot.initrd.supportedFilesystems = [ "btrfs" ]; # Cover nix memory consumption peaks by compressing the RAM - zramSwap = { + zramSwap = mkDefault { enable = true; memoryPercent = 80; }; - fileSystems = { + fileSystems = mkDefault { "/" = { device = "/dev/disk/by-partlabel/" + cnf.rootLabel; fsType = "btrfs"; diff --git a/nixos/modules/turris-tarball.nix b/nixos/modules/turris-tarball.nix index 87c4fb9..55187e4 100644 --- a/nixos/modules/turris-tarball.nix +++ b/nixos/modules/turris-tarball.nix @@ -63,7 +63,7 @@ in { 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} + APPEND init=${tarballVariant.config.system.build.toplevel}/init ${builtins.toString tarballVariant.config.boot.kernelParams} ''; target = "./boot/extlinux/extlinux.conf"; } |