summaryrefslogtreecommitdiffstats
path: root/presets
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2017-11-23 10:54:29 +0100
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2017-12-06 10:19:35 +0100
commitcfdda37c9fe0d28fd29a74b665072b92228d68f2 (patch)
tree93bdd57c0de36b9167be7a0970b80b9e4f268969 /presets
parenttmpfiles: add --user switch (diff)
downloadsystemd-cfdda37c9fe0d28fd29a74b665072b92228d68f2.tar.xz
systemd-cfdda37c9fe0d28fd29a74b665072b92228d68f2.zip
Hook up systemd-tmpfiles as user units
An explicit --user switch is necessary because for the user@0.service instance systemd-tmpfiles is running as root, and we need to distinguish that from systemd-tmpfiles running in systemd-tmpfiles*.service. Fixes #2208. v2: - restore "systemd-" prefix - add systemd-tmpfiles-clean.{service,timer}, systemd-setup.service to systemd-tmpfiles(8)
Diffstat (limited to 'presets')
-rw-r--r--presets/meson.build3
-rw-r--r--presets/user/90-systemd.preset14
2 files changed, 17 insertions, 0 deletions
diff --git a/presets/meson.build b/presets/meson.build
index 89bed8a05a..48aa8c9796 100644
--- a/presets/meson.build
+++ b/presets/meson.build
@@ -17,3 +17,6 @@
install_data('90-systemd.preset',
install_dir : systempresetdir)
+
+install_data('user/90-systemd.preset',
+ install_dir : userpresetdir)
diff --git a/presets/user/90-systemd.preset b/presets/user/90-systemd.preset
new file mode 100644
index 0000000000..22fe41fc33
--- /dev/null
+++ b/presets/user/90-systemd.preset
@@ -0,0 +1,14 @@
+# SPDX-License-Identifier: LGPL-2.1+
+#
+# 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.
+
+# These ones should be enabled by default, even if distributions
+# generally follow a default-off policy.
+
+enable systemd-tmpfiles-setup.service
+enable systemd-tmpfiles-clean.timer