From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Wed, 2 Aug 2017 08:35:11 +0000 (+0900)
Subject: units: use {State,Logs}Directory= if they are applicable
X-Git-Tag: v235~246^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d0e62ae0f6d05657a9bec134cefb0994d9734e67;p=thirdparty%2Fsystemd.git

units: use {State,Logs}Directory= if they are applicable
---

diff --git a/units/systemd-coredump@.service.in b/units/systemd-coredump@.service.in
index 18f2d2d605c..f6044a4d3f3 100644
--- a/units/systemd-coredump@.service.in
+++ b/units/systemd-coredump@.service.in
@@ -34,4 +34,4 @@ RestrictNamespaces=yes
 RestrictAddressFamilies=AF_UNIX
 SystemCallFilter=~@clock @cpu-emulation @debug @keyring @module @mount @obsolete @raw-io @reboot @swap
 SystemCallArchitectures=native
-ReadWritePaths=/var/lib/systemd/coredump
+StateDirectory=systemd/coredump
diff --git a/units/systemd-journal-remote.service.in b/units/systemd-journal-remote.service.in
index 5404bf1c035..62e862a8377 100644
--- a/units/systemd-journal-remote.service.in
+++ b/units/systemd-journal-remote.service.in
@@ -28,7 +28,7 @@ RestrictRealtime=yes
 RestrictNamespaces=yes
 RestrictAddressFamilies=AF_UNIX AF_INET AF_INET6
 SystemCallArchitectures=native
-ReadWritePaths=/var/log/journal/remote
+LogsDirectory=journal/remote
 
 [Install]
 Also=systemd-journal-remote.socket
diff --git a/units/systemd-journal-upload.service.in b/units/systemd-journal-upload.service.in
index d00b9292117..b0bee3925e3 100644
--- a/units/systemd-journal-upload.service.in
+++ b/units/systemd-journal-upload.service.in
@@ -28,7 +28,7 @@ RestrictRealtime=yes
 RestrictNamespaces=yes
 RestrictAddressFamilies=AF_UNIX AF_INET AF_INET6
 SystemCallArchitectures=native
-ReadWritePaths=/var/lib/systemd/journal-upload
+StateDirectory=systemd/journal-upload
 
 # If there are many split up journal files we need a lot of fds to
 # access them all and combine