From 1990bc64cdc6058ba54199632279d8106c51fdea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 16 Nov 2021 09:08:12 +0100 Subject: [PATCH 1/3] basic/errno-util: adjust indentation It was bothering me that this backslash wasn't aligned with the ones below. --- src/basic/errno-util.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 \ From fe8538e499fe18daedb58d871fa171bcb5a3f2fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 16 Nov 2021 09:15:29 +0100 Subject: [PATCH 2/3] man: add markup --- man/binfmt.d.xml | 5 ++--- 1 file changed, 2 insertions(+), 3 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 documentation file for more information on registration of additional binary formats and how to write rules. - Empty lines and lines beginning with ; and # are ignored. - Note that this means you may not use ; and # as delimiter in - binary format rules. + Empty lines and lines beginning with ; and # are ignored. + Note that this means you may not use those symbols as the delimiter in binary format rules. From 0491ab5fcd1e8a7d6c532c591dabb98a9e6ed648 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 16 Nov 2021 09:19:07 +0100 Subject: [PATCH 3/3] units: delay binfmt processing until after local-fs.target Users may use rules that refer to binaries e.g. in /opt or /usr/local, and those directories may be separate mount points. We don't need the binfmt rules in early boot, so let's delay the service so that we can rely on the full local filesystem being visible. Fixes #21178. --- units/systemd-binfmt.service.in | 1 + 1 file changed, 1 insertion(+) 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