summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2024-01-04 14:57:59 +0100
committerLennart Poettering <lennart@poettering.net>2024-01-04 14:57:59 +0100
commitd88b65f66d8daf536d51447eee4348dcb9ecd0aa (patch)
tree79cff3d15ada4770e76a85f1e68fcb79060b1e4a /src
parentexecute: make sure Type=exec and PAMName= work together (diff)
downloadsystemd-d88b65f66d8daf536d51447eee4348dcb9ecd0aa.tar.xz
systemd-d88b65f66d8daf536d51447eee4348dcb9ecd0aa.zip
tmpfiles: always list tmpfiles line types in same order
otherwise it just gets too confusing to follow.
Diffstat (limited to 'src')
-rw-r--r--src/tmpfiles/tmpfiles.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c
index 230ec09b97..e762c71b61 100644
--- a/src/tmpfiles/tmpfiles.c
+++ b/src/tmpfiles/tmpfiles.c
@@ -381,20 +381,20 @@ static int user_config_paths(char*** ret) {
static bool needs_glob(ItemType t) {
return IN_SET(t,
WRITE_FILE,
- IGNORE_PATH,
- IGNORE_DIRECTORY_PATH,
- REMOVE_PATH,
- RECURSIVE_REMOVE_PATH,
EMPTY_DIRECTORY,
- ADJUST_MODE,
- RELABEL_PATH,
- RECURSIVE_RELABEL_PATH,
SET_XATTR,
RECURSIVE_SET_XATTR,
SET_ACL,
RECURSIVE_SET_ACL,
SET_ATTRIBUTE,
- RECURSIVE_SET_ATTRIBUTE);
+ RECURSIVE_SET_ATTRIBUTE,
+ IGNORE_PATH,
+ IGNORE_DIRECTORY_PATH,
+ REMOVE_PATH,
+ RECURSIVE_REMOVE_PATH,
+ RELABEL_PATH,
+ RECURSIVE_RELABEL_PATH,
+ ADJUST_MODE);
}
static bool takes_ownership(ItemType t) {
@@ -402,7 +402,6 @@ static bool takes_ownership(ItemType t) {
CREATE_FILE,
TRUNCATE_FILE,
CREATE_DIRECTORY,
- EMPTY_DIRECTORY,
TRUNCATE_DIRECTORY,
CREATE_SUBVOLUME,
CREATE_SUBVOLUME_INHERIT_QUOTA,
@@ -413,6 +412,7 @@ static bool takes_ownership(ItemType t) {
CREATE_BLOCK_DEVICE,
COPY_FILES,
WRITE_FILE,
+ EMPTY_DIRECTORY,
IGNORE_PATH,
IGNORE_DIRECTORY_PATH,
REMOVE_PATH,