Unverified Commit a7f4ae06 authored by github-actions[bot]'s avatar github-actions[bot] Committed by GitHub
Browse files

Merge master into staging-next

parents b38903da cf57af7f
Loading
Loading
Loading
Loading
+6 −0
Original line number Diff line number Diff line
@@ -4371,6 +4371,12 @@
    githubId = 49904992;
    name = "Dawid Sowa";
  };
  daylinmorgan = {
    email = "daylinmorgan@gmail.com";
    github = "daylinmorgan";
    githubId = 47667941;
    name = "Daylin Morgan";
  };
  dbalan = {
    email = "nix@dbalan.in";
    github = "dbalan";
+1 −0
Original line number Diff line number Diff line
@@ -39,4 +39,5 @@ and non-critical by adding `options = [ "nofail" ];`.
```{=include=} sections
luks-file-systems.section.md
sshfs-file-systems.section.md
overlayfs.section.md
```
+27 −0
Original line number Diff line number Diff line
# Overlayfs {#sec-overlayfs}

NixOS offers a convenient abstraction to create both read-only as well writable
overlays.

```nix
fileSystems = {
  "/writable-overlay" = {
    overlay = {
      lowerdir = [ writableOverlayLowerdir ];
      upperdir = "/.rw-writable-overlay/upper";
      workdir = "/.rw-writable-overlay/work";
    };
    # Mount the writable overlay in the initrd.
    neededForBoot = true;
  };
  "/readonly-overlay".overlay.lowerdir = [
    writableOverlayLowerdir
    writableOverlayLowerdir2
  ];
};
```

If `upperdir` and `workdir` are not null, they will be created before the
overlay is mounted.

To mount an overlay as read-only, you need to provide at least two `lowerdir`s.
+5 −0
Original line number Diff line number Diff line
@@ -278,6 +278,11 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m
- The option [`services.nextcloud.config.dbport`] of the Nextcloud module was removed to match upstream.
  The port can be specified in [`services.nextcloud.config.dbhost`](#opt-services.nextcloud.config.dbhost).

- A new abstraction to create both read-only as well as writable overlay file
  systems was added. Available via
  [fileSystems.overlay](#opt-fileSystems._name_.overlay.lowerdir). See also the
  [NixOS docs](#sec-overlayfs).

- `stdenv`: The `--replace` flag in `substitute`, `substituteInPlace`, `substituteAll`, `substituteAllStream`, and `substituteStream` is now deprecated if favor of the new `--replace-fail`, `--replace-warn` and `--replace-quiet`. The deprecated `--replace` equates to `--replace-warn`.

- A new hardening flag, `zerocallusedregs` was made available, corresponding to the gcc/clang option `-fzero-call-used-regs=used-gpr`.
+1 −0
Original line number Diff line number Diff line
@@ -1527,6 +1527,7 @@
  ./tasks/filesystems/jfs.nix
  ./tasks/filesystems/nfs.nix
  ./tasks/filesystems/ntfs.nix
  ./tasks/filesystems/overlayfs.nix
  ./tasks/filesystems/reiserfs.nix
  ./tasks/filesystems/sshfs.nix
  ./tasks/filesystems/squashfs.nix
Loading