This repository was archived by the owner on Aug 5, 2022. It is now read-only.
image: adjust partition sizes #44
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The VFAT parition size specified in the DSK_IMAGE_LAYOUT no longer matched the actual size used for images, and 15MB indeed is barely large enough. Adding tools like cryptsetup to the initramfs causes it to exceed that limit. Instead of hard-coding a fixed size in the .wks.in file, now a per-image variable is inserted instead. The size of the rootfs can also be controlled, including not limiting it at all and thus adapting the image size to the size of the rootfs. This will be needed for the installer image which is larger than normal images. The default is the same as before (30MB for the VFAT partitions, 4GB total image size). Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Contributor
|
@pohly are the submodule updates necessary? |
Contributor
Author
|
On Thu, 2017-02-23 at 07:28 -0800, Mikko Ylinen wrote:
@pohly are the submodule updates necessary?
No, that crept in unintentionally (juggling between my image-installer
branch and this PR). I'll amend it.
|
30MB are not enough for an initramfs with cryptsetup included. Bumping it up to the next power of two. The size of the rootfs gets adjusted so that the full image fits into 4*10^9 bytes, i.e. "4GB" regardless whether 1000 or 1024 is used as base. 64M are reserved for potential partitioning overhead. Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Contributor
Author
|
Force-pushed updated commit. |
Contributor
|
test this please |
Contributor
|
@pohly I also keep committing the submodules unintentionally ( |
Contributor
Author
|
@ipuustin if the change for the submodule was a bit more obvious in "git diff" output perhaps it would be easier to spot the mistake - at least I tend to check my change that way before committing. But I've not found a way to get more than the two-line change with old and new hash, which is just too easy to miss. |
Contributor
|
+1 @jlaako Are you OK? |
Contributor
|
@mythi yes, +1 |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
4 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
They were inconsistent and too small for future use cases.
Replaces PR #36 and needed for PR #19, which already had commit
13829d8.