almalinux/lorax
13
0
Fork 0
Code Issues Pull Requests Releases Activity

x86.tmpl: initially define compressargs as empty string

Browse Source 
pjones and I happened to notice this suspicious line in the
lmc log for a Fedora 27 live image compose:

2017-08-25 16:04:55,327 DEBUG pylorax.ltmpl: template line 25: installimg None usr/share/lorax//product/ images/product.img

That 'None' does not look right. I believe this is the problem.
The command is defined as `installimg ${compressargs} ...`, and
a few lines earlier, `compressargs` is initially assigned (in
Python) as `None`. `None`, in Python, stringifies to the string
'None'. So unless we're on i386 (where `compressargs` gets
defined to an actual string of arguments in a conditional), we
wind up passing in the string 'None' as the first arg to the
`installimg` command.

To fix this, `compressargs` should be initially set to the empty
string rather than `None`.
This commit is contained in:
Adam Williamson 2017-08-25 13:11:09 -07:00 committed by Brian C. Lane
parent 35f954531b
commit 5ace9bdec4
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
share/templates.d/99-generic/live/x86.tmpl
View File

@ -95,7 +95,7 @@ hardlink ${KERNELDIR}/initrd.img ${BOOTDIR}
%endif %endif
# Create optional product.img and updates.img # Create optional product.img and updates.img
<% filegraft=""; images=["product", "updates"]; compressargs=None; %> <% filegraft=""; images=["product", "updates"]; compressargs=""; %>
%if basearch == 'i386': %if basearch == 'i386':
# Limit the amount of memory xz uses on i386 # Limit the amount of memory xz uses on i386
<% compressargs="--xz -9 --memlimit-compress=3700MiB" %> <% compressargs="--xz -9 --memlimit-compress=3700MiB" %>

2
share/templates.d/99-generic/x86.tmpl
View File

@ -97,7 +97,7 @@ hardlink ${KERNELDIR}/initrd.img ${BOOTDIR}
%endif %endif
# Create optional product.img and updates.img # Create optional product.img and updates.img
<% filegraft=""; images=["product", "updates"]; compressargs=None; %> <% filegraft=""; images=["product", "updates"]; compressargs=""; %>
%if basearch == 'i386': %if basearch == 'i386':
# Limit the amount of memory xz uses on i386 # Limit the amount of memory xz uses on i386
<% compressargs="--xz -9 --memlimit-compress=3700MiB" %> <% compressargs="--xz -9 --memlimit-compress=3700MiB" %>