-
Notifications
You must be signed in to change notification settings - Fork 57
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
many: move machine id first boot to image config #1258
base: main
Are you sure you want to change the base?
Conversation
Signed-off-by: Simon de Vlieger <[email protected]>
This moves the machine id handling from specific to Fedora to the image config. Signed-off-by: Simon de Vlieger <[email protected]>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thank you!
Yes, this is the correct approach from my point of view, but I've added a few comments.
// How to handle the /etc/machine-id file | ||
FirstBootStrategy *osbuild.MachineIdFirstBoot |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
In general, we want to avoid using osbuild
stage options or types as types in ImageConfig
.
I'm also not too keen on the name. FirstBootStrategy
sounds way too general, while all it does is manage machine-id
... 🤔
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, but the status quo right now is to use them. Do I need to introduce another type and then directly convert/map that onto osbuild types?
I don't particularly like it either (everything seems to be called something-FirstBoot). It controls "ConditionFirstBoot" which is where the name comes from :)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
MachineIdStrategy
?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
MachineIdFirstBoot
? 🙄 I like your suggestion, but the values make it weird.
I'll let others comment since there isn't a good option.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, but the status quo right now is to use them. Do I need to introduce another type and then directly convert/map that onto osbuild types?
It is, but we want to move away from it. So, it seems natural not to use it for newly added options. So yes, ideally, you should add a new type to https://github.com/osbuild/images/tree/main/pkg/customizations if it can't be represented by a primitive type.
On the other hand, we do not need to necessarily map the stage options 1:1 to the ImageConfig
option. Maybe adding just something like MachineIdUninitialized bool
would be good enough? And the OS
pipeline would just set the correct stage option if true
.
This moves the machine id handling from specific to Fedora to the image config.
Had a chat with @achilleas-k and @thozza today who pointed out that they'd prefer this to live in the image config. Is this the right approach?