From bbd758d9986c674d806ef6f41d1d3456cbb025ab Mon Sep 17 00:00:00 2001
From: Martin Gracik <mgracik@redhat.com>
Date: Thu, 9 Feb 2012 16:59:15 +0100
Subject: [PATCH] Change the squashfs image section in .treeinfo

Related: rhbz#782108
---
 share/ppc.tmpl   | 4 +---
 share/s390.tmpl  | 2 +-
 share/sparc.tmpl | 2 +-
 share/x86.tmpl   | 2 +-
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/share/ppc.tmpl b/share/ppc.tmpl
index 66b10bc7..7433afd5 100644
--- a/share/ppc.tmpl
+++ b/share/ppc.tmpl
@@ -23,9 +23,7 @@ rootarg = "root=live:CDLABEL=%s" % isolabel
 
 mkdir ${LIVEDIR}
 install ${runtime_img} ${LIVEDIR}/squashfs.img
-%for kernel in kernels:
-    treeinfo images-${kernel.arch} LiveOS ${LIVEDIR}/squashfs.img
-%endfor
+treeinfo stage2 mainimage ${LIVEDIR}/squashfs.img
 
 ## install bootloaders.
 ## NOTE: there's two different bootloader setups here:
diff --git a/share/s390.tmpl b/share/s390.tmpl
index 95a1b499..ffc7ec37 100644
--- a/share/s390.tmpl
+++ b/share/s390.tmpl
@@ -11,7 +11,7 @@ kernel = kernels[0]
 
 mkdir images
 install ${runtime_img} images
-treeinfo images-${basearch} LiveOS images/${runtime_base}
+treeinfo stage2 mainimage images/${runtime_base}
 
 ## install bootloader (such as it is) and bootloader config
 install ${configdir}/redhat.exec ${BOOTDIR}
diff --git a/share/sparc.tmpl b/share/sparc.tmpl
index 89ea8231..cfdb04e4 100644
--- a/share/sparc.tmpl
+++ b/share/sparc.tmpl
@@ -7,7 +7,7 @@ LIVEDIR="LiveOS"
 
 mkdir ${LIVEDIR}
 install ${runtime_img} ${LIVEDIR}/squashfs.img
-treeinfo images-${basearch} LiveOS ${LIVEDIR}/squashfs.img
+treeinfo stage2 mainimage ${LIVEDIR}/squashfs.img
 
 ## install bootloader and config files
 install boot/*.b ${BOOTDIR}
diff --git a/share/x86.tmpl b/share/x86.tmpl
index 4c0a371a..5959bc45 100644
--- a/share/x86.tmpl
+++ b/share/x86.tmpl
@@ -10,7 +10,7 @@ LIVEDIR="LiveOS"
 
 mkdir ${LIVEDIR}
 install ${runtime_img} ${LIVEDIR}/squashfs.img
-treeinfo images-${basearch} LiveOS ${LIVEDIR}/squashfs.img
+treeinfo stage2 mainimage ${LIVEDIR}/squashfs.img
 
 ## install bootloader and config files
 mkdir ${BOOTDIR}