From fa4c0455068b6b4f5120703c4ef46c47c9d6bb97 Mon Sep 17 00:00:00 2001 From: mxi1 Date: Fri, 9 Apr 2010 03:18:56 +0000 Subject: [PATCH] -defect 2984257 is fixed; git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@5726 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- xCAT-server/share/xcat/netboot/sles/genimage | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/xCAT-server/share/xcat/netboot/sles/genimage b/xCAT-server/share/xcat/netboot/sles/genimage index 705cf09c4..7f69d25d1 100755 --- a/xCAT-server/share/xcat/netboot/sles/genimage +++ b/xCAT-server/share/xcat/netboot/sles/genimage @@ -297,13 +297,10 @@ unless ($onlyinitrd) { #-- add custom repositories to the image #TODO: should we add the support to otherpkgs for this? we have too many list files and it seems only SLES supports this my $repolist; - if ( -r "$pathtofiles/$profile.$osver.$arch.repolist") { - $repolist = "$pathtofiles/$profile.$osver.$arch.repolist"; - }elsif ( -r "$pathtofiles/$profile.$osver.repolist") { - $repolist = "$pathtofiles/$profile.$osver.repolist"; - }elsif ( -r "$pathtofiles/$profile.repolist") { - $repolist = "$pathtofiles/$profile.repolist"; - } + $repolist = get_profile_def_filename($customdir, "repolist"); + if(!$repolist) { + $repolist = get_profile_def_filename($pathtofiles, "repolist"); + } if ( -r "$repolist") { print "Reading custom repositories\n";