pyrox.dev
lol
udisks2: fix conf file loading warnings
+13
-6
+9
-5
nixos/modules/services/hardware/udisks2.nix
+9
-5
nixos/modules/services/hardware/udisks2.nix
···
71
71
72
72
environment.systemPackages = [ pkgs.udisks2 ];
73
73
74
-
environment.etc = (mapAttrs' (name: value: nameValuePair "udisks2/${name}" { source = value; } ) configFiles) // {
75
-
# We need to make sure /etc/libblockdev/conf.d is populated to avoid
74
+
environment.etc = (mapAttrs' (name: value: nameValuePair "udisks2/${name}" { source = value; } ) configFiles) // (
75
+
let
76
+
libblockdev = pkgs.udisks2.libblockdev;
77
+
majorVer = versions.major libblockdev.version;
78
+
in {
79
+
# We need to make sure /etc/libblockdev/@major_ver@/conf.d is populated to avoid
76
80
# warnings
77
-
"libblockdev/conf.d/00-default.cfg".source = "${pkgs.libblockdev}/etc/libblockdev/conf.d/00-default.cfg";
78
-
"libblockdev/conf.d/10-lvm-dbus.cfg".source = "${pkgs.libblockdev}/etc/libblockdev/conf.d/10-lvm-dbus.cfg";
79
-
};
81
+
"libblockdev/${majorVer}/conf.d/00-default.cfg".source = "${libblockdev}/etc/libblockdev/${majorVer}/conf.d/00-default.cfg";
82
+
"libblockdev/${majorVer}/conf.d/10-lvm-dbus.cfg".source = "${libblockdev}/etc/libblockdev/${majorVer}/conf.d/10-lvm-dbus.cfg";
83
+
});
80
84
81
85
security.polkit.enable = true;
82
86
+4
-1
pkgs/os-specific/linux/udisks/2-default.nix
+4
-1
pkgs/os-specific/linux/udisks/2-default.nix
···
83
83
84
84
doCheck = true;
85
85
86
-
passthru.tests.vm = nixosTests.udisks2;
86
+
passthru = {
87
+
inherit libblockdev;
88
+
tests.vm = nixosTests.udisks2;
89
+
};
87
90
88
91
meta = with lib; {
89
92
description = "A daemon, tools and libraries to access and manipulate disks, storage devices and technologies";