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

add more comments and handle the return code of enable_TFTPhpa

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@11094 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
daniceexi 2011-12-01 01:08:03 +00:00
parent 41a24210cc
commit c647909000
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
xCAT-server/lib/xcat/plugins/AAsn.pm
View File

@ -277,7 +277,7 @@ sub init_plugin
$rc = &setup_FTP(); # setup FTP
}
#enable the tftp-hpa for MN
enable_TFTPhpa();
$rc = enable_TFTPhpa();
}
}
return $rc;
@ -1265,7 +1265,7 @@ sub setup_TFTP
}
# enable the tftp-hpa
enable_TFTPhpa();
$rc = enable_TFTPhpa();
if ($rc == 0)
{
@ -1352,20 +1352,25 @@ sub enable_TFTPhpa
my @newcfgfile;
# Check whether need to reconfigure the /etc/xinetd.d/tftp
while (<FILE>) {
# check the configuration of 'server_args = -s /xx -m xx' entry
if (/^\s*server_args\s*=(.*)$/) {
my $cfg_args = $1;
# handle the -s option for the location of tftp root dir
if ($cfg_args =~ /-s\s+([^\s]*)/) {
my $cfgdir = $1;
$cfgdir =~ s/\$//;
$tftpdir =~ s/\$//;
# make sure the tftp dir should comes from the site.tftpdir
if ($cfgdir ne $tftpdir) {
$recfg = 1;
}
}
# handle the -m option for the mapfile
if ($cfg_args !~ /-m\s+([^\s]*)/) {
$recfg = 1;
}
if ($recfg) {
# regenerate the entry for server_args
my $newcfg = $_;
$newcfg =~ s/=.*$/= -s $tftpdir -m $mapfile/;
push @newcfgfile, $newcfg;
@ -1373,6 +1378,7 @@ sub enable_TFTPhpa
push @newcfgfile, $_;
}
} elsif (/^\s*disable\s*=/ && !/^\s*disable\s*=\s*no/) {
# enable the tftp by handling the entry 'disable = xx'
my $newcfg = $_;
$newcfg =~ s/=.*$/= no/;
push @newcfgfile, $newcfg;