summary refs log tree commit diff
path: root/pkgs/os-specific/linux/systemd
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2014-05-05 16:18:20 +0200
committerEelco Dolstra <eelco.dolstra@logicblox.com>2014-05-05 16:47:43 +0200
commit24cbe874d6b97a6471b51bcbca956910d92fea9b (patch)
treefda25bd7e1d9f380dd4f924e9a7e378ca05c1074 /pkgs/os-specific/linux/systemd
parent4a08f3720635b7bb3b46dea80bba491302b16f68 (diff)
downloadnixpkgs-24cbe874d6b97a6471b51bcbca956910d92fea9b.tar
nixpkgs-24cbe874d6b97a6471b51bcbca956910d92fea9b.tar.gz
nixpkgs-24cbe874d6b97a6471b51bcbca956910d92fea9b.tar.bz2
nixpkgs-24cbe874d6b97a6471b51bcbca956910d92fea9b.tar.lz
nixpkgs-24cbe874d6b97a6471b51bcbca956910d92fea9b.tar.xz
nixpkgs-24cbe874d6b97a6471b51bcbca956910d92fea9b.tar.zst
nixpkgs-24cbe874d6b97a6471b51bcbca956910d92fea9b.zip
systemd-journal-flush: Require /var/log/journal rather than all filesystems
Backport: 14.04
Diffstat (limited to 'pkgs/os-specific/linux/systemd')
-rw-r--r--pkgs/os-specific/linux/systemd/fixes.patch15
1 files changed, 15 insertions, 0 deletions
diff --git a/pkgs/os-specific/linux/systemd/fixes.patch b/pkgs/os-specific/linux/systemd/fixes.patch
index b2c141f3aaf..7410c87e277 100644
--- a/pkgs/os-specific/linux/systemd/fixes.patch
+++ b/pkgs/os-specific/linux/systemd/fixes.patch
@@ -326,6 +326,21 @@ index e945d87..77728f2 100644
  ExecStart=@rootlibexecdir@/systemd-backlight load %i
  ExecStop=@rootlibexecdir@/systemd-backlight save %i
 +X-RestartIfChanged=false
+diff --git a/units/systemd-journal-flush.service.in b/units/systemd-journal-flush.service.in
+index 503e8a6..fe23b8b 100644
+--- a/units/systemd-journal-flush.service.in
++++ b/units/systemd-journal-flush.service.in
+@@ -10,8 +10,9 @@ Description=Trigger Flushing of Journal to Persistent Storage
+ Documentation=man:systemd-journald.service(8) man:journald.conf(5)
+ DefaultDependencies=no
+ Requires=systemd-journald.service
+-After=systemd-journald.service local-fs.target remote-fs.target
++After=systemd-journald.service
+ Before=systemd-user-sessions.service
++RequiresMountsFor=/var/log/journal
+ 
+ [Service]
+ ExecStart=@rootbindir@/systemctl kill --kill-who=main --signal=SIGUSR1 systemd-journald.service
 diff --git a/units/systemd-journald.service.in b/units/systemd-journald.service.in
 index de93879..c9a49f3 100644
 --- a/units/systemd-journald.service.in