Merge pull request #186028 from helsinki-systems/disable-udisks2-by-default

nixos/udisks2: don't enable by default

authored by Janne Heß and committed by GitHub d69a36d1 f20cf2e5

+18 -9
+12
nixos/doc/manual/from_md/release-notes/rl-2211.section.xml
··· 394 </listitem> 395 <listitem> 396 <para> 397 Add udev rules for the Teensy family of microcontrollers. 398 </para> 399 </listitem>
··· 394 </listitem> 395 <listitem> 396 <para> 397 + The udisks2 service, available at 398 + <literal>services.udisks2.enable</literal>, is now disabled by 399 + default. It will automatically be enabled through services and 400 + desktop environments as needed. This also means that polkit 401 + will now actually be disabled by default. The default for 402 + <literal>security.polkit.enable</literal> was already flipped 403 + in the previous release, but udisks2 being enabled by default 404 + re-enabled it. 405 + </para> 406 + </listitem> 407 + <listitem> 408 + <para> 409 Add udev rules for the Teensy family of microcontrollers. 410 </para> 411 </listitem>
+3
nixos/doc/manual/release-notes/rl-2211.section.md
··· 145 146 - 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. 147 148 - Add udev rules for the Teensy family of microcontrollers. 149 150 - 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.
··· 145 146 - 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. 147 148 + - 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. 149 + 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. 150 + 151 - Add udev rules for the Teensy family of microcontrollers. 152 153 - 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.
+2
nixos/modules/services/desktops/gvfs.nix
··· 56 57 services.udev.packages = [ pkgs.libmtp.out ]; 58 59 # Needed for unwrapped applications 60 environment.sessionVariables.GIO_EXTRA_MODULES = [ "${cfg.package}/lib/gio/modules" ]; 61
··· 56 57 services.udev.packages = [ pkgs.libmtp.out ]; 58 59 + services.udisks2.enable = true; 60 + 61 # Needed for unwrapped applications 62 environment.sessionVariables.GIO_EXTRA_MODULES = [ "${cfg.package}/lib/gio/modules" ]; 63
+1 -8
nixos/modules/services/hardware/udisks2.nix
··· 19 20 services.udisks2 = { 21 22 - enable = mkOption { 23 - type = types.bool; 24 - default = true; 25 - description = lib.mdDoc '' 26 - Whether to enable Udisks, a DBus service that allows 27 - applications to query and manipulate storage devices. 28 - ''; 29 - }; 30 31 settings = mkOption rec { 32 type = types.attrsOf settingsFormat.type;
··· 19 20 services.udisks2 = { 21 22 + enable = mkEnableOption "udisks2, a DBus service that allows applications to query and manipulate storage devices."; 23 24 settings = mkOption rec { 25 type = types.attrsOf settingsFormat.type;
-1
nixos/modules/virtualisation/container-config.nix
··· 8 9 # Disable some features that are not useful in a container. 10 nix.optimise.automatic = mkDefault false; # the store is host managed 11 - services.udisks2.enable = mkDefault false; 12 powerManagement.enable = mkDefault false; 13 documentation.nixos.enable = mkDefault false; 14
··· 8 9 # Disable some features that are not useful in a container. 10 nix.optimise.automatic = mkDefault false; # the store is host managed 11 powerManagement.enable = mkDefault false; 12 documentation.nixos.enable = mkDefault false; 13