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

snap-bootstrap: mount the correct snapd snap to /run/mnt/snapd #7957

Merged
merged 3 commits into from
Jan 8, 2020

Conversation

mvo5
Copy link
Contributor

@mvo5 mvo5 commented Jan 6, 2020

This will ensure that the snapd snap for the given recovery system
is mounted to /run/mnt/snapd. With this in place we can modify
the script in core20:/usr/lib/core20/run-snapd-from-snap to
use this path instead of mounting a "random" snapd snap to
bootstrap.

Based on #7953

Relevant commit: 2e00af0

Matching core20 change: snapcore/core20#18

This will ensure that the snapd snap for the given recovery system
is mounted to /run/mnt/snapd. With this in place we can modify
the script in `core20:/usr/lib/core20/run-snapd-from-snap` to
use this path instead of mounting a "random" snapd snap to
bootstrap.
@mvo5 mvo5 added the UC20 label Jan 6, 2020
mvo5 added a commit to mvo5/core20 that referenced this pull request Jan 6, 2020
With snapcore/snapd#7957 snap-boostrap
will mount the "correct" snapd snap to /run/mnt/snapd. With that
in place we can simplify the run-snapd-from-snap script and also
avoid potentially mounting a random snapd snap when there are
multiple recovery systems.

This commit keeps the old way of doing things for compatiblity
but once the snapd PR is merged we can remove the compat code.
mvo5 added a commit to mvo5/core20 that referenced this pull request Jan 6, 2020
With snapcore/snapd#7957 snap-boostrap
will mount the "correct" snapd snap to /run/mnt/snapd. With that
in place we can simplify the run-snapd-from-snap script and also
avoid potentially mounting a random snapd snap when there are
multiple recovery systems.

This commit keeps the old way of doing things for compatiblity
but once the snapd PR is merged we can remove the compat code.
Copy link
Member

@anonymouse64 anonymouse64 left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link
Collaborator

@bboozzoo bboozzoo left a comment

Choose a reason for hiding this comment

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

LGTM

@cmatsuoka cmatsuoka merged commit 735c7e0 into snapcore:master Jan 8, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
4 participants