From 72ce49431d82ab0c226386d23715efcc7eb7a1ec Mon Sep 17 00:00:00 2001
From: jbjohnso <jbjohnso@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Tue, 12 Feb 2008 15:52:22 +0000
Subject: [PATCH] Correct pkglist search path, add cpio explicit copy to centos
 genimage

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@451 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT-server-2.0/share/xcat/netboot/centos/genimage | 4 ++--
 xCAT-server-2.0/share/xcat/netboot/fedora/genimage | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/xCAT-server-2.0/share/xcat/netboot/centos/genimage b/xCAT-server-2.0/share/xcat/netboot/centos/genimage
index 34027bb0f..9f76e8f87 100755
--- a/xCAT-server-2.0/share/xcat/netboot/centos/genimage
+++ b/xCAT-server-2.0/share/xcat/netboot/centos/genimage
@@ -62,7 +62,7 @@ if (-r "$pathtofiles/$profile.$osver.$arch.pkglist") {
    $pkglist = "$pathtofiles/$profile.$arch.pkglist";
 } elsif (-r "$pathtofiles/$profile.$osver.pkglist") {
    $pkglist = "$pathtofiles/$profile.$osver.pkglist";
-} elsif (-r "$pathtofiles/$profile.$arch.pkglist") {
+} elsif (-r "$pathtofiles/$profile.pkglist") {
    $pkglist = "$pathtofiles/$profile.pkglist";
 } else {
    print "Unable to find package list for $profile!";
@@ -213,7 +213,7 @@ sub mkinitrd {
          push @filestoadd,[$_,"lib/$_"];
       }
    }
-   foreach ("sbin/nash","sbin/busybox.anaconda","sbin/rmmod") {
+   foreach ("bin/cpio","sbin/nash","sbin/busybox.anaconda","sbin/rmmod") {
       getlibs($_);
       push @filestoadd,$_;
    }
diff --git a/xCAT-server-2.0/share/xcat/netboot/fedora/genimage b/xCAT-server-2.0/share/xcat/netboot/fedora/genimage
index aad045c31..bf8f74088 100755
--- a/xCAT-server-2.0/share/xcat/netboot/fedora/genimage
+++ b/xCAT-server-2.0/share/xcat/netboot/fedora/genimage
@@ -62,7 +62,7 @@ if (-r "$pathtofiles/$profile.$osver.$arch.pkglist") {
    $pkglist = "$pathtofiles/$profile.$arch.pkglist";
 } elsif (-r "$pathtofiles/$profile.$osver.pkglist") {
    $pkglist = "$pathtofiles/$profile.$osver.pkglist";
-} elsif (-r "$pathtofiles/$profile.$arch.pkglist") {
+} elsif (-r "$pathtofiles/$profile.pkglist") {
    $pkglist = "$pathtofiles/$profile.pkglist";
 } else {
    print "Unable to find package list for $profile!";