dasharo/systemd
0
0
Fork 0
mirror of https://github.com/Dasharo/systemd.git synced 2026-03-06 15:02:31 -08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #26825 from keszybz/log-message-fix

Browse Source 
Log message fix
This commit is contained in:
Luca Boccassi
2023-03-15 10:49:35 +00:00
committed by GitHub
parent 32e7970304 add74820b7
commit 62562ef5b4
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/dbus-manager.c
View File

@@ -1530,7 +1530,7 @@ static void log_caller(sd_bus_message *message, Manager *manager, const char *me
log_info("%s requested from client PID " PID_FMT "%s%s%s%s%s%s...",
method, pid,
comm ? " ('" : "", strempty(comm), comm ? "')" : "",
caller ? " (unit " : "", caller ? caller->id : NULL, caller ? ")" : "");
caller ? " (unit " : "", caller ? caller->id : "", caller ? ")" : "");
}
static int method_reload(sd_bus_message *message, void *userdata, sd_bus_error *error) {

9
src/core/load-fragment.c
View File

@@ -202,7 +202,7 @@ bool contains_instance_specifier_superset(const char *s) {
return false;
/* %i, %n and %N all expand to the instance or a superset of it. */
for (; p < q; p++) {
for (; p < q; p++)
if (*p == '%')
percent = !percent;
else if (percent) {
@@ -210,7 +210,6 @@ bool contains_instance_specifier_superset(const char *s) {
return true;
percent = false;
}
}
return false;
}
@@ -4382,15 +4381,13 @@ int config_parse_io_limit(
}
if (!l) {
CGroupIOLimitType ttype;
l = new0(CGroupIODeviceLimit, 1);
if (!l)
return log_oom();
l->path = TAKE_PTR(resolved);
for (ttype = 0; ttype < _CGROUP_IO_LIMIT_TYPE_MAX; ttype++)
l->limits[ttype] = cgroup_io_limit_defaults[ttype];
for (CGroupIOLimitType i = 0; i < _CGROUP_IO_LIMIT_TYPE_MAX; i++)
l->limits[i] = cgroup_io_limit_defaults[i];
LIST_PREPEND(device_limits, c->io_device_limits, l);
}