From db8a4dd07dc5fa40921b96b9c9f87384b6193345 Mon Sep 17 00:00:00 2001 From: immarvin Date: Tue, 2 Jun 2015 02:02:40 -0400 Subject: [PATCH] donot create statelite osimages and diskless service osimages after copycds, --- xCAT-server/lib/perl/xCAT/SvrUtils.pm | 4 ++-- xCAT-server/lib/xcat/plugins/anaconda.pm | 4 ---- xCAT-server/lib/xcat/plugins/debian.pm | 4 ---- xCAT-server/lib/xcat/plugins/sles.pm | 4 ---- 4 files changed, 2 insertions(+), 14 deletions(-) diff --git a/xCAT-server/lib/perl/xCAT/SvrUtils.pm b/xCAT-server/lib/perl/xCAT/SvrUtils.pm index 01924481a..6e92a96fc 100755 --- a/xCAT-server/lib/perl/xCAT/SvrUtils.pm +++ b/xCAT-server/lib/perl/xCAT/SvrUtils.pm @@ -1048,7 +1048,7 @@ sub update_tables_with_diskless_image if ($profile) { $profiles{$profile} = 1; } else { - my @tmplfiles=glob($cuspath."/{compute,service}*.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,service}*.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 '.' diff --git a/xCAT-server/lib/xcat/plugins/anaconda.pm b/xCAT-server/lib/xcat/plugins/anaconda.pm index 325f4666b..2c24fd90d 100755 --- a/xCAT-server/lib/xcat/plugins/anaconda.pm +++ b/xCAT-server/lib/xcat/plugins/anaconda.pm @@ -2337,10 +2337,6 @@ sub copycd #$callback->({data => "Error when updating the osimage tables for stateless: " . $ret[1]}); #} - my @ret=xCAT::SvrUtils->update_tables_with_diskless_image($distname, $arch, undef, "statelite",$path,$osdistroname); - #if ($ret[0] != 0) { - #$callback->({data => "Error when updating the osimage tables for statelite: " . $ret[1]}); - #} } } } diff --git a/xCAT-server/lib/xcat/plugins/debian.pm b/xCAT-server/lib/xcat/plugins/debian.pm index f8d6d836d..65b2cdbd5 100755 --- a/xCAT-server/lib/xcat/plugins/debian.pm +++ b/xCAT-server/lib/xcat/plugins/debian.pm @@ -430,10 +430,6 @@ sub copycd if ($ret[0] != 0) { $callback->({data => "Error when updating the osimage tables for stateless: " . $ret[1]}); } - my @ret=xCAT::SvrUtils->update_tables_with_diskless_image($distname, $arch, undef, "statelite", $temppath, $osdistroname); - if ($ret[0] != 0) { - $callback->({data => "Error when updating the osimage tables for statelite: " . $ret[1]}); - } } } } diff --git a/xCAT-server/lib/xcat/plugins/sles.pm b/xCAT-server/lib/xcat/plugins/sles.pm index 5e0f491d1..84f586189 100755 --- a/xCAT-server/lib/xcat/plugins/sles.pm +++ b/xCAT-server/lib/xcat/plugins/sles.pm @@ -2042,10 +2042,6 @@ sub copycd $callback->({data => "Error when updating the osimage tables for stateless: " . $ret[1]}); } - my @ret=xCAT::SvrUtils->update_tables_with_diskless_image($distname, $arch, undef, "statelite",$path,$osdistroname); - if ($ret[0] != 0) { - $callback->({data => "Error when updating the osimage tables for statelite: " . $ret[1]}); - } } } }