SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

core: use unit-based logging instead of generic logging where appropriate

Browse Source
This commit is contained in:
Lennart Poettering
2020-01-09 17:08:36 +01:00
parent eb34a981d6
commit af4454cb17
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/swap.c
+4 -5
View File
@@ -768,9 +768,9 @@ static void swap_enter_activating(Swap *s) {
r = fstab_find_pri(s->parameters_fragment.options, &priority);
if (r < 0)
log_warning_errno(r, "Failed to parse swap priority \"%s\", ignoring: %m", s->parameters_fragment.options);
else if (r == 1 && s->parameters_fragment.priority_set)
log_warning("Duplicate swap priority configuration by Priority and Options fields.");
log_unit_warning_errno(UNIT(s), r, "Failed to parse swap priority \"%s\", ignoring: %m", s->parameters_fragment.options);
else if (r > 0 && s->parameters_fragment.priority_set)
log_unit_warning(UNIT(s), "Duplicate swap priority configuration by Priority= and Options= fields.");
if (r <= 0 && s->parameters_fragment.priority_set) {
if (s->parameters_fragment.options)
@@ -788,7 +788,7 @@ static void swap_enter_activating(Swap *s) {
if (s->parameters_fragment.options || opts) {
r = exec_command_append(s->control_command, "-o",
opts ? : s->parameters_fragment.options, NULL);
opts ?: s->parameters_fragment.options, NULL);
if (r < 0)
goto fail;
}
@@ -804,7 +804,6 @@ static void swap_enter_activating(Swap *s) {
goto fail;
swap_set_state(s, SWAP_ACTIVATING);
return;
fail: