initrd-setup-root-after-ignition: Ensure /etc/extensions is mergable #78
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
added a commit
to flatcar/scripts
that referenced
this pull request
Nov 27, 2023
This pulls in flatcar/bootengine#78 to make the Docker/containerd sysexts show up when updating from Beta 3760.1.0.
2 tasks
krnowak
reviewed
Nov 27, 2023
| # to have it non-opaque. | ||
| for DIR in /sysroot/etc/extensions /sysroot/etc/flatcar /sysroot/etc/cni; do | ||
| if [ -d "${DIR}" ]; then | ||
| usrbin unshare -m sh -c "umount /sysroot/etc && /sysusr/usr/bin/attr -R -r overlay.opaque '${DIR}' || true'" |
There was a problem hiding this comment.
You could use bash quoting feature and also there seem to be some stray apostrophe at the end:
Suggested change
| usrbin unshare -m sh -c "umount /sysroot/etc && /sysusr/usr/bin/attr -R -r overlay.opaque '${DIR}' || true'" | |
| usrbin unshare -m sh -c "umount /sysroot/etc && /sysusr/usr/bin/attr -R -r overlay.opaque ${DIR@Q} || true" |
There was a problem hiding this comment.
Thanks, for the quoting I think it's ok to rely on ' because the paths are defined above and not passed in, so we know that they don't contain ' themselves.
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 might be missing for whatever reason.
pothos
force-pushed
the
kai/overlay-opaque-dirs
branch
from
9fb184d to
b674e2d
Compare
pothos
added a commit
to flatcar/scripts
that referenced
this pull request
Nov 27, 2023
This pulls in flatcar/bootengine#78 to make the Docker/containerd sysexts show up when updating from Beta 3760.1.0.
|
Oh, this only seems to take effect after the reboot. I guess then it rather makes sense to put this in the update-engine postinstall hook as one-time fix for |
pothos
added a commit
to flatcar/scripts
that referenced
this pull request
Nov 28, 2023
This pulls in flatcar/bootengine#78 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
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 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 might be missing for whatever reason.
How to use
Backport to Alpha and Beta
Testing done
TODO
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.