From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Thu, 27 Jul 2017 09:05:29 +0000 (+0900)
Subject: tmpfiles: drop systemd-remote.conf
X-Git-Tag: v235~246^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=29444df23bea21c15a3284ad8acfe2f008e5dbae;p=thirdparty%2Fsystemd.git

tmpfiles: drop systemd-remote.conf

The directories are only used by the specific services, and
created before the services are started. So, it is not necessary
to create them by systemd-tmpfiles.
---

diff --git a/tmpfiles.d/meson.build b/tmpfiles.d/meson.build
index 29efe21f9d9..7d21c64708a 100644
--- a/tmpfiles.d/meson.build
+++ b/tmpfiles.d/meson.build
@@ -22,7 +22,6 @@ endforeach
 
 m4_files = [['etc.conf',             ''],
             ['systemd.conf',         ''],
-            ['systemd-remote.conf',  'ENABLE_REMOTE'],
             ['var.conf',             ''],
            ]
 
diff --git a/tmpfiles.d/systemd-remote.conf.m4 b/tmpfiles.d/systemd-remote.conf.m4
deleted file mode 100644
index 7a0f698c119..00000000000
--- a/tmpfiles.d/systemd-remote.conf.m4
+++ /dev/null
@@ -1,17 +0,0 @@
-#  This file is part of systemd.
-#
-#  systemd is free software; you can redistribute it and/or modify it
-#  under the terms of the GNU Lesser General Public License as published by
-#  the Free Software Foundation; either version 2.1 of the License, or
-#  (at your option) any later version.
-
-# See tmpfiles.d(5) for details
-m4_ifdef(`HAVE_LIBCURL',
-
-d /var/lib/systemd/journal-upload 0755 systemd-journal-upload systemd-journal-upload - -
-)m4_dnl
-m4_ifdef(`HAVE_MICROHTTPD',
-
-z /var/log/journal/remote 2755 systemd-journal-remote systemd-journal-remote - -
-z /run/log/journal/remote 2755 systemd-journal-remote systemd-journal-remote - -
-)m4_dnl