diff options
| author | aszlig <aszlig@redmoonstudios.org> | 2016-02-05 14:56:06 +0100 |
|---|---|---|
| committer | aszlig <aszlig@redmoonstudios.org> | 2016-02-05 15:31:04 +0100 |
| commit | b060d70d7f54dffbb7b9b31ae2d3635a6dc4c11d (patch) | |
| tree | dee008fd96ec56b776a66ebefb934583056bd37e /nixos/modules/services/hardware/udev.nix | |
| parent | 3a17abfdae5af2ac77ffb12180145107339f5295 (diff) | |
| download | nixpkgs-b060d70d7f54dffbb7b9b31ae2d3635a6dc4c11d.tar nixpkgs-b060d70d7f54dffbb7b9b31ae2d3635a6dc4c11d.tar.gz nixpkgs-b060d70d7f54dffbb7b9b31ae2d3635a6dc4c11d.tar.bz2 nixpkgs-b060d70d7f54dffbb7b9b31ae2d3635a6dc4c11d.tar.lz nixpkgs-b060d70d7f54dffbb7b9b31ae2d3635a6dc4c11d.tar.xz nixpkgs-b060d70d7f54dffbb7b9b31ae2d3635a6dc4c11d.tar.zst nixpkgs-b060d70d7f54dffbb7b9b31ae2d3635a6dc4c11d.zip | |
nixos/udev: Fix printing impure FHS paths
The test only checked for existence of the rule file in the output path of the rulefile generator. However, we also need to check whether the basename of the file is also the one we're currently searching for. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Diffstat (limited to 'nixos/modules/services/hardware/udev.nix')
| -rw-r--r-- | nixos/modules/services/hardware/udev.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/nixos/modules/services/hardware/udev.nix b/nixos/modules/services/hardware/udev.nix index 74200eec4c0..1b3333a2973 100644 --- a/nixos/modules/services/hardware/udev.nix +++ b/nixos/modules/services/hardware/udev.nix @@ -104,10 +104,10 @@ let remoteFile="origin unknown" for i in ${toString cfg.packages}; do for j in "$i"/*/udev/rules.d/*; do - if [ -e "$out/$(basename "$j")" ]; then - remoteFile="originally from $j" - break 2 - fi + [ -e "$out/$(basename "$j")" ] || continue + [ "$(basename "$j")" = "$(basename "$localFile")" ] || continue + remoteFile="originally from $j" + break 2 done done refs="$( |