about summary refs log tree commit diff
path: root/nixos/doc
diff options
context:
space:
mode:
authorFrederik Rietdijk <fridh@fridh.nl>2020-06-05 19:42:16 +0200
committerFrederik Rietdijk <fridh@fridh.nl>2020-06-05 19:42:16 +0200
commit1c68570ab297a96861ec87034ff9ef155e23b0a4 (patch)
treea6785ac0ec23ec3b4686ec4c11b0cc4590320c80 /nixos/doc
parent462aa777dfbb45829321dead7749382e3d551e8c (diff)
parent43f71029cc6b18c1b4db4d01b35dbb30425c2f4e (diff)
downloadnixlib-1c68570ab297a96861ec87034ff9ef155e23b0a4.tar
nixlib-1c68570ab297a96861ec87034ff9ef155e23b0a4.tar.gz
nixlib-1c68570ab297a96861ec87034ff9ef155e23b0a4.tar.bz2
nixlib-1c68570ab297a96861ec87034ff9ef155e23b0a4.tar.lz
nixlib-1c68570ab297a96861ec87034ff9ef155e23b0a4.tar.xz
nixlib-1c68570ab297a96861ec87034ff9ef155e23b0a4.tar.zst
nixlib-1c68570ab297a96861ec87034ff9ef155e23b0a4.zip
Merge staging-next into staging
Diffstat (limited to 'nixos/doc')
-rw-r--r--nixos/doc/manual/release-notes/rl-2009.xml14
1 files changed, 14 insertions, 0 deletions
diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml
index c65be35bea50..ae55f77b0cc4 100644
--- a/nixos/doc/manual/release-notes/rl-2009.xml
+++ b/nixos/doc/manual/release-notes/rl-2009.xml
@@ -446,6 +446,20 @@ systemd.services.nginx.serviceConfig.ReadWritePaths = [ "/var/www" ];
        recommended to only use lower-case characters.
      </para>
    </listitem>
+   <listitem>
+    <para>
+     The GRUB specific option <option>boot.loader.grub.extraInitrd</option>
+     has been replaced with the generic option
+     <option>boot.initrd.secrets</option>. This option creates a secondary
+     initrd from the specified files, rather than using a manually created
+     initrd file.
+
+     Due to an existing bug with <option>boot.loader.grub.extraInitrd</option>,
+     it is not possible to directly boot an older generation that used that
+     option. It is still possible to rollback to that generation if the required
+     initrd file has not been deleted.
+    </para>
+   </listitem>
   </itemizedlist>
  </section>