diff options
Diffstat (limited to 'modules/services')
-rw-r--r-- | modules/services/hardware/udev.nix | 52 | ||||
-rw-r--r-- | modules/services/hardware/udisks.nix | 1 | ||||
-rw-r--r-- | modules/services/hardware/upower.nix | 2 | ||||
-rw-r--r-- | modules/services/system/dbus.nix | 2 |
4 files changed, 45 insertions, 12 deletions
diff --git a/modules/services/hardware/udev.nix b/modules/services/hardware/udev.nix index 7b4f86b93cbf..73ec53e04e75 100644 --- a/modules/services/hardware/udev.nix +++ b/modules/services/hardware/udev.nix @@ -34,9 +34,6 @@ let ensureDir $out shopt -s nullglob - # Use all the default udev rules. - cp -v ${udev}/libexec/rules.d/*.rules $out/ - # Set a reasonable $PATH for programs called by udev rules. echo 'ENV{PATH}="${udevPath}/bin:${udevPath}/sbin"' > $out/00-path.rules @@ -48,19 +45,19 @@ let for i in ${toString cfg.packages}; do echo "Adding rules for package $i" for j in $i/*/udev/rules.d/*; do - ln -sv $j $out/$(basename $j) + echo "Copying $j to $out/$(basename $j)" + echo "# Copied from $j" > $out/$(basename $j) + cat $j >> $out/$(basename $j) done done # Fix some paths in the standard udev rules. Hacky. for i in $out/*.rules; do substituteInPlace $i \ - --replace /sbin/modprobe ${modprobe}/sbin/modprobe \ - --replace /sbin/blkid ${pkgs.utillinux}/sbin/blkid \ - --replace /sbin/mdadm ${pkgs.mdadm}/sbin/mdadm \ - --replace '$env{DM_SBIN_PATH}/blkid' ${pkgs.utillinux}/sbin/blkid \ - --replace 'ENV{DM_SBIN_PATH}="/sbin"' 'ENV{DM_SBIN_PATH}="${pkgs.lvm2}/sbin"' \ - --replace /bin/mount ${pkgs.utillinux}/bin/mount + --replace \"/sbin/modprobe \"${modprobe}/sbin/modprobe \ + --replace \"/sbin/mdadm \"${pkgs.mdadm}/sbin/mdadm \ + --replace \"/sbin/blkid \"${pkgs.utillinux}/sbin/blkid \ + --replace \"/bin/mount \"${pkgs.utillinux}/bin/mount done # If auto-configuration is disabled, then remove @@ -68,6 +65,39 @@ let # automatically calling modprobe. ${if !config.boot.hardwareScan then "rm $out/80-drivers.rules" else ""} + 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/* | + sed -e 's/.*RUN+="\([^ "]*\)[ "].*/\1/' | uniq) + for i in $import_progs $run_progs; do + if [[ ! -x ${pkgs.udev}/lib/udev/$i ]]; then + echo "FAIL" + echo "$i is called in udev rules but not installed by udev" + exit 1 + fi + done + echo "OK" + + 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/* | + sed -e 's/.*RUN+="\([^ "]*\)[ "].*/\1/' | uniq) + for i in $import_progs $run_progs; do + if [[ ! -x $i ]]; then + echo "FAIL" + echo "$i is called in udev rules but not installed by udev" + exit 1 + fi + done + echo "OK" + + echo "Consider fixing the following udev rules:" + for i in ${toString cfg.packages}; do + grep -l '\(RUN+\|IMPORT{program}\)="\(/usr\)\?/s\?bin' $i/*/udev/rules.d/* || true + done + # Use the persistent device rules (naming for CD/DVD and # network devices) stored in # /var/lib/udev/rules.d/70-persistent-{cd,net}.rules. These are @@ -178,7 +208,7 @@ in services.udev.extraRules = nixosRules; - services.udev.packages = [ extraUdevRules ]; + services.udev.packages = [ pkgs.udev extraUdevRules ]; services.udev.path = [ pkgs.coreutils pkgs.gnused pkgs.gnugrep pkgs.utillinux pkgs.udev ]; diff --git a/modules/services/hardware/udisks.nix b/modules/services/hardware/udisks.nix index 8d526e22bad1..21749da424ee 100644 --- a/modules/services/hardware/udisks.nix +++ b/modules/services/hardware/udisks.nix @@ -38,6 +38,7 @@ with pkgs.lib; mkdir -m 0755 -p /var/lib/udisks ''; + services.udev.packages = [ pkgs.udisks ]; }; } diff --git a/modules/services/hardware/upower.nix b/modules/services/hardware/upower.nix index c529e8b3cdb0..8e7cf23900ce 100644 --- a/modules/services/hardware/upower.nix +++ b/modules/services/hardware/upower.nix @@ -33,6 +33,8 @@ with pkgs.lib; services.dbus.packages = [ pkgs.upower ]; + services.udev.packages = [ pkgs.upower ]; + }; } diff --git a/modules/services/system/dbus.nix b/modules/services/system/dbus.nix index e083707751a4..e33adbe4feaf 100644 --- a/modules/services/system/dbus.nix +++ b/modules/services/system/dbus.nix @@ -17,7 +17,7 @@ let buildCommand = '' ensureDir $out - cp ${dbus}/etc/dbus-1/system.conf $out/system.conf + cp -v ${dbus}/etc/dbus-1/system.conf $out/system.conf # !!! Hm, these `sed' calls are rather error-prone... |