Ubuntu system image

Merge lp://staging/~mvo/ubuntu-system-image/machine-id-fallback into lp://staging/~registry/ubuntu-system-image/client

  1. machine-id-fallback
  2. Merge into 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://staging/~mvo/ubuntu-system-image/machine-id-fallback
Merge into: lp://staging/~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://staging/~mvo/ubuntu-system-image/machine-id-fallback
Reviewer Review Type Date Requested Status
Barry Warsaw (community) Approve
Review via email: mp+240616@code.staging.launchpad.net

Description of the change

This branch adds support for both /etc/machine-id and /var/lib/dbus/machine-id as the later is taking over (see also freedesktop bug https://bugs.freedesktop.org/show_bug.cgi?id=85572 - waiting for final confirmation from upstream though).

To post a comment you must log in.
Revision history for this message
Barry Warsaw (barry) wrote :

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. :)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches