summary refs log tree commit diff
path: root/nixos/modules/system
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2014-07-22 11:00:00 +0200
committerEelco Dolstra <eelco.dolstra@logicblox.com>2014-07-22 11:00:00 +0200
commit7f410ef923b5959147e3902f727bb91b08543f72 (patch)
tree5081fe1dbc7731c179ac8ab945e9ae2d9caefcfd /nixos/modules/system
parentf77abc8b7a8b4279258862a7b6d3810e73d4b092 (diff)
parent7491fccfe65e204ecbc7addc7ccac7b6b69fe3c5 (diff)
downloadnixlib-7f410ef923b5959147e3902f727bb91b08543f72.tar
nixlib-7f410ef923b5959147e3902f727bb91b08543f72.tar.gz
nixlib-7f410ef923b5959147e3902f727bb91b08543f72.tar.bz2
nixlib-7f410ef923b5959147e3902f727bb91b08543f72.tar.lz
nixlib-7f410ef923b5959147e3902f727bb91b08543f72.tar.xz
nixlib-7f410ef923b5959147e3902f727bb91b08543f72.tar.zst
nixlib-7f410ef923b5959147e3902f727bb91b08543f72.zip
Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/misc/vim-plugins/default.nix
Diffstat (limited to 'nixos/modules/system')
-rw-r--r--nixos/modules/system/boot/systemd.nix1
1 files changed, 1 insertions, 0 deletions
diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index c6c0021ba6d3..14caa5d360d5 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -825,6 +825,7 @@ in
     systemd.services."user@".restartIfChanged = false;
 
     systemd.services.systemd-remount-fs.restartIfChanged = false;
+    systemd.services.systemd-journal-flush.restartIfChanged = false;
 
   };
 }