diff options
| author | Stzx <silence.m@hotmail.com> | 2023-07-23 10:46:13 +0800 |
|---|---|---|
| committer | Stzx <silence.m@hotmail.com> | 2023-07-24 11:41:50 +0800 |
| commit | e196c81a2343895fa9fd3782c20c67f180619dcc (patch) | |
| tree | 7495475d4f0e8d3e5285200b2d2a8989a7a582a2 | |
| parent | ac8e9946878082bee87c1f92d5458e2c366264dc (diff) | |
| download | nixpkgs-e196c81a2343895fa9fd3782c20c67f180619dcc.tar nixpkgs-e196c81a2343895fa9fd3782c20c67f180619dcc.tar.gz nixpkgs-e196c81a2343895fa9fd3782c20c67f180619dcc.tar.bz2 nixpkgs-e196c81a2343895fa9fd3782c20c67f180619dcc.tar.lz nixpkgs-e196c81a2343895fa9fd3782c20c67f180619dcc.tar.xz nixpkgs-e196c81a2343895fa9fd3782c20c67f180619dcc.tar.zst nixpkgs-e196c81a2343895fa9fd3782c20c67f180619dcc.zip | |
udisks2: fix conf file loading warnings
| -rw-r--r-- | nixos/modules/services/hardware/udisks2.nix | 14 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/udisks/2-default.nix | 5 |
2 files changed, 13 insertions, 6 deletions
diff --git a/nixos/modules/services/hardware/udisks2.nix b/nixos/modules/services/hardware/udisks2.nix index c53dbf47774..5c058f1f0a6 100644 --- a/nixos/modules/services/hardware/udisks2.nix +++ b/nixos/modules/services/hardware/udisks2.nix @@ -71,12 +71,16 @@ in environment.systemPackages = [ pkgs.udisks2 ]; - environment.etc = (mapAttrs' (name: value: nameValuePair "udisks2/${name}" { source = value; } ) configFiles) // { - # We need to make sure /etc/libblockdev/conf.d is populated to avoid + environment.etc = (mapAttrs' (name: value: nameValuePair "udisks2/${name}" { source = value; } ) configFiles) // ( + let + libblockdev = pkgs.udisks2.libblockdev; + majorVer = versions.major libblockdev.version; + in { + # We need to make sure /etc/libblockdev/@major_ver@/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"; - }; + "libblockdev/${majorVer}/conf.d/00-default.cfg".source = "${libblockdev}/etc/libblockdev/${majorVer}/conf.d/00-default.cfg"; + "libblockdev/${majorVer}/conf.d/10-lvm-dbus.cfg".source = "${libblockdev}/etc/libblockdev/${majorVer}/conf.d/10-lvm-dbus.cfg"; + }); security.polkit.enable = true; diff --git a/pkgs/os-specific/linux/udisks/2-default.nix b/pkgs/os-specific/linux/udisks/2-default.nix index 36f0963935b..07a9ceaa517 100644 --- a/pkgs/os-specific/linux/udisks/2-default.nix +++ b/pkgs/os-specific/linux/udisks/2-default.nix @@ -83,7 +83,10 @@ stdenv.mkDerivation rec { doCheck = true; - passthru.tests.vm = nixosTests.udisks2; + passthru = { + inherit libblockdev; + tests.vm = nixosTests.udisks2; + }; meta = with lib; { description = "A daemon, tools and libraries to access and manipulate disks, storage devices and technologies"; |