From e7154e03483d0e5c1f9288ec48213fcfa7ad2a73 Mon Sep 17 00:00:00 2001 From: immarvin Date: Tue, 2 Jun 2015 03:41:23 -0400 Subject: [PATCH] fix #4687 [FVT]:copycds rhels6.5 iso create rhels6.5-ppc64-install-compute_ad. please remove it. --- xCAT-server/lib/perl/xCAT/SvrUtils.pm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/xCAT-server/lib/perl/xCAT/SvrUtils.pm b/xCAT-server/lib/perl/xCAT/SvrUtils.pm index 6e92a96fc..535afed84 100755 --- a/xCAT-server/lib/perl/xCAT/SvrUtils.pm +++ b/xCAT-server/lib/perl/xCAT/SvrUtils.pm @@ -639,7 +639,7 @@ sub update_tables_with_templates #now get all the profile names for full installation my %profiles=(); - my @tmplfiles=glob($cuspath."/{compute,service}*.tmpl"); + my @tmplfiles=glob($cuspath."/{compute,service}.*tmpl"); foreach (@tmplfiles) { my $tmpf=basename($_); #get the profile name out of the file, TODO: this does not work if the profile name contains the '.' @@ -653,7 +653,7 @@ sub update_tables_with_templates #print "$tmpf\n"; $profiles{$tmpf}=1; } - @tmplfiles=glob($defpath."/{compute,service}*.tmpl"); + @tmplfiles=glob($defpath."/{compute,service}.*tmpl"); foreach (@tmplfiles) { my $tmpf=basename($_); #get the profile name out of the file, TODO: this does not work if the profile name contains the '.' @@ -844,7 +844,7 @@ sub update_tables_with_mgt_image #now get all the profile names for full installation my %profiles=(); - my @tmplfiles=glob($cuspath."/{compute,service}*.tmpl"); + my @tmplfiles=glob($cuspath."/{compute,service}.*tmpl"); foreach (@tmplfiles) { my $tmpf=basename($_); #get the profile name out of the file, TODO: this does not work if the profile name contains the '.' @@ -853,7 +853,7 @@ sub update_tables_with_mgt_image #print "$tmpf\n"; $profiles{$tmpf}=1; } - @tmplfiles=glob($defpath."/{compute,service}*.tmpl"); + @tmplfiles=glob($defpath."/{compute,service}.*tmpl"); foreach (@tmplfiles) { my $tmpf=basename($_); #get the profile name out of the file, TODO: this does not work if the profile name contains the '.' @@ -1048,7 +1048,7 @@ sub update_tables_with_diskless_image if ($profile) { $profiles{$profile} = 1; } else { - my @tmplfiles=glob($cuspath."/compute*.pkglist"); + my @tmplfiles=glob($cuspath."/compute.*pkglist"); foreach (@tmplfiles) { my $tmpf=basename($_); #get the profile name out of the file, TODO: this does not work if the profile name contains the '.' @@ -1056,7 +1056,7 @@ sub update_tables_with_diskless_image $tmpf = $1; $profiles{$tmpf}=1; } - @tmplfiles=glob($defpath."/compute*.pkglist"); + @tmplfiles=glob($defpath."/compute.*pkglist"); foreach (@tmplfiles) { my $tmpf=basename($_); #get the profile name out of the file, TODO: this does not work if the profile name contains the '.'