Merge lp://staging/~barry/ubuntu-system-image/reload-configuration into lp://staging/~snappy-dev/ubuntu-system-image/ppa-upload

Proposed by Barry Warsaw
Status: Merged
Merged at revision: 303
Proposed branch: lp://staging/~barry/ubuntu-system-image/reload-configuration
Merge into: lp://staging/~snappy-dev/ubuntu-system-image/ppa-upload
Diff against target: 160 lines (+94/-5)
4 files modified
debian/changelog (+8/-0)
systemimage/dbus.py (+24/-0)
systemimage/tests/test_config.py (+6/-2)
systemimage/tests/test_dbus.py (+56/-3)
To merge this branch: bzr merge lp://staging/~barry/ubuntu-system-image/reload-configuration
Reviewer Review Type Date Requested Status
Steve Langasek Approve
James Hunt Pending
Michael Vogt Pending
Snappy Developers Pending
Review via email: mp+246507@code.staging.launchpad.net

Description of the change

Adds a new D-Bus method called ReloadConfiguration() which takes a single argument, the path to the new client.ini file. Reloads the D-Bus service's configuration from the new path. A channel.ini file may live next to the client.ini file. The empty string is returned on success, otherwise an error string is returned.

You should be able to use this to load the configuration from the B partition.

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

I should mention that while I think this will do what you want in the immediate case, we'll have to work out something different for si 3.0, which will have the config.d/ directory support (soon to land in trunk). So consider this expedient rather than permanent.

Oh, and I fixed the test suite so now you can run `tox` again. :)

305. By Barry Warsaw

Remove some comments.

Revision history for this message
Steve Langasek (vorlon) wrote :

This looks good to me. Merging and uploading.

review: Approve
Revision history for this message
Michael Vogt (mvo) wrote :

Thanks a lot Barry!

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