[lorax/f18] fix calls to installupgradeinitrd

[Dennis Gilmore]

commit b716deb309a7afdab308747d41b6d32bb3824f8c
Author: Dennis Gilmore <dennis at ausil.us>
Date:   Fri Nov 30 11:19:28 2012 -0600

    fix calls to installupgradeinitrd

 ...upgradeinitrd-function-and-use-it-to-inst.patch |   22 ++++++++++----------
 lorax.spec                                         |    5 +++-
 2 files changed, 15 insertions(+), 12 deletions(-)
---
diff --git a/0009-add-installupgradeinitrd-function-and-use-it-to-inst.patch b/0009-add-installupgradeinitrd-function-and-use-it-to-inst.patch
index 449fba0..0631cc6 100644
--- a/0009-add-installupgradeinitrd-function-and-use-it-to-inst.patch
+++ b/0009-add-installupgradeinitrd-function-and-use-it-to-inst.patch
@@ -1,4 +1,4 @@
-From a69f256029f4144109e288db5f0ad09119175e17 Mon Sep 17 00:00:00 2001
+From 91cdb29fb99f67ced27953cb4ef4f8c7161bc825 Mon Sep 17 00:00:00 2001
 From: Dennis Gilmore <dennis at ausil.us>
 Date: Mon, 26 Nov 2012 17:26:45 -0600
 Subject: [PATCH 9/9] add installupgradeinitrd function and use it to install
@@ -13,7 +13,7 @@ Subject: [PATCH 9/9] add installupgradeinitrd function and use it to install
  5 files changed, 15 insertions(+), 12 deletions(-)
 
 diff --git a/share/arm.tmpl b/share/arm.tmpl
-index 08d9254..13649b0 100644
+index 08d9254..de1c8c8 100644
 --- a/share/arm.tmpl
 +++ b/share/arm.tmpl
 @@ -33,8 +33,7 @@ mkdir ${KERNELDIR}
@@ -22,7 +22,7 @@ index 08d9254..13649b0 100644
          ## install upgrade image
 -        installinitrd ${kernel.upgrade.img} ${KERNELDIR}/upgrade-${kernel.flavor}.img
 -        treeinfo images-${kernel.flavor}-${basearch} upgrade ${KERNELDIR}/upgrade-${kernel.flavor}.img
-+        installupgradeinitrd ${kernel.upgrade.img} ${KERNELDIR}/upgrade-${kernel.flavor}.img
++        installupgradeinitrd images-${kernel.flavor}-${basearch} ${kernel.upgrade.img} ${KERNELDIR}/upgrade-${kernel.flavor}.img
  
          ## create U-Boot wrapped images
  
@@ -32,12 +32,12 @@ index 08d9254..13649b0 100644
          ## install upgrade image
 -        installinitrd ${kernel.upgrade.img} ${KERNELDIR}/upgrade.img
 -        treeinfo images-${basearch} upgrade ${KERNELDIR}/upgrade.img
-+        installupgradeinitrd ${kernel.upgrade.img} ${KERNELDIR}/upgrade.img
++        installupgradeinitrd images-${basearch} ${kernel.upgrade.img} ${KERNELDIR}/upgrade.img
  
          ## create U-Boot wrapped images
  
 diff --git a/share/ppc.tmpl b/share/ppc.tmpl
-index 3eb4a89..68d8bf6 100644
+index 3eb4a89..4eb0b0c 100644
 --- a/share/ppc.tmpl
 +++ b/share/ppc.tmpl
 @@ -67,8 +67,7 @@ install ${configdir}/magic ${BOOTDIR}
@@ -46,12 +46,12 @@ index 3eb4a89..68d8bf6 100644
      ## upgrade image
 -    installinitrd ${kernel.upgrade.path} ${KERNELDIR}/upgrade.img
 -    treeinfo images-${kernel.arch} upgrade ${KERNELDIR}/upgrade.img
-+    installupgradeinitrd ${kernel.upgrade.path} ${KERNELDIR}/upgrade.img
++    installupgradeinitrd images-${kernel.arch} ${kernel.upgrade.path} ${KERNELDIR}/upgrade.img
  
      ## install arch-specific bootloader config
      install ${configdir}/yaboot.conf.in  ${KERNELDIR}/yaboot.conf
 diff --git a/share/s390.tmpl b/share/s390.tmpl
-index dcd78d2..d03c336 100644
+index dcd78d2..9380c75 100644
 --- a/share/s390.tmpl
 +++ b/share/s390.tmpl
 @@ -25,8 +25,7 @@ installkernel images-${basearch} ${kernel.path} ${KERNELDIR}/kernel.img
@@ -60,12 +60,12 @@ index dcd78d2..d03c336 100644
  ## upgrader image
 -installinitrd ${kernel.upgrade.img} ${KERNELDIR}/upgrade.img
 -treeinfo images-${basearch} upgrade ${KERNELDIR}/upgrade.img
-+installupgradeinitrd ${kernel.upgrade.img} ${KERNELDIR}/upgrade.img
++installupgradeinitrd images-${basearch} ${kernel.upgrade.img} ${KERNELDIR}/upgrade.img
  
  ## s390 needs some extra boot config
  createaddrsize ${INITRD_ADDRESS} ${outroot}/${BOOTDIR}/initrd.img ${outroot}/${BOOTDIR}/initrd.addrsize
 diff --git a/share/x86.tmpl b/share/x86.tmpl
-index de2ab89..9bd4cee 100644
+index de2ab89..6e1f305 100644
 --- a/share/x86.tmpl
 +++ b/share/x86.tmpl
 @@ -34,14 +34,12 @@ mkdir ${KERNELDIR}
@@ -74,14 +74,14 @@ index de2ab89..9bd4cee 100644
          installinitrd images-xen ${kernel.initrd.path} ${KERNELDIR}/initrd-${kernel.flavor}.img
 -        installinitrd ${kernel.upgrade.path} ${KERNELDIR}/upgrade-${kernel.flavor}.img
 -        treeinfo images-xen upgrade ${KERNELDIR}/upgrade-${kernel.flavor}.img
-+        installupgradeinitrd ${kernel.upgrade.path} ${KERNELDIR}/upgrade-${kernel.flavor}.img
++        installupgradeinitrd images-xen ${kernel.upgrade.path} ${KERNELDIR}/upgrade-${kernel.flavor}.img
      %else:
          ## normal i386, x86_64
          installkernel images-${basearch} ${kernel.path} ${KERNELDIR}/vmlinuz
          installinitrd images-${basearch} ${kernel.initrd.path} ${KERNELDIR}/initrd.img
 -        installinitrd ${kernel.upgrade.path} ${KERNELDIR}/upgrade.img
 -        treeinfo images-${basearch} upgrade ${KERNELDIR}/upgrade.img
-+        installupgradeinitrd ${kernel.upgrade.path} ${KERNELDIR}/upgrade.img
++        installupgradeinitrd images-${basearch} ${kernel.upgrade.path} ${KERNELDIR}/upgrade.img
      %endif
  %endfor
  
diff --git a/lorax.spec b/lorax.spec
index 687f253..5d217a8 100644
--- a/lorax.spec
+++ b/lorax.spec
@@ -2,7 +2,7 @@
 
 Name:           lorax
 Version:        18.22
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Tool for creating the anaconda install images
 
 Group:          Applications/System
@@ -103,6 +103,9 @@ make DESTDIR=$RPM_BUILD_ROOT install
 
 
 %changelog
+* Fri Nov 30 2012 Dennis Gilmore <dennis at ausil.us> - 18.22-7
+- fix calls to installupgradeinitrd
+
 * Tue Nov 27 2012 Dennis Gilmore <dennis at ausil.us> 18.22-6
 - switch to using installupgradeinitrd method for upgrade initrds