Remove VMType check from the lima-init boot script #3861
+8
−2
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Do this when setting up the cidata instead, next to the decision on whether to use "cidata" dir or "cidata.iso". This means that this particular boot script is not depending on the driver, but can be used from all container drivers. Signed-off-by: Anders F Björklund <[email protected]>
AkihiroSuda
reviewed
Aug 19, 2025
AkihiroSuda
reviewed
Aug 19, 2025
AkihiroSuda
reviewed
Aug 19, 2025
There was a problem hiding this comment.
the file name should be changed.
e.g. 02-no-cloudinit.sh
AkihiroSuda
reviewed
Aug 19, 2025
| @@ -4,8 +4,7 @@ | |||
| # SPDX-License-Identifier: Apache-2.0 | |||
|
|
|||
| # This script replaces the cloud-init functionality of creating a user and setting its SSH keys | |||
| # when using a WSL2 VM. | |||
There was a problem hiding this comment.
# when cloud-init is not available
AkihiroSuda
reviewed
Aug 19, 2025
| @@ -4,8 +4,7 @@ | |||
| # SPDX-License-Identifier: Apache-2.0 | |||
|
|
|||
| # This script replaces the cloud-init functionality of creating a user and setting its SSH keys | |||
| # when using a WSL2 VM. | |||
| [ "$LIMA_CIDATA_VMTYPE" = "wsl2" ] || exit 0 | |||
| [ "$LIMA_CIDATA_LIMA_INIT" = "1" ] || exit 0 | |||
There was a problem hiding this comment.
maybe you can just check the existence of cloud-init here, then the variable can be just dropped
There was a problem hiding this comment.
It is still needed (in the Go code, that is) to know if we should create a "cidata" directory, or a cidata.iso
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Do this when setting up the cidata instead, next to the decision on whether to use "cidata/" directory or "cidata.iso".
This means that this particular boot script is not depending on the driver, but can be used from all container drivers.
Apple Container external driver for macOS #3839
Docker Container external driver for Linux #3840
We probably want to add an explicit
boolconfig for it to the driver, instead of checking for the driver name?And there are still some features left to add to the script (from cloud-config), like the hostname and timezone.
Currently we dont use
user-data, butlima.env(+ ssh key)We execute this script through the
boot.shdirectly (lima-init).