Sync with latest-edge (latest-candidate) #639
Merged
+44
−11
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
Signed-off-by: Thomas Parrott <thomas.parrott@canonical.com>
Signed-off-by: Simon Deziel <simon.deziel@canonical.com> (cherry picked from commit 136d7fe)
Signed-off-by: Simon Deziel <simon.deziel@canonical.com> (cherry picked from commit cb9d5d2)
The PATH inside the snap is configured to prefer /sbin over /bin so the lxd binary will still
be called by default.
The lxd-stophook-wrapper script which will be placed into `/bin/lxd`.
Because containers are configured to call `/snap/lxd/current/bin/lxd callhook` which in turn will be
routed to `/snap/lxd/current/bin/lxd-user` by the lxd-stophook-wrapper script, which will then connect
to LXD's unix socket to indicate to the server that the container is stopping.
Because lxd-user is compiled as a static binary this will work across snap core base changes.
Also update LXD_EXEC_PATH env var so that LXD will still directly execute itself when needed, rather
than going via the lxd-stophook wrapper script.
Signed-off-by: Thomas Parrott <thomas.parrott@canonical.com>
(cherry picked from commit 75de117)
(cherry picked from commit 74e8bc7)
This command is intended to replace the `lxd` command in the snap so that existing running containers that are stopping will call this script as part of their stop hooks. This will then "route" the command to the `lxd-user` command that will be statically compiled so that it can connect to the running LXD daemon via the unix socket to indicate the container is stopping, even after refreshing the LXD snap to a different core base snap. Signed-off-by: Thomas Parrott <thomas.parrott@canonical.com> (cherry picked from commit 4d10cbd) (cherry picked from commit d037e01)
Signed-off-by: Thomas Parrott <thomas.parrott@canonical.com> (cherry picked from commit c0b8a0d)
Signed-off-by: Thomas Parrott <thomas.parrott@canonical.com>
tomponline
requested review from
simondeziel,
MusicDin,
markylaing,
kadinsayani and
roosterfish
MusicDin
approved these changes
Nov 27, 2024
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.
No description provided.