added site table attribute to not allow xcatd on the mn to bring up vsftpd automatically

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/branches/2.6@9707 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
linggao
2011-05-27 14:50:57 +00:00
parent 45ed594a42
commit 02a3edbc58
2 changed files with 8 additions and 1 deletions
+4
View File
@@ -850,6 +850,10 @@ site => {
" will not interfere.\n\n".
" vmwarereconfigonpower: When set to no, the VMWare plugin will make no effort to\n".
" push vm.cpus/vm.memory updates from xCAT to VMWare.\n\n".
" vsftp: Default is 'y'. If set to 'n', the xcatd on the mn will not automatically \n".
" bring up the vsftpd. This setting does not apply to the sn, for sn\n".
" you need to set servicenode.ftpserver=0 if you do not want the xcatd\n".
" bring up vsftpd.\n\n".
" xcatconfdir: Where xCAT config data is (default /etc/xcat).\n\n".
" xcatdport: The port used by the xcatd daemon for client/server communication.\n\n".
" xcatiport: The port used by xcatd to receive install status updates from nodes.\n\n",
+4 -1
View File
@@ -272,7 +272,10 @@ sub init_plugin
{
print "\n"
; # make OK prints look better. Only need to do this for the 1st service.
$rc = &setup_FTP(); # setup FTP
my @tmp = xCAT::Utils->get_site_attribute("vsftp");
if ((!$tmp[0]) || ($tmp[0] !~ /0|NO|No|no|N|n/ )) {
$rc = &setup_FTP(); # setup FTP
}
}
}
return $rc;