Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,14 @@
<literal>virtualisation.docker.daemon.settings</literal>.
</para>
</listitem>
<listitem>
<para>
<literal>systemd-gpt-auto-generator</literal> is now disabled
by default due to conflicting with our declarative mount
management, Issue
<link xlink:href="https://github.com/NixOS/nixpkgs/issues/4002">#4002</link>.
</para>
</listitem>
</itemizedlist>
</section>
<section xml:id="sec-release-22.05-notable-changes">
Expand Down
2 changes: 2 additions & 0 deletions nixos/doc/manual/release-notes/rl-2205.section.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@ In addition to numerous new and upgraded packages, this release has the followin

- If you previously used `/etc/docker/daemon.json`, you need to incorporate the changes into the new option `virtualisation.docker.daemon.settings`.

- `systemd-gpt-auto-generator` is now disabled by default due to conflicting with our declarative mount management, Issue [#4002](https://github.com/NixOS/nixpkgs/issues/4002).

## Other Notable Changes {#sec-release-22.05-notable-changes}

- The option [services.redis.servers](#opt-services.redis.servers) was added
Expand Down
6 changes: 4 additions & 2 deletions nixos/modules/system/boot/systemd.nix
Original file line number Diff line number Diff line change
Expand Up @@ -512,12 +512,14 @@ in
systemd.generators = mkOption {
type = types.attrsOf types.path;
default = {};
example = { systemd-gpt-auto-generator = "/dev/null"; };
example = literalExpression ''{ systemd-gpt-auto-generator = "${config.systemd.package}/lib/systemd/system-generators/systemd-gpt-auto-generator"; };'';
description = ''
Definition of systemd generators.
For each <literal>NAME = VALUE</literal> pair of the attrSet, a link is generated from
<literal>/etc/systemd/system-generators/NAME</literal> to <literal>VALUE</literal>.
Note: systemd-gpt-auto-generator is disabled by default due to not being declarative.
'';
# systemd-gpt-auto-generator issue https://github.com/NixOS/nixpkgs/issues/4002
};

systemd.shutdown = mkOption {
Expand Down Expand Up @@ -1053,7 +1055,7 @@ in
'') config.system.build.etc.passthru.targets;
}) + "/*";

"systemd/system-generators" = { source = hooks "generators" cfg.generators; };
"systemd/system-generators" = { source = hooks "generators" ({ systemd-gpt-auto-generator = "/dev/null"; } // cfg.generators); };
"systemd/system-shutdown" = { source = hooks "shutdown" cfg.shutdown; };
});

Expand Down