From 492471b453d0b3fd9c8ffac58e274d97306878da Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 11 May 2015 12:39:37 +0200 Subject: [PATCH] Apply some overrides to upstream systemd units This removes the need for the following patches: https://github.com/edolstra/systemd/commit/9a6cade993f432b520d4a2f77d0a15e08abc4dfa https://github.com/edolstra/systemd/commit/9f7e832c901815d80d0ef38c3cbb68abb07fd914 --- nixos/modules/system/boot/systemd.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index 0f210d506881..1fde720bba0d 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -736,10 +736,18 @@ in ${concatStringsSep "\n" cfg.tmpfiles.rules} ''; + # Some overrides to upstream units. + systemd.services."systemd-backlight@".restartIfChanged = false; + systemd.services."systemd-rfkill@".restartIfChanged = false; systemd.services."user@".restartIfChanged = false; - - systemd.services.systemd-remount-fs.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; + systemd.services.systemd-user-sessions.restartIfChanged = false; # Restart kills all active sessions. + systemd.targets.local-fs.unitConfig.X-StopOnReconfiguration = true; + systemd.targets.remote-fs.unitConfig.X-StopOnReconfiguration = true; };