From dc093b57ddf018de97fa076a07784d025685a8f6 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 11 Aug 2009 21:16:15 +0000 Subject: [PATCH] * Updates to the udev service: support persistant CD-ROM / network interface names, use udev's own firmware loader, and dropped the sndMode option (udev puts all audio devices in the "audio" group, so users can be added to that group if necessary). svn path=/nixos/trunk/; revision=16692 --- modules/module-list.nix | 1 - modules/services/hardware/firmware.nix | 51 ------------ .../services/hardware/udev-firmware-loader.sh | 32 -------- modules/services/hardware/udev.nix | 77 ++++++++++--------- 4 files changed, 41 insertions(+), 120 deletions(-) delete mode 100644 modules/services/hardware/firmware.nix delete mode 100755 modules/services/hardware/udev-firmware-loader.sh diff --git a/modules/module-list.nix b/modules/module-list.nix index d3290226b9a..9938cc6e1b5 100644 --- a/modules/module-list.nix +++ b/modules/module-list.nix @@ -31,7 +31,6 @@ ./services/databases/mysql.nix ./services/databases/postgresql.nix ./services/hardware/acpid.nix - ./services/hardware/firmware.nix ./services/hardware/hal.nix ./services/hardware/udev.nix ./services/logging/klogd.nix diff --git a/modules/services/hardware/firmware.nix b/modules/services/hardware/firmware.nix deleted file mode 100644 index 0ed5fb31f98..00000000000 --- a/modules/services/hardware/firmware.nix +++ /dev/null @@ -1,51 +0,0 @@ -# This module provides support for automatic loading of firmware from -# kernel modules. -{pkgs, config, ...}: - -with pkgs.lib; - -let - - firmwareLoader = pkgs.substituteAll { - src = ./udev-firmware-loader.sh; - path = "${pkgs.coreutils}/bin"; - isExecutable = true; - firmwareDirs = config.hardware.firmware; - }; - -in - -{ - - ###### interface - - options = { - - hardware.firmware = mkOption { - default = []; - example = ["/root/my-firmware"]; - merge = mergeListOption; - description = '' - List of directories containing firmware files. Such files - will be loaded automatically if the kernel asks for them - (i.e., when it has detected specific hardware that requires - firmware to function). - ''; - }; - - }; - - - ###### implementation - - config = { - - services.udev.extraRules = - '' - # Firmware loading. - SUBSYSTEM=="firmware", ACTION=="add", RUN+="${firmwareLoader}" - ''; - - }; - -} diff --git a/modules/services/hardware/udev-firmware-loader.sh b/modules/services/hardware/udev-firmware-loader.sh deleted file mode 100755 index 3592e72bb13..00000000000 --- a/modules/services/hardware/udev-firmware-loader.sh +++ /dev/null @@ -1,32 +0,0 @@ -#! @shell@ - -export PATH="@path@" - -exec > /var/log/udev-fw 2>&1 - -if test "$ACTION" = "add"; then - - ls -l /sys/$DEVPATH - - if ! test -e /sys/$DEVPATH/loading; then - echo "Firmware loading is not supported by device \`DEVPATH'." - exit 1 - fi - - # /root/test-firmware is an impure location allowing quick testing - # of firmwares. - for dir in /root/test-firmware @firmwareDirs@; do - if test -e "$dir/$FIRMWARE"; then - echo "Loading \`$FIRMWARE' for device \`$DEVPATH' from $dir." - echo 1 > /sys/$DEVPATH/loading - cat "$dir/$FIRMWARE" > /sys/$DEVPATH/data - echo 0 > /sys/$DEVPATH/loading - exit 0 - fi - done - - echo "Firmware \`$FIRMWARE' for device \`$DEVPATH' not found." - echo -1 > /sys/$DEVPATH/loading - exit 1 - -fi diff --git a/modules/services/hardware/udev.nix b/modules/services/hardware/udev.nix index d1e22efc58a..f22adac6eb6 100644 --- a/modules/services/hardware/udev.nix +++ b/modules/services/hardware/udev.nix @@ -24,46 +24,37 @@ let KERNEL=="kqemu", NAME="%k", MODE="0666" KERNEL=="vboxdrv", NAME="vboxdrv", OWNER="root", GROUP="root", MODE="0666" - # Create symlinks for CD/DVD devices. - ACTION=="add", SUBSYSTEM=="block", ENV{ID_CDROM}=="?*", SYMLINK+="cdrom cdrom-%k" - ACTION=="add", SUBSYSTEM=="block", ENV{ID_CDROM_CD_RW}=="?*", SYMLINK+="cdrw cdrw-%k" - ACTION=="add", SUBSYSTEM=="block", ENV{ID_CDROM_DVD}=="?*", SYMLINK+="dvd dvd-%k" - ACTION=="add", SUBSYSTEM=="block", ENV{ID_CDROM_DVD_RW}=="?*", SYMLINK+="dvdrw dvdrw-%k" - - # ALSA sound devices. - KERNEL=="controlC[0-9]*", NAME="snd/%k", MODE="${cfg.sndMode}" - KERNEL=="hwC[D0-9]*", NAME="snd/%k", MODE="${cfg.sndMode}" - KERNEL=="pcmC[D0-9cp]*", NAME="snd/%k", MODE="${cfg.sndMode}" - KERNEL=="midiC[D0-9]*", NAME="snd/%k", MODE="${cfg.sndMode}" - KERNEL=="timer", NAME="snd/%k", MODE="${cfg.sndMode}" - KERNEL=="seq", NAME="snd/%k", MODE="${cfg.sndMode}" - ''; # Perform substitutions in all udev rules files. udevRules = stdenv.mkDerivation { name = "udev-rules"; - #src = cleanSource ./udev-rules; buildCommand = '' ensureDir $out shopt -s nullglob # Use all the default udev rules. - cp ${udev}/*/udev/rules.d/*.rules $out/ + cp ${udev}/libexec/rules.d/*.rules $out/ + + # Set a reasonable $PATH for programs called by udev rules. + echo 'ENV{PATH}="${pkgs.coreutils}/bin:${pkgs.gnused}/bin:${pkgs.utillinux}/bin"' > $out/00-path.rules + + # Set the firmware search path so that the firmware.sh helper + # called by 50-firmware.rules works properly. + echo 'ENV{FIRMWARE_DIRS}="${toString config.hardware.firmware}"' >> $out/00-path.rules + + # Fix some paths in the standard udev rules. + 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/madm + done # If auto-configuration is disabled, then remove # udev's 80-drivers.rules file, which contains rules for # automatically calling modprobe. - ${if config.boot.hardwareScan then - '' - substituteInPlace $out/80-drivers.rules \ - --replace /sbin/modprobe ${modprobe}/sbin/modprobe - '' - else - '' - rm $out/80-drivers.rules - '' - } + ${if !config.boot.hardwareScan then "rm $out/80-drivers.rules" else ""} # Add the udev rules from other packages. for i in ${toString cfg.packages}; do @@ -71,6 +62,15 @@ let ln -s $j $out/$(basename $j) done 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 + # modified by the write_{cd,net}_rules helpers called from + # 75-cd-aliases-generator.rules and + # 75-persistent-net-generator.rules. + ln -s /var/lib/udev/rules.d/70-persistent-cd.rules $out/ + ln -s /var/lib/udev/rules.d/70-persistent-net.rules $out/ ''; # */ }; @@ -136,16 +136,18 @@ in ''; }; - sndMode = mkOption { - default = "0600"; - example = "0666"; - description = '' - Permissions for sound devices, in case you have multiple - logged in users or if the devices belong to root for some - reason. - ''; - }; - + }; + + hardware.firmware = mkOption { + default = []; + example = ["/root/my-firmware"]; + merge = mergeListOption; + description = '' + List of directories containing firmware files. Such files + will be loaded automatically if the kernel asks for them + (i.e., when it has detected specific hardware that requires + firmware to function). + ''; }; }; @@ -171,6 +173,8 @@ in '' echo "" > /proc/sys/kernel/hotplug + mkdir -p /var/lib/udev/rules.d + # Get rid of possible old udev processes. ${procps}/bin/pkill -u root "^udevd$" || true @@ -182,6 +186,7 @@ in done # Start udev. + mkdir -p /dev/.udev # !!! bug in udev? ${udev}/sbin/udevd --daemon # Let udev create device nodes for all modules that have already