diff options
author | sternenseemann <sternenseemann@systemli.org> | 2022-03-26 09:59:28 +0100 |
---|---|---|
committer | sternenseemann <sternenseemann@systemli.org> | 2022-03-26 09:59:28 +0100 |
commit | 372d0a707e13e20443543461ff4f7c00454dea8c (patch) | |
tree | ca619a9578bd21b04841c5aade7e9e5f38b19145 /nixos/doc | |
parent | 66996acc2a9afd1b0c34beffc2bab3e8daecbcad (diff) | |
parent | b9eab51eed6fb41c85bcda2d6241f151735c853a (diff) |
Merge remote-tracking branch 'origin/master' into haskell-updates
Diffstat (limited to 'nixos/doc')
4 files changed, 73 insertions, 0 deletions
diff --git a/nixos/doc/manual/development/writing-nixos-tests.section.md b/nixos/doc/manual/development/writing-nixos-tests.section.md index 7de57d0d2a379..433e1906f7756 100644 --- a/nixos/doc/manual/development/writing-nixos-tests.section.md +++ b/nixos/doc/manual/development/writing-nixos-tests.section.md @@ -158,6 +158,12 @@ The following methods are available on machine objects: e.g., `send_chars("foobar\n")` will type the string `foobar` followed by the Enter key. +`send_console` + +: Send keys to the kernel console. This allows interaction with the systemd + emergency mode, for example. Takes a string that is sent, e.g., + `send_console("\n\nsystemctl default\n")`. + `execute` : Execute a shell command, returning a list `(status, stdout)`. @@ -272,6 +278,13 @@ The following methods are available on machine objects: Killing the interactive session with `Ctrl-d` or `Ctrl-c` also ends the guest session. +`console_interact` + +: Allows you to directly interact with QEMU's stdin. This should + only be used during test development, not in production tests. + Output from QEMU is only read line-wise. `Ctrl-c` kills QEMU and + `Ctrl-d` closes console and returns to the test runner. + To test user units declared by `systemd.user.services` the optional `user` argument can be used: diff --git a/nixos/doc/manual/from_md/development/writing-nixos-tests.section.xml b/nixos/doc/manual/from_md/development/writing-nixos-tests.section.xml index 45c9c40c6095c..4f856f98f2a22 100644 --- a/nixos/doc/manual/from_md/development/writing-nixos-tests.section.xml +++ b/nixos/doc/manual/from_md/development/writing-nixos-tests.section.xml @@ -263,6 +263,19 @@ start_all() </varlistentry> <varlistentry> <term> + <literal>send_console</literal> + </term> + <listitem> + <para> + Send keys to the kernel console. This allows interaction + with the systemd emergency mode, for example. Takes a string + that is sent, e.g., + <literal>send_console("\n\nsystemctl default\n")</literal>. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> <literal>execute</literal> </term> <listitem> @@ -502,6 +515,21 @@ machine.systemctl("list-jobs --no-pager", "any-user") # spaw </para> </listitem> </varlistentry> + <varlistentry> + <term> + <literal>console_interact</literal> + </term> + <listitem> + <para> + Allows you to directly interact with QEMU’s stdin. This + should only be used during test development, not in + production tests. Output from QEMU is only read line-wise. + <literal>Ctrl-c</literal> kills QEMU and + <literal>Ctrl-d</literal> closes console and returns to the + test runner. + </para> + </listitem> + </varlistentry> </variablelist> <para> To test user units declared by diff --git a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml index 8b25a19d5ede9..c2748cfd49c14 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml @@ -27,6 +27,16 @@ </listitem> <listitem> <para> + GNOME has been upgraded to 42. Please take a look at their + <link xlink:href="https://release.gnome.org/42/">Release + Notes</link> for details. Notably, it replaces gedit with + GNOME Text Editor, GNOME Terminal with GNOME Console (formerly + King’s Cross), and GNOME Screenshot with a tool built into the + Shell. + </para> + </listitem> + <listitem> + <para> PHP 8.1 is now available </para> </listitem> @@ -680,6 +690,16 @@ </listitem> <listitem> <para> + <literal>services.gnome.experimental-features.realtime-scheduling</literal> + option has been removed, as GNOME Shell now + <link xlink:href="https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2060">uses + rtkit</link>. Use + <literal>security.rtkit.enable = true;</literal> instead. As + before, you will need to have it enabled using GSettings. + </para> + </listitem> + <listitem> + <para> If you previously used <literal>/etc/docker/daemon.json</literal>, you need to incorporate the changes into the new option @@ -1668,6 +1688,12 @@ </listitem> </itemizedlist> </listitem> + <listitem> + <para> + The <literal>programs.nncp</literal> options were added for + generating host-global NNCP configuration. + </para> + </listitem> </itemizedlist> </section> </section> diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md index 08644654f6668..46ea2e22b7bea 100644 --- a/nixos/doc/manual/release-notes/rl-2205.section.md +++ b/nixos/doc/manual/release-notes/rl-2205.section.md @@ -11,6 +11,8 @@ In addition to numerous new and upgraded packages, this release has the followin the option to use DNS-01 validation when using `enableACME` on web server virtual hosts (e.g. `services.nginx.virtualHosts.*.enableACME`). +- GNOME has been upgraded to 42. Please take a look at their [Release Notes](https://release.gnome.org/42/) for details. Notably, it replaces gedit with GNOME Text Editor, GNOME Terminal with GNOME Console (formerly King’s Cross), and GNOME Screenshot with a tool built into the Shell. + - PHP 8.1 is now available - Mattermost has been updated to extended support release 6.3, as the previously packaged extended support release 5.37 is [reaching its end of life](https://docs.mattermost.com/upgrade/extended-support-release.html). @@ -277,6 +279,8 @@ In addition to numerous new and upgraded packages, this release has the followin - The `gnome-passwordsafe` package updated to [version 6.x](https://gitlab.gnome.org/World/secrets/-/tags/6.0) and renamed to `gnome-secrets`. +- `services.gnome.experimental-features.realtime-scheduling` option has been removed, as GNOME Shell now [uses rtkit](https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2060). Use `security.rtkit.enable = true;` instead. As before, you will need to have it enabled using GSettings. + - If you previously used `/etc/docker/daemon.json`, you need to incorporate the changes into the new option `virtualisation.docker.daemon.settings`. - Ntopng (`services.ntopng`) is updated to 5.2.1 and uses a separate Redis instance if `system.stateVersion` is at least `22.05`. Existing setups shouldn't be affected. @@ -589,4 +593,6 @@ In addition to numerous new and upgraded packages, this release has the followin - Testing has been enabled for `aarch64-linux` in addition to `x86_64-linux`. - The `spark3` package is now usable on `aarch64-darwin` as a result of [#158613](https://github.com/NixOS/nixpkgs/pull/158613) and [#158992](https://github.com/NixOS/nixpkgs/pull/158992). +- The `programs.nncp` options were added for generating host-global NNCP configuration. + <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. --> |