-
Notifications
You must be signed in to change notification settings - Fork 155
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
support falling back to a bridge kernel #2089
Conversation
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.
Looks reasonable so far
examples/sources/bridge.yaml
Outdated
size: 1066115072 | ||
type: fsimage-layered | ||
variant: server | ||
bridge_kernel_name: linux-generic-brg-22.04 |
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.
This bit is inconsistent with the spec
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.
oh yeah. the spec is also a bit inconsistent with latest terminology. I'll try to move the spec and this branch towards a consistent approach.
subiquity/models/source.py
Outdated
class SourceCatalog: | ||
version: int | ||
sources: typing.List[CatalogEntry] | ||
bridge_kernel_name: typing.Optional[str] = None |
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 particular I want to pull in the default kernel in here as well, so we aren't specifying them in different ways in livecd-rootfs.
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 I wondered about that but we already have a way to specify a default kernel, /etc/subiquity/kernel-meta-package (and similar). Should we work towards dropping that in favour of recording the default in the catalog? How would this interact with the server .2+ ISOs?
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.
Oh i see the spec covers this, good reading skills there Michael.
subiquity/server/types.py
Outdated
@@ -47,3 +47,7 @@ class InstallerChannels(CoreChannels): | |||
# step is after logfiles have been copied to the system, so should be used | |||
# sparingly and only as absolutely required. | |||
PRE_SHUTDOWN = "pre-shutdown" | |||
# |
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.
Reminder note for real comments since this looks like a stub.
e856310
to
1186e5d
Compare
OK pushed a new version that has some tests and comments and is probably a bit better in most ways. Two things though:
I'll try to work on those tomorrow. |
complete with quite complicated tests
1186e5d
to
7e235ce
Compare
7e235ce
to
fb9d1b8
Compare
I think this is conceptually sound now, and possibly ready for merging? It could stand to gain some more tests I think. |
This needs a lot more commentary and tests but its the end of my week and I think the logic is basically correct and I welcome any comments you have before I get back to it on Monday.