Merge ~bjornt/maas:bug-1888021-2.8 into maas:2.8
Proposed by
Björn Tillenius
Status: | Merged |
---|---|
Approved by: | Björn Tillenius |
Approved revision: | a68fd8e90b54ba5a152f4d304a099b154766dd3c |
Merge reported by: | MAAS Lander |
Merged at revision: | not available |
Proposed branch: | ~bjornt/maas:bug-1888021-2.8 |
Merge into: | maas:2.8 |
Diff against target: |
303 lines (+129/-18) 3 files modified
src/machine-resources/src/machine-resources/Gopkg.lock (+3/-3) src/metadataserver/user_data/templates/snippets/maas_run_remote_scripts.py (+55/-5) src/metadataserver/user_data/templates/snippets/tests/test_maas_run_remote_scripts.py (+71/-10) |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
MAAS Lander | Needs Fixing | ||
Björn Tillenius | Approve | ||
Review via email: mp+388870@code.launchpad.net |
Commit message
LP: #1888021 - Read storage MODEL and MODEL_ENC from udev
Storage devices may have two model names. One is encoded to allow spaces
and other special characters, the other is not. lsblk in Xenial and Bionic
give the encoded model name while in Focal it gives the non-encode model
name. LXD gives the encoded model name in LXD 4.3+. Read and store both
from udev to ensure matching works.
(cherry picked from commit 7312172b4076d24
To post a comment you must log in.
Self-approve backport