Merge lp://staging/~smoser/maas-images/trunk.dyn-netconf-krd-only into lp://staging/maas-images
| Status: | Rejected | ||||
|---|---|---|---|---|---|
| Rejected by: | Scott Moser | ||||
| Proposed branch: | lp://staging/~smoser/maas-images/trunk.dyn-netconf-krd-only | ||||
| Merge into: | lp://staging/maas-images | ||||
| Diff against target: |
87 lines (+19/-37) 2 files modified
bin/kpack-from-image (+11/-35) bin/maas-cloudimg2ephemeral (+8/-2) |
||||
| To merge this branch: | bzr merge lp://staging/~smoser/maas-images/trunk.dyn-netconf-krd-only | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| maintainers of maas images | Pending | ||
|
Review via email:
|
|||
Commit message
Add cloud-initramfs
The package cloud-initramfs
For releases less than bionic, leave it there. In those releases it
was either always installed (xenial) or installed via the ubuntu-server
meta-package.
For bionic, it is not needed in the image, and was removed from the
ubuntu-server seed and meta-package.
Thus, for bionic, we have to add it in the initramfs generation.
The mechanism for doing so that is added ensures it is added if not
present.
| Scott Moser (smoser) wrote | # |
Unmerged revisions
- 394. By Scott Moser
-
much simpler installation of required packages.
Just let apt figure it out.
- 393. By Scott Moser
-
Add cloud-initramfs
-dyn-netconf in initramfs generation. The package cloud-initramfs
-dyn-netconf is not needed inside the image.
For releases less than bionic, leave it there. In those releases it
was either always installed (xenial) or installed via the ubuntu-server
meta-package.For bionic, it is not needed in the image, and was removed from the
ubuntu-server seed and meta-package.Thus, for bionic, we have to add it in the initramfs generation.
The mechanism for doing so that is added ensures it is added if not
present.This change is actually not meaningful if the squashfs image is
the one used in publication (maas v3 streams). But is meaningful
for v2 streams, where the maas-image build process produces
the root-image.gz.
The first hunk of this (cloud-
got fixed under revno 392 (fdebb643909b4d
The remaining chunk is a simplification for sure. but Im' not going to push on that now.