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

Prevent the OEM mount point from showing up before Ignition mounts #58

Merged
merged 1 commit into from
Mar 20, 2023

Conversation

pothos
Copy link
Member

@pothos pothos commented Mar 17, 2023

Ignition may run a manual mount command for the OEM partition if the
user specifies it. This fails if the OEM mount unit is triggered early,
because it can't be mounted twice, thus we need to prevent that from
happening by unmounting the OEM partition (but not the tmpfs OEM mount
for PXE-provided OEM contents). To spare users from even dealing with
the OEM partition specification in Ignition we can ensure it is mounted
before Ignition writes files.

How to use

Testing done

Ran flatcar/mantle#421 manually for the image from http://jenkins.infra.kinvolk.io:8080/job/container/job/packages_all_arches/1516/cldsv/

pothos added a commit to flatcar-archive/coreos-overlay that referenced this pull request Mar 17, 2023
@pothos pothos force-pushed the kai/initrd-oem-ordering branch from f9156fe to 2fb5a75 Compare March 18, 2023 11:40
pothos added a commit to flatcar-archive/coreos-overlay that referenced this pull request Mar 18, 2023
@pothos pothos changed the title Prevent the OEM mount point from showing up before Ignition could Prevent the OEM mount point from showing up before Ignition mounts Mar 18, 2023
@pothos pothos marked this pull request as ready for review March 20, 2023 05:23
@pothos pothos requested a review from a team March 20, 2023 05:23
Ignition may run a manual mount command for the OEM partition if the
user specifies it. This fails if the OEM mount unit is triggered early,
because it can't be mounted twice, thus we need to prevent that from
happening by unmounting the OEM partition (but not the tmpfs OEM mount
for PXE-provided OEM contents). To spare users from even dealing with
the OEM partition specification in Ignition we can ensure it is mounted
before Ignition writes files.
@pothos pothos force-pushed the kai/initrd-oem-ordering branch from 2fb5a75 to 2c99de8 Compare March 20, 2023 05:45
pothos added a commit to flatcar-archive/coreos-overlay that referenced this pull request Mar 20, 2023
This pulls in
flatcar/bootengine#58
to prevent the OEM mount point from showing up before Ignition mounts.
It also makes it simpler to write files to the OEM partition without
having to specify the partition first as initrd mount point.

Fixes flatcar/Flatcar#979
@pothos pothos marked this pull request as draft March 20, 2023 05:55
@pothos pothos marked this pull request as ready for review March 20, 2023 08:13
@pothos pothos merged commit 3ba6216 into flatcar-master Mar 20, 2023
@pothos pothos deleted the kai/initrd-oem-ordering branch March 20, 2023 12:30
pothos added a commit to flatcar-archive/coreos-overlay that referenced this pull request Mar 20, 2023
This pulls in
flatcar/bootengine#58
to prevent the OEM mount point from showing up before Ignition mounts.
It also makes it simpler to write files to the OEM partition without
having to specify the partition first as initrd mount point.

Fixes flatcar/Flatcar#979
pothos added a commit to flatcar-archive/coreos-overlay that referenced this pull request Mar 20, 2023
This pulls in
flatcar/bootengine#58
to prevent the OEM mount point from showing up before Ignition mounts.
It also makes it simpler to write files to the OEM partition without
having to specify the partition first as initrd mount point.

Fixes flatcar/Flatcar#979
@pothos
Copy link
Member Author

pothos commented Mar 21, 2023

Beta (3510) is also affected, I'll look into a backport before it goes Stable.

Edit: Done, also had one additional single word change backported to ensure the ordering for initrd-setup-root when Ignition doesn't run.

pothos added a commit that referenced this pull request Mar 23, 2023
Prevent the OEM mount point from showing up before Ignition mounts
pothos added a commit to flatcar-archive/coreos-overlay that referenced this pull request Mar 23, 2023
This pulls in
flatcar/bootengine#58
to prevent the OEM mount point from showing up before Ignition mounts.
It also makes it simpler to write files to the OEM partition without
having to specify the partition first as initrd mount point.

Fixes flatcar/Flatcar#979
t-lo pushed a commit to flatcar/scripts that referenced this pull request Apr 13, 2023
This pulls in
flatcar/bootengine#58
to prevent the OEM mount point from showing up before Ignition mounts.
It also makes it simpler to write files to the OEM partition without
having to specify the partition first as initrd mount point.

Fixes flatcar/Flatcar#979
t-lo pushed a commit to flatcar/scripts that referenced this pull request Apr 13, 2023
This pulls in
flatcar/bootengine#58
to prevent the OEM mount point from showing up before Ignition mounts.
It also makes it simpler to write files to the OEM partition without
having to specify the partition first as initrd mount point.

Fixes flatcar/Flatcar#979
t-lo pushed a commit to flatcar/scripts that referenced this pull request Apr 17, 2023
This pulls in
flatcar/bootengine#58
to prevent the OEM mount point from showing up before Ignition mounts.
It also makes it simpler to write files to the OEM partition without
having to specify the partition first as initrd mount point.

Fixes flatcar/Flatcar#979
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.

2 participants