Merge lp://staging/~stub/charm-helpers/fix-systemd-detection into lp://staging/charm-helpers
Proposed by
Stuart Bishop
| Status: | Merged |
|---|---|
| Merged at revision: | 712 |
| Proposed branch: | lp://staging/~stub/charm-helpers/fix-systemd-detection |
| Merge into: | lp://staging/charm-helpers |
| Diff against target: |
53 lines (+18/-2) 2 files modified
charmhelpers/core/host.py (+2/-0) tests/core/test_host.py (+16/-2) |
| To merge this branch: | bzr merge lp://staging/~stub/charm-helpers/fix-systemd-detection |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| James Page | Approve | ||
| Tim Van Steenburgh | Approve | ||
| Chris MacNaughton (community) | Approve | ||
|
Review via email:
|
|||
Description of the change
Per Bug #1670944, trusty charms start failing if the snapd package
is installed on the system. Fix this.
I've just hardcoded the check for trusty, rather than some convoluted
method to attempt to detect if upstart is the default init system,
because we only need this to work under trusty. xenial is fine, and
systemd doesn't exist for precise.
To post a comment you must log in.
Revision history for this message
| Stuart Bishop (stub) wrote | # |
Revision history for this message
| James Page (james-page) | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Note that having the snapd package installed is beyond the control of the charm, as it may be pulled in by a subordinate or layer.