summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2021-11-16 16:54:47 +0100
committerGitHub <noreply@github.com>2021-11-16 16:54:47 +0100
commit032e11a234b5d220c83ae5dd5deda9d5dec79234 (patch)
tree0485004b002e04600c022c2e19162b82834336f1
parenthwdb: ieee1394-unit-function: add entry for MOTU Track 16 (diff)
parentunits: delay binfmt processing until after local-fs.target (diff)
downloadsystemd-032e11a234b5d220c83ae5dd5deda9d5dec79234.tar.xz
systemd-032e11a234b5d220c83ae5dd5deda9d5dec79234.zip
Merge pull request #21386 from keszybz/binfmt-later
Order binfmt.service after local-fs.target
-rw-r--r--man/binfmt.d.xml5
-rw-r--r--src/basic/errno-util.h2
-rw-r--r--units/systemd-binfmt.service.in1
3 files changed, 4 insertions, 4 deletions
diff --git a/man/binfmt.d.xml b/man/binfmt.d.xml
index 6134b27d03..822e4fb8e1 100644
--- a/man/binfmt.d.xml
+++ b/man/binfmt.d.xml
@@ -44,9 +44,8 @@
url="https://www.kernel.org/doc/html/latest/admin-guide/binfmt-misc.html">binfmt-misc.rst</ulink> documentation
file for more information on registration of additional binary formats and how to write rules.</para>
- <para>Empty lines and lines beginning with ; and # are ignored.
- Note that this means you may not use ; and # as delimiter in
- binary format rules.</para>
+ <para>Empty lines and lines beginning with <literal>;</literal> and <literal>#</literal> are ignored.
+ Note that this means you may not use those symbols as the delimiter in binary format rules.</para>
</refsect1>
<xi:include href="standard-conf.xml" xpointer="confd" />
diff --git a/src/basic/errno-util.h b/src/basic/errno-util.h
index 6d79723b39..8cd7de5bc8 100644
--- a/src/basic/errno-util.h
+++ b/src/basic/errno-util.h
@@ -13,7 +13,7 @@ static inline void _reset_errno_(int *saved_errno) {
errno = *saved_errno;
}
-#define PROTECT_ERRNO \
+#define PROTECT_ERRNO \
_cleanup_(_reset_errno_) _unused_ int _saved_errno_ = errno
#define UNPROTECT_ERRNO \
diff --git a/units/systemd-binfmt.service.in b/units/systemd-binfmt.service.in
index fdafce7ff7..96f595ad72 100644
--- a/units/systemd-binfmt.service.in
+++ b/units/systemd-binfmt.service.in
@@ -16,6 +16,7 @@ DefaultDependencies=no
Conflicts=shutdown.target
After=proc-sys-fs-binfmt_misc.automount
After=proc-sys-fs-binfmt_misc.mount
+After=local-fs.target
Before=sysinit.target shutdown.target
ConditionPathIsReadWrite=/proc/sys/
ConditionDirectoryNotEmpty=|/lib/binfmt.d