diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-06-28 14:19:38 -0400 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-06-28 14:19:38 -0400 |
| commit | bf15293b1efc4eda36e535cec043ba4fdace9b44 (patch) | |
| tree | 09de472bb8f6d12ffac7f2de2b7c0570776f5ce0 /modules/services/hardware/udev.nix | |
| parent | bd0f065c0545034c0400990f487c53b830ba6798 (diff) | |
| parent | 76c74cd7c718da9d3cc6e1d76fb78a86c363406c (diff) | |
| download | nixpkgs-bf15293b1efc4eda36e535cec043ba4fdace9b44.tar nixpkgs-bf15293b1efc4eda36e535cec043ba4fdace9b44.tar.gz nixpkgs-bf15293b1efc4eda36e535cec043ba4fdace9b44.tar.bz2 nixpkgs-bf15293b1efc4eda36e535cec043ba4fdace9b44.tar.lz nixpkgs-bf15293b1efc4eda36e535cec043ba4fdace9b44.tar.xz nixpkgs-bf15293b1efc4eda36e535cec043ba4fdace9b44.tar.zst nixpkgs-bf15293b1efc4eda36e535cec043ba4fdace9b44.zip | |
Merge branch 'master' of github.com:NixOS/nixos into systemd
Conflicts: modules/services/hardware/udev.nix
Diffstat (limited to 'modules/services/hardware/udev.nix')
| -rw-r--r-- | modules/services/hardware/udev.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/modules/services/hardware/udev.nix b/modules/services/hardware/udev.nix index fe1b7323358..8d66982fb5c 100644 --- a/modules/services/hardware/udev.nix +++ b/modules/services/hardware/udev.nix @@ -51,7 +51,7 @@ let --replace \"/bin/mount \"${pkgs.utillinux}/bin/mount done - echo -n "Checking that all programs called by relative paths in udev rules exist in ${udev}/lib/udev ... " + echo -n "Checking that all programs called by relative paths in udev rules exist in ${udev}/lib/udev... " import_progs=$(grep 'IMPORT{program}="[^/$]' $out/* | sed -e 's/.*IMPORT{program}="\([^ "]*\)[ "].*/\1/' | uniq) run_progs=$(grep -v '^[[:space:]]*#' $out/* | grep 'RUN+="[^/$]' | @@ -65,8 +65,8 @@ let done echo "OK" - echo -n "Checking that all programs called by absolute paths in udev rules exist ... " - import_progs=$(grep 'IMPORT{program}="/' $out/* | + echo -n "Checking that all programs called by absolute paths in udev rules exist... " + import_progs=$(grep 'IMPORT{program}="\/' $out/* | sed -e 's/.*IMPORT{program}="\([^ "]*\)[ "].*/\1/' | uniq) run_progs=$(grep -v '^[[:space:]]*#' $out/* | grep 'RUN+="/' | sed -e 's/.*RUN+="\([^ "]*\)[ "].*/\1/' | uniq) |