66 lines
2.9 KiB
Diff
66 lines
2.9 KiB
Diff
|
From 1a0e6961cfaed42bda542e111738c136f7b4d73f Mon Sep 17 00:00:00 2001
|
||
|
|
From: Mike Yuan <me@yhndnzj.com>
|
||
|
|
Date: Sat, 15 Jun 2024 17:27:33 +0200
|
||
|
|
Subject: [PATCH] man,units: drop "temporary" from description of
|
||
|
|
systemd-tmpfiles
|
||
|
|
|
||
|
|
Historically, systemd-tmpfiles was designed to manager temporary
|
||
|
|
files, but nowadays it has become a generic tool for managing
|
||
|
|
all kinds of files. To avoid user confusion, let's remove "temporary"
|
||
|
|
from the tool's description.
|
||
|
|
|
||
|
|
As discussed in #33349
|
||
|
|
|
||
|
|
(cherry picked from commit b5c8cc0a3b8e4e2fea0539d6420a76b524ea5735)
|
||
|
|
---
|
||
|
|
man/systemd-tmpfiles.xml | 8 +++++---
|
||
|
|
units/systemd-tmpfiles-setup.service | 2 +-
|
||
|
|
units/user/systemd-tmpfiles-setup.service | 2 +-
|
||
|
|
3 files changed, 7 insertions(+), 5 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/man/systemd-tmpfiles.xml b/man/systemd-tmpfiles.xml
|
||
|
|
index 6f3ec66611..9767aead85 100644
|
||
|
|
--- a/man/systemd-tmpfiles.xml
|
||
|
|
+++ b/man/systemd-tmpfiles.xml
|
||
|
|
@@ -55,9 +55,11 @@
|
||
|
|
<refsect1>
|
||
|
|
<title>Description</title>
|
||
|
|
|
||
|
|
- <para><command>systemd-tmpfiles</command> creates, deletes, and cleans up volatile and temporary files
|
||
|
|
- and directories, using the configuration file format and location specified in
|
||
|
|
- <citerefentry><refentrytitle>tmpfiles.d</refentrytitle><manvolnum>5</manvolnum></citerefentry>. It must
|
||
|
|
+ <para><command>systemd-tmpfiles</command> creates, deletes, and cleans up files and directories, using
|
||
|
|
+ the configuration file format and location specified in
|
||
|
|
+ <citerefentry><refentrytitle>tmpfiles.d</refentrytitle><manvolnum>5</manvolnum></citerefentry>.
|
||
|
|
+ Historically, it was designed to manage volatile and temporary files, as the name suggests, but it provides
|
||
|
|
+ generic file management functionality and can be used to manage any kind of files. It must
|
||
|
|
be invoked with one or more commands <option>--create</option>, <option>--remove</option>, and
|
||
|
|
<option>--clean</option>, to select the respective subset of operations.</para>
|
||
|
|
|
||
|
|
diff --git a/units/systemd-tmpfiles-setup.service b/units/systemd-tmpfiles-setup.service
|
||
|
|
index 6cae32850f..b92beb7314 100644
|
||
|
|
--- a/units/systemd-tmpfiles-setup.service
|
||
|
|
+++ b/units/systemd-tmpfiles-setup.service
|
||
|
|
@@ -8,7 +8,7 @@
|
||
|
|
# (at your option) any later version.
|
||
|
|
|
||
|
|
[Unit]
|
||
|
|
-Description=Create Volatile Files and Directories
|
||
|
|
+Description=Create System Files and Directories
|
||
|
|
Documentation=man:tmpfiles.d(5) man:systemd-tmpfiles(8)
|
||
|
|
|
||
|
|
DefaultDependencies=no
|
||
|
|
diff --git a/units/user/systemd-tmpfiles-setup.service b/units/user/systemd-tmpfiles-setup.service
|
||
|
|
index 156689edcd..54e453c4fc 100644
|
||
|
|
--- a/units/user/systemd-tmpfiles-setup.service
|
||
|
|
+++ b/units/user/systemd-tmpfiles-setup.service
|
||
|
|
@@ -8,7 +8,7 @@
|
||
|
|
# (at your option) any later version.
|
||
|
|
|
||
|
|
[Unit]
|
||
|
|
-Description=Create User's Volatile Files and Directories
|
||
|
|
+Description=Create User Files and Directories
|
||
|
|
Documentation=man:tmpfiles.d(5) man:systemd-tmpfiles(8)
|
||
|
|
DefaultDependencies=no
|
||
|
|
Conflicts=shutdown.target
|