Author: shlevy
Date: Mon Dec 5 16:53:58 2011
New Revision: 30763
URL: https://nixos.org/websvn/nix/?rev=30763&sc=1
Log:
udev: Ignore commented lines when populating run_progs.
Patch by mornfall
Modified:
nixos/trunk/modules/services/hardware/udev.nix
Modified: nixos/trunk/modules/services/hardware/udev.nix
==============================================================================
--- nixos/trunk/modules/services/hardware/udev.nix Mon Dec 5 16:23:05
2011 (r30762)
+++ nixos/trunk/modules/services/hardware/udev.nix Mon Dec 5 16:53:58
2011 (r30763)
@@ -68,7 +68,7 @@
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 'RUN+="[^/$]' $out/* |
+ run_progs=$(grep -v '^[[:space:]]*#' $out/* | grep 'RUN+="[^/$]' |
sed -e 's/.*RUN+="\([^ "]*\)[ "].*/\1/' | uniq)
for i in $import_progs $run_progs; do
if [[ ! -x ${pkgs.udev}/lib/udev/$i && ! $i =~ socket:.* ]]; then
@@ -82,7 +82,7 @@
echo -n "Checking that all programs call by absolute paths in udev rules
exist ... "
import_progs=$(grep 'IMPORT{program}="/' $out/* |
sed -e 's/.*IMPORT{program}="\([^ "]*\)[ "].*/\1/' | uniq)
- run_progs=$(grep 'RUN+="/' $out/* |
+ run_progs=$(grep -v '^[[:space:]]*#' $out/* | grep 'RUN+="/' |
sed -e 's/.*RUN+="\([^ "]*\)[ "].*/\1/' | uniq)
for i in $import_progs $run_progs; do
if [[ ! -x $i ]]; then
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
