summary refs log tree commit diff
path: root/nixos/doc
diff options
context:
space:
mode:
authorMichael Weiss <dev.primeos@gmail.com>2021-11-27 17:14:55 +0100
committerMichael Weiss <dev.primeos@gmail.com>2021-11-27 17:22:22 +0100
commit1cfecb636b14a88174d914cd0522b78ff3bf9f82 (patch)
tree68f3b11a71e557e2c23e452344c929ec63ae01ab /nixos/doc
parent549025bbedac9080a513507a263a6c06326be62c (diff)
downloadnixpkgs-1cfecb636b14a88174d914cd0522b78ff3bf9f82.tar
nixpkgs-1cfecb636b14a88174d914cd0522b78ff3bf9f82.tar.gz
nixpkgs-1cfecb636b14a88174d914cd0522b78ff3bf9f82.tar.bz2
nixpkgs-1cfecb636b14a88174d914cd0522b78ff3bf9f82.tar.lz
nixpkgs-1cfecb636b14a88174d914cd0522b78ff3bf9f82.tar.xz
nixpkgs-1cfecb636b14a88174d914cd0522b78ff3bf9f82.tar.zst
nixpkgs-1cfecb636b14a88174d914cd0522b78ff3bf9f82.zip
Revert "Merge pull request #141192 from helsinki-systems/feat/improved-socket-handling2"
This reverts commit 57961d2b838cc31fa4ce89641b6a8db544a8471a, reversing
changes made to b04f913afce4419f6b777fd64ac52315dbef3aaf.
(I.e. this reverts PR #141192.)

While well-intended, this change does unfortunately introduce very
serious regressions that are especially disruptive/noticeable on desktop
systems (e.g. users of Sway will loose their graphical session when
running "nixos-rebuild switch").

Therefore, this change has to be reverted ASAP instead of trying to fix
it in "production".
Note: An updated version should be extensively discussed, reviewed, and
tested before re-landing this change as an earlier version also had to
be reverted for the exact same issues [0].

Fix: #146727

[0]: https://github.com/NixOS/nixpkgs/pull/73871#issuecomment-559783752
Diffstat (limited to 'nixos/doc')
-rw-r--r--nixos/doc/manual/from_md/release-notes/rl-2111.section.xml9
-rw-r--r--nixos/doc/manual/release-notes/rl-2111.section.md2
2 files changed, 0 insertions, 11 deletions
diff --git a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml
index f0e39471ece..eb620a3e3ed 100644
--- a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml
+++ b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml
@@ -1862,15 +1862,6 @@ Superuser created successfully.
       </listitem>
       <listitem>
         <para>
-          Changing systemd <literal>.socket</literal> units now restarts
-          them and stops the service that is activated by them.
-          Additionally, services with
-          <literal>stopOnChange = false</literal> don’t break anymore
-          when they are socket-activated.
-        </para>
-      </listitem>
-      <listitem>
-        <para>
           The <literal>virtualisation.libvirtd</literal> module has been
           refactored and updated with new options:
         </para>
diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md
index 3bdda82c026..c0151479903 100644
--- a/nixos/doc/manual/release-notes/rl-2111.section.md
+++ b/nixos/doc/manual/release-notes/rl-2111.section.md
@@ -520,8 +520,6 @@ In addition to numerous new and upgraded packages, this release has the followin
 
 - `networking.sits` now supports Foo-over-UDP encapsulation.
 
-- Changing systemd `.socket` units now restarts them and stops the service that is activated by them. Additionally, services with `stopOnChange = false` don't break anymore when they are socket-activated.
-
 -  The `virtualisation.libvirtd` module has been refactored and updated with new options:
     - `virtualisation.libvirtd.qemu*` options (e.g.: `virtualisation.libvirtd.qemuRunAsRoot`) were moved to [`virtualisation.libvirtd.qemu`](options.html#opt-virtualisation.libvirtd.qemu) submodule,
     - software TPM1/TPM2 support (e.g.: Windows 11 guests) ([`virtualisation.libvirtd.qemu.swtpm`](options.html#opt-virtualisation.libvirtd.qemu.swtpm)),