summary refs log tree commit diff
path: root/nixos/modules/system
diff options
context:
space:
mode:
authorRamses <141248+R-VdP@users.noreply.github.com>2022-01-31 12:49:29 +0100
committerRamses <141248+R-VdP@users.noreply.github.com>2022-01-31 12:49:29 +0100
commit4cea2574401fe6b6690085098dc8e96f84747205 (patch)
treeefc5f0350496cdeaa384c3a9ace20d99aa32a576 /nixos/modules/system
parente67d26b0f0fad23a9a5b844b4dad4dfae1769fe9 (diff)
downloadnixpkgs-4cea2574401fe6b6690085098dc8e96f84747205.tar
nixpkgs-4cea2574401fe6b6690085098dc8e96f84747205.tar.gz
nixpkgs-4cea2574401fe6b6690085098dc8e96f84747205.tar.bz2
nixpkgs-4cea2574401fe6b6690085098dc8e96f84747205.tar.lz
nixpkgs-4cea2574401fe6b6690085098dc8e96f84747205.tar.xz
nixpkgs-4cea2574401fe6b6690085098dc8e96f84747205.tar.zst
nixpkgs-4cea2574401fe6b6690085098dc8e96f84747205.zip
nixos/tmp: Fix format of /tmp mount options
The mount options need to be passed as a comma-separated list of options so that they
end up one a single Options line in the resulting mount unit.
The current code passed the options as a list, resulting in several Options lines in
the mount unit, all but the first of these were ignored by systemd however.
This behaviour is not clearly defined in the systemd man page.
Diffstat (limited to 'nixos/modules/system')
-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}" ];
       }
     ];