morgan/systemd
1
0
Fork 0
mirror of https://github.com/morgan9e/systemd synced 2026-04-14 08:25:20 +09:00
Code Issues Packages Projects Releases Wiki Activity

shared/conf-parser: collapse pkgdir and conf_file args into one

Browse Source 
This essentially reverts 5656cdfeea. I find it
much easier to understand what is going on when the
path-relative-to-the-search-path is passed in full, instead of being constructed
from two parts, with one of the parts being implicit in some places.

Also, we call 'systemd-analyze cat-config <path>' with <path> with the same
meaning, so this makes the internal and external APIs more consistent.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2024-01-25 18:30:43 +01:00
parent 76d75d8b7b
commit e5abff372d
16 changed files with 24 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/main.c
View File

@@ -736,7 +736,7 @@ static int parse_config_file(void) {
};
if (arg_runtime_scope == RUNTIME_SCOPE_SYSTEM)
(void) config_parse_config_file("system.conf",
(void) config_parse_config_file("systemd/system.conf",
"Manager\0",
config_item_table_lookup, items,
CONFIG_PARSE_WARN,

2
src/coredump/coredump.c
View File

@@ -179,7 +179,7 @@ static int parse_config(void) {
int r;
r = config_parse_config_file(
"coredump.conf",
"systemd/coredump.conf",
"Coredump\0",
config_item_table_lookup,
items,

2
src/home/homed-conf.c
View File

@@ -9,7 +9,7 @@ int manager_parse_config_file(Manager *m) {
assert(m);
return config_parse_config_file("homed.conf", "Home\0",
return config_parse_config_file("systemd/homed.conf", "Home\0",
config_item_perf_lookup, homed_gperf_lookup,
CONFIG_PARSE_WARN, m);
}

2
src/journal-remote/journal-remote-main.c
View File

@@ -746,7 +746,7 @@ static int parse_config(void) {
{}
};
return config_parse_config_file("journal-remote.conf", "Remote\0",
return config_parse_config_file("systemd/journal-remote.conf", "Remote\0",
config_item_table_lookup, items,
CONFIG_PARSE_WARN, NULL);
}

2
src/journal-remote/journal-upload.c
View File

@@ -531,7 +531,7 @@ static int parse_config(void) {
{}
};
return config_parse_config_file("journal-upload.conf", "Upload\0",
return config_parse_config_file("systemd/journal-upload.conf", "Upload\0",
config_item_table_lookup, items,
CONFIG_PARSE_WARN, NULL);
}

6
src/journal/journald-server.c
View File

@@ -1884,12 +1884,14 @@ static int parse_proc_cmdline_item(const char *key, const char *value, void *dat
}
static int server_parse_config_file(Server *s) {
const char *conf_file = "journald.conf";
const char *conf_file;
assert(s);
if (s->namespace)
conf_file = strjoina("journald@", s->namespace, ".conf");
conf_file = strjoina("systemd/journald@", s->namespace, ".conf");
else
conf_file = "systemd/journald.conf";
return config_parse_config_file(conf_file, "Journal\0",
config_item_perf_lookup, journald_gperf_lookup,

2
src/login/logind-core.c
View File

@@ -82,7 +82,7 @@ void manager_reset_config(Manager *m) {
int manager_parse_config_file(Manager *m) {
assert(m);
return config_parse_config_file("logind.conf", "Login\0",
return config_parse_config_file("systemd/logind.conf", "Login\0",
config_item_perf_lookup, logind_gperf_lookup,
CONFIG_PARSE_WARN, m);
}

2
src/network/networkd-conf.c
View File

@@ -14,7 +14,7 @@ int manager_parse_config_file(Manager *m) {
assert(m);
r = config_parse_config_file("networkd.conf",
r = config_parse_config_file("systemd/networkd.conf",
"Network\0"
"DHCPv4\0"
"DHCPv6\0"

2
src/oom/oomd.c
View File

@@ -31,7 +31,7 @@ static int parse_config(void) {
{}
};
return config_parse_config_file("oomd.conf", "OOM\0",
return config_parse_config_file("systemd/oomd.conf", "OOM\0",
config_item_table_lookup, items,
CONFIG_PARSE_WARN, NULL);
}

2
src/pstore/pstore.c
View File

@@ -77,7 +77,7 @@ static int parse_config(void) {
{}
};
return config_parse_config_file("pstore.conf", "PStore\0",
return config_parse_config_file("systemd/pstore.conf", "PStore\0",
config_item_table_lookup, items,
CONFIG_PARSE_WARN, NULL);
}

2
src/resolve/resolved-conf.c
View File

@@ -570,7 +570,7 @@ int manager_parse_config_file(Manager *m) {
assert(m);
r = config_parse_config_file("resolved.conf", "Resolve\0",
r = config_parse_config_file("systemd/resolved.conf", "Resolve\0",
config_item_perf_lookup, resolved_gperf_lookup,
CONFIG_PARSE_WARN, m);
if (r < 0)

10
src/shared/conf-parser.c
View File

@@ -600,9 +600,8 @@ static int config_parse_many_files(
/* Parse one main config file located in /etc/$pkgdir and its drop-ins, which is what all systemd daemons
* do. */
int config_parse_config_file_full(
int config_parse_config_file(
const char *conf_file,
const char *pkgdir,
const char *sections,
ConfigItemLookup lookup,
const void *table,
@@ -614,7 +613,6 @@ int config_parse_config_file_full(
int r;
assert(conf_file);
assert(pkgdir);
/* build the dropin dir list */
dropin_dirs = new0(char*, strv_length(conf_paths) + 1);
@@ -628,10 +626,10 @@ int config_parse_config_file_full(
STRV_FOREACH(p, conf_paths) {
char *d;
d = strjoin(*p, pkgdir, "/", conf_file, ".d");
d = strjoin(*p, conf_file, ".d");
if (!d) {
if (flags & CONFIG_PARSE_WARN)
return log_oom();
log_oom();
return -ENOMEM;
}
@@ -642,7 +640,7 @@ int config_parse_config_file_full(
if (r < 0)
return r;
const char *sysconf_file = strjoina(SYSCONF_DIR, "/", pkgdir, "/", conf_file);
const char *sysconf_file = strjoina(SYSCONF_DIR, "/", conf_file);
return config_parse_many_files(STRV_MAKE_CONST(sysconf_file), dropins,
sections, lookup, table, flags, userdata, NULL);

15
src/shared/conf-parser.h
View File

@@ -93,25 +93,14 @@ int config_parse(
void *userdata,
struct stat *ret_stat); /* possibly NULL */
int config_parse_config_file_full(
const char *conf_file,
const char *pkgdir,
int config_parse_config_file(
const char *conf_file, /* a path like "systemd/frobnicator.conf" */
const char *sections, /* nulstr */
ConfigItemLookup lookup,
const void *table,
ConfigParseFlags flags,
void *userdata);
static inline int config_parse_config_file(
const char *conf_file,
const char *sections, /* nulstr */
ConfigItemLookup lookup,
const void *table,
ConfigParseFlags flags,
void *userdata) {
return config_parse_config_file_full(conf_file, "systemd", sections, lookup, table, flags, userdata);
}
int config_parse_many(
const char* const* conf_files, /* possibly empty */
const char* const* conf_file_dirs,

2
src/shared/sleep-config.c
View File

@@ -145,7 +145,7 @@ int parse_sleep_config(SleepConfig **ret) {
{}
};
(void) config_parse_config_file("sleep.conf", "Sleep\0",
(void) config_parse_config_file("systemd/sleep.conf", "Sleep\0",
config_item_table_lookup, items,
CONFIG_PARSE_WARN, NULL);

5
src/shared/udev-util.c
View File

@@ -28,9 +28,8 @@ int udev_parse_config_full(const ConfigTableItem config_table[]) {
assert(config_table);
r = config_parse_config_file_full(
"udev.conf",
"udev",
r = config_parse_config_file(
"udev/udev.conf",
/* sections = */ NULL,
config_item_table_lookup,
config_table,

2
src/timesync/timesyncd-conf.c
View File

@@ -102,7 +102,7 @@ int manager_parse_config_file(Manager *m) {
assert(m);
r = config_parse_config_file("timesyncd.conf", "Time\0",
r = config_parse_config_file("systemd/timesyncd.conf", "Time\0",
config_item_perf_lookup, timesyncd_gperf_lookup,
CONFIG_PARSE_WARN, m);
if (r < 0)