picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #6780 from poettering/agent-message

Browse source 
Three minor fixes.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2017-09-09 22:32:37 +02:00 committed by GitHub
parent 309f631d41 e1e26566ec
commit c5aaaebced
4 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
man/systemd-mount.xml
View file

@ -101,7 +101,7 @@
systems that may be mounted with this command.</para>
<para><command>systemd-umount</command> can be used to unmount a mount or automount point. It is the same
as <command>systemd-mount</command> <option>--unmount</option>.</para>
as <command>systemd-mount</command> <option>--umount</option>.</para>
</refsect1>
<refsect1>

2
src/core/dbus.c
View file

@ -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;
}

2
src/core/manager.c
View file

@ -1784,7 +1784,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;
}

2
src/shared/efivars.c
View file

@ -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",