Merge pull request #186028 from helsinki-systems/disable-udisks2-by-default
nixos/udisks2: don't enable by default
This commit is contained in:
commit
d69a36d1c1
|
@ -392,6 +392,18 @@
|
||||||
as coreboot’s fork is no longer available.
|
as coreboot’s fork is no longer available.
|
||||||
</para>
|
</para>
|
||||||
</listitem>
|
</listitem>
|
||||||
|
<listitem>
|
||||||
|
<para>
|
||||||
|
The udisks2 service, available at
|
||||||
|
<literal>services.udisks2.enable</literal>, is now disabled by
|
||||||
|
default. It will automatically be enabled through services and
|
||||||
|
desktop environments as needed. This also means that polkit
|
||||||
|
will now actually be disabled by default. The default for
|
||||||
|
<literal>security.polkit.enable</literal> was already flipped
|
||||||
|
in the previous release, but udisks2 being enabled by default
|
||||||
|
re-enabled it.
|
||||||
|
</para>
|
||||||
|
</listitem>
|
||||||
<listitem>
|
<listitem>
|
||||||
<para>
|
<para>
|
||||||
Add udev rules for the Teensy family of microcontrollers.
|
Add udev rules for the Teensy family of microcontrollers.
|
||||||
|
|
|
@ -145,6 +145,9 @@ Use `configure.packages` instead.
|
||||||
|
|
||||||
- memtest86+ was updated from 5.00-coreboot-002 to 6.00-beta2. It is now the upstream version from https://www.memtest.org/, as coreboot's fork is no longer available.
|
- memtest86+ was updated from 5.00-coreboot-002 to 6.00-beta2. It is now the upstream version from https://www.memtest.org/, as coreboot's fork is no longer available.
|
||||||
|
|
||||||
|
- The udisks2 service, available at `services.udisks2.enable`, is now disabled by default. It will automatically be enabled through services and desktop environments as needed.
|
||||||
|
This also means that polkit will now actually be disabled by default. The default for `security.polkit.enable` was already flipped in the previous release, but udisks2 being enabled by default re-enabled it.
|
||||||
|
|
||||||
- Add udev rules for the Teensy family of microcontrollers.
|
- Add udev rules for the Teensy family of microcontrollers.
|
||||||
|
|
||||||
- The `pass-secret-service` package now includes systemd units from upstream, so adding it to the NixOS `services.dbus.packages` option will make it start automatically as a systemd user service when an application tries to talk to the libsecret D-Bus API.
|
- The `pass-secret-service` package now includes systemd units from upstream, so adding it to the NixOS `services.dbus.packages` option will make it start automatically as a systemd user service when an application tries to talk to the libsecret D-Bus API.
|
||||||
|
|
|
@ -56,6 +56,8 @@ in
|
||||||
|
|
||||||
services.udev.packages = [ pkgs.libmtp.out ];
|
services.udev.packages = [ pkgs.libmtp.out ];
|
||||||
|
|
||||||
|
services.udisks2.enable = true;
|
||||||
|
|
||||||
# Needed for unwrapped applications
|
# Needed for unwrapped applications
|
||||||
environment.sessionVariables.GIO_EXTRA_MODULES = [ "${cfg.package}/lib/gio/modules" ];
|
environment.sessionVariables.GIO_EXTRA_MODULES = [ "${cfg.package}/lib/gio/modules" ];
|
||||||
|
|
||||||
|
|
|
@ -19,14 +19,7 @@ in
|
||||||
|
|
||||||
services.udisks2 = {
|
services.udisks2 = {
|
||||||
|
|
||||||
enable = mkOption {
|
enable = mkEnableOption "udisks2, a DBus service that allows applications to query and manipulate storage devices.";
|
||||||
type = types.bool;
|
|
||||||
default = true;
|
|
||||||
description = lib.mdDoc ''
|
|
||||||
Whether to enable Udisks, a DBus service that allows
|
|
||||||
applications to query and manipulate storage devices.
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
|
|
||||||
settings = mkOption rec {
|
settings = mkOption rec {
|
||||||
type = types.attrsOf settingsFormat.type;
|
type = types.attrsOf settingsFormat.type;
|
||||||
|
|
|
@ -8,7 +8,6 @@ with lib;
|
||||||
|
|
||||||
# Disable some features that are not useful in a container.
|
# Disable some features that are not useful in a container.
|
||||||
nix.optimise.automatic = mkDefault false; # the store is host managed
|
nix.optimise.automatic = mkDefault false; # the store is host managed
|
||||||
services.udisks2.enable = mkDefault false;
|
|
||||||
powerManagement.enable = mkDefault false;
|
powerManagement.enable = mkDefault false;
|
||||||
documentation.nixos.enable = mkDefault false;
|
documentation.nixos.enable = mkDefault false;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue