Merge pull request #244969 from Stzx/fix-warnings
udisks2: fix conf file loading warnings
This commit is contained in:
commit
6ea628b5c5
|
@ -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;
|
||||
|
||||
|
|
|
@ -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";
|
||||
|
|
Loading…
Reference in a new issue