Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

boot: load bits of kernel command line from gadget snaps #10130

Merged

Conversation

bboozzoo
Copy link
Collaborator

@bboozzoo bboozzoo commented Apr 9, 2021

Stacked on top of #10119, the relevant commit is: af2862f

The branch adds support for loading bits of kernel command line from the gadget. Currently only cmdline.extra is supported.

Load the kernel command line arguments provided by the gadget if the path to a
gadget snap directory or file is provided.

Signed-off-by: Maciej Borzecki <maciej.zenon.borzecki@canonical.com>
@bboozzoo bboozzoo added the Run nested The PR also runs tests inluded in nested suite label Apr 9, 2021
Copy link
Collaborator

@pedronis pedronis left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks, one remark

extraArgs := ""
if gadgetDirOrSnapPath != "" {
sf, err := snapfile.Open(gadgetDirOrSnapPath)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

shouldn't we merge this Open into gadget.KernelCommandLineFromGadget ? do we have a case where we have the container already?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, that's a good point. I'll do it in a followup so that #10134 is unblocked first, if that's ok with you.

Copy link
Contributor

@mvo5 mvo5 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you

@mvo5
Copy link
Contributor

mvo5 commented Apr 13, 2021

All failures look unreleated

@mvo5 mvo5 merged commit 5cf8e21 into snapcore:master Apr 13, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Run nested The PR also runs tests inluded in nested suite
Projects
None yet
3 participants