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

flatcar-postinst: Ensure /etc/extensions is mergable #32

Merged
merged 1 commit into from
Nov 29, 2023

Conversation

pothos
Copy link
Member

@pothos pothos commented Nov 28, 2023

In Beta 3760.1.0 the /etc/extensions/ folder gets created by "mkdir -p" because it does not exist in the lowerdir /usr/share/flatcar/etc/. This causes the opaque marker to be set by overlayfs. The update to Alpha thus does not merge the new /usr/share/flatcar/etc/extensions/ folder with its docker/containerd sysext symlinks. We should have had /etc/extensions/ in the lowerdir in Beta but didn't.

Ensure that the created folders are mergable by removing the overlayfs marker. This is needed for existing installations and folders we expect to exist in the lowerdir but were missing so far.

How to use

Backport to Alpha and Beta

Testing done

Update from Beta to this here with sudo flatcar-update -D -V 1.2.3 -E flatcar_test_update-oem-qemu.gz -P flatcar_test_update.gz and after the reboot the extension folder has all contents.

  • Changelog entries added in the respective changelog/ directory (user-facing change, bug fix, security fix, update)
  • Inspected CI output for image differences: /boot and /usr size, packages, list files for any missing binaries, kernel modules, config files, kernel modules, etc.

pothos added a commit to flatcar/scripts that referenced this pull request Nov 28, 2023
This pulls in
flatcar/update_engine#32
to make the Docker/containerd sysexts show up when updating from Beta
3760.1.0.
In Beta 3760.1.0 the /etc/extensions/ folder gets created by "mkdir -p"
because it does not exist in the lowerdir /usr/share/flatcar/etc/. This
causes the opaque marker to be set by overlayfs. The update to Alpha
thus does not merge the new /usr/share/flatcar/etc/extensions/ folder
with its docker/containerd sysext symlinks. We should have had
/etc/extensions/ in the lowerdir in Beta but didn't.

Ensure that the created folders are mergable by removing the overlayfs
marker. This is needed for existing installations and folders we expect
to exist in the lowerdir but were missing so far.
pothos added a commit to flatcar/scripts that referenced this pull request Nov 28, 2023
This pulls in
flatcar/update_engine#32
to make the Docker/containerd sysexts show up when updating from Beta
3760.1.0.
@pothos pothos requested a review from a team November 28, 2023 17:27
@pothos pothos merged commit a9b9bee into flatcar-master Nov 29, 2023
1 check passed
@pothos pothos deleted the kai/overlay-opaque-dirs branch November 29, 2023 11:43
pothos added a commit to flatcar/scripts that referenced this pull request Nov 29, 2023
This pulls in
flatcar/update_engine#32
to make the Docker/containerd sysexts show up when updating from Beta
3760.1.0.
pothos added a commit to flatcar/scripts that referenced this pull request Nov 29, 2023
This pulls in
flatcar/update_engine#32
to make the Docker/containerd sysexts show up when updating from Beta
3760.1.0.
pothos added a commit to flatcar/scripts that referenced this pull request Nov 29, 2023
This pulls in
flatcar/update_engine#32
to make the Docker/containerd sysexts show up when updating from Beta
3760.1.0.
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