lp://staging/~mvo/ubuntu-system-image/machine-id-fallback

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp://staging/~registry/ubuntu-system-image/client

Barry Warsaw (community): Approve on 2014-12-01

Diff: 106 lines (+30/-16)

2 files modified

systemimage/helpers.py (+7/-3)
systemimage/tests/test_helpers.py (+23/-13)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1384859: Use other machine-id files as alternatives to D-Bus file

High

Fix Released

Link a bug report

Related blueprints

290. By Michael Vogt on 2014-11-04

Allow both ['/var/lib/dbus/machine-id', '/etc/machine-id'] as valid machine-ids

With systemd taking over it provides its own machine-id in /etc. Dbus
will read that and fallback to /var/lib/dbus/machine-id.

289. By Barry Warsaw on 2014-10-27

Trunk merge

288. By Barry Warsaw on 2014-10-03

mvo branch merge

287. By Barry Warsaw on 2014-09-29

Make coverage 100% again.

286. By Barry Warsaw on 2014-09-29

Improve the error message when the assertion fails.

285. By Barry Warsaw on 2014-09-29

Bump the manpages

284. By Barry Warsaw on 2014-09-29

Release

283. By Barry Warsaw on 2014-09-25

 * Add a `target_build_number` key to the mapping returned by the
   `.Information()` D-Bus method. (LP: #1370586)

282. By Barry Warsaw on 2014-09-24

 * Remove the previously deprecated `system-image-cli --dbus` command line
   switch. (LP: #1369717)

281. By Barry Warsaw on 2014-09-17

Remove unused import.