summaryrefslogtreecommitdiffstats
path: root/src/tmpfiles/tmpfiles.c
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2022-10-09 18:36:43 +0200
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2023-05-23 12:39:34 +0200
commit2223a0258032938f95c85bd9dde9ae5e1cb7396b (patch)
treea1375301439861cd73d98acf269c8bfc159ba193 /src/tmpfiles/tmpfiles.c
parentfirstboot: clarify that machine-id options are only offline, add missing docs (diff)
downloadsystemd-2223a0258032938f95c85bd9dde9ae5e1cb7396b.tar.xz
systemd-2223a0258032938f95c85bd9dde9ae5e1cb7396b.zip
tmpfiles: align table
Diffstat (limited to '')
-rw-r--r--src/tmpfiles/tmpfiles.c61
1 files changed, 33 insertions, 28 deletions
diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c
index be04b25653..5232f17de7 100644
--- a/src/tmpfiles/tmpfiles.c
+++ b/src/tmpfiles/tmpfiles.c
@@ -86,35 +86,35 @@ typedef enum OperationMask {
typedef enum ItemType {
/* These ones take file names */
- CREATE_FILE = 'f',
- TRUNCATE_FILE = 'F', /* deprecated: use f+ */
- CREATE_DIRECTORY = 'd',
- TRUNCATE_DIRECTORY = 'D',
- CREATE_SUBVOLUME = 'v',
+ CREATE_FILE = 'f',
+ TRUNCATE_FILE = 'F', /* deprecated: use f+ */
+ CREATE_DIRECTORY = 'd',
+ TRUNCATE_DIRECTORY = 'D',
+ CREATE_SUBVOLUME = 'v',
CREATE_SUBVOLUME_INHERIT_QUOTA = 'q',
- CREATE_SUBVOLUME_NEW_QUOTA = 'Q',
- CREATE_FIFO = 'p',
- CREATE_SYMLINK = 'L',
- CREATE_CHAR_DEVICE = 'c',
- CREATE_BLOCK_DEVICE = 'b',
- COPY_FILES = 'C',
+ CREATE_SUBVOLUME_NEW_QUOTA = 'Q',
+ CREATE_FIFO = 'p',
+ CREATE_SYMLINK = 'L',
+ CREATE_CHAR_DEVICE = 'c',
+ CREATE_BLOCK_DEVICE = 'b',
+ COPY_FILES = 'C',
/* These ones take globs */
- WRITE_FILE = 'w',
- EMPTY_DIRECTORY = 'e',
- SET_XATTR = 't',
- RECURSIVE_SET_XATTR = 'T',
- SET_ACL = 'a',
- RECURSIVE_SET_ACL = 'A',
- SET_ATTRIBUTE = 'h',
- RECURSIVE_SET_ATTRIBUTE = 'H',
- IGNORE_PATH = 'x',
- IGNORE_DIRECTORY_PATH = 'X',
- REMOVE_PATH = 'r',
- RECURSIVE_REMOVE_PATH = 'R',
- RELABEL_PATH = 'z',
- RECURSIVE_RELABEL_PATH = 'Z',
- ADJUST_MODE = 'm', /* legacy, 'z' is identical to this */
+ WRITE_FILE = 'w',
+ EMPTY_DIRECTORY = 'e',
+ SET_XATTR = 't',
+ RECURSIVE_SET_XATTR = 'T',
+ SET_ACL = 'a',
+ RECURSIVE_SET_ACL = 'A',
+ SET_ATTRIBUTE = 'h',
+ RECURSIVE_SET_ATTRIBUTE = 'H',
+ IGNORE_PATH = 'x',
+ IGNORE_DIRECTORY_PATH = 'X',
+ REMOVE_PATH = 'r',
+ RECURSIVE_REMOVE_PATH = 'R',
+ RELABEL_PATH = 'z',
+ RECURSIVE_RELABEL_PATH = 'Z',
+ ADJUST_MODE = 'm', /* legacy, 'z' is identical to this */
} ItemType;
typedef enum AgeBy {
@@ -125,7 +125,7 @@ typedef enum AgeBy {
/* All file timestamp types are checked by default. */
AGE_BY_DEFAULT_FILE = AGE_BY_ATIME | AGE_BY_BTIME | AGE_BY_CTIME | AGE_BY_MTIME,
- AGE_BY_DEFAULT_DIR = AGE_BY_ATIME | AGE_BY_BTIME | AGE_BY_MTIME
+ AGE_BY_DEFAULT_DIR = AGE_BY_ATIME | AGE_BY_BTIME | AGE_BY_MTIME,
} AgeBy;
typedef struct Item {
@@ -3717,7 +3717,12 @@ static int parse_line(
i.mode = m;
i.mode_set = true;
} else
- i.mode = IN_SET(i.type, CREATE_DIRECTORY, TRUNCATE_DIRECTORY, CREATE_SUBVOLUME, CREATE_SUBVOLUME_INHERIT_QUOTA, CREATE_SUBVOLUME_NEW_QUOTA) ? 0755 : 0644;
+ i.mode = IN_SET(i.type,
+ CREATE_DIRECTORY,
+ TRUNCATE_DIRECTORY,
+ CREATE_SUBVOLUME,
+ CREATE_SUBVOLUME_INHERIT_QUOTA,
+ CREATE_SUBVOLUME_NEW_QUOTA) ? 0755 : 0644;
if (!empty_or_dash(age)) {
const char *a = age;