From 6ce8b815d771fcc5d50f473d90fdd0fdaf813e59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Thu, 21 Apr 2016 19:55:09 +0200 Subject: [PATCH] lorax: do not generate upgrade.img QubesOS/qubes-issues#1807 --- lorax-templates-qubes/templates/x86.tmpl | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/lorax-templates-qubes/templates/x86.tmpl b/lorax-templates-qubes/templates/x86.tmpl index ba930cf..b90a446 100644 --- a/lorax-templates-qubes/templates/x86.tmpl +++ b/lorax-templates-qubes/templates/x86.tmpl @@ -51,16 +51,10 @@ sortedkernels = [ kernel for kernel in sortedkernels if 'qubes' in kernel.versio ## i386 PAE installkernel images-xen ${kernel.path} ${KERNELDIR}/vmlinuz-${kernel.flavor} installinitrd images-xen ${kernel.initrd.path} ${KERNELDIR}/initrd-${kernel.flavor}.img - %if doupgrade: - installupgradeinitrd images-xen ${kernel.upgrade.path} ${KERNELDIR}/upgrade-${kernel.flavor}.img - %endif %else: ## normal i386, x86_64 installkernel images-${basearch} ${kernel.path} ${KERNELDIR}/vmlinuz installinitrd images-${basearch} ${kernel.initrd.path} ${KERNELDIR}/initrd.img - %if doupgrade: - installupgradeinitrd images-${basearch} ${kernel.upgrade.path} ${KERNELDIR}/upgrade.img - %endif %endif installkernel images-alt-${shortkver} ${kernel.path} ${BOOTDIR}/vmlinuz-${shortkver} installinitrd images-alt-${shortkver} ${kernel.initrd.path} ${BOOTDIR}/initrd-${shortkver}.img @@ -77,15 +71,9 @@ replace @EXTRAKERNELS@ '' ${BOOTDIR}/isolinux.cfg hardlink ${KERNELDIR}/vmlinuz ${BOOTDIR} hardlink ${KERNELDIR}/initrd.img ${BOOTDIR} -%if doupgrade: - hardlink ${KERNELDIR}/upgrade.img ${BOOTDIR} -%endif %if basearch == 'x86_64': treeinfo images-xen kernel ${KERNELDIR}/vmlinuz treeinfo images-xen initrd ${KERNELDIR}/initrd.img - %if doupgrade: - treeinfo images-xen upgrade ${KERNELDIR}/upgrade.img - %endif %endif ## WHeeeeeeee, EFI.