summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorFlorian Klink <flokli@flokli.de>2022-11-11 20:38:46 +0000
committerGitHub <noreply@github.com>2022-11-11 20:38:46 +0000
commit989eb42390665ba963894b2eb7f3d2bc51326789 (patch)
treef427e489ce41ee05da9443cdc3b6bf5c9452ce1c /nixos
parent1b9dab307438ca6ef129470b0b979bd107a0a7d3 (diff)
parentc9e23626a1558f7ab33e44c7d509b2f6da44a0f6 (diff)
Merge pull request #200421 from lovesegfault/udisks-libblockdev-cfg
nixos/udisks2: symlink libblockdev configs
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/services/hardware/udisks2.nix7
1 files changed, 6 insertions, 1 deletions
diff --git a/nixos/modules/services/hardware/udisks2.nix b/nixos/modules/services/hardware/udisks2.nix
index 70667dc6d3b12..7368845dafd55 100644
--- a/nixos/modules/services/hardware/udisks2.nix
+++ b/nixos/modules/services/hardware/udisks2.nix
@@ -62,7 +62,12 @@ in
 
     environment.systemPackages = [ pkgs.udisks2 ];
 
-    environment.etc = mapAttrs' (name: value: nameValuePair "udisks2/${name}" { source = value; } ) configFiles;
+    environment.etc = (mapAttrs' (name: value: nameValuePair "udisks2/${name}" { source = value; } ) configFiles) // {
+      # We need to make sure /etc/libblockdev/conf.d is populated to avoid
+      # warnings
+      "libblockdev/conf.d/00-default.cfg".source = "${pkgs.libblockdev}/etc/libblockdev/conf.d/00-default.cfg";
+      "libblockdev/conf.d/10-lvm-dbus.cfg".source = "${pkgs.libblockdev}/etc/libblockdev/conf.d/10-lvm-dbus.cfg";
+    };
 
     security.polkit.enable = true;