diff options
| author | Peter Hoeg <peter@hoeg.com> | 2020-03-28 21:24:32 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-28 21:24:32 +0800 |
| commit | 1859f129d2367527c65e34a5672d8f5917068657 (patch) | |
| tree | beea639486e8bf4292c62b51a656799f6133e1f9 /nixos | |
| parent | 06313ad0c459da04e6b383865ee2f153c7fef249 (diff) | |
| parent | 7f838b4ddeadffbbe5863a6ca27ad776064a2f4a (diff) | |
Merge pull request #25311 from peterhoeg/f/udev-settle
display-manager: systemd-udev-settle serves no purpose, boot 10% faster
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/scheduling/atd.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/services/x11/xserver.nix | 3 | ||||
| -rw-r--r-- | nixos/modules/tasks/filesystems/zfs.nix | 1 |
3 files changed, 2 insertions, 4 deletions
diff --git a/nixos/modules/services/scheduling/atd.nix b/nixos/modules/services/scheduling/atd.nix index 93ed9231d3c5..cefe72b0e999 100644 --- a/nixos/modules/services/scheduling/atd.nix +++ b/nixos/modules/services/scheduling/atd.nix @@ -67,8 +67,6 @@ in systemd.services.atd = { description = "Job Execution Daemon (atd)"; - after = [ "systemd-udev-settle.service" ]; - wants = [ "systemd-udev-settle.service" ]; wantedBy = [ "multi-user.target" ]; path = [ at ]; diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix index 74d702ea1c3d..6aec1c0753a2 100644 --- a/nixos/modules/services/x11/xserver.nix +++ b/nixos/modules/services/x11/xserver.nix @@ -651,8 +651,7 @@ in systemd.services.display-manager = { description = "X11 Server"; - after = [ "systemd-udev-settle.service" "acpid.service" "systemd-logind.service" ]; - wants = [ "systemd-udev-settle.service" ]; + after = [ "acpid.service" "systemd-logind.service" ]; restartIfChanged = false; diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix index 09c7e074e121..07225ee88ff1 100644 --- a/nixos/modules/tasks/filesystems/zfs.nix +++ b/nixos/modules/tasks/filesystems/zfs.nix @@ -478,6 +478,7 @@ in createImportService = pool: nameValuePair "zfs-import-${pool}" { description = "Import ZFS pool \"${pool}\""; + # we need systemd-udev-settle until https://github.com/zfsonlinux/zfs/pull/4943 is merged requires = [ "systemd-udev-settle.service" ]; after = [ "systemd-udev-settle.service" "systemd-modules-load.service" ]; wantedBy = (getPoolMounts pool) ++ [ "local-fs.target" ]; |