From a3c2beca1d1fc9ed4d884baa53c1a449360ad9e1 Mon Sep 17 00:00:00 2001 From: bp-sawyers Date: Thu, 10 May 2012 00:33:22 +0000 Subject: [PATCH] No longer require vsftpd. git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@12589 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- perl-xCAT/xCAT/Schema.pm | 5 +++-- xCAT/xCAT.spec | 2 +- xCATsn/xCATsn.spec | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/perl-xCAT/xCAT/Schema.pm b/perl-xCAT/xCAT/Schema.pm index cd3bae68e..dd7907682 100644 --- a/perl-xCAT/xCAT/Schema.pm +++ b/perl-xCAT/xCAT/Schema.pm @@ -750,7 +750,7 @@ servicenode => { monserver => 'Is this a monitoring event collection point? Valid values:yes or 1, no or 0. If no or 0, it does not change the current state of the service.', ldapserver => 'Do we set up ldap caching proxy on this service node? Not supported on AIX. Valid values:yes or 1, no or 0. If no or 0, it does not change the current state of the service.', ntpserver => 'Not used. Use setupntp postscript to setup a ntp server on this service node? Valid values:yes or 1, no or 0. If no or 0, it does not change the current state of the service.', - ftpserver => 'Do we set up a ftp server on this service node? Not supported on AIX Valid values:yes or 1, no or 0. If yes, configure and start vsftpd. If no or 0, it does not change the current state of the service. xCAT is not using ftp for compute nodes provisioning or any other xCAT features, so this attribute can be set to 0 if the ftp service will not be used for other purposes', + ftpserver => 'Do we set up a ftp server on this service node? Not supported on AIX Valid values:yes or 1, no or 0. If yes, configure and start vsftpd. (You must manually install vsftpd on the service nodes before this.) If no or 0, it does not change the current state of the service. xCAT is not using ftp for compute nodes provisioning or any other xCAT features, so this attribute can be set to 0 if the ftp service will not be used for other purposes', nimserver => 'Not used. Do we set up a NIM server on this service node? Valid values:yes or 1, no or 0. If no or 0, it does not change the current state of the service.', ipforward => 'Do we set up ip forwarding on this service node? Valid values:yes or 1, no or 0. If no or 0, it does not change the current state of the service.', @@ -923,7 +923,8 @@ site => { " 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 'n'. If set to 'y', the xcatd on the mn will automatically\n". - " bring up vsftpd. This setting does not apply to the sn, for sn\n". + " bring up vsftpd. (You must manually install vsftpd before this.\n". + " This setting does not apply to the service node. For sn\n". " you need to set servicenode.ftpserver=1 if you want xcatd to\n". " bring up vsftpd.\n\n". " xcatconfdir: Where xCAT config data is (default /etc/xcat).\n\n". diff --git a/xCAT/xCAT.spec b/xCAT/xCAT.spec index 330a77be4..7f8d79602 100644 --- a/xCAT/xCAT.spec +++ b/xCAT/xCAT.spec @@ -24,7 +24,7 @@ Conflicts: xCATsn Requires: xCAT-server xCAT-client perl-DBD-SQLite %ifos linux -Requires: dhcp httpd nfs-utils nmap fping bind perl-XML-Parser vsftpd perl(CGI) +Requires: dhcp httpd nfs-utils nmap fping bind perl-XML-Parser perl(CGI) Requires: /etc/xinetd.d/tftp %ifarch s390x # No additional requires for zLinux right now diff --git a/xCATsn/xCATsn.spec b/xCATsn/xCATsn.spec index 1b4808229..8ddbc9889 100644 --- a/xCATsn/xCATsn.spec +++ b/xCATsn/xCATsn.spec @@ -25,7 +25,7 @@ Conflicts: xCAT %ifos linux # yaboot-xcat is pulled in so any SN can manage ppc nodes -Requires: dhcp httpd nfs-utils nmap fping bind perl-XML-Parser vsftpd +Requires: dhcp httpd nfs-utils nmap fping bind perl-XML-Parser %ifarch ppc64 Requires: perl-IO-Stty %endif