From 4d072363a8ff443ab622f5133305cf53f5e681e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Mon, 18 Nov 2013 11:30:45 +0100 Subject: [PATCH] lorax: use newest kernel for installer Sort the kernels before creating installing them. The last one will be the newest and will override older ones. --- lorax-templates-qubes/templates/x86.tmpl | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/lorax-templates-qubes/templates/x86.tmpl b/lorax-templates-qubes/templates/x86.tmpl index 7781067..ebdc2f9 100644 --- a/lorax-templates-qubes/templates/x86.tmpl +++ b/lorax-templates-qubes/templates/x86.tmpl @@ -8,6 +8,9 @@ KERNELDIR=PXEBOOTDIR LIVEDIR="LiveOS" EXTRAKERNELS="extrakernels" %> +<%! +from distutils.version import LooseVersion +%> mkdir ${LIVEDIR} install ${runtime_img} ${LIVEDIR}/squashfs.img @@ -31,7 +34,11 @@ install ../../../../yum/qubes-dom0/rpm/kernel-[0-9]*rpm ${EXTRAKERNELS} ## install kernels mkdir ${KERNELDIR} -%for kernel in kernels: +<% +sortedkernels = sorted(kernels, key=lambda k: LooseVersion(k['version'])) +%> + +%for kernel in sortedkernels: # Use short kernel version because of ISO9660 filename length limitation <% shortkver = kernel.version.replace('.pvops.qubes','')