Merge master into staging-next

2021-01-15 01:16:33 +00:00
parent 183b673b64 5525440dd6
commit 9f69dadafd
47 changed files with 742 additions and 363 deletions
@@ -34,6 +34,7 @@ with lib;
      {
        what = "tmpfs";
        where = "/tmp";
+        type = "tmpfs";
        mountConfig.Options = [ "mode=1777" "strictatime" "rw" "nosuid" "nodev" "size=50%" ];
      }
    ];