Merge lp://staging/~jderose/ubiquity/fix-1539266 into lp://staging/~ubuntu-installer/ubiquity/trusty-proposed
Proposed by
Jason Gerard DeRose
| Status: | Merged |
|---|---|
| Approved by: | Mathieu Trudel-Lapierre |
| Approved revision: | 6203 |
| Merged at revision: | 6203 |
| Proposed branch: | lp://staging/~jderose/ubiquity/fix-1539266 |
| Merge into: | lp://staging/~ubuntu-installer/ubiquity/trusty-proposed |
| Diff against target: |
27 lines (+10/-0) 1 file modified
ubiquity/misc.py (+10/-0) |
| To merge this branch: | bzr merge lp://staging/~jderose/ubiquity/fix-1539266 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Mathieu Trudel-Lapierre | Approve | ||
|
Review via email:
|
|||
Description of the change
1) Adds SMBIOS28_JUNK module variable for better readability when using this value within dmimodel().
2) Changes dmimodel() to check if the resulting model starts with SMBIOS28_JUNK, and if so, to strip this prefix.
The comment above SMBIOS28_JUNK provides an explanation, and this bug provides more background:
https:/
In the future, I do wonder if it might be better for Ubiquity to get these values from /sys/class/
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Looks fine to me.