diff --git a/xCAT-client/pods/man8/copycds.8.pod b/xCAT-client/pods/man8/copycds.8.pod index 1b63ed7b0..26b744336 100644 --- a/xCAT-client/pods/man8/copycds.8.pod +++ b/xCAT-client/pods/man8/copycds.8.pod @@ -1,7 +1,6 @@ - =head1 NAME -B - Copies Linux distributions and service levels from CDs/DVDs to install directory. +B - Copies Linux distributions and service levels from DVDs/ISOs to the xCAT /install directory. =head1 SYNOPSIS @@ -9,15 +8,11 @@ B [{B<-n|--name|--osver>}=I] [{B<-a|--arch>}=I [B<-h>|B<--help>] - =head1 DESCRIPTION -The B command copies all contents of Distribution CDs/DVDs or Service Pack CDs/DVDs to the install directory as -designated in the B table attribute: B. The B command can copy from one or more ISO files, -or from the CD/DVD device path. If xCAT doesn't recognize the signature of the CD/DVD (e.g. in the .discinfo -file), you must specify the -n and -a options. This is sometimes the case for distros that have very -recently been released, and the xCAT code hasn't been updated for it yet. +The B command copies all contents of Distribution DVDs/ISOs or Service Pack DVDs/ISOs to a destination directory. The destination directory will be formed from the B site attribute and the distro name and architecture, for example: /install/rhels6.3/x86_64. The B command can copy from one or more ISO files, or the CD/DVD device path. +You can get xCAT to recognize new DVDs/ISOs by adding them to /opt/xcat/lib/perl/xCAT/data/discinfo.pm and reloading xcatd (service xcatd reload). =head1 OPTIONS @@ -25,40 +20,38 @@ recently been released, and the xCAT code hasn't been updated for it yet. =item {B<-n|--name|--osver>}=I -The linux distro name and version that the ISO/DVD contains. Examples: rhels5.3, centos5.1, fedora9. +The linux distro name and version that the ISO/DVD contains. Examples: rhels6.3, sles11.2, fedora9. Note the 's' in rhels6.3 which denotes the Server version of RHEL, which is typically used. =item {B<-a|--arch>}=I] -The architecture of the linux distro on the ISO/DVD. Examples: x86, x86_64, ppc64. +The architecture of the linux distro on the ISO/DVD. Examples: x86, x86_64, ppc64, s390x. =back - =head1 EXAMPLES =over 2 =item * -To copy the RPMs from a set of ISOs that represent the CDs of a distro: +To copy the RPMs from a set of ISOs that represent the DVDs of a distro: -B + copycds dvd1.iso dvd2.iso =item * To copy the RPMs from a physical DVD: -B + copycds /dev/dvd =item * To copy the RPMs from a DVD ISO of a very recently released distro: -B + copycds -n rhels5.3 -a x86_64 dvd.iso =back - =head1 SEE ALSO L, L, L diff --git a/xCAT/xCAT.spec b/xCAT/xCAT.spec index aaa604206..b0719b65f 100644 --- a/xCAT/xCAT.spec +++ b/xCAT/xCAT.spec @@ -25,14 +25,11 @@ Requires: xCAT-server xCAT-client perl-DBD-SQLite %ifos linux Requires: dhcp httpd nfs-utils expect nmap bind perl-XML-Parser vsftpd perl(CGI) -Requires: /etc/xinetd.d/tftp %ifnarch s390x +Requires: /etc/xinetd.d/tftp # yaboot-xcat is pulled in so any MN can manage ppc nodes Requires: conserver-xcat yaboot-xcat perl-Net-Telnet fping %endif -%ifarch ppc64 -Requires: perl-IO-Stty -%endif %endif %ifarch i386 i586 i686 x86 x86_64 diff --git a/xCATsn/xCATsn.spec b/xCATsn/xCATsn.spec index 9940156a8..9c1013a79 100644 --- a/xCATsn/xCATsn.spec +++ b/xCATsn/xCATsn.spec @@ -24,15 +24,10 @@ Requires: perl-XML-Parser Conflicts: xCAT %ifos linux -# yaboot-xcat is pulled in so any SN can manage ppc nodes Requires: dhcp httpd nfs-utils expect nmap fping bind perl-XML-Parser vsftpd -%ifarch ppc64 -Requires: perl-IO-Stty -%endif -%ifarch s390x -# No additional requires for zLinux right now -%else +%ifnarch s390x Requires: /etc/xinetd.d/tftp +# yaboot-xcat is pulled in so any SN can manage ppc nodes Requires: conserver-xcat yaboot-xcat perl-Net-Telnet %endif %endif