summary refs log tree commit diff
diff options
context:
space:
mode:
authorDanielle Lancashire <dani@builds.terrible.systems>2021-01-09 15:32:17 +0100
committerDanielle Lancashire <dani@builds.terrible.systems>2021-01-09 15:32:17 +0100
commitca7b35d2d9c276cf08d9ca8248eae004f4e9d295 (patch)
tree735fdf4bc3f84f2a17eea24cbc61c33c06c9edba
parentf78f1b076c997c905ba1b3d686ff61b8a2bf576c (diff)
downloadnixpkgs-ca7b35d2d9c276cf08d9ca8248eae004f4e9d295.tar
nixpkgs-ca7b35d2d9c276cf08d9ca8248eae004f4e9d295.tar.gz
nixpkgs-ca7b35d2d9c276cf08d9ca8248eae004f4e9d295.tar.bz2
nixpkgs-ca7b35d2d9c276cf08d9ca8248eae004f4e9d295.tar.lz
nixpkgs-ca7b35d2d9c276cf08d9ca8248eae004f4e9d295.tar.xz
nixpkgs-ca7b35d2d9c276cf08d9ca8248eae004f4e9d295.tar.zst
nixpkgs-ca7b35d2d9c276cf08d9ca8248eae004f4e9d295.zip
modules/boot: Specify the type for tmpfs mounts
https://github.com/NixOS/nixpkgs/pull/107497 broke booting on many systems that
use tmpOnTmpfs due to the lack of specifying the mount type.

This commit explicitly adds the mount type, which should fix booting
such systems.

The original change may want to be revisited however too.
-rw-r--r--nixos/modules/system/boot/tmp.nix1
1 files changed, 1 insertions, 0 deletions
diff --git a/nixos/modules/system/boot/tmp.nix b/nixos/modules/system/boot/tmp.nix
index 837e308cbea..5bb299adb15 100644
--- a/nixos/modules/system/boot/tmp.nix
+++ b/nixos/modules/system/boot/tmp.nix
@@ -34,6 +34,7 @@ with lib;
       {
         what = "tmpfs";
         where = "/tmp";
+        type = "tmpfs";
         mountConfig.Options = [ "mode=1777" "strictatime" "rw" "nosuid" "nodev" "size=50%" ];
       }
     ];