diff --git a/docs/source/guides/admin-guides/manage_clusters/common/deployment/syncfile/syncfile_synclist_file.rst b/docs/source/guides/admin-guides/manage_clusters/common/deployment/syncfile/syncfile_synclist_file.rst index 3d2232995..7582a91a6 100644 --- a/docs/source/guides/admin-guides/manage_clusters/common/deployment/syncfile/syncfile_synclist_file.rst +++ b/docs/source/guides/admin-guides/manage_clusters/common/deployment/syncfile/syncfile_synclist_file.rst @@ -45,7 +45,7 @@ sync file **/etc/file2** to the file **/etc/file2** on the node :: /etc/file2 -> /etc/ -sync all files in **/home/mikev** to directory **/home/mikev** on the node :: +sync all files, including subdirectories, in **/home/mikev** to directory **/home/mikev** on the node :: /home/mikev/* -> /home/mikev/ diff --git a/docs/source/guides/admin-guides/references/man1/updatenode.1.rst b/docs/source/guides/admin-guides/references/man1/updatenode.1.rst index 57a821f0a..0b64d2314 100644 --- a/docs/source/guides/admin-guides/references/man1/updatenode.1.rst +++ b/docs/source/guides/admin-guides/references/man1/updatenode.1.rst @@ -61,7 +61,7 @@ Update the ca and credentials for the service nodes. The default behavior when no options are input to \ **updatenode**\ will be to run the following options \ **-S**\ , \ **-P**\ and \ **-F**\ options in this order. If you wish to limit \ **updatenode**\ to specific -actions you can use combinations of the \ **-S**\ , \ **-P**\ , and \ **-F**\ flags. +actions you can use combination of the \ **-S**\ , \ **-P**\ , and \ **-F**\ flags. For example, If you just want to synchronize configuration file you could specify the \ **-F**\ flag. If you want to synchronize files and update diff --git a/docs/source/guides/admin-guides/references/man1/xdcp.1.rst b/docs/source/guides/admin-guides/references/man1/xdcp.1.rst index fe9661d72..49732546a 100644 --- a/docs/source/guides/admin-guides/references/man1/xdcp.1.rst +++ b/docs/source/guides/admin-guides/references/man1/xdcp.1.rst @@ -21,7 +21,7 @@ xdcp.1 \ **xdcp**\ \ *noderange*\ [[\ **-B**\ | \ **-**\ **-bypass**\ ] [\ **-f**\ \ *fanout*\ ] [\ **-L**\ ] [\ **-l**\ \ *userID*\ ] [\ **-o**\ \ *node_options*\ ] [\ **-p**\ ] [\ **-P**\ ] [\ **-r**\ \ *node remote copy command] [\ \*\*-R\*\*\ ] [\ \*\*-t\*\*\ \ \*timeout\*\ ] [\ \*\*-T\*\*\ ] [\ \*\*-v\*\*\ ] [\ \*\*-q\*\*\ ] [\ \*\*-X\*\*\ \ \*env_list\*\ ] \ \*sourcefile.... targetpath\*\ *\ -\ **xdcp**\ \ *noderange*\ [\ **-F**\ Irsynclist input file>] [\ **-r**\ \ *node remote copy command*\ ] +\ **xdcp**\ \ *noderange*\ [\ **-F**\ \ *rsynclist input file*\ ] [\ **-r**\ \ *node remote copy command*\ ] \ **xdcp**\ \ *computenoderange*\ [\ **-s**\ \ **-F**\ \ *synclist input file*\ ] [\ **-r**\ \ *node remote copy command*\ ] diff --git a/docs/source/guides/admin-guides/references/man5/site.5.rst b/docs/source/guides/admin-guides/references/man5/site.5.rst index 33f4ac5e3..dd18b0b9f 100644 --- a/docs/source/guides/admin-guides/references/man5/site.5.rst +++ b/docs/source/guides/admin-guides/references/man5/site.5.rst @@ -406,7 +406,7 @@ site Attributes: dbtracelevel: The trace level for the database access log. To activate this setting, please. restart xcatd or send HUP signal to the 'xcatd: DB Access' process, Like: . - pkill -f -HUP 'xcatd: DB Access' + pkill -f -HUP 'xcatd: DB Access' Currrent support values: 0: disable the trace log for db 1: trace the calls of database subroutines diff --git a/xCAT-client/pods/man1/updatenode.1.pod b/xCAT-client/pods/man1/updatenode.1.pod index 782722996..a35d07080 100644 --- a/xCAT-client/pods/man1/updatenode.1.pod +++ b/xCAT-client/pods/man1/updatenode.1.pod @@ -4,7 +4,7 @@ B - Update nodes in an xCAT cluster environment. =head1 SYNOPSIS -B I [B<-V>|B<--verbose>] [B<-F>|B<--sync>] [B<-f>|B<--snsync>] [B<-r>|B<--node-rcp> [I]] [B<-S>|B<--sw>] [B<-l> I] [B<-P>|B<--scripts> [I]] [B<-s>|B<--sn>] [B<-A>|B<--updateallsw>] [B<-c>|B<--cmdlineonly>] [B<-d> I] [B<--fanout>=I] [B<-t> I} [I [I]] [B<-n>|B<--noverify>] +B I [B<-V>|B<--verbose>] [B<-F>|B<--sync>] [B<-f>|B<--snsync>] [B<-r>|B<--node-rcp> [I]] [B<-S>|B<--sw>] [B<-l> I] [B<-P>|B<--scripts> [I]] [B<-s>|B<--sn>] [B<-A>|B<--updateallsw>] [B<-c>|B<--cmdlineonly>] [B<-d> I] [B<--fanout>=I] [B<-t> I} [I [I]] [B<-n>|B<--noverify>] B B [B<-k>|B<--security>] [B<-t> I] @@ -41,7 +41,7 @@ Update the ca and credentials for the service nodes. The default behavior when no options are input to B will be to run the following options B<-S>, B<-P> and B<-F> options in this order. If you wish to limit B to specific -actions you can use combinations of the B<-S>, B<-P>, and B<-F> flags. +actions you can use combination of the B<-S>, B<-P>, and B<-F> flags. For example, If you just want to synchronize configuration file you could specify the B<-F> flag. If you want to synchronize files and update @@ -315,17 +315,17 @@ read-only option for files/directories listed in B table with source location specified in the B table. -=item [B<-r>|B<--node-rcp> [I]] +=item [B<-r>|B<--node-rcp> [I]] -Specifies the full path of the remote copy command used for syncing files to node targets, such as "/usr/bin/rsync" or "/usr/bin/scp". If not specified, rsync will be used by default. +Specifies the full path of the remote copy command used for syncing files to node targets, such as B or B. If not specified, B will be used by default. -Notice: The synclist for "-r /usr/bin/scp" has some differences with "-r /usr/bin/rsync": +Note: The synclist processing for B<-r /usr/bin/scp> has some differences with B<-r /usr/bin/rsync>: -1) the ``EXECUTE`` clause is not supported in "-r /usr/bin/scp" +1) the B clause in synclist file is not supported with B<-r /usr/bin/scp> flag -2) if the destination directory specified in synclist is an existing file on target node, "updatenode -r /usr/bin/scp" will fail with ``scp: : Not a directory`` +2) if the destination directory specified in synclist file is an existing file on target node, B will fail with "scp: : Not a directory" -3) if the destination file specified in synclist is an existing directory on target node, "updatenode -r /usr/bin/scp" will fail with ``scp: : Is a directory`` +3) if the destination file specified in synclist file is an existing directory on target node, B will fail with "scp: : Is a directory" =item B<-g|--genmypost> diff --git a/xCAT-client/pods/man1/xdcp.1.pod b/xCAT-client/pods/man1/xdcp.1.pod index 665823e79..bd41741bc 100644 --- a/xCAT-client/pods/man1/xdcp.1.pod +++ b/xCAT-client/pods/man1/xdcp.1.pod @@ -4,15 +4,13 @@ B - Concurrently copies files to or from multiple nodes. In addition, prov =head1 B -B I [[B<-B> | B<--bypass>] [B<-f> I] [B<-L>] [B<-l> I] [B<-o> I] [B<-p>] [B<-P>] [B<-r> I] [B<-R>] [B<-t> I] [B<-T>] [B<-v>] [B<-q>] [B<-X> I] I +B I [[B<-B> | B<--bypass>] [B<-f> I] [B<-L>] [B<-l> I] [B<-o> I] [B<-p>] [B<-P>] [B<-r> I] [B<-t> I] [B<-T>] [B<-v>] [B<-q>] [B<-X> I] I -B I [B<-F> I] +B I [B<-F> I] [B<-r> I] -B I [B<-s> B<-F> I] - - -B [B<-i> I] [B<-F> I] +B I [B<-s> B<-F> I] [B<-r> I] +B [B<-i> I] [B<-F> I] [B<-r> I] B [B<-h> | B<-V> | B<-q>] @@ -46,7 +44,7 @@ For node targets, the remote copy command is determined by the following order 1. The B<-r> flag. -2. The B command. +2. The B command. B B: @@ -99,7 +97,7 @@ Specifies a fanout value for the maximum number of concurrently executing rem can be specified by indicating a fanout value of B<1>. If B<-f> is not specified, a default fanout value of B<64> is used. -=item B<-F>|B<--File> I +=item B<-F>|B<--File> I Specifies the path to the file that will be used to build the B command. @@ -151,10 +149,17 @@ valid contexts. Each setting is prefixed with I: to identify the source context of the setting. -=item B<-r>|B<--node-rcp> I +=item B<-r>|B<--node-rcp> I -Specifies the full path of the remote copy command used -for remote command execution on node targets. +Specifies the full path of the remote copy command used for syncing files to node targets, such as B or B. If not specified, B will be used by default. + +Note: The synclist processing for B<-r /usr/bin/scp> has some differences with B<-r /usr/bin/rsync>: + +1) the B clause in synclist file is not supported with B<-r /usr/bin/scp> flag + +2) if the destination directory specified in synclist file is an existing file on target node, B will fail with "scp: : Not a directory" + +3) if the destination file specified in synclist file is an existing directory on target node, B will fail with "scp: : Is a directory" =item B<-R>|B<--recursive> I diff --git a/xCAT-server/lib/xcat/plugins/DBobjectdefs.pm b/xCAT-server/lib/xcat/plugins/DBobjectdefs.pm index 9b3a3fe34..ae64092ef 100755 --- a/xCAT-server/lib/xcat/plugins/DBobjectdefs.pm +++ b/xCAT-server/lib/xcat/plugins/DBobjectdefs.pm @@ -4609,7 +4609,7 @@ sub defmk_usage } $rsp->{data}->[$n] = "$dataobj\n"; $n++; - $rsp->{data}->[$n] = "\nUse the \'-h\' option together with the \'-t\' option to"; + $rsp->{data}->[$n] = "\nUse the \'-h\' option together with the \'-t \' option to"; $n++; $rsp->{data}->[$n] = " get a list of valid attribute names for each object type.\n"; xCAT::MsgUtils->message("I", $rsp, $::callback); @@ -4656,7 +4656,7 @@ sub defch_usage } $rsp->{data}->[$n] = "$dataobj\n"; $n++; - $rsp->{data}->[$n] = "\nUse the \'-h\' option together with the \'-t\' option to"; + $rsp->{data}->[$n] = "\nUse the \'-h\' option together with the \'-t \' option to"; $n++; $rsp->{data}->[$n] = " get a list of valid attribute names for each object type.\n"; xCAT::MsgUtils->message("I", $rsp, $::callback); @@ -4700,7 +4700,7 @@ sub defls_usage } $rsp->{data}->[$n] = "$dataobj\n"; $n++; - $rsp->{data}->[$n] = "\nUse the \'-h\' option together with the \'-t\' option to"; + $rsp->{data}->[$n] = "\nUse the \'-h\' option together with the \'-t \' option to"; $n++; $rsp->{data}->[$n] = " get a list of valid attribute names for each object type.\n"; xCAT::MsgUtils->message("I", $rsp, $::callback); @@ -4741,7 +4741,7 @@ sub defrm_usage } $rsp->{data}->[$n] = "$dataobj\n"; $n++; - $rsp->{data}->[$n] = "\nUse the \'-h\' option together with the \'-t\' option to"; + $rsp->{data}->[$n] = "\nUse the \'-h\' option together with the \'-t \' option to"; $n++; $rsp->{data}->[$n] = " get a list of valid attribute names for each object type.\n"; xCAT::MsgUtils->message("I", $rsp, $::callback);