coreos-ignition-setup-user: remount /usr rw if needed
#3031
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
systemd v256 now runs the initrd with `ProtectSystem=yes`, which makes `/usr` read-only: https://github.com/systemd/systemd/blob/07748c53df5a72111d8b3eef49d275210d6018cd/NEWS#L168-L175 This breaks coreos-ignition-setup-user which wants to copy the Ignition config to `/usr/lib/ignition`. I think the right fix for this is to have Ignition learn to also source from `/etc` and `/run`, which is the standard nowadays: coreos/ignition#1891 But for now at least, we can safely remount `/usr` read-write ourselves without affecting the rest of the system since we're already running with `MountFlags=slave`.
travier
approved these changes
Jun 19, 2024
laenion
reviewed
Jul 29, 2024
Comment on lines
15
to
+23
| mkdir -p $destination | ||
|
|
||
| # systemd v256 now runs the initrd with ProtectSystem=yes, which makes /usr | ||
| # read-only. Just remount it rw until we have: | ||
| # https://github.com/coreos/ignition/issues/1891 | ||
| if [ ! -w /usr ]; then | ||
| mount -o rw,remount /usr | ||
| fi | ||
|
|
There was a problem hiding this comment.
Shouldn't the remount occur before calling mkdir -p $destination?
There was a problem hiding this comment.
Good catch, thanks! OOC, did you actually hit an issue from this? I think this still worked because the directory already exists and mkdir -p no-ops before even trying to create the directory.
travier
added a commit
to travier/fedora-coreos-config
that referenced
this pull request
Jul 29, 2024
Thanks to Ignaz Forster <[email protected]> Fixes: coreos#3031
travier
added a commit
that referenced
this pull request
Jul 29, 2024
Thanks to Ignaz Forster <[email protected]> Fixes: #3031
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.
systemd v256 now runs the initrd with
ProtectSystem=yes, which makes/usrread-only:https://github.com/systemd/systemd/blob/07748c53df5a72111d8b3eef49d275210d6018cd/NEWS#L168-L175
This breaks coreos-ignition-setup-user which wants to copy the Ignition config to
/usr/lib/ignition.I think the right fix for this is to have Ignition learn to also source from
/etcand/run, which is the standard nowadays:coreos/ignition#1891
But for now at least, we can safely remount
/usrread-write ourselves without affecting the rest of the system since we're already running withMountFlags=slave.