diff --git a/perl-xCAT/xCAT/Schema.pm b/perl-xCAT/xCAT/Schema.pm index 5590af9f9..18f187c21 100644 --- a/perl-xCAT/xCAT/Schema.pm +++ b/perl-xCAT/xCAT/Schema.pm @@ -843,9 +843,12 @@ site => { " defserialport: The default serial port - currently only used by mknb.\n\n". " defserialspeed: The default serial speed - currently only used by mknb.\n\n". " dhcpinterfaces: The network interfaces DHCP should listen on. If it is the same\n". - " for all nodes, use simple comma-separated list of NICs. To\n". + " for all nodes, use a simple comma-separated list of NICs. To\n". " specify different NICs for different nodes:\n". - " mn|eth1,eth2;service|bond0.\n\n". + " xcatmn|eth1,eth2;service|bond0.\n". + " In this example xcatmn is the name of the xCAT MN, and DHCP there\n". + " should listen on eth1 and eth2. On all of the nodes in group\n". + " 'service' DHCP should listen on the bond0 nic.\n\n". " dhcpsetup: If set to 'n', it will skip the dhcp setup process in the nodeset cmd.\n\n". " dhcplease: The lease time for the dhcp client. The default value is 43200.\n\n". " disjointdhcps: If set to '1', the .leases file on a service node only contains\n". diff --git a/perl-xCAT/xCAT/data/discinfo.pm b/perl-xCAT/xCAT/data/discinfo.pm index 819d8a46e..7d8b10976 100644 --- a/perl-xCAT/xCAT/data/discinfo.pm +++ b/perl-xCAT/xCAT/data/discinfo.pm @@ -1,9 +1,10 @@ # IBM(c) 2007 EPL license http://www.eclipse.org/legal/epl-v10.html + +# You can get copycds to recognize new distro DVDs/ISOs (so that you do not have to specify -n and -a) +# by adding the disc ids to the %distnames hash below. Follow the syntax carefully. +# Reload xcatd to have it take affect (service xcatd reload). + package xCAT::data::discinfo; -#BEGIN -#{ -# $::XCATROOT = $ENV{'XCATROOT'} ? $ENV{'XCATROOT'} : '/opt/xcat'; -#} require Exporter; @ISA=qw(Exporter); @@ -11,8 +12,6 @@ require Exporter; @EXPORT_OK=qw(distnames numdiscs); - - %distnames = ( "1310229985.226287" => "centos6", "1323560292.885204" => "centos6.2", @@ -78,9 +77,4 @@ my %numdiscs = ( ); -#sub handled_commands -#{ -# return; -#}; - 1; diff --git a/xCAT-client/pods/man8/copycds.8.pod b/xCAT-client/pods/man8/copycds.8.pod index 124fbfc3b..6b2299df8 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 @@ -11,12 +10,12 @@ B [B<-i>|B<--inspection>] {I|I} B [B<-h>|B<--help>] - =head1 DESCRIPTION -The B command copies all contents of Distribution CDs/DVDs or Service Pack CDs/DVDs to a destination directory. The destination directory is specified by -p option. If no path is specified, the default destination directory will be formed from the B site attribute and the distro name and architecture, for example: /install/sles11.2/ppc64. The B command can copy from one or more ISO files, or CD/DVD device path. You can specify -i or --inspection option to check whether the CDs/DVDs can be recognized by xCAT. If recognized, the distribution name, architecture and the disc no (the disc sequence number of CDs/DVDs in multi-disk distribution) of the CD/DVD is displayed. If xCAT doesn't recognize the CD/DVD, 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 can be specified by the -p option. If no path is specified, the default 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 specify -i or --inspection option to check whether the DVDs/ISOs can be recognized by xCAT. If recognized, the distribution name, architecture and the disc no (the disc sequence number of DVDs/ISOs in multi-disk distribution) of the DVD/ISO is displayed. If xCAT doesn't recognize the DVD/ISO, you must manually specify the distro name and architecture using 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. +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 @@ -24,32 +23,27 @@ The B command copies all contents of Distribution CDs/DVDs or Service P =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. =item {B<-p|--path>}=I -The destination directory to which the contents of ISO/DVD will be copied. When this option is not specified, the default destination directory will be formed from the B site attribute and the distro name and architecture, for example: /install/sles11.2/ppc64. This option only supports distributions of sles and redhat. +The destination directory to which the contents of ISO/DVD will be copied. When this option is not specified, the default destination directory will be formed from the B site attribute and the distro name and architecture, for example: /install/rhel6.3/x86_64. This option is only supported distributions of sles and redhat. =item {B<-i|--inspection>} -Check whether xCAT can recognize the CD/DVDs in the argument list without any disc copy, display the os distribution name, architecture and disc no of each recognized CD/DVD. This option only supports distributions of sles and redhat. +Check whether xCAT can recognize the DVDs/ISOs in the argument list, but do not copy the disc. Displays the os distribution name, architecture and disc no of each recognized DVD/ISO. This option only supported for distributions of sles and redhat. =back =head1 RETURN VALUE -Zero: - The command completed successfully. - For the --inspection option, the ISO/DVD have been recognized successfully - -Nonzero: - An Error has occurred. - For the --inspection option, the ISO/DVD cannot be recognized +0: The command completed successfully. For the --inspection option, the ISO/DVD have been recognized successfully +Nonzero: An Error has occurred. For the --inspection option, the ISO/DVD cannot be recognized =head1 EXAMPLES @@ -57,49 +51,38 @@ Nonzero: =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 to /depot/kits/3 directory: -B + copycds -p /depot/kits/3 /dev/dvd =item * To copy the RPMs from a DVD ISO of a very recently released distro: -B + copycds -n rhels6.4 -a x86_64 dvd.iso =item * To check whether a DVD ISO can be recognized by xCAT and display the recognized disc info: -B + copycds -i /media/RHEL/6.2/RHEL6.2-20111117.0-Server-ppc64-DVD1.iso -=back - -=head1 NOTES - -1. The B<-p> and B<-i> options currently only support distributions of sles and redhat. - -2. The output format of copycds --inspection is: - - OS Image: - DISTNAME: - ARCH: - DISCNO: - -As a example: +Output will be similar to: OS Image:/media/RHEL/6.2/RHEL6.2-20111117.0-Server-ppc64-DVD1.iso DISTNAME:rhels6.2 ARCH:ppc64 DISCNO:1 -For the attributes failed to be recognized, the value will be blank. +For the attributes that are not recognized, the value will be blank. + +=back =head1 SEE ALSO