Fixed hardcoded root partition device name sda2 #830
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
|
Same comment as on lxc/lxc-ci#822, I'd prefer that some race-free method be used as otherwise multiple image builds on the same system may make this logic racy. |
I changed my mind, do as you prefered. |
nanjj
force-pushed
the
main
branch
5 times, most recently
from
0518c5b
to
8613f0e
Compare
nanjj
added a commit
to nanjj/lxc-ci
that referenced
this pull request
Apr 2, 2024
The root partition may not be /dev/sda2, for example if set the boot disk as the second disk, the root partition device name will be /dev/sdb2. It may be /dev/vda2 if not using san disk. The fix figured out the root partition device UUID and set the UUID as the root, the root partition device UUID keeps no change. Depends on lxc/distrobuilder#830 Signed-off-by: JUN JIE NAN <[email protected]>
|
Great to see! Could you split your PR into two commits? One adding the new env variables to distrobuilder and then the second updating the example .yaml to use it? |
nanjj
added a commit
to nanjj/distrobuilder
that referenced
this pull request
Apr 3, 2024
Depends on PR lxc#830
nanjj
added a commit
to nanjj/distrobuilder
that referenced
this pull request
Apr 3, 2024
Depends on PR lxc#830 Signed-off-by: JUN JIE NAN <[email protected]>
stgraber
reviewed
Apr 3, 2024
distrobuilder/main_incus.go
Outdated
| } | ||
|
|
||
| c.global.ctx = context.WithValue(c.global.ctx, shared.ContextKeyEnviron, | ||
| []string{fmt.Sprintf("ROOTFS_DEVICE_UUID=%s", rootfsDevUUID)}) |
There was a problem hiding this comment.
I'd probably go for DISTROBUILDR_ROOTFS_UUID instead so that it's clear that this is a distrobuilder thing and we avoid potential conflicts with other env variables (as unlikely as that may be).
The root partition may not be /dev/sda2, for example if set the boot disk as the second disk, the root partition device name will be /dev/sdb2. It may be /dev/vda2 if not using san disk. The fix figured out the root partition device UUID and set the UUID as the root, the root partition device UUID keeps no change. Signed-off-by: JUN JIE NAN <[email protected]>
nanjj
added a commit
to nanjj/distrobuilder
that referenced
this pull request
Apr 7, 2024
Depends on PR lxc#830 Signed-off-by: JUN JIE NAN <[email protected]>
nanjj
added a commit
to nanjj/lxc-ci
that referenced
this pull request
Apr 7, 2024
The root partition may not be /dev/sda2, for example if set the boot disk as the second disk, the root partition device name will be /dev/sdb2. It may be /dev/vda2 if not using san disk. The fix figured out the root partition device UUID and set the UUID as the root, the root partition device UUID keeps no change. Depends on lxc/distrobuilder#830 Signed-off-by: JUN JIE NAN <[email protected]>
stgraber
approved these changes
Apr 7, 2024
tomponline
added a commit
to canonical/lxd-imagebuilder
that referenced
this pull request
Aug 6, 2024
… Incus) (#83) Cherry-picked from lxc/distrobuilder#830 and lxc/distrobuilder#831
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.
The root partition may not be /dev/sda2, for example if set the boot disk as the second disk, the root partition device name will be /dev/sdb2. It may be /dev/vda2 if not using san disk. The fix figured out the root partition device UUID and set the UUID as the root, the root partition device UUID keeps no change.