summary refs log tree commit diff
diff options
context:
space:
mode:
authorVladimír Čunát <v@cunat.cz>2022-02-17 16:26:01 +0100
committerVladimír Čunát <v@cunat.cz>2022-02-17 16:26:28 +0100
commit9d09daa0a91ab1c7ccefdc32d6a2f0ada9e78d39 (patch)
treebbc6cffddc2fde3031ed9caf323f3304b228d801
parent28bdc3d8f1f372a7917bcac79c357271b8899ec4 (diff)
parent4cea2574401fe6b6690085098dc8e96f84747205 (diff)
downloadnixpkgs-9d09daa0a91ab1c7ccefdc32d6a2f0ada9e78d39.tar
nixpkgs-9d09daa0a91ab1c7ccefdc32d6a2f0ada9e78d39.tar.gz
nixpkgs-9d09daa0a91ab1c7ccefdc32d6a2f0ada9e78d39.tar.bz2
nixpkgs-9d09daa0a91ab1c7ccefdc32d6a2f0ada9e78d39.tar.lz
nixpkgs-9d09daa0a91ab1c7ccefdc32d6a2f0ada9e78d39.tar.xz
nixpkgs-9d09daa0a91ab1c7ccefdc32d6a2f0ada9e78d39.tar.zst
nixpkgs-9d09daa0a91ab1c7ccefdc32d6a2f0ada9e78d39.zip
Merge #157512: nixos/tmp: Fix format of /tmp mount options
-rw-r--r--nixos/modules/system/boot/tmp.nix7
1 files changed, 6 insertions, 1 deletions
diff --git a/nixos/modules/system/boot/tmp.nix b/nixos/modules/system/boot/tmp.nix
index 6edafd6695b..cf6d19eb5f0 100644
--- a/nixos/modules/system/boot/tmp.nix
+++ b/nixos/modules/system/boot/tmp.nix
@@ -48,7 +48,12 @@ in
         what = "tmpfs";
         where = "/tmp";
         type = "tmpfs";
-        mountConfig.Options = [ "mode=1777" "strictatime" "rw" "nosuid" "nodev" "size=${toString cfg.tmpOnTmpfsSize}" ];
+        mountConfig.Options = concatStringsSep "," [ "mode=1777"
+                                                     "strictatime"
+                                                     "rw"
+                                                     "nosuid"
+                                                     "nodev"
+                                                     "size=${toString cfg.tmpOnTmpfsSize}" ];
       }
     ];