templates: Fix runtime_img check
commit66241f7cd7
added a check on runtime_img to create UDF iso's. Ends up it is only in outroot for live, so switch all the checks to look at it in inroot instead. (cherry picked from commit077167cdb2
)
This commit is contained in:
parent
f21f126fb8
commit
2ff1998597
@ -1,4 +1,4 @@
|
|||||||
<%page args="kernels, runtime_img, basearch, outroot, product, isolabel"/>
|
<%page args="kernels, runtime_img, basearch, inroot, outroot, product, isolabel"/>
|
||||||
<%
|
<%
|
||||||
configdir="tmp/config_files/aarch64"
|
configdir="tmp/config_files/aarch64"
|
||||||
PXEBOOTDIR="images/pxeboot"
|
PXEBOOTDIR="images/pxeboot"
|
||||||
@ -11,7 +11,7 @@ LORAXDIR="usr/share/lorax/"
|
|||||||
<%
|
<%
|
||||||
import os
|
import os
|
||||||
from pylorax.sysutils import joinpaths
|
from pylorax.sysutils import joinpaths
|
||||||
if os.stat(joinpaths(outroot, runtime_img)).st_size >= 4*1024**3:
|
if os.stat(joinpaths(inroot, runtime_img)).st_size >= 4*1024**3:
|
||||||
udfargs = "-allow-limited-size"
|
udfargs = "-allow-limited-size"
|
||||||
else:
|
else:
|
||||||
udfargs = ""
|
udfargs = ""
|
||||||
|
@ -24,7 +24,7 @@ isolabel = ''.join(ch if ch.isalnum() else '_' for ch in isolabel)
|
|||||||
<%
|
<%
|
||||||
import os
|
import os
|
||||||
from pylorax.sysutils import joinpaths
|
from pylorax.sysutils import joinpaths
|
||||||
if os.stat(joinpaths(outroot, runtime_img)).st_size >= 4*1024**3:
|
if os.stat(joinpaths(inroot, runtime_img)).st_size >= 4*1024**3:
|
||||||
udfargs = "-allow-limited-size"
|
udfargs = "-allow-limited-size"
|
||||||
else:
|
else:
|
||||||
udfargs = ""
|
udfargs = ""
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
<%page args="kernels, runtime_img, basearch, outroot, product, isolabel"/>
|
<%page args="kernels, runtime_img, basearch, inroot, outroot, product, isolabel"/>
|
||||||
<%
|
<%
|
||||||
configdir="tmp/config_files/x86"
|
configdir="tmp/config_files/x86"
|
||||||
SYSLINUXDIR="usr/share/syslinux"
|
SYSLINUXDIR="usr/share/syslinux"
|
||||||
@ -19,7 +19,7 @@ isolabel = ''.join(ch if valid_label(ch) else '-' for ch in isolabel)
|
|||||||
<%
|
<%
|
||||||
import os
|
import os
|
||||||
from pylorax.sysutils import joinpaths
|
from pylorax.sysutils import joinpaths
|
||||||
if os.stat(joinpaths(outroot, runtime_img)).st_size >= 4*1024**3:
|
if os.stat(joinpaths(inroot, runtime_img)).st_size >= 4*1024**3:
|
||||||
udfargs = "-allow-limited-size"
|
udfargs = "-allow-limited-size"
|
||||||
else:
|
else:
|
||||||
udfargs = ""
|
udfargs = ""
|
||||||
|
@ -27,7 +27,7 @@ rootarg = ""
|
|||||||
<%
|
<%
|
||||||
import os
|
import os
|
||||||
from pylorax.sysutils import joinpaths
|
from pylorax.sysutils import joinpaths
|
||||||
if os.stat(joinpaths(outroot, runtime_img)).st_size >= 4*1024**3:
|
if os.stat(joinpaths(inroot, runtime_img)).st_size >= 4*1024**3:
|
||||||
udfargs = "-allow-limited-size"
|
udfargs = "-allow-limited-size"
|
||||||
else:
|
else:
|
||||||
udfargs = ""
|
udfargs = ""
|
||||||
|
@ -20,7 +20,7 @@ rootarg = ""
|
|||||||
<%
|
<%
|
||||||
import os
|
import os
|
||||||
from pylorax.sysutils import joinpaths
|
from pylorax.sysutils import joinpaths
|
||||||
if os.stat(joinpaths(outroot, runtime_img)).st_size >= 4*1024**3:
|
if os.stat(joinpaths(inroot, runtime_img)).st_size >= 4*1024**3:
|
||||||
udfargs = "-allow-limited-size"
|
udfargs = "-allow-limited-size"
|
||||||
else:
|
else:
|
||||||
udfargs = ""
|
udfargs = ""
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
<%page args="kernels, runtime_img, runtime_base, basearch, outroot, product, isolabel"/>
|
<%page args="kernels, runtime_img, runtime_base, basearch, inroot, outroot, product, isolabel"/>
|
||||||
<%
|
<%
|
||||||
configdir="tmp/config_files/x86"
|
configdir="tmp/config_files/x86"
|
||||||
SYSLINUXDIR="usr/share/syslinux"
|
SYSLINUXDIR="usr/share/syslinux"
|
||||||
@ -19,7 +19,7 @@ isolabel = ''.join(ch if valid_label(ch) else '-' for ch in isolabel)
|
|||||||
<%
|
<%
|
||||||
import os
|
import os
|
||||||
from pylorax.sysutils import joinpaths
|
from pylorax.sysutils import joinpaths
|
||||||
if os.stat(joinpaths(outroot, runtime_img)).st_size >= 4*1024**3:
|
if os.stat(joinpaths(inroot, runtime_img)).st_size >= 4*1024**3:
|
||||||
udfargs = "-allow-limited-size"
|
udfargs = "-allow-limited-size"
|
||||||
else:
|
else:
|
||||||
udfargs = ""
|
udfargs = ""
|
||||||
|
Loading…
Reference in New Issue
Block a user