From 356482d75e17f278369fc76bae961f7763695298 Mon Sep 17 00:00:00 2001
From: Daniel Mach <dmach@redhat.com>
Date: Wed, 19 Dec 2012 10:04:06 +0100
Subject: [PATCH] Several 'doupgrade' fixes in the x86 template.

---
 share/x86.tmpl | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/share/x86.tmpl b/share/x86.tmpl
index 6412291f..30041ee6 100644
--- a/share/x86.tmpl
+++ b/share/x86.tmpl
@@ -49,11 +49,15 @@ mkdir ${KERNELDIR}
 
 hardlink ${KERNELDIR}/vmlinuz ${BOOTDIR}
 hardlink ${KERNELDIR}/initrd.img ${BOOTDIR}
-hardlink ${KERNELDIR}/upgrade.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
-    treeinfo images-xen upgrade ${KERNELDIR}/upgrade.img
+    %if doupgrade:
+        treeinfo images-xen upgrade ${KERNELDIR}/upgrade.img
+    %endif
 %endif
 
 ## WHeeeeeeee, EFI.