diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2016-01-07 12:48:12 +0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2016-01-07 13:20:53 +0100 |
| commit | e4b4e9b9866758d7843cafe941cb7b59132bd673 (patch) | |
| tree | 3941aa6e13b9bc742af766e50286a522e987d0e7 | |
| parent | 48e66c39257526a94986ea24c1baa2b7e00835ee (diff) | |
| download | nixpkgs-e4b4e9b9866758d7843cafe941cb7b59132bd673.tar nixpkgs-e4b4e9b9866758d7843cafe941cb7b59132bd673.tar.gz nixpkgs-e4b4e9b9866758d7843cafe941cb7b59132bd673.tar.bz2 nixpkgs-e4b4e9b9866758d7843cafe941cb7b59132bd673.tar.lz nixpkgs-e4b4e9b9866758d7843cafe941cb7b59132bd673.tar.xz nixpkgs-e4b4e9b9866758d7843cafe941cb7b59132bd673.tar.zst nixpkgs-e4b4e9b9866758d7843cafe941cb7b59132bd673.zip | |
linux: Make Unix domain sockets builtin
This hopefully fixes intermittent initrd failures where udevd cannot create a Unix domain socket: machine# running udev... machine# error getting socket: Address family not supported by protocol machine# error initializing udev control socket machine# error getting socket: Address family not supported by protocol The "unix" kernel module is supposed to be loaded automatically, and clearly that works most of the time, but maybe there is a race somewhere. In any case, no sane person would run a kernel without Unix domain sockets, so we may as well make it builtin. http://hydra.nixos.org/build/30001448
| -rw-r--r-- | nixos/modules/system/boot/kernel.nix | 3 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/kernel/common-config.nix | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/nixos/modules/system/boot/kernel.nix b/nixos/modules/system/boot/kernel.nix index 17e3a038221..bef18fc8771 100644 --- a/nixos/modules/system/boot/kernel.nix +++ b/nixos/modules/system/boot/kernel.nix @@ -197,9 +197,6 @@ in "hid_generic" "hid_lenovo" "hid_apple" "hid_logitech_dj" "hid_lenovo_tpkbd" "hid_roccat" - # Unix domain sockets (needed by udev). - "unix" - # Misc. stuff. "pcips2" "atkbd" diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index ef38043b8d6..14e28170e6f 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -36,6 +36,9 @@ with stdenv.lib; SCHEDSTATS n DETECT_HUNG_TASK y + # Unix domain sockets. + UNIX y + # Power management. ${optionalString (versionOlder version "3.19") '' PM_RUNTIME y |