Merge lp:~toykeeper/phablet-tools/phablet-network-no-nm into lp:phablet-tools
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Oliver Grawert | ||||
Approved revision: | 338 | ||||
Merged at revision: | 357 | ||||
Proposed branch: | lp:~toykeeper/phablet-tools/phablet-network-no-nm | ||||
Merge into: | lp:phablet-tools | ||||
Diff against target: |
35 lines (+7/-3) 1 file modified
phablet-network (+7/-3) |
||||
To merge this branch: | bzr merge lp:~toykeeper/phablet-tools/phablet-network-no-nm | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Robert Bruce Park (community) | Approve | ||
PS Jenkins bot | continuous-integration | Approve | |
Oliver Grawert | Approve | ||
Review via email: mp+251564@code.launchpad.net |
Commit message
This fixes Bug #1427559 (phablet-network requires NetworkManager).
It adds support for an optional dotfile to specify the data the script would otherwise try to detect from NetworkManager. With no dotfile, the script acts the same as before, but by adding a dotfile it allows people to use phablet-network in half a dozen corner cases which would otherwise fail.
Description of the change
This fixes Bug #1427559 (phablet-network requires NetworkManager).
It adds support for an optional dotfile to specify the data the script would otherwise try to detect from NetworkManager. With no dotfile, the script acts the same as before, but by adding a dotfile it allows people to use phablet-network in half a dozen corner cases which would otherwise fail.
PASSED: Continuous integration, rev:336 jenkins. qa.ubuntu. com/job/ phablet- tools-ci/ 435/ jenkins. qa.ubuntu. com/job/ phablet- tools-vivid- amd64-ci/ 12 jenkins. qa.ubuntu. com/job/ phablet- tools-vivid- armhf-ci/ 12 jenkins. qa.ubuntu. com/job/ phablet- tools-vivid- i386-ci/ 12
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/phablet- tools-ci/ 435/rebuild
http://