Merge lp://staging/~smoser/maas-images/trunk.proposed-kpack into lp://staging/maas-images
Proposed by
Scott Moser
| Status: | Merged |
|---|---|
| Merged at revision: | 388 |
| Proposed branch: | lp://staging/~smoser/maas-images/trunk.proposed-kpack |
| Merge into: | lp://staging/maas-images |
| Diff against target: |
57 lines (+9/-6) 3 files modified
bin/kpack-from-image (+3/-2) bin/maas-cloudimg2eph2 (+3/-1) bin/maas-cloudimg2ephemeral (+3/-3) |
| To merge this branch: | bzr merge lp://staging/~smoser/maas-images/trunk.proposed-kpack |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Lee Trager (community) | Approve | ||
|
Review via email:
|
|||
Commit message
Cleanups around use of --proposed.
The --proposed flag was not getting all the way through to
kpack-from-image. This modification just gets it set all the way through.
It isn't strictly needed, because the image that it runs in will have
proposed enabled already, but passing it through makes it more obvious.
In kpack-from-image, use the same .list file name that is used in
maas-cloudimg2eph and also enable universe and multiverse as are done there.
Also some cleanups:
- dist_upgrade was set to 'false' by default, but then enabled to either
'true' or '1'. Just be consistent and set to true to avoid confusion.
- fix a debug message that reported about ppa when it should have reported
about proposed.
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
LGTM!