diff options
| author | Robin Gloster <mail@glob.in> | 2017-01-26 01:52:38 +0100 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2017-01-26 17:52:52 +0100 |
| commit | a38f1911d34f2a72e15d5e98d76bece6cb8042a8 (patch) | |
| tree | 405bbccaca440b4810c3d3831d41858c887b4239 /nixos/modules/system/boot/systemd.nix | |
| parent | 6973c7739ea1581595931e8c8b3b76241083b2df (diff) | |
| download | nixpkgs-a38f1911d34f2a72e15d5e98d76bece6cb8042a8.tar nixpkgs-a38f1911d34f2a72e15d5e98d76bece6cb8042a8.tar.gz nixpkgs-a38f1911d34f2a72e15d5e98d76bece6cb8042a8.tar.bz2 nixpkgs-a38f1911d34f2a72e15d5e98d76bece6cb8042a8.tar.lz nixpkgs-a38f1911d34f2a72e15d5e98d76bece6cb8042a8.tar.xz nixpkgs-a38f1911d34f2a72e15d5e98d76bece6cb8042a8.tar.zst nixpkgs-a38f1911d34f2a72e15d5e98d76bece6cb8042a8.zip | |
systemd: 231 -> 232
Includes adding some more upstream units and removing obsolete (-.slice) ones.
Diffstat (limited to 'nixos/modules/system/boot/systemd.nix')
| -rw-r--r-- | nixos/modules/system/boot/systemd.nix | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index a2ee5166971..ace1545b96e 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -17,6 +17,7 @@ let "busnames.target" "sysinit.target" "sockets.target" + "exit.target" "graphical.target" "multi-user.target" "network.target" @@ -41,11 +42,13 @@ let "systemd-udevd.service" "systemd-udev-settle.service" "systemd-udev-trigger.service" + "systemd-hwdb-update.service" # Consoles. "getty.target" "getty@.service" "serial-getty@.service" + "console-getty.service" "container-getty@.service" "systemd-vconsole-setup.service" @@ -72,6 +75,7 @@ let "systemd-journal-flush.service" "systemd-journal-gatewayd.socket" "systemd-journal-gatewayd.service" + "systemd-journal-catalog-update.service" "systemd-journald-audit.socket" "systemd-journald-dev-log.socket" "syslog.socket" @@ -104,6 +108,7 @@ let "systemd-random-seed.service" "systemd-backlight@.service" "systemd-rfkill.service" + "systemd-rfkill.socket" # Hibernate / suspend. "hibernate.target" @@ -111,8 +116,8 @@ let "sleep.target" "hybrid-sleep.target" "systemd-hibernate.service" - "systemd-suspend.service" "systemd-hybrid-sleep.service" + "systemd-suspend.service" # Reboot stuff. "reboot.target" @@ -136,10 +141,10 @@ let # Slices / containers. "slices.target" - "-.slice" "system.slice" "user.slice" "machine.slice" + "machines.target" "systemd-machined.service" "systemd-nspawn@.service" @@ -162,12 +167,12 @@ let "systemd-localed.service" "systemd-hostnamed.service" "systemd-binfmt.service" + "systemd-exit.service" ] ++ cfg.additionalUpstreamSystemUnits; upstreamSystemWants = - [ #"basic.target.wants" - "sysinit.target.wants" + [ "sysinit.target.wants" "sockets.target.wants" "local-fs.target.wants" "multi-user.target.wants" @@ -176,11 +181,18 @@ let upstreamUserUnits = [ "basic.target" + "bluetooth.target" + "busnames.target" "default.target" "exit.target" + "graphical-session-pre.target" + "graphical-session.target" "paths.target" + "printer.target" "shutdown.target" + "smartcard.target" "sockets.target" + "sound.target" "systemd-exit.service" "timers.target" ]; |