imds: some minor review fixes
Addresses these issues: https://github.com/systemd/systemd/pull/40980#pullrequestreview-4013313066
This commit is contained in:
committed by
Lennart Poettering
parent
720848d368
commit
4cb283f931
@@ -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"/>
|
||||
|
||||
@@ -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) {
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user