diff options
| author | Lennart Poettering <lennart@poettering.net> | 2024-01-04 22:55:23 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-04 22:55:23 +0100 |
| commit | 86e62e9e02d8dd43fed5feaedc53af4671b98032 (patch) | |
| tree | 859cfd128e2655ef5293cab8bd946885ec3f0f2b /src/tmpfiles | |
| parent | Merge pull request #30758 from YHNdnzj/vpick-not-ptr (diff) | |
| parent | tmpfiles: 'x' takes globs, hence clean it with globbing (diff) | |
| download | systemd-86e62e9e02d8dd43fed5feaedc53af4671b98032.tar.xz systemd-86e62e9e02d8dd43fed5feaedc53af4671b98032.zip | |
Merge pull request #30749 from poettering/tmpfiles-verb-fix
tmpfiles: correctly apply globbing when cleaning 'x' lines
Diffstat (limited to 'src/tmpfiles')
| -rw-r--r-- | src/tmpfiles/tmpfiles.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c index 681e773cba..5d8f45b5df 100644 --- a/src/tmpfiles/tmpfiles.c +++ b/src/tmpfiles/tmpfiles.c @@ -400,20 +400,20 @@ static bool needs_purge(ItemType t) { 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) { @@ -421,7 +421,6 @@ static bool takes_ownership(ItemType t) { CREATE_FILE, TRUNCATE_FILE, CREATE_DIRECTORY, - EMPTY_DIRECTORY, TRUNCATE_DIRECTORY, CREATE_SUBVOLUME, CREATE_SUBVOLUME_INHERIT_QUOTA, @@ -432,6 +431,7 @@ static bool takes_ownership(ItemType t) { CREATE_BLOCK_DEVICE, COPY_FILES, WRITE_FILE, + EMPTY_DIRECTORY, IGNORE_PATH, IGNORE_DIRECTORY_PATH, REMOVE_PATH, @@ -3051,16 +3051,16 @@ static int clean_item(Context *c, Item *i) { switch (i->type) { case CREATE_DIRECTORY: + case TRUNCATE_DIRECTORY: case CREATE_SUBVOLUME: case CREATE_SUBVOLUME_INHERIT_QUOTA: case CREATE_SUBVOLUME_NEW_QUOTA: - case TRUNCATE_DIRECTORY: - case IGNORE_PATH: case COPY_FILES: clean_item_instance(c, i, i->path, CREATION_EXISTING); return 0; case EMPTY_DIRECTORY: + case IGNORE_PATH: case IGNORE_DIRECTORY_PATH: return glob_item(c, i, clean_item_instance); |