Switch to unified cgroup mode for rc edition #18
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
mook-as
requested changes
Aug 25, 2023
mook-as
reviewed
Aug 25, 2023
| @@ -32,6 +32,10 @@ makefile root:root 0644 "$tmp"/etc/hostname <<EOF | |||
| $HOSTNAME | |||
| EOF | |||
|
|
|||
| if [ "$LIMA_CGROUP_MODE" != "hybrid" ]; then | |||
| sed -E "s/#(rc_cgroup_mode).*/\1=\"$LIMA_CGROUP_MODE\"/" /etc/rc.conf >"$tmp"/etc/rc.conf | |||
There was a problem hiding this comment.
Wouldn't there technically be an issue if the builder and the build target uses different versions? (I don't think that's actually possible, though, so we should be fine… but I didn't spot any other copy-from-host things in this file at a quick glance.)
There was a problem hiding this comment.
I wondered about this too, but I don't know where also to get a matching copy of rc.conf. Lmk if you have any idea!
Most lines in the default rc.conf are just commented out defaults anyways, so not sure if this matters a lot:
# grep -E -v '^(#|$)' /etc/rc.conf
rc_tty_number=12
respawn_delay=2
respawn_max=5
respawn_period=1800Buildkit v0.12.0+ seems to no longer work with the hybrid layout. Real explanation remains elusive, as buildkitd 0.12.1 seems to work fine on Alpine in WSL2, which still uses the hybrid layout. But for Lima the unified layout avoid the issue. Signed-off-by: Jan Dubois <jan.dubois@suse.com>
mook-as
approved these changes
Aug 25, 2023
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.
Buildkit v0.12.0+ seems to no longer work with the hybrid layout.
Real explanation remains elusive, as buildkitd 0.12.1 seems to work fine on Alpine in WSL2, which still uses the hybrid layout. But for Lima the unified layout avoid the issue.