almalinux/lorax
14
1
Fork 0
Code Issues Pull Requests Releases Activity

Fix live/x86.tmpl indents removed by commit 6aa0a3fdf

Browse Source
This commit is contained in:
Brian C. Lane 2019-08-14 15:11:25 -07:00
parent d7fe470183
commit 2a4d2f3a9b
1 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,7 +10,7 @@ LORAXDIR="usr/share/lorax/"
## Don't allow spaces or escape characters in the iso label ## Don't allow spaces or escape characters in the iso label
def valid_label(ch): def valid_label(ch):
return ch.isalnum() or ch == '_' return ch.isalnum() or ch == '_'
isolabel = ''.join(ch if valid_label(ch) else '-' for ch in isolabel) isolabel = ''.join(ch if valid_label(ch) else '-' for ch in isolabel)
@ -19,11 +19,11 @@ from os.path import basename
## Test ${runtime_img} to see if udf is needed ## Test ${runtime_img} to see if udf is needed
<% <%
import os import os
from pylorax.sysutils import joinpaths from pylorax.sysutils import joinpaths
if os.stat(joinpaths(inroot, 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 = ""
%> %>
@ -53,44 +53,44 @@ replace @EXTRA@ '${extra_boot_args}' ${BOOTDIR}/isolinux.cfg
## install kernels ## install kernels
mkdir ${KERNELDIR} mkdir ${KERNELDIR}
%for kernel in kernels: %for kernel in kernels:
%if kernel.flavor: %if kernel.flavor:
installkernel images-xen ${kernel.path} ${KERNELDIR}/vmlinuz-${kernel.flavor} installkernel images-xen ${kernel.path} ${KERNELDIR}/vmlinuz-${kernel.flavor}
installinitrd images-xen ${kernel.initrd.path} ${KERNELDIR}/initrd-${kernel.flavor}.img installinitrd images-xen ${kernel.initrd.path} ${KERNELDIR}/initrd-${kernel.flavor}.img
%else: %else:
installkernel images-${basearch} ${kernel.path} ${KERNELDIR}/vmlinuz installkernel images-${basearch} ${kernel.path} ${KERNELDIR}/vmlinuz
installinitrd images-${basearch} ${kernel.initrd.path} ${KERNELDIR}/initrd.img installinitrd images-${basearch} ${kernel.initrd.path} ${KERNELDIR}/initrd.img
%endif %endif
%endfor %endfor
hardlink ${KERNELDIR}/vmlinuz ${BOOTDIR} hardlink ${KERNELDIR}/vmlinuz ${BOOTDIR}
hardlink ${KERNELDIR}/initrd.img ${BOOTDIR} hardlink ${KERNELDIR}/initrd.img ${BOOTDIR}
%if basearch == 'x86_64': %if basearch == 'x86_64':
treeinfo images-xen kernel ${KERNELDIR}/vmlinuz treeinfo images-xen kernel ${KERNELDIR}/vmlinuz
treeinfo images-xen initrd ${KERNELDIR}/initrd.img treeinfo images-xen initrd ${KERNELDIR}/initrd.img
%endif %endif
## WHeeeeeeee, EFI. ## WHeeeeeeee, EFI.
<% efiargs=""; efigraft=""; efihybrid=""; efiarch32=None; efiarch64=None %> <% efiargs=""; efigraft=""; efihybrid=""; efiarch32=None; efiarch64=None %>
%if exists("boot/efi/EFI/*/gcdia32.efi"): %if exists("boot/efi/EFI/*/gcdia32.efi"):
<% efiarch32 = 'IA32' %> <% efiarch32 = 'IA32' %>
%endif %endif
%if exists("boot/efi/EFI/*/gcdx64.efi"): %if exists("boot/efi/EFI/*/gcdx64.efi"):
<% efiarch64 = 'X64' %> <% efiarch64 = 'X64' %>
%endif %endif
%if (efiarch32 or efiarch64) and basearch != 'i386': %if (efiarch32 or efiarch64) and basearch != 'i386':
<% <%
efigraft="EFI/BOOT={0}/EFI/BOOT".format(outroot) efigraft="EFI/BOOT={0}/EFI/BOOT".format(outroot)
images = ["images/efiboot.img"] images = ["images/efiboot.img"]
if domacboot: if domacboot:
images.append("images/macboot.img") images.append("images/macboot.img")
%> %>
%for img in images: %for img in images:
<% <%
efiargs += " -eltorito-alt-boot -e {0} -no-emul-boot".format(img) efiargs += " -eltorito-alt-boot -e {0} -no-emul-boot".format(img)
efigraft += " {0}={1}/{0}".format(img,outroot) efigraft += " {0}={1}/{0}".format(img,outroot)
%> %>
treeinfo images-${basearch} ${img|basename} ${img} treeinfo images-${basearch} ${img|basename} ${img}
%endfor %endfor
<% efihybrid = "--uefi --mac" if domacboot else "--uefi" %> <% efihybrid = "--uefi --mac" if domacboot else "--uefi" %>
<%include file="efi.tmpl" args="configdir=configdir, KERNELDIR=KERNELDIR, efiarch32=efiarch32, efiarch64=efiarch64, isolabel=isolabel"/> <%include file="efi.tmpl" args="configdir=configdir, KERNELDIR=KERNELDIR, efiarch32=efiarch32, efiarch64=efiarch64, isolabel=isolabel"/>
%endif %endif