Merge lp://staging/~wallyworld/golxc/lxc-console-log into lp://staging/golxc
Proposed by
Ian Booth
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Approved by: | Ian Booth | ||||
| Approved revision: | 15 | ||||
| Merged at revision: | 12 | ||||
| Proposed branch: | lp://staging/~wallyworld/golxc/lxc-console-log | ||||
| Merge into: | lp://staging/golxc | ||||
| Diff against target: |
255 lines (+104/-64) 3 files modified
export_test.go (+0/-2) golxc.go (+23/-47) golxc_test.go (+81/-15) |
||||
| To merge this branch: | bzr merge lp://staging/~wallyworld/golxc/lxc-console-log | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Tim Penhey (community) | Approve | ||
|
Review via email:
|
|||
Commit message
Rework the method used to detect if lxc-start supports --console-log or --console.
Description of the change
Rework the method used to detect if lxc-start supports --console-log or --console.
Try running lxc-start with --console-log and if that fails, use --console.
As a drive by change lxc args to long form.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
We should probably check that the long options that we want to use are in the 0.7.5 version (precise). I think they are... actually, just checked.
lxc-create doesn't support any long options, which is why we don't do it.
lxc-start does seem to support long options.
You are going to need to fix the flags for lxc-create to be short options again.