Merge master into staging-next

2021-01-09 01:00:25 +00:00
parent f89e74dbcc 9ff1aa8d2c
commit e251591528
34 changed files with 2325 additions and 828 deletions
@@ -30,7 +30,13 @@ with lib;

  config = {

-    systemd.additionalUpstreamSystemUnits = optional config.boot.tmpOnTmpfs "tmp.mount";
+    systemd.mounts = mkIf config.boot.tmpOnTmpfs [
+      {
+        what = "tmpfs";
+        where = "/tmp";
+        mountConfig.Options = [ "mode=1777" "strictatime" "rw" "nosuid" "nodev" "size=50%" ];
+      }
+    ];

    systemd.tmpfiles.rules = optional config.boot.cleanTmpDir "D! /tmp 1777 root root";