From 9a894676068434ad953fc70091885ac12093fd31 Mon Sep 17 00:00:00 2001
From: Jörg Thalheim <joerg@thalheim.io>
Date: Tue, 8 Oct 2019 12:10:23 +0100
Subject: nixos/zfs: simplify logic for scrub/autosnapshot service

This makes them consistent with the way zfs.trim is enabled
and allow to enable them by default in future.
---
 nixos/doc/manual/release-notes/rl-2003.xml | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'nixos/doc/manual/release-notes')

diff --git a/nixos/doc/manual/release-notes/rl-2003.xml b/nixos/doc/manual/release-notes/rl-2003.xml
index bdf56acd5451..7c234d004602 100644
--- a/nixos/doc/manual/release-notes/rl-2003.xml
+++ b/nixos/doc/manual/release-notes/rl-2003.xml
@@ -36,6 +36,15 @@
      quirk in the boot menu.
     </para>
    </listitem>
+   <listitem>
+     <para>
+       The zfs scrub service (<varname>services.zfs.autoScrub.enable</varname>)
+       and the zfs autosnapshot service (<varname>services.zfs.autoSnapshot.enable</varname>)
+       are now only enabled if zfs is set in <varname>config.boot.initrd.supportedFilesystems</varname> or
+       <varname>config.boot.supportedFilesystems</varname>. These lists will automatically contain
+       zfs as soon as any zfs mountpoint is configured in <varname>fileSystems</varname>.
+     </para>
+   </listitem>
   </itemizedlist>
  </section>
 
-- 
cgit 1.4.1


From 12880e57e173379ba094d0dd9815f262248729d8 Mon Sep 17 00:00:00 2001
From: Jörg Thalheim <joerg@thalheim.io>
Date: Tue, 8 Oct 2019 12:15:15 +0100
Subject: nixos/zfs: mention trim support in the release notes

---
 nixos/doc/manual/release-notes/rl-2003.xml | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'nixos/doc/manual/release-notes')

diff --git a/nixos/doc/manual/release-notes/rl-2003.xml b/nixos/doc/manual/release-notes/rl-2003.xml
index 7c234d004602..ab0951e831ce 100644
--- a/nixos/doc/manual/release-notes/rl-2003.xml
+++ b/nixos/doc/manual/release-notes/rl-2003.xml
@@ -38,6 +38,10 @@
    </listitem>
    <listitem>
      <para>
+       By default zfs pools will now be trimmed on a weekly basis.
+       Trimming is only done on supported devices (i.e. NVME or SSDs)
+       and should improve throughput and lifetime of these devices.
+       It is controlled by the <varname>services.zfs.trim.enable</varname> varname.
        The zfs scrub service (<varname>services.zfs.autoScrub.enable</varname>)
        and the zfs autosnapshot service (<varname>services.zfs.autoSnapshot.enable</varname>)
        are now only enabled if zfs is set in <varname>config.boot.initrd.supportedFilesystems</varname> or
-- 
cgit 1.4.1