From 2c56d137eec7f6fefd3664b3e9f1486d6710356d Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 3 Jul 2008 18:54:16 +0000 Subject: [PATCH] I hope that hardwareScan = false now works as expected again... svn path=/nixos/trunk/; revision=12253 --- upstart-jobs/udev.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/upstart-jobs/udev.nix b/upstart-jobs/udev.nix index f2235a7b481..01a3f88bb37 100644 --- a/upstart-jobs/udev.nix +++ b/upstart-jobs/udev.nix @@ -47,8 +47,16 @@ let ln -s ${nixRules} $out/${nixRules.name} shopt -s nullglob cp ${udev}/etc/udev/rules.d/*.rules $out/ - substituteInPlace $out/80-drivers.rules \ - --replace /sbin/modprobe ${modprobe}/sbin/modprobe + ${if config.boot.hardwareScan then + '' + substituteInPlace $out/80-drivers.rules \ + --replace /sbin/modprobe ${modprobe}/sbin/modprobe + '' + else + '' + rm $out/80-drivers.rules + '' + } for i in ${toString extraUdevPkgs}; do for j in $i/etc/udev/rules.d/*; do ln -s $j $out/$(basename $j)