[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

Re: [lorax] Change the squashfs image section in .treeinfo



Ack.

On 02/09/2012 11:00 AM, Martin Gracik wrote:
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 66b10bc..7433afd 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 95a1b49..ffc7ec3 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 89ea823..cfdb04e 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 4c0a371..5959bc4 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}

--
David Cantrell <dcantrell redhat com>
Supervisor, Installer Engineering Team
Red Hat, Inc. | Westford, MA | EST5EDT


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]