diff --git a/xCAT-server/lib/xcat/plugins/sles.pm b/xCAT-server/lib/xcat/plugins/sles.pm index b3baacbd0..dfe92e43a 100644 --- a/xCAT-server/lib/xcat/plugins/sles.pm +++ b/xCAT-server/lib/xcat/plugins/sles.pm @@ -286,31 +286,6 @@ sub mkinstall next; } - #before setting sles11 full installation, check if stunnel is in the right place - if ($os =~ /sles11/ && $arch eq "ppc64") { - unless ( -d "/install/post/otherpkgs/sles11/ppc64" ) - { - $callback->( - { - error => ["No such a directory: /install/post/otherpkgs/sles11/ppc64"], - errorcode => [1] - } - ); - } - opendir(DIR, "/install/post/otherpkgs/sles11/ppc64"); - my @tmp = grep { /^stunnel.*\.ppc64\.rpm$/ } readdir(DIR); - closedir DIR; - unless ( scalar @tmp> 0 && -r "/install/post/otherpkgs/sles11/ppc64/$rpms[0]" ) - { - $callback->( - { - error => ["No stunnel rpm package in /install/post/otherpkgs/sles11/ppc64"], - errorcode => [1] - } - ); - } - } - #Call the Template class to do substitution to produce a kickstart file in the autoinst dir my $tmperr; if (-r "$tmplfile") @@ -321,27 +296,6 @@ sub mkinstall "/install/autoinst/$node", $node ); - #sles11 cannot find base-64bit and - #stunnel in the autoyast file - if($os =~ /sles11/) { - my $SLES_YAST_FILE; - open SLES_YAST_FILE, "/install/autoinst/$node"||\ - return "Cannot open autoyast file for SLES11\n"; - my $yast_content=""; - while() { - if($_ !~ m/base-64bit<\/pattern>| - stunnel<\/package>/) { - $yast_content .=$_; - } - } - close SLES_YAST_FILE; - #create one new autoyast file - system("rm /install/autoinst/$node"); - open SLES_YAST_FILE, ">/install/autoinst/$node" || \ - return "cannot open autoyast file for SLES11\n"; - print SLES_YAST_FILE $yast_content; - close SLES_YAST_FILE; - } } if ($tmperr) diff --git a/xCAT-server/share/xcat/install/sles/compute.sles11.ppc64.tmpl b/xCAT-server/share/xcat/install/sles/compute.sles11.ppc64.tmpl index 9a8adab7e..92b364fc2 100644 --- a/xCAT-server/share/xcat/install/sles/compute.sles11.ppc64.tmpl +++ b/xCAT-server/share/xcat/install/sles/compute.sles11.ppc64.tmpl @@ -38,7 +38,6 @@ - base-64bit base x11