From: Lennart Poettering <lennart@amutable.com>
Date: Thu, 26 Mar 2026 13:48:26 +0000 (+0100)
Subject: imds: some minor review fixes
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4cb283f931994e2d7802bbc38551446b24600b2f;p=thirdparty%2Fsystemd.git

imds: some minor review fixes

Addresses these issues:

https://github.com/systemd/systemd/pull/40980#pullrequestreview-4013313066
---

diff --git a/man/systemd-imds-generator.xml b/man/systemd-imds-generator.xml
index d8e1f1aa05b..d5eaf1e16a0 100644
--- a/man/systemd-imds-generator.xml
+++ b/man/systemd-imds-generator.xml
@@ -71,7 +71,7 @@
           <para>Takes a boolean argument or the special value <literal>auto</literal>, and may be used to
           enable or disable the IMDS logic. Note that this controls only whether the relevant services (as
           listed above) are automatically pulled into the initial transaction, it has no effect if some other
-          unit or the user explicitly activate the relevant units. If this option is not used (or set to
+          unit or the user explicitly activates the relevant units. If this option is not used (or set to
           <literal>auto</literal>) automatic detection of IMDS is used, see above.</para>
 
           <xi:include href="version-info.xml" xpointer="v261"/>
diff --git a/src/imds/imds-generator.c b/src/imds/imds-generator.c
index d33e63bddd3..9cb48688a8c 100644
--- a/src/imds/imds-generator.c
+++ b/src/imds/imds-generator.c
@@ -153,7 +153,7 @@ static int run(const char *dest, const char *dest_early, const char *dest_late)
                 return 0;
         }
 
-        log_info("IMDS support enabled, pull in IMDS units.");
+        log_info("IMDS support enabled, pulling in IMDS units.");
 
         /* Enable IMDS early networking, so that we can actually reach the IMDS server. */
         if (arg_network_mode != IMDS_NETWORK_OFF) {
diff --git a/test/units/TEST-74-AUX-UTILS.imds.sh b/test/units/TEST-74-AUX-UTILS.imds.sh
index 2ee0c632d2f..ccd3d04c042 100755
--- a/test/units/TEST-74-AUX-UTILS.imds.sh
+++ b/test/units/TEST-74-AUX-UTILS.imds.sh
@@ -14,10 +14,10 @@ fi
 
 at_exit() {
     set +e
-    systemctl stop fake-imds systemd-imdsd.socket ||:
-    ip link del dummy0 ||:
+    systemctl stop fake-imds systemd-imdsd.socket
+    ip link del dummy0
     rm -f /run/credstore/firstboot.hostname /run/credstore/acredtest /run/systemd/system/systemd-imdsd@.service.d/50-env.conf
-    rmdir /run/systemd/system/systemd-imdsd@.service.d ||:
+    rmdir /run/systemd/system/systemd-imdsd@.service.d
 }
 
 trap at_exit EXIT