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 d8e1f1aa05b555479aed4fdce55982321780867e..d5eaf1e16a05f8c1a6c464e75847ce3661dd476d 100644 (file)
--- 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 d33e63bddd3234a2548e880aa97970a7ccc9337d..9cb48688a8c646049543a63e5e8e1e2e71a44b6e 100644 (file)
--- 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 2ee0c632d2f6d8e422149e7ef329e60326dcae6e..ccd3d04c04265c85c54cf7f4a0f626568249b941 100755 (executable)
--- 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