oem: port GCE to sysext image #1441
Merged
Conversation
This file contains 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
pothos
reviewed
Nov 30, 2023
| @@ -0,0 +1 @@ | |||
| - GCP OEM images now use a systemd-sysext image for layering additional platform-specific software on top of `/usr` ([flatcar#1146](https://github.com/flatcar/Flatcar/issues/1146)) | |||
There was a problem hiding this comment.
Suggested change
| - GCP OEM images now use a systemd-sysext image for layering additional platform-specific software on top of `/usr` ([flatcar#1146](https://github.com/flatcar/Flatcar/issues/1146)) | |
| - GCP OEM images now use a systemd-sysext image for layering additional platform-specific software on top of `/usr` and being part of the OEM A/B updates ([flatcar#1146](https://github.com/flatcar/Flatcar/issues/1146)) |
pothos
reviewed
Nov 30, 2023
...rc/third_party/coreos-overlay/coreos-base/oem-gce/files/units/oem-gce-enable-oslogin.service
Show resolved
Hide resolved
pothos
reviewed
Nov 30, 2023
There was a problem hiding this comment.
One more task is to boot a GCE image, look at created files, and add them to the migration cleanup step in sdk_container/src/third_party/coreos-overlay/coreos-base/misc-files/files/oems/azure (some can be inferred from the base Ign but there is also /oem/flatcar-oem-gce.aci with the copy to /var/lib/flatcar-oem-gce.img and so on).
Edit: Done together, thanks!
/etc/systemd/system/oem-gce.service
/etc/systemd/system/multi-user.target.wants/oem-gce.service
/etc/systemd/system/oem-gce-enable-oslogin.service
/etc/systemd/system/sysinit.target.wants/oem-gce-enable-oslogin.service
/etc/systemd/system/oem-cloudinit.service
/etc/systemd/system/multi-user.target.wants/oem-cloudinit.service
/var/lib/flatcar-oem-gce
/var/lib/flatcar-oem-gce.img
/oem/flatcar-oem-gce.aci
/oem/bin/
/oem/units/
/oem/base/
/oem/files/
pothos
reviewed
Nov 30, 2023
sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/files/bin/init.sh
Show resolved
Hide resolved
pothos
reviewed
Nov 30, 2023
sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/files/units/setup-oem.service
Show resolved
Hide resolved
pothos
reviewed
Nov 30, 2023
| # no source directory | ||
| S="${WORKDIR}" | ||
|
|
||
| RDEPEND="coreos-base/coreos-oem-gce" |
There was a problem hiding this comment.
I think we can remove this package and move the deps here, or? I think only app-emulation/google-compute-engine is needed, the rest looks related to the ACI setup.
tormath1
force-pushed
the
tormath1/gcp-oem
branch
from
ce9e65e
to
4433373
Compare
tormath1
force-pushed
the
tormath1/gcp-oem
branch
from
4433373
to
54c1900
Compare
tormath1
force-pushed
the
tormath1/gcp-oem
branch
from
54c1900
to
3130b33
Compare
pothos
approved these changes
Dec 4, 2023
Signed-off-by: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
Signed-off-by: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
Signed-off-by: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
tormath1
force-pushed
the
tormath1/gcp-oem
branch
from
3130b33
to
d92b9c0
Compare
tormath1
had a problem deploying
to
development
GitHub Actions
Failure
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
In this PR, we migrate the last important OEM partition to sysext image. The main change is the removal of the GCE ACI image started via systemd-nspawn.
changelog/directory (user-facing change, bug fix, security fix, update)/bootand/usrsize, packages, list files for any missing binaries, kernel modules, config files, kernel modules, etc.Closes: flatcar/Flatcar#1146
TODO: