arif/xcat-core
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

For the places that open site table to read attributes, change to call xCAT::Utils->get_site_attribute instead

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@12896 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
jjhua 2012-05-23 06:18:22 +00:00
parent 0624c69117
commit f9c5ee43cc
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
xCAT-server/lib/xcat/plugins/vsmppxe.pm
View File

@ -198,7 +198,7 @@ sub preprocess_request {
#Assume shared tftp directory for boring people, but for cool people, help sync up tftpdirectory contents when
#they specify no sharedtftp in site table
my $stab = xCAT::Table->new('site');
#my $stab = xCAT::Table->new('site');
my $req = shift;
if ( (defined($req->{_xcatpreprocessed}))
&& ($req->{_xcatpreprocessed}->[0] == 1))
@ -253,8 +253,10 @@ sub preprocess_request {
return;
}
my $sent = $stab->getAttribs({key=>'sharedtftp'},'value');
if ($sent and ($sent->{value} == 0 or $sent->{value} =~ /no/i)) {
#my $sent = $stab->getAttribs({key=>'sharedtftp'},'value');
my @entries = xCAT::Utils->get_site_attribute("sharedtftp");
my $t_entry = $entries[0];
if ( defined($t_entry) and ($t_entry == 0 or $t_entry =~ /no/i)) {
$req->{'_disparatetftp'}=[1];
if ($req->{inittime}->[0]) {
return [$req];
@ -409,13 +411,15 @@ sub process_request {
#dhcp stuff -- inittime is set when xcatd on sn is started
unless (($args[0] eq 'stat') || ($inittime)) {
my $do_dhcpsetup=1;
my $sitetab = xCAT::Table->new('site');
if ($sitetab) {
(my $ref) = $sitetab->getAttribs({key => 'dhcpsetup'}, 'value');
if ($ref) {
if ($ref->{value} =~ /0|n|N/) { $do_dhcpsetup=0; }
#my $sitetab = xCAT::Table->new('site');
#if ($sitetab) {
#(my $ref) = $sitetab->getAttribs({key => 'dhcpsetup'}, 'value');
my @entries = xCAT::Utils->get_site_attribute("dhcpsetup");
my $t_entry = $entries[0];
if (defined($t_entry)) {
if ($t_entry =~ /0|n|N/) { $do_dhcpsetup=0; }
}
}
#}
if ($do_dhcpsetup) {
if ($request->{'_disparatetftp'}->[0]) { #reading hint from preprocess_command