init: support other locations for krun_config #220
Merged
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
slp
added a commit
to slp/krun
that referenced
this pull request
Sep 26, 2024
When using "krun_set_exec", the arguments and environment variables are passed to the guest using the kernel command line. In addition to being limited in length, this is also only compatible with ASCII strings. libkrun is also capable or reading both arguments and environment variables from a JSON config file, which doesn't suffer from any of those limitations, so switch to using this approach instead. Depends on containers/libkrun#220 Signed-off-by: Sergio Lopez <slp@redhat.com>
alyssarosenzweig
approved these changes
Sep 26, 2024
| } else { | ||
| fd = open(CONFIG_FILE_PATH, O_RDONLY); | ||
| } | ||
|
|
Contributor
There was a problem hiding this comment.
A bit cleaner, maybe:
config_file = getenv("KRUN_CONFIG");
if (!config_file) {
config_file = CONFIG_FILE_PATH;
}
fd = open(config_file, O_RDONLY);
Contributor
There was a problem hiding this comment.
Or if you don't care about MSVC, open(getenv("KRUN_CONFIG") ?: CONFIG_FILE_PATH, O_RDONLY) is a one-liner with the elvis operator 🕺
slp
added a commit
to slp/krun
that referenced
this pull request
Sep 26, 2024
When using "krun_set_exec", the arguments and environment variables are passed to the guest using the kernel command line. In addition to being limited in length, this is also only compatible with ASCII strings. libkrun is also capable or reading both arguments and environment variables from a JSON config file, which doesn't suffer from any of those limitations, so switch to using this approach instead. Depends on containers/libkrun#220 Signed-off-by: Sergio Lopez <slp@redhat.com>
slp
added a commit
to slp/krun
that referenced
this pull request
Sep 26, 2024
When using "krun_set_exec", the arguments and environment variables are passed to the guest using the kernel command line. In addition to being limited in length, this is also only compatible with ASCII strings. libkrun is also capable or reading both arguments and environment variables from a JSON config file, which doesn't suffer from any of those limitations, so switch to using this approach instead. Depends on containers/libkrun#220 Signed-off-by: Sergio Lopez <slp@redhat.com>
So far, the configuration was always expected to be in "/.krun_config.json". To support it to be located elsewhere, use the path stored in KRUN_CONFIG, falling back to the original location if not found there. Signed-off-by: Sergio Lopez <slp@redhat.com> Reviewed-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
slp
force-pushed
the
flexible_krun_config
branch
from
66f5bc1 to
33a1f3d
Compare
slp
added a commit
to slp/krun
that referenced
this pull request
Sep 27, 2024
When using "krun_set_exec", the arguments and environment variables are passed to the guest using the kernel command line. In addition to being limited in length, this is also only compatible with ASCII strings. libkrun is also capable or reading both arguments and environment variables from a JSON config file, which doesn't suffer from any of those limitations, so switch to using this approach instead. Depends on containers/libkrun#220 Signed-off-by: Sergio Lopez <slp@redhat.com>
alyssarosenzweig
pushed a commit
to AsahiLinux/muvm
that referenced
this pull request
Sep 27, 2024
When using "krun_set_exec", the arguments and environment variables are passed to the guest using the kernel command line. In addition to being limited in length, this is also only compatible with ASCII strings. libkrun is also capable or reading both arguments and environment variables from a JSON config file, which doesn't suffer from any of those limitations, so switch to using this approach instead. Depends on containers/libkrun#220 Signed-off-by: Sergio Lopez <slp@redhat.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
So far, the configuration was always expected to be in "/.krun_config.json". To support it to be located elsewhere, use the path stored in KRUN_CONFIG, falling back to the original location if not found there.