Remove 3G minimum from lorax-composer
The reason for the 3G minimum was because anaconda had a bug with how it
calculated minimum disk size when using kickstart. The gix for this has
been in Anaconda since 29.19-1, so we can now remove our limit and
create somewhat smaller disk images.
(cherry picked from commit 7e78dc368f
)
This commit is contained in:
parent
1a76c4816f
commit
a08dd1585c
@ -135,7 +135,7 @@ Requires: libgit2
|
|||||||
Requires: libgit2-glib
|
Requires: libgit2-glib
|
||||||
Requires: python3-flask
|
Requires: python3-flask
|
||||||
Requires: python3-gevent
|
Requires: python3-gevent
|
||||||
Requires: anaconda-tui
|
Requires: anaconda-tui >= 29.19-1
|
||||||
Requires: qemu-img
|
Requires: qemu-img
|
||||||
Requires: tar
|
Requires: tar
|
||||||
|
|
||||||
|
@ -340,9 +340,7 @@ def start_build(cfg, dnflock, gitlock, branch, recipe_name, compose_type, test_m
|
|||||||
log.debug("installed_size = %d, template_size=%d", installed_size, template_size)
|
log.debug("installed_size = %d, template_size=%d", installed_size, template_size)
|
||||||
|
|
||||||
# Minimum LMC disk size is 1GiB, and anaconda bumps the estimated size up by 10% (which doesn't always work).
|
# Minimum LMC disk size is 1GiB, and anaconda bumps the estimated size up by 10% (which doesn't always work).
|
||||||
# XXX BUT Anaconda has a bug, it won't execute a kickstart on a disk smaller than 3000 MB
|
installed_size = int((installed_size+template_size)) * 1.2
|
||||||
# XXX There is an upstream patch pending, but until then, use that as the minimum
|
|
||||||
installed_size = max(3e9, int((installed_size+template_size))) * 1.2
|
|
||||||
log.debug("/ partition size = %d", installed_size)
|
log.debug("/ partition size = %d", installed_size)
|
||||||
|
|
||||||
# Create the results directory
|
# Create the results directory
|
||||||
|
Loading…
Reference in New Issue
Block a user