system/systemd
system/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd synced 2024-07-21 02:05:05 +00:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Merge pull request #27686 from keszybz/make-boot-output-nicer

Browse source 
Make boot output nicer
This commit is contained in:
Yu Watanabe 2023-05-19 03:50:45 +09:00 committed by GitHub
parent 60ca859bf0 d0cf9a9562
commit 47f4ddaf28
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/libsystemd/sd-bus/sd-bus.c
View file

@ -4198,14 +4198,14 @@ _public_ int sd_bus_get_description(sd_bus *bus, const char **description) {
assert_return(bus, -EINVAL);
assert_return(bus = bus_resolve(bus), -ENOPKG);
assert_return(description, -EINVAL);
assert_return(bus->description, -ENXIO);
assert_return(!bus_origin_changed(bus), -ECHILD);
if (bus->description)
*description = bus->description;
else
*description = runtime_scope_to_string(bus->runtime_scope);
const char *d = bus->description;
if (!d)
d = runtime_scope_to_string(bus->runtime_scope);
if (!d)
return -ENXIO;
*description = d;
return 0;
}

1
src/libsystemd/sd-event/sd-event.c
View file

@ -2603,7 +2603,6 @@ _public_ int sd_event_source_set_description(sd_event_source *s, const char *des
_public_ int sd_event_source_get_description(sd_event_source *s, const char **description) {
assert_return(s, -EINVAL);
assert_return(description, -EINVAL);
assert_return(!event_origin_changed(s->event), -ECHILD);
if (!s->description)
return -ENXIO;

2
src/oom/oomd.c
View file

@ -146,7 +146,7 @@ static int run(int argc, char *argv[]) {
r = safe_atollu(swap, &s);
if (r < 0 || s == 0)
log_warning("Swap is currently not detected; memory pressure usage will be degraded");
log_warning("No swap; memory pressure usage will be degraded");
if (!is_pressure_supported())
return log_error_errno(SYNTHETIC_ERRNO(EOPNOTSUPP), "Pressure Stall Information (PSI) is not supported");