diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-11-04 15:37:28 +0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-11-04 15:37:28 +0100 |
| commit | 3e44182487af5696d55912c701a576fa47d006b8 (patch) | |
| tree | 871c527f08cfb3545f047670e2eac5d96daa868f /nixos | |
| parent | d34f5b657051e268e41084e9751996d16f7f0a1a (diff) | |
| parent | 81f6c62004a8ef711a8c23e8bdcf9f4bdf2c072d (diff) | |
| download | nixlib-3e44182487af5696d55912c701a576fa47d006b8.tar nixlib-3e44182487af5696d55912c701a576fa47d006b8.tar.gz nixlib-3e44182487af5696d55912c701a576fa47d006b8.tar.bz2 nixlib-3e44182487af5696d55912c701a576fa47d006b8.tar.lz nixlib-3e44182487af5696d55912c701a576fa47d006b8.tar.xz nixlib-3e44182487af5696d55912c701a576fa47d006b8.tar.zst nixlib-3e44182487af5696d55912c701a576fa47d006b8.zip | |
Merge remote-tracking branch 'origin/systemd-219' into staging
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/system/boot/systemd.nix | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index 4704b3981e46..0b7647093e0f 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -69,6 +69,7 @@ let "systemd-journal-flush.service" "systemd-journal-gatewayd.socket" "systemd-journal-gatewayd.service" + "systemd-journald-audit.socket" "systemd-journald-dev-log.socket" "syslog.socket" @@ -99,7 +100,7 @@ let # Maintaining state across reboots. "systemd-random-seed.service" "systemd-backlight@.service" - "systemd-rfkill@.service" + "systemd-rfkill.service" # Hibernate / suspend. "hibernate.target" @@ -109,8 +110,6 @@ let "systemd-hibernate.service" "systemd-suspend.service" "systemd-hybrid-sleep.service" - "systemd-shutdownd.socket" - "systemd-shutdownd.service" # Reboot stuff. "reboot.target" @@ -758,7 +757,6 @@ in systemd.services."systemd-rfkill@".restartIfChanged = false; systemd.services."user@".restartIfChanged = false; systemd.services.systemd-journal-flush.restartIfChanged = false; - systemd.services.systemd-journald.restartIfChanged = false; # FIXME: shouldn't be necessary with systemd 219 systemd.services.systemd-random-seed.restartIfChanged = false; systemd.services.systemd-remount-fs.restartIfChanged = false; systemd.services.systemd-update-utmp.restartIfChanged = false; |