Merge lp://qastaging/~mvo/snappy/snappy-systemctl-enable into lp://qastaging/~snappy-dev/snappy/snappy-moved-to-github
Proposed by
Michael Vogt
| Status: | Work in progress |
|---|---|
| Proposed branch: | lp://qastaging/~mvo/snappy/snappy-systemctl-enable |
| Merge into: | lp://qastaging/~snappy-dev/snappy/snappy-moved-to-github |
| Diff against target: |
174 lines (+59/-6) (has conflicts) 3 files modified
snappy/click.go (+41/-1) snappy/click_test.go (+15/-5) snappy/snapp_test.go (+3/-0) Text conflict in snappy/click.go Text conflict in snappy/click_test.go |
| To merge this branch: | bzr merge lp://qastaging/~mvo/snappy/snappy-systemctl-enable |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Sergio Schvezov | Needs Fixing | ||
|
Review via email:
|
|||
Description of the change
This branch sets a manual symlink to enable a systemd unit instead of using systemctl enable that may not be available on the system.
To post a comment you must log in.
Unmerged revisions
- 308. By Michael Vogt
-
manually set the symlink that systemctl enable sets to ensure that ubuntu-device-flash works on systems with no systemd
- 307. By Sergio Schvezov
-
Fixing tests:
- Check for len 0 for system hooks when inhibiting.
- Make it easier on editors that trim empty spaces. - 306. By Sergio Schvezov
-
systemctl not to be called with inhibithooks
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Please remerge trunk