public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix module loading in systemd-udevd

Browse Source
This commit is contained in:
Eelco Dolstra 2014-04-17 12:22:24 +02:00
parent 89155dbc01
commit 518f710547
3 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nixos/modules/services/hardware/udev.nix
View File

@ -243,5 +243,10 @@ in
fi fi
''; '';
systemd.services.systemd-udevd =
{ baseUnit = "${config.systemd.package}/example/systemd/system/systemd-udevd.service";
environment.MODULE_DIR = "/run/booted-system/kernel-modules/lib/modules";
};
}; };
} }

2
nixos/modules/system/boot/systemd.nix
View File

@ -50,7 +50,7 @@ let
# Udev. # Udev.
"systemd-udevd-control.socket" "systemd-udevd-control.socket"
"systemd-udevd-kernel.socket" "systemd-udevd-kernel.socket"
"systemd-udevd.service" #"systemd-udevd.service"
"systemd-udev-settle.service" "systemd-udev-settle.service"
"systemd-udev-trigger.service" "systemd-udev-trigger.service"

6
nixos/tests/misc.nix
View File

@ -63,6 +63,12 @@ import ./make-test.nix {
$machine->succeed('[ "`hostname`" = machine ]'); $machine->succeed('[ "`hostname`" = machine ]');
$machine->succeed('[ "`hostname -s`" = machine ]'); $machine->succeed('[ "`hostname -s`" = machine ]');
}; };
# Test whether systemd-udevd automatically loads modules for our hardware.
subtest "udev-auto-load", sub {
$machine->waitForUnit('systemd-udev-settle.service');
$machine->succeed('lsmod | grep psmouse');
};
''; '';
} }