From 4b85218629c1a9a97cffb38fd7eb4ed4cdc1b5b4 Mon Sep 17 00:00:00 2001
From: Luca Boccassi <luca.boccassi@gmail.com>
Date: Tue, 1 Apr 2025 09:55:52 +0100
Subject: [PATCH 1/2] test: use 'exit 0' instead of 'return' in test scripts

14385s [   66.896852] TEST-87-AUX-UTILS-VM.sh[3744]: + test -x /usr/lib/systemd/systemd-validatefs
14385s [   66.898544] TEST-87-AUX-UTILS-VM.sh[3744]: + echo 'no systemd-validatefs'
14385s [   66.899115] TEST-87-AUX-UTILS-VM.sh[3744]: no systemd-validatefs
14385s [   66.899699] TEST-87-AUX-UTILS-VM.sh[3744]: + return
14385s [   66.900189] TEST-87-AUX-UTILS-VM.sh[3744]: .//usr/lib/systemd/tests/testdata/units/TEST-87-AUX-UTILS-VM.validatefs.sh: line 13: return: can only `return' from a function or sourced script

Follow-up for 6e003d18bbf5e9f55c08b25d80b138b3a98d5f26
---
 test/units/TEST-87-AUX-UTILS-VM.validatefs.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/units/TEST-87-AUX-UTILS-VM.validatefs.sh b/test/units/TEST-87-AUX-UTILS-VM.validatefs.sh
index 5b142e178a..b4f3c58239 100755
--- a/test/units/TEST-87-AUX-UTILS-VM.validatefs.sh
+++ b/test/units/TEST-87-AUX-UTILS-VM.validatefs.sh
@@ -5,12 +5,12 @@ set -o pipefail
 
 if ! command -v systemd-repart >/dev/null; then
     echo "no systemd-repart"
-    return
+    exit 0
 fi
 
 if ! test -x /usr/lib/systemd/systemd-validatefs ; then
     echo "no systemd-validatefs"
-    return
+    exit 0
 fi
 
 export SYSTEMD_LOG_LEVEL=debug

From b73a042ab036a082887b1e4f3a6e9147926581cf Mon Sep 17 00:00:00 2001
From: Luca Boccassi <luca.boccassi@gmail.com>
Date: Tue, 1 Apr 2025 10:40:45 +0100
Subject: [PATCH 2/2] man: add missing conditional

Follow-up for d95818f5221d9b9b19648cffa0cb2407f023b27e

man: run 'update-man-rules' again
---
 man/rules/meson.build  | 2 +-
 man/systemd.nspawn.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/man/rules/meson.build b/man/rules/meson.build
index 9d375de83d..f98a55437c 100644
--- a/man/rules/meson.build
+++ b/man/rules/meson.build
@@ -1193,7 +1193,7 @@ manpages = [
  ['systemd.net-naming-scheme', '7', [], ''],
  ['systemd.netdev', '5', [], 'ENABLE_NETWORKD'],
  ['systemd.network', '5', [], 'ENABLE_NETWORKD'],
- ['systemd.nspawn', '5', [], ''],
+ ['systemd.nspawn', '5', [], 'ENABLE_NSPAWN'],
  ['systemd.offline-updates', '7', [], ''],
  ['systemd.path', '5', [], ''],
  ['systemd.pcrlock', '5', ['systemd.pcrlock.d'], ''],
diff --git a/man/systemd.nspawn.xml b/man/systemd.nspawn.xml
index 591933a10c..e6bf8209d3 100644
--- a/man/systemd.nspawn.xml
+++ b/man/systemd.nspawn.xml
@@ -6,7 +6,7 @@
 ]>
 <!-- SPDX-License-Identifier: LGPL-2.1-or-later -->
 
-<refentry id="systemd.nspawn" xmlns:xi="http://www.w3.org/2001/XInclude">
+<refentry id="systemd.nspawn" conditional="ENABLE_NSPAWN" xmlns:xi="http://www.w3.org/2001/XInclude">
 
   <refentryinfo>
     <title>systemd.nspawn</title>