diff --git a/perl-xCAT/xCAT/Yum.pm b/perl-xCAT/xCAT/Yum.pm
index 963b15b66..7da4b3a7d 100644
--- a/perl-xCAT/xCAT/Yum.pm
+++ b/perl-xCAT/xCAT/Yum.pm
@@ -23,14 +23,15 @@ sub localize_yumrepo {
 }
 sub check_tofix {
    if (-d $File::Find::name and $File::Find::name =~ /\/repodata$/) {
-      fix_directory($File::Find::name);
+		if($distname =~ /rhels5/)
+		{
+		  fix_directory($File::Find::name);
+		}
+		generate_repo($File::Find::name);
    }
 }
-sub fix_directory { 
-
-    my @xmlines=();
-    my $primaryxml;
-    
+sub generate_repo
+{
     #write local-repository.tmpl
     my $dirlocation = shift;
     my @dircomps = File::Spec->splitdir($dirlocation);
@@ -43,6 +44,11 @@ sub fix_directory {
     print $yumrepofile "baseurl=$yumurl\n";
     print $yumrepofile "enabled=1\n";
     print $yumrepofile "gpgcheck=0\n\n";
+}
+sub fix_directory { 
+
+    my @xmlines=();
+    my $primaryxml;
   
     $grep_result = system("grep sha256 $dirlocation/repomd.xml|grep \\<checksum");
     if( $grep_result == 0 )
diff --git a/xCAT-server/lib/xcat/plugins/anaconda.pm b/xCAT-server/lib/xcat/plugins/anaconda.pm
index d8394e49f..5fdf13812 100644
--- a/xCAT-server/lib/xcat/plugins/anaconda.pm
+++ b/xCAT-server/lib/xcat/plugins/anaconda.pm
@@ -1410,11 +1410,10 @@ sub copycd
     #my $rc = system("cd $path;rsync -a . $installroot/$distname/$arch/");
     chmod 0755, "$installroot/$distname/$arch";
     require xCAT::Yum;
-    if($distname =~ /rhels5/)
-    {
-        xCAT::Yum->localize_yumrepo($installroot, $distname, $arch);
-    }
-    if ($rc != 0)
+	
+	xCAT::Yum->localize_yumrepo($installroot, $distname, $arch);
+    
+	if ($rc != 0)
     {
         $callback->({error => "Media copy operation failed, status $rc"});
     }