6ee4abe797
Remove resolved scriptlets Don't install tests Resolves: RHEL-46277,RHEL-46576,RHEL-46280
38 lines
2.1 KiB
Diff
38 lines
2.1 KiB
Diff
From 08b8237303efdf072a0f61615b7f1633eafc8e0a Mon Sep 17 00:00:00 2001
|
|
From: Lennart Poettering <lennart@poettering.net>
|
|
Date: Tue, 18 Jun 2024 09:56:15 +0200
|
|
Subject: [PATCH] tmpfiles: move --purge to command section in --help text
|
|
where it belongs
|
|
|
|
Also, make contrast between --remove and --purge clearer: one deletes
|
|
files marked for deletion, the other deletes files marked for creation.
|
|
|
|
(cherry picked from commit 69d76823ce6e9c307184946ed55b207eb728e625)
|
|
---
|
|
src/tmpfiles/tmpfiles.c | 5 +++--
|
|
1 file changed, 3 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c
|
|
index 1704197207..8cc8c1ccd6 100644
|
|
--- a/src/tmpfiles/tmpfiles.c
|
|
+++ b/src/tmpfiles/tmpfiles.c
|
|
@@ -4148,7 +4148,9 @@ static int help(void) {
|
|
"\n%3$sCommands:%4$s\n"
|
|
" --create Create files and directories\n"
|
|
" --clean Clean up files and directories\n"
|
|
- " --remove Remove files and directories\n"
|
|
+ " --remove Remove files and directories marked for removal\n"
|
|
+ " --purge Delete files and directories marked for creation in\n"
|
|
+ " specified configuration files (careful!)\n"
|
|
" -h --help Show this help\n"
|
|
" --version Show package version\n"
|
|
"\n%3$sOptions:%4$s\n"
|
|
@@ -4157,7 +4159,6 @@ static int help(void) {
|
|
" --tldr Show non-comment parts of configuration\n"
|
|
" --boot Execute actions only safe at boot\n"
|
|
" --graceful Quietly ignore unknown users or groups\n"
|
|
- " --purge Delete all files owned by the configuration files\n"
|
|
" --prefix=PATH Only apply rules with the specified prefix\n"
|
|
" --exclude-prefix=PATH Ignore rules with the specified prefix\n"
|
|
" -E Ignore rules prefixed with /dev, /proc, /run, /sys\n"
|