From d5f1532657da107f1c8be8a97c15d964cd96665c Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 8 Sep 2017 17:24:57 +0200 Subject: [PATCH 1/3] core: downgrade log message about inability to propagate cgroup release message If dbus is already down during shutdown, we can't propagate the cgroup release message anymore, but that's expected and nothing to warn about. Hence let's downgrade the message from LOG_WARN to LOG_DEBUG. Fixes: #6777 --- src/core/dbus.c | 2 +- src/core/manager.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/core/dbus.c b/src/core/dbus.c index 96bf975f88..6d3f714192 100644 --- a/src/core/dbus.c +++ b/src/core/dbus.c @@ -92,7 +92,7 @@ int bus_forward_agent_released(Manager *m, const char *path) { "Released", "s", path); if (r < 0) - return log_warning_errno(r, "Failed to propagate agent release message: %m"); + return log_debug_errno(r, "Failed to propagate agent release message: %m"); return 1; } diff --git a/src/core/manager.c b/src/core/manager.c index 939d117ad1..33d9e37df2 100644 --- a/src/core/manager.c +++ b/src/core/manager.c @@ -1780,7 +1780,7 @@ static int manager_dispatch_cgroups_agent_fd(sd_event_source *source, int fd, ui buf[n] = 0; manager_notify_cgroup_empty(m, buf); - bus_forward_agent_released(m, buf); + (void) bus_forward_agent_released(m, buf); return 0; } From 8cc7661dc5e9235142959075df3286ff38d7d315 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 8 Sep 2017 17:29:55 +0200 Subject: [PATCH 2/3] man: only document "systemd-mount --umount", never "--unmount" Internally, we accept either, but let's stick to one of the spellings for all docs. Fixes: #6757 --- man/systemd-mount.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/man/systemd-mount.xml b/man/systemd-mount.xml index 63e4fc40f1..40dc70fe70 100644 --- a/man/systemd-mount.xml +++ b/man/systemd-mount.xml @@ -101,7 +101,7 @@ systems that may be mounted with this command. systemd-umount can be used to unmount a mount or automount point. It is the same - as systemd-mount . + as systemd-mount . From e1e26566ec60aa66a3c21682322ebc376df609b2 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 8 Sep 2017 17:34:11 +0200 Subject: [PATCH 3/3] efivars: don't crash when somebody wants to remove an efi variable This corrects b3c908b4a230c5cca0dcdd7e94d02ec54a298abf by allowing a NULL value again for variable deletion. Fixes: #6753 --- src/shared/efivars.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/shared/efivars.c b/src/shared/efivars.c index 8229e6b183..2503346610 100644 --- a/src/shared/efivars.c +++ b/src/shared/efivars.c @@ -269,7 +269,7 @@ int efi_set_variable( _cleanup_close_ int fd = -1; assert(name); - assert(value); + assert(value || size == 0); if (asprintf(&p, "/sys/firmware/efi/efivars/%s-%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x",