Merge lp:~mvo/ubuntu-system-image/machine-id-fallback into lp:~registry/ubuntu-system-image/client
Proposed by
Michael Vogt
Status: | Merged |
---|---|
Approved by: | Barry Warsaw |
Approved revision: | 290 |
Merge reported by: | Barry Warsaw |
Merged at revision: | not available |
Proposed branch: | lp:~mvo/ubuntu-system-image/machine-id-fallback |
Merge into: | lp:~registry/ubuntu-system-image/client |
Diff against target: |
106 lines (+30/-16) 2 files modified
systemimage/helpers.py (+7/-3) systemimage/tests/test_helpers.py (+23/-13) |
To merge this branch: | bzr merge lp:~mvo/ubuntu-system-image/machine-id-fallback |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Barry Warsaw (community) | Approve | ||
Review via email:
|
Description of the change
This branch adds support for both /etc/machine-id and /var/lib/
To post a comment you must log in.
Thanks Michael. I had to port this branch to s-i 3.0, which has changed quite a few things as to make this a non-trivial merge. But I copied your implementation in spirit so you get credit. :)