factory: mount users imported from hybrid system during recovery mode #263
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
alfonsosanchezbeato
requested review from
alfonsosanchezbeato and
valentindavid
factory/usr/lib/core/extra-paths
Outdated
| @@ -20,3 +20,12 @@ if [ ! -d /run/mnt/data/system-data/var/lib/snapd/kernel/"$kernelName"/"$rev" ]; | |||
| /run/mnt/kernel/modules /usr/lib/modules none bind,x-initrd.mount 0 0 | |||
| EOF | |||
| fi | |||
|
|
|||
| if [ -f /run/snapd/hybrid-users/passwd ]; then | |||
There was a problem hiding this comment.
This should check also if we are in recover mode (you can use get-mode for this)
factory/usr/lib/core/extra-paths
Outdated
|
|
||
| if [ -f /run/snapd/hybrid-users/passwd ]; then | ||
| cat <<'EOF' >>/sysroot/etc/fstab | ||
| /run/snapd/hybrid-users/passwd /etc/passwd none bind,x-initrd.mount 0 0 |
There was a problem hiding this comment.
x-initrd.mount is not needed, the mounts can happen after switch root
factory/usr/lib/core/extra-paths
Outdated
| @@ -21,11 +21,12 @@ if [ ! -d /run/mnt/data/system-data/var/lib/snapd/kernel/"$kernelName"/"$rev" ]; | |||
| EOF | |||
| fi | |||
|
|
|||
| if [ -f /run/snapd/hybrid-users/passwd ]; then | |||
| mode="$(/usr/libexec/core/get-mode mode)" || mode="$(/usr/libexec/core/get-arg snapd_recovery_mode)" || mode="unknown" | |||
| if [ -f /run/snapd/hybrid-users/passwd -a "${mode}" = "recover" ]; then | |||
There was a problem hiding this comment.
Using -a was deprecated, please use [...] && [...]
Meulengracht
reviewed
Oct 1, 2024
| @@ -20,3 +20,13 @@ if [ ! -d /run/mnt/data/system-data/var/lib/snapd/kernel/"$kernelName"/"$rev" ]; | |||
| /run/mnt/kernel/modules /usr/lib/modules none bind,x-initrd.mount 0 0 | |||
| EOF | |||
| fi | |||
|
|
|||
| mode="$(/usr/libexec/core/get-mode mode)" || mode="$(/usr/libexec/core/get-arg snapd_recovery_mode)" || mode="unknown" | |||
There was a problem hiding this comment.
I'd really like to see a comment describing why we need to do this before this section
Meulengracht
approved these changes
Oct 2, 2024
andrewphelpsj
force-pushed
the
mount-hybrid-users
branch
from
250c950
to
4585d95
Compare
These files are generated by snap-bootstrap when booting a hybrid system into recovery mode. The files contain a combination of the login information from the hybrid rootfs and the base.
andrewphelpsj
force-pushed
the
mount-hybrid-users
branch
from
4585d95
to
274be59
Compare
valentindavid
approved these changes
Oct 8, 2024
|
@valentindavid the two PRs are here: canonical/snapd#14521, canonical/snapd#13581 |
|
@andrewphelpsj this will need a backport to the |
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.
These files are generated by snap-bootstrap when booting a hybrid system into recovery mode. The files contain a combination of the login information from the hybrid rootfs and the base.