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

expose sysfs overlay option #182

Merged
merged 4 commits into from
Feb 15, 2024

Conversation

masahiro-nakagawa
Copy link
Contributor

Rebased jawn-smith's PR

  • Adds sysfs-overlay option to ubuntu-image.

@upils
Copy link
Collaborator

upils commented Feb 5, 2024

Hey @masahiro-nakagawa,

As mentionned here #120 (review), can you give us a bit of context of why you need this feature for?

@alfonsosanchezbeato @valentindavid Does it make sense to let users set this from the snapd point of view?

@masahiro-nakagawa
Copy link
Contributor Author

This change allows to pass sysfs-overlay option required to generate a preseeding image which enhances the initial boot time of Ubuntu Core 20.

@upils upils mentioned this pull request Feb 6, 2024
@masahiro-nakagawa masahiro-nakagawa marked this pull request as draft February 7, 2024 09:05
This change allows to pass sysfs-overlay option required to generate a preseeding image which enhances the initial boot time of Ubuntu Core 20.
Copy link

codecov bot commented Feb 8, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (b223c38) 90.03% compared to head (21813d9) 90.04%.
Report is 2 commits behind head on main.

Additional details and impacted files
@@           Coverage Diff           @@
##             main     #182   +/-   ##
=======================================
  Coverage   90.03%   90.04%           
=======================================
  Files          13       13           
  Lines        3504     3505    +1     
=======================================
+ Hits         3155     3156    +1     
  Misses        311      311           
  Partials       38       38           
Flag Coverage Δ
unittests 90.04% <100.00%> (+<0.01%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Copy link
Member

@alfonsosanchezbeato alfonsosanchezbeato left a comment

Choose a reason for hiding this comment

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

This is a valid option for preseeding that u-i was not yet exposing, LGTM (I have a couple of minor nits though)

ubuntu-image.rst Outdated
@@ -104,6 +105,15 @@ model_assertion
both a revision and channel are provided, the revision specified will be
installed in the image, and updates will come from the specified channel

--preseed
Preseed the image (UC20 only).
Copy link
Member

Choose a reason for hiding this comment

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

Maybe this should be UC20+ only

debian/changelog Outdated

[Masahiro Nakagawa]
* Add sysfs-overlay option used with --presseed option.
* This option is required to generate a preseeding image which enhances the initial boot time of Ubuntu Core 20.
Copy link
Member

Choose a reason for hiding this comment

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

20+

Copy link

Choose a reason for hiding this comment

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

Agree this is 20+, to be aligned with our preseeding documentation.

@masahiro-nakagawa
Copy link
Contributor Author

@upils I am sorry to bother you but I have one quick qestion about documentation-check.
I updated ubuntu-image.rst file but I still get below error. Would you please let me know if I need to modify other files to pass this test or not?

Run echo "Command line flags have been updated but the manpage has not"
Command line flags have been updated but the manpage has not
Error: Process completed with exit code 1.

Thank you in advance

@upils
Copy link
Collaborator

upils commented Feb 8, 2024

@masahiro-nakagawa everything is good on you end. This failure makes me notice the GH check is buggy. So do not worry about this one, I will fix it in another PR.

The spread test check will also fail, that is expected.

And thank you for adding the missing documentation on --preseed and --preseed-sign-key!

And feel free to set the PR "Ready for review" when you are done. So far I do not have any more comment than what @alfonsosanchezbeato spotted so I expect it to be merged quickly.

… option (--sysfs-overlay=<path>) to ubuntu-image.rst
Copy link

@kubiko kubiko left a comment

Choose a reason for hiding this comment

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

This is a valid option we should support in ubuntu-image.
As picked by Alfonso, change 20 -> 20+ otherwise looks good.
LGTM

@masahiro-nakagawa masahiro-nakagawa marked this pull request as ready for review February 14, 2024 08:22
@upils upils merged commit 04d50a9 into canonical:main Feb 15, 2024
10 of 12 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants