From a9ba6f8a88b7277b76caaf378371a7cc1f12af81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 17 Jan 2023 17:10:34 +0100 Subject: [PATCH 1/2] man: minor corrections Two issues that were missed in 8b9f092112ce097dd5c72a58a092c4176458889c. --- man/systemd-nspawn.xml | 2 +- man/systemd.unit.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml index be2c3882d7..ca33d82a74 100644 --- a/man/systemd-nspawn.xml +++ b/man/systemd-nspawn.xml @@ -1386,7 +1386,7 @@ After=sys-subsystem-net-devices-ens1.device Whichever ID mapping option is used, the same mapping will be used for users and groups IDs. If - is used, the group owning the bind mounted directory will have no effect + is used, the group owning the bind mounted directory will have no effect. Note that when this option is used in combination with , the resulting mount points will be owned by the nobody user. That's because the mount and its files and diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml index 0c17d91814..91015c8f47 100644 --- a/man/systemd.unit.xml +++ b/man/systemd.unit.xml @@ -1245,7 +1245,7 @@ device-tree-compatible(value) - matches systems with a device tree that is compatible with value. + matches systems with a device tree that are compatible with value. smbios-field(field From 066991f9fe510d0b4c9530f8b455b5b32b63a554 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sun, 22 Jan 2023 17:51:30 +0100 Subject: [PATCH 2/2] man/sd_notify: fix indentation in sample programs Whether we use a newline at the beginning of or not doesn't seem to have any effect. So let's use the newline in multi-line examples; it is easier to get the indentation right this way. --- man/sd_notify.xml | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/man/sd_notify.xml b/man/sd_notify.xml index 0ba191c0ce..8ef1c507ca 100644 --- a/man/sd_notify.xml +++ b/man/sd_notify.xml @@ -436,10 +436,11 @@ A service could send the following after completing initialization: - sd_notifyf(0, "READY=1\n" - "STATUS=Processing requests…\n" - "MAINPID=%lu", - (unsigned long) getpid()); + +sd_notifyf(0, "READY=1\n" + "STATUS=Processing requests…\n" + "MAINPID=%lu", + (unsigned long) getpid()); @@ -447,10 +448,11 @@ A service could send the following shortly before exiting, on failure: - sd_notifyf(0, "STATUS=Failed to start up: %s\n" - "ERRNO=%i", - strerror_r(errnum, (char[1024]){}, 1024), - errnum); + +sd_notifyf(0, "STATUS=Failed to start up: %s\n" + "ERRNO=%i", + strerror_r(errnum, (char[1024]){}, 1024), + errnum); @@ -473,9 +475,10 @@ to synchronize against reception of all notifications sent before this call is made. - sd_notify(0, "READY=1"); - /* set timeout to 5 seconds */ - sd_notify_barrier(0, 5 * 1000000); + +sd_notify(0, "READY=1"); +/* set timeout to 5 seconds */ +sd_notify_barrier(0, 5 * 1000000);