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

Lunar 2023 04 03 #1632

Merged
merged 5 commits into from
Apr 3, 2023
Merged

Lunar 2023 04 03 #1632

merged 5 commits into from
Apr 3, 2023

Conversation

ogayot
Copy link
Member

@ogayot ogayot commented Apr 3, 2023

NOTE: with the comment I added in snapcraft.yaml, I expect future cherry-picks adjusting the curtin revision to conflict. This is on purpose, we don't want to pull new revisions of curtin from master (this would potentially introduce new features). To fix the conflict, we need to find the relevant revision in ubuntu/lunar.

CarlosNihelton and others added 5 commits April 3, 2023 21:24
LP: #2013079
Found during beta testing that the live session is joining, instead of
the target.

(cherry picked from commit cd6e691)
realm --install <target> requires system bind-mounts to work properly.

(cherry picked from commit 37f3348)
Sometimes unmounting order matters. Let's take the defensive approach.

(cherry picked from commit cda5a0f)
UDI snap ships the package, thus its data dir is part of the snap
subiquity snap does not.
This tries l-s-c data dir in the base system, outside of the snap
and gives up if the dir does not exits.

(cherry picked from commit 1105da2)
Adjusted to pick commit from ubuntu/lunar branch.

Signed-off-by: Olivier Gayot <[email protected]>
(cherry picked from commit 4c4ab16)
Copy link
Collaborator

@CarlosNihelton CarlosNihelton left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM 👍🏽

Thanks!

@dbungert dbungert merged commit 2d74167 into canonical:ubuntu/lunar Apr 3, 2023
@ogayot ogayot deleted the lunar-2023-04-03 branch April 4, 2023 08:19
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.

3 participants