shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-01-03 01:17:45 +03:00
Code

Merge pull request #25282 from keszybz/trivial-cleanups

Browse Source 
Trivial cleanups
This commit is contained in:
Yu Watanabe 2022-11-08 00:21:40 +09:00 committed by GitHub
commit 6c826ed161
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
man/systemd.network.xml
View File

@ -1274,7 +1274,7 @@ allow my_server_t localnet_peer_t:peer recv;</programlisting>
<varlistentry>
<term><varname>Table=</varname></term>
<listitem>
<para>Specifies the routing table identifier to lookup if the rule selector matches. Takes
<para>Specifies the routing table identifier to look up if the rule selector matches. Takes
one of predefined names <literal>default</literal>, <literal>main</literal>, and
<literal>local</literal>, and names defined in <varname>RouteTable=</varname> in
<citerefentry><refentrytitle>networkd.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,

6
src/libsystemd/sd-event/sd-event.c
View File

@ -2171,9 +2171,9 @@ _public_ int sd_event_add_inotify(
assert_return(path, -EINVAL);
fd = open(path, O_PATH|O_CLOEXEC|
(mask & IN_ONLYDIR ? O_DIRECTORY : 0)|
(mask & IN_DONT_FOLLOW ? O_NOFOLLOW : 0));
fd = open(path, O_PATH | O_CLOEXEC |
(mask & IN_ONLYDIR ? O_DIRECTORY : 0) |
(mask & IN_DONT_FOLLOW ? O_NOFOLLOW : 0));
if (fd < 0)
return -errno;

9
src/udev/udevadm-settle.c
View File

@ -217,11 +217,10 @@ int settle_main(int argc, char *argv[], void *userdata) {
return log_error_errno(r, "Failed to wait for daemon to reply: %m");
} else {
/* For non-privileged users, at least check if udevd is running. */
if (access("/run/udev/control", F_OK) < 0) {
if (errno == ENOENT)
return log_error_errno(errno, "systemd-udevd is not running.");
return log_error_errno(errno, "Failed to check if /run/udev/control exists: %m");
}
if (access("/run/udev/control", F_OK) < 0)
return log_error_errno(errno,
errno == ENOENT ? "systemd-udevd is not running." :
"Failed to check if /run/udev/control exists: %m");
}
r = sd_event_default(&event);