From 9f87f3ccb0963e317594018016113ecea4686fe0 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 27 Feb 2015 14:15:53 +0100 Subject: [PATCH] linux: disable UEVENT_HELPER* Deprecated since 2006: http://lwn.net/Articles/166954/ --- nixos/modules/services/hardware/udev.nix | 2 -- pkgs/os-specific/linux/kernel/common-config.nix | 3 +++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/hardware/udev.nix b/nixos/modules/services/hardware/udev.nix index 39180f4d37ec..1dc344a10fce 100644 --- a/nixos/modules/services/hardware/udev.nix +++ b/nixos/modules/services/hardware/udev.nix @@ -236,8 +236,6 @@ in system.activationScripts.udevd = '' - echo "" > /proc/sys/kernel/hotplug - # Regenerate the hardware database /var/lib/udev/hwdb.bin # whenever systemd changes. if [ ! -e /var/lib/udev/prev-systemd -o "$(readlink /var/lib/udev/prev-systemd)" != ${config.systemd.package} ]; then diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 3e92e9c3fa6a..fedfb707f320 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -263,6 +263,9 @@ with stdenv.lib; SLIP_COMPRESSED y # CSLIP compressed headers SLIP_SMART y THERMAL_HWMON y # Hardware monitoring support + ${optionalString (versionAtLeast version "3.15") '' + UEVENT_HELPER n + ''} USB_DEBUG? n USB_EHCI_ROOT_HUB_TT y # Root Hub Transaction Translators USB_EHCI_TT_NEWSCHED y # Improved transaction translator scheduling