Fixed hardcoded root partition device name sda2 #822
Conversation
nanjj
force-pushed
the
main
branch
2 times, most recently
from
d484e97
to
a6af75a
Compare
|
Hmm, I like the idea behind the change but I'm not sure that the implementation is going to be safe. We frequently build multiple images in parallel on the same system which means that any kind of wildcard pattern around /dev/loop*p2 is going to be racy. |
The code is running in the build namespaces, you can check the distrobuilder code, only the free loop device used by this build being created in this build. So I think it's OK. Another idea is to pass environment variable say ROOT_PARTITION_DEVICE_NAME or ROOT_PARTITION_DEVICE_UUID to the POST SCRIPT but that may lead to distrobuilder code change. |
|
Yeah, I'd actually prefer we change distrobuilder to expose env variables, that'd be far more reliable. /dev is usually a devtmpfs or can get mounted as one by a package during the build process, devices aren't namespaced so loop devices will show up in all containers/namespaces that also use devtmpfs. |
|
The code I mentioned here: |
nanjj
force-pushed
the
main
branch
2 times, most recently
from
42fe395
to
3b382b0
Compare
|
Note line 149, the logic you're pointing out is fallback logic for the images that do not have a full /dev already available. The code as it's written actually shows that distrobuilder was meant to support images building with a full /dev instance. |
OK, I changed my mind, now the fix is based on PR lxc/distrobuilder#830 |
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 <nanjunjie@gmail.com>
|
Going to wait a day before merging that one so we can be sure all the builders get the new distrobuilder first. |
Cherry-picked from lxc/lxc-ci#822 Passing workflows: - Alpine: https://github.com/MusicDin/lxd-ci/actions/runs/10269160208 - CentOS: https://github.com/MusicDin/lxd-ci/actions/runs/10269156356
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