X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/505ada146c9fbace57a92f1cd5567b38e78221d3..5e65c96705a80b6b0b14f8ea19e6a37563e19a6d:/rsync.yo diff --git a/rsync.yo b/rsync.yo index 92982926..d61dfb81 100644 --- a/rsync.yo +++ b/rsync.yo @@ -36,7 +36,7 @@ itemize( it() exclude and exclude-from options similar to GNU tar it() a CVS exclude mode for ignoring the same files that CVS would ignore it() can use any transparent remote shell, including ssh or rsh - it() does not require root privileges + it() does not require super-user privileges it() pipelining of file transfers to minimize latency costs it() support for anonymous or authenticated rsync daemons (ideal for mirroring) @@ -316,11 +316,16 @@ to the detailed description below for a complete description. verb( -H, --hard-links preserve hard links -K, --keep-dirlinks treat symlinked dir on receiver as dir -p, --perms preserve permissions - -o, --owner preserve owner (root only) + -E, --executability preserve executability + -o, --owner preserve owner (super-user only) -g, --group preserve group - -D, --devices preserve devices (root only) + --devices preserve device files (super-user only) + --specials preserve special files + -D same as --devices --specials -t, --times preserve times -O, --omit-dir-times omit directories when preserving times + --super receiver attempts super-user activities + --chmod=CHMOD change destination permissions -S, --sparse handle sparse files efficiently -n, --dry-run show what would have been transferred -W, --whole-file copy files whole (without rsync algorithm) @@ -328,7 +333,7 @@ to the detailed description below for a complete description. verb( -B, --block-size=SIZE force a fixed checksum block-size -e, --rsh=COMMAND specify the remote shell to use --rsync-path=PROGRAM specify the rsync to run on remote machine - --existing only update files that already exist + --existing ignore non-existing files on receiving side --ignore-existing ignore files that already exist on receiver --remove-sent-files sent files/symlinks are removed from sender --del an alias for --delete-during @@ -341,9 +346,11 @@ to the detailed description below for a complete description. verb( --force force deletion of dirs even if not empty --max-delete=NUM don't delete more than NUM files --max-size=SIZE don't transfer any file larger than SIZE + --min-size=SIZE don't transfer any file smaller than SIZE --partial keep partially transferred files --partial-dir=DIR put a partially transferred file into DIR --delay-updates put all updated files into place at end + -m, --prune-empty-dirs prune empty directory chains from file-list --numeric-ids don't map uid/gid values by user/group name --timeout=TIME set I/O timeout in seconds -I, --ignore-times don't skip files that match size and time @@ -355,6 +362,7 @@ to the detailed description below for a complete description. verb( --copy-dest=DIR ... and include copies of unchanged files --link-dest=DIR hardlink to files in DIR when unchanged -z, --compress compress file data during the transfer + --compress-level=NUM explicitly set compression level -C, --cvs-exclude auto-ignore files in the same way CVS does -f, --filter=RULE add a file-filtering RULE -F same as --filter='dir-merge /.rsync-filter' @@ -367,8 +375,11 @@ to the detailed description below for a complete description. verb( -0, --from0 all *from/filter files are delimited by 0s --address=ADDRESS bind address for outgoing socket to daemon --port=PORT specify double-colon alternate port number + --sockopts=OPTIONS specify custom TCP options --blocking-io use blocking I/O for the remote shell --stats give some file-transfer stats + -h, --human-readable output numbers in a human-readable format + --si like human-readable, but use powers of 1000 --progress show progress during transfer -P same as --partial --progress -i, --itemize-changes output a change-summary for all updates @@ -384,7 +395,7 @@ to the detailed description below for a complete description. verb( -4, --ipv4 prefer IPv4 -6, --ipv6 prefer IPv6 --version print version number - -h, --help show this help screen) + --help show this help screen) Rsync can also be run as a daemon, in which case the following options are accepted: verb( @@ -394,10 +405,11 @@ accepted: verb( --config=FILE specify alternate rsyncd.conf file --no-detach do not detach from the parent --port=PORT listen on alternate port number + --sockopts=OPTIONS specify custom TCP options -v, --verbose increase verbosity -4, --ipv4 prefer IPv4 -6, --ipv6 prefer IPv6 - -h, --help show this help screen) + --help show this help screen) manpageoptions() @@ -408,8 +420,10 @@ The '=' for options that take a parameter is optional; whitespace can be used instead. startdit() -dit(bf(-h, --help)) Print a short help page describing the options -available in rsync. +dit(bf(--help)) Print a short help page describing the options +available in rsync and exit. For backward-compatibility with older +versions of rsync, the same help output can also be requested by using +the bf(-h) option without any other args. dit(bf(--version)) print the rsync version number and exit. @@ -485,7 +499,7 @@ could specify bf(-a --no-o) (or bf(-a --no-owner)). The order of the options is important: if you specify bf(--no-r -a), the bf(-r) option would end up being turned on, the opposite of bf(-a --no-r). Note also that the side-effects of the bf(--files-from) option are NOT -positional, as it affects the default state of several options and sligntly +positional, as it affects the default state of several options and slightly changes the meaning of bf(-a) (see the bf(--files-from) option for more details). @@ -545,8 +559,17 @@ dit(bf(-b, --backup)) With this option, preexisting destination files are renamed as each file is transferred or deleted. You can control where the backup file goes and what (if any) suffix gets appended using the bf(--backup-dir) and bf(--suffix) options. -Note that if you don't specify bf(--backup-dir), the bf(--omit-dir-times) -option will be enabled. + +Note that if you don't specify bf(--backup-dir), (1) the +bf(--omit-dir-times) option will be implied, and (2) if bf(--delete) is +also in effect (without bf(--delete-excluded)), rsync will add a "protect" +filter-rule for the backup suffix to the end of all your existing excludes +(e.g. -f "P *~"). This will prevent previously backed-up files from being +deleted. Note that if you are supplying your own filter rules, you may +need to manually insert your own exclude/protect rule somewhere higher up +in the list so that it has a high enough priority to be effective (e.g., if +your rules specify a trailing inclusion/exclusion of '*', the auto-added +rule would never be reached). dit(bf(--backup-dir=DIR)) In combination with the bf(--backup) option, this tells rsync to store all backups in the specified directory. This is @@ -608,11 +631,11 @@ data is required). dit(bf(-d, --dirs)) Tell the sending side to include any directories that are encountered. Unlike bf(--recursive), a directory's contents are not copied -unless the directory was specified on the command-line as either "." or a -name with a trailing slash (e.g. "foo/"). Without this option or the +unless the directory name specified is "." or ends with a trailing slash +(e.g. ".", "dir/.", "dir/", etc.). Without this option or the bf(--recursive) option, rsync will skip all directories it encounters (and output a message to that effect for each one). If you specify both -bf(--dirs) and bf(--recursive), the latter takes precedence. +bf(--dirs) and bf(--recursive), bf(--recursive) takes precedence. dit(bf(-l, --links)) When symlinks are encountered, recreate the symlink on the destination. @@ -656,31 +679,65 @@ destination machines is higher than the bandwidth to disk (especially when the "disk" is actually a networked filesystem). This is the default when both the source and destination are specified as local paths. -dit(bf(-p, --perms)) This option causes rsync to set the destination -permissions to be the same as the source permissions. +dit(bf(-p, --perms)) This option causes the receiving rsync to set the +destination permissions to be the same as the source permissions. (See +also the bf(--chmod) option for a way to modify what rsync considers to +be the source permissions.) + +When this option is em(off), permissions are set as follows: + +quote(itemize( + it() Existing files (including updated files) retain their existing + permissions, though the bf(--executability) option might change just + the execute permission for the file. + it() Each new file gets its permissions set based on the source file's + permissions, but masked by the receiving end's umask setting (including + the stripping of the three special permission bits). +)) + +Thus, when bf(--perms) and bf(--executability) are both disabled, +rsync's behavior is the same as that of other file-copy utilities, +such as bf(cp)(1) and bf(tar)(1). -Without this option, all existing files (including updated files) retain -their existing permissions, while each new file gets its permissions set -based on the source file's permissions, but masked by the receiving end's -umask setting -(which is the same behavior as other file-copy utilities, such as cp). +dit(bf(-E, --executability)) This option causes rsync to preserve the +executability (or non-executability) of regular files when bf(--perms) is +not enabled. A regular file is considered to be executable if at least one +'x' is turned on in the source permissions. + +quote(itemize( + it() To make a file non-executable, rsync turns off all its 'x' + permissions. + it() To make a file executable, rsync turns on each 'x' permission that + has a corresponding 'r' permission enabled. +)) + +If bf(--perms) is enabled, this option is ignored. dit(bf(-o, --owner)) This option causes rsync to set the owner of the -destination file to be the same as the source file. On most systems, -only the super-user can set file ownership. By default, the preservation -is done by name, but may fall back to using the ID number in some -circumstances. See the bf(--numeric-ids) option for a full discussion. +destination file to be the same as the source file. By default, the +preservation is done by name, but may fall back to using the ID number +in some circumstances (see the bf(--numeric-ids) option for a full +discussion). +This option has no effect if the receiving rsync is not run as the +super-user and bf(--super) is not specified. dit(bf(-g, --group)) This option causes rsync to set the group of the destination file to be the same as the source file. If the receiving -program is not running as the super-user, only groups that the +program is not running as the super-user (or with the bf(--no-super) +option), only groups that the receiver is a member of will be preserved. By default, the preservation is done by name, but may fall back to using the ID number in some circumstances. See the bf(--numeric-ids) option for a full discussion. -dit(bf(-D, --devices)) This option causes rsync to transfer character and -block device information to the remote system to recreate these -devices. This option is only available to the super-user. +dit(bf(--devices)) This option causes rsync to transfer character and +block device files to the remote system to recreate these devices. +This option has no effect if the receiving rsync is not run as the +super-user and bf(--super) is not specified. + +dit(bf(--specials)) This option causes rsync to transfer special files +such as named sockets and fifos. + +dit(bf(-D)) The bf(-D) option is equivalent to bf(--devices) bf(--specials). dit(bf(-t, --times)) This tells rsync to transfer modification times along with the files and update them on the remote system. Note that if this @@ -695,6 +752,35 @@ it is preserving modification times (see bf(--times)). If NFS is sharing the directories on the receiving side, it is a good idea to use bf(-O). This option is inferred if you use bf(--backup) without bf(--backup-dir). +dit(bf(--super)) This tells the receiving side to attempt super-user +activities even if the receiving rsync wasn't run by the super-user. These +activities include: preserving users via the bf(--owner) option, preserving +all groups (not just the current user's groups) via the bf(--groups) +option, and copying devices via the bf(--devices) option. This is useful +for systems that allow such activities without being the super-user, and +also for ensuring that you will get errors if the receiving side isn't +being running as the super-user. To turn off super-user activities, the +super-user can use bf(--no-super). + +dit(bf(--chmod)) This option tells rsync to apply one or more +comma-separated "chmod" strings to the permission of the files in the +transfer. The resulting value is treated as though it was the permissions +that the sending side supplied for the file, which means that this option +can seem to have no effect on existing files if bf(--perms) is not enabled. + +In addition to the normal parsing rules specified in the bf(chmod)(1) +manpage, you can specify an item that should only apply to a directory by +prefixing it with a 'D', or specify an item that should only apply to a +file by prefixing it with a 'F'. For example: + +quote(--chmod=Dg+s,ug+w,Fo-w,+X) + +It is also legal to specify multiple bf(--chmod) options, as each +additional option is just appended to the list of changes to make. + +See the bf(--perms) and bf(--executability) options for how the resulting +permission value can be applied to the files in the transfer. + dit(bf(-n, --dry-run)) This tells rsync to not do any file transfers, instead it will just report the actions it would have taken. @@ -706,16 +792,31 @@ NOTE: Don't use this option when the destination is a Solaris "tmpfs" filesystem. It doesn't seem to handle seeks over null regions correctly and ends up corrupting the files. -dit(bf(-x, --one-file-system)) This tells rsync not to cross filesystem -boundaries when recursing. This is useful for transferring the -contents of only one filesystem. +dit(bf(-x, --one-file-system)) This tells rsync to avoid crossing a +filesystem boundary when recursing. This does not limit the user's ability +to specify items to copy from multiple filesystems, just rsync's recursion +through the hierarchy of each directory that the user specified, and also +the analogous recursion on the receiving side during deletion. Also keep +in mind that rsync treats a "bind" mount to the same device as being on the +same filesystem. + +If this option is repeated, rsync omits all mount-point directories from +the copy. Otherwise, it includes an empty directory at each mount-point it +encounters (using the attributes of the mounted directory because those of +the underlying mount-point directory are inaccessible). + +If rsync has been told to collapse symlinks (via bf(--copy-links) or +bf(--copy-unsafe-links)), a symlink to a directory on another device is +treated like a mount-point. Symlinks to non-directories are unaffected +by this option. -dit(bf(--existing)) This tells rsync not to create any new files -- -only update files that already exist on the destination. +dit(bf(--existing, --ignore-non-existing)) This tells rsync to skip +updating files that do not exist yet on the destination. If this option is +combined with the bf(--ignore-existing) option, no files will be updated +(which can be useful if all you want to do is to delete missing files). -dit(bf(--ignore-existing)) -This tells rsync not to update files that already exist on -the destination. +dit(bf(--ignore-existing)) This tells rsync to skip updating files that +already exist on the destination. See also bf(--ignore-non-existing). dit(bf(--remove-sent-files)) This tells rsync to remove from the sending side the files and/or symlinks that are newly created or whose content is @@ -735,7 +836,7 @@ include/exclude modifiers in the FILTER RULES section). Prior to rsync 2.6.7, this option would have no effect unless bf(--recursive) was in effect. Beginning with 2.6.7, deletions will also occur when bf(--dirs) -is specified, but only for directories whose contents are being copied. +(bf(-d)) is in effect, but only for directories whose contents are being copied. This option can be dangerous if used incorrectly! It is a very good idea to run first using the bf(--dry-run) option (bf(-n)) to see what files would be @@ -788,10 +889,13 @@ See bf(--delete) (which is implied) for more details on file-deletion. dit(bf(--ignore-errors)) Tells bf(--delete) to go ahead and delete files even when there are I/O errors. -dit(bf(--force)) This options tells rsync to delete directories even if -they are not empty when they are to be replaced by non-directories. This -is only relevant without bf(--delete) because deletions are now done depth-first. -Requires the bf(--recursive) option (which is implied by bf(-a)) to have any effect. +dit(bf(--force)) This option tells rsync to delete a non-empty directory +when it is to be replaced by a non-directory. This is only relevant if +deletions are not active (see bf(--delete) for details). + +Note for older rsync versions: bf(--force) used to still be required when +using bf(--delete-after), and it used to be non-functional unless the +bf(--recursive) option was also enabled. dit(bf(--max-delete=NUM)) This tells rsync not to delete more than NUM files or directories (NUM must be non-zero). @@ -799,9 +903,25 @@ This is useful when mirroring very large trees to prevent disasters. dit(bf(--max-size=SIZE)) This tells rsync to avoid transferring any file that is larger than the specified SIZE. The SIZE value can be -suffixed with a letter to indicate a size multiplier (K, M, or G) and +suffixed with a string to indicate a size multiplier, and may be a fractional value (e.g. "bf(--max-size=1.5m)"). +The suffixes are as follows: "K" (or "KiB") is a kibibyte (1024), +"M" (or "MiB") is a mebibyte (1024*1024), and "G" (or "GiB") is a +gibibyte (1024*1024*1024). +If you want the multiplier to be 1000 instead of 1024, use "KB", +"MB", or "GB". (Note: lower-case is also accepted for all values.) +Finally, if the suffix ends in either "+1" or "-1", the value will +be offset by one byte in the indicated direction. + +Examples: --max-size=1.5mb-1 is 1499999 bytes, and --max-size=2g+1 is +2147483649 bytes. + +dit(bf(--min-size=SIZE)) This tells rsync to avoid transferring any +file that is smaller than the specified SIZE, which can help in not +transferring small, junk files. +See the bf(--max-size) option for a description of SIZE. + dit(bf(-B, --block-size=BLOCKSIZE)) This forces the block size used in the rsync algorithm to a fixed value. It is normally selected based on the size of each file being updated. See the technical report for details. @@ -819,9 +939,18 @@ running rsync daemon on the remote host. See the section "USING RSYNC-DAEMON FEATURES VIA A REMOTE-SHELL CONNECTION" above. Command-line arguments are permitted in COMMAND provided that COMMAND is -presented to rsync as a single argument. For example: +presented to rsync as a single argument. You must use spaces (not tabs +or other whitespace) to separate the command and args from each other, +and you can use single- and/or double-quotes to preserve spaces in an +argument (but not backslashes). Note that doubling a single-quote +inside a single-quoted string gives you a single-quote; likewise for +double-quotes (though you need to pay attention to which quotes your +shell is parsing and which quotes rsync is parsing). Some examples: -quote(tt( -e "ssh -p 2234")) +quote( +tt( -e 'ssh -p 2234')nl() +tt( -e 'ssh -o "ProxyCommand nohup ssh firewall nc -w1 %h %p"')nl() +) (Note that ssh users can alternately customize site-specific connect options in their .ssh/config file.) @@ -983,9 +1112,36 @@ It does not affect bf(--cvs-exclude) (since all names read from a .cvsignore file are split on whitespace). dit(bf(-T, --temp-dir=DIR)) This option instructs rsync to use DIR as a -scratch directory when creating temporary copies of the files -transferred on the receiving side. The default behavior is to create -the temporary files in the receiving directory. +scratch directory when creating temporary copies of the files transferred +on the receiving side. The default behavior is to create each temporary +file in the same directory as the associated destination file. + +This option is most often used when the receiving disk partition does not +have enough free space to hold a copy of the largest file in the transfer. +In this case (i.e. when the scratch directory in on a different disk +partition), rsync will not be able to rename each received temporary file +over the top of the associated destination file, but instead must copy it +into place. Rsync does this by copying the file over the top of the +destination file, which means that the destination file will contain +truncated data during this copy. If this were not done this way (even if +the destination file were first removed, the data locally copied to a +temporary file in the destination directory, and then renamed into place) +it would be possible for the old file to continue taking up disk space (if +someone had it open), and thus there might not be enough room to fit the +new version on the disk at the same time. + +If you are using this option for reasons other than a shortage of disk +space, you may wish to combine it with the bf(--delay-updates) option, +which will ensure that all copied files get put into subdirectories in the +destination hierarchy, awaiting the end of the transfer. If you don't +have enough room to duplicate all the arriving files on the destination +partition, another way to tell rsync that you aren't overly concerned +about disk space is to use the bf(--partial-dir) option with a relative +path; because this tells rsync that it is OK to stash off a copy of a +single file in a subdir in the destination hierarchy, rsync will use the +partial-dir as a staging area to bring over the copied file, and then +rename it into place from there. (Specifying a bf(--partial-dir) with +an absolute path does not have this side-effect.) dit(bf(-y, --fuzzy)) This option tells rsync that it should look for a basis file for any destination file that is missing. The current algorithm @@ -1051,9 +1207,9 @@ If em(DIR) is a relative path, it is relative to the destination directory. See also bf(--compare-dest) and bf(--copy-dest). Note that rsync versions prior to 2.6.1 had a bug that could prevent -bf(--link-dest) from working properly for a non-root user when bf(-o) was specified -(or implied by bf(-a)). You can work-around this bug by avoiding the bf(-o) option -when sending to an old rsync. +bf(--link-dest) from working properly for a non-super-user when bf(-o) was +specified (or implied by bf(-a)). You can work-around this bug by avoiding +the bf(-o) option when sending to an old rsync. dit(bf(-z, --compress)) With this option, rsync compresses the file data as it is sent to the destination machine, which reduces the amount of data @@ -1064,6 +1220,10 @@ be achieved by using a compressing remote shell or a compressing transport because it takes advantage of the implicit information in the matching data blocks that are not explicitly sent over the connection. +dit(bf(--compress-level=NUM)) Explicitly set the compression level to use +(see bf(--compress)) instead of letting it default. If NUM is non-zero, +the bf(--compress) option is implied. + dit(bf(--numeric-ids)) With this option rsync will transfer numeric group and user IDs rather than using user and group names and mapping them at both ends. @@ -1095,6 +1255,15 @@ double-colon (::) syntax to connect with an rsync daemon (since the URL syntax has a way to specify the port as a part of the URL). See also this option in the bf(--daemon) mode section. +dit(bf(--sockopts)) This option can provide endless fun for people +who like to tune their systems to the utmost degree. You can set all +sorts of socket options which may make transfers faster (or +slower!). Read the man page for the setsockopt() system call for +details on some of the options you may be able to set. By default no +special socket options are set. This only affects direct socket +connections to a remote rsync daemon. This option also exists in the +bf(--daemon) mode section. + dit(bf(--blocking-io)) This tells rsync to use blocking I/O when launching a remote shell transport. If the remote shell is either rsh or remsh, rsync defaults to using @@ -1104,14 +1273,18 @@ ssh prefers non-blocking I/O.) dit(bf(-i, --itemize-changes)) Requests a simple itemized list of the changes that are being made to each file, including attribute changes. This is exactly the same as specifying bf(--log-format='%i %n%L'). +If you repeat the option, unchanged files will also be output, but only +if the receiving rsync is at least version 2.6.7 (you can use bf(-vv) +with older versions of rsync, but that also turns on the output of other +verbose messages). -The "%i" escape has a cryptic output that is 9 letters long. The general -format is like the string bf(UXcstpoga)), where bf(U) is replaced by the +The "%i" escape has a cryptic output that is 8 letters long. The general +format is like the string bf(YXcstpog), where bf(Y) is replaced by the kind of update being done, bf(X) is replaced by the file-type, and the other letters represent attributes that may be output if they are being modified. -The update types that replace the bf(U) are as follows: +The update types that replace the bf(Y) are as follows: quote(itemize( it() A bf(<) means that a file is being transferred to the remote host @@ -1127,7 +1300,8 @@ quote(itemize( )) The file-types that replace the bf(X) are: bf(f) for a file, a bf(d) for a -directory, an bf(L) for a symlink, and a bf(D) for a device. +directory, an bf(L) for a symlink, a bf(D) for a device, and a bf(S) for a +special file (e.g. named sockets and fifos). The other letters in the string above are the actual letters that will be output if the associated attribute for the item is being updated or @@ -1151,11 +1325,9 @@ quote(itemize( it() A bf(p) means the permissions are different and are being updated to the sender's value (requires bf(--perms)). it() An bf(o) means the owner is different and is being updated to the - sender's value (requires bf(--owner) and root privileges). + sender's value (requires bf(--owner) and super-user privileges). it() A bf(g) means the group is different and is being updated to the sender's value (requires bf(--group) and the authority to set the group). - it() The bf(a) is reserved for a future enhanced version that supports - extended file attributes, such as ACLs. )) One other output is possible: when deleting files, the "%i" will output @@ -1175,11 +1347,11 @@ in a significant way (a transferred file, a recreated symlink/device, or a touched directory) unless the itemized-changes escape (%i) is included in the string, in which case the logging of names increases to mention any item that is changed in any way (as long as the receiving side is at least -2.6.4). See the bf(--itemized-changes) option for a description of the +2.6.4). See the bf(--itemize-changes) option for a description of the output of "%i". The bf(--verbose) option implies a format of "%n%L", but you can use -bf(--log-format) without bv(--verbose) if you like, or you can override +bf(--log-format) without bf(--verbose) if you like, or you can override the format of its per-file output using this option. Rsync will output the log-format string prior to a file's transfer unless @@ -1193,6 +1365,13 @@ dit(bf(--stats)) This tells rsync to print a verbose set of statistics on the file transfer, allowing you to tell how effective the rsync algorithm is for your data. +dit(bf(-h, --human-readable)) Output numbers in a more human-readable format. +Large numbers may be output in larger units, with a K (1024), M (1024*1024), +or G (1024*1024*1024) suffix. + +dit(bf(--si)) Similar to the bf(--human-readable) option, but using powers +of 1000 instead of 1024. + dit(bf(--partial)) By default, rsync will delete any partially transferred file if the transfer is interrupted. In some circumstances it is more desirable to keep partially transferred files. Using the @@ -1203,8 +1382,9 @@ dit(bf(--partial-dir=DIR)) A better way to keep partial files than the bf(--partial) option is to specify a em(DIR) that will be used to hold the partial data (instead of writing it out to the destination file). On the next transfer, rsync will use a file found in this -dir as data to speed up the resumption of the transfer and then deletes it +dir as data to speed up the resumption of the transfer and then delete it after it has served its purpose. + Note that if bf(--whole-file) is specified (or implied), any partial-dir file that is found for a file that is being updated will simply be removed (since @@ -1222,10 +1402,10 @@ will prevent partial-dir files from being transferred and also prevent the untimely deletion of partial-dir items on the receiving side. An example: the above bf(--partial-dir) option would add an "bf(--exclude=.rsync-partial/)" rule at the end of any other filter rules. Note that if you are -supplying your own filter rules, you may need to manually insert a -rule for this directory exclusion somewhere higher up in the list so that +supplying your own exclude rules, you may need to manually insert your own +exclude/protect rule somewhere higher up in the list so that it has a high enough priority to be effective (e.g., if your rules specify -a trailing bf(--exclude='*') rule, the auto-added rule would never be +a trailing inclusion/exclusion of '*', the auto-added rule would never be reached). IMPORTANT: the bf(--partial-dir) should not be writable by other users or it @@ -1237,9 +1417,9 @@ enabled, but rather it effects where partial files go when bf(--partial) is specified. For instance, instead of using bf(--partial-dir=.rsync-tmp) along with bf(--progress), you could set RSYNC_PARTIAL_DIR=.rsync-tmp in your environment and then just use the bf(-P) option to turn on the use of the -.rsync-tmp dir for partial transfers. The only time that the bf(--partial) -option does not look for this environment value is (1) when bf(--inplace) was -specified (since bf(--inplace) conflicts with bf(--partial-dir)), or (2) when +.rsync-tmp dir for partial transfers. The only times that the bf(--partial) +option does not look for this environment value are (1) when bf(--inplace) was +specified (since bf(--inplace) conflicts with bf(--partial-dir)), and (2) when bf(--delay-updates) was specified (see below). For the purposes of the daemon-config's "refuse options" setting, @@ -1253,11 +1433,9 @@ updated file into a holding directory until the end of the transfer, at which time all the files are renamed into place in rapid succession. This attempts to make the updating of the files a little more atomic. By default the files are placed into a directory named ".~tmp~" in -each file's destination directory, but you can override this by specifying -the bf(--partial-dir) option. (Note that RSYNC_PARTIAL_DIR has no effect -on this value, nor is bf(--partial-dir) considered to be implied for the -purposes of the daemon-config's "refuse options" setting.) -Conflicts with bf(--inplace). +each file's destination directory, but if you've specified the +bf(--partial-dir) option, that directory will be used instead. +Conflicts with bf(--inplace) and bf(--append). This option uses more memory on the receiving side (one bit per file transferred) and also requires enough free disk space on the receiving @@ -1274,6 +1452,36 @@ See also the "atomic-rsync" perl script in the "support" subdir for an update algorithm that is even more atomic (it uses bf(--link-dest) and a parallel hierarchy of files). +dit(bf(-m, --prune-empty-dirs)) This option tells the receiving rsync to get +rid of empty directories from the file-list, including nested directories +that have no non-directory children. This is useful for avoiding the +creation of a bunch of useless directories when the sending rsync is +recursively scanning a hierarchy of files using include/exclude/filter +rules. + +Because the file-list is actually being pruned, this option also affects +what directories get deleted when a delete is active. However, keep in +mind that excluded files and directories can prevent existing items from +being deleted (because an exclude hides source files and protects +destination files). + +You can prevent the pruning of certain empty directories from the file-list +by using a global "protect" filter. For instance, this option would ensure +that the directory "emptydir" was kept in the file-list: + +quote( --filter 'protect emptydir/') + +Here's an example that copies all .pdf files in a hierarchy, only creating +the necessary destination directories to hold the .pdf files, and ensures +that any superfluous files and directories in the destination are removed +(note the hide filter of non-directories being used instead of an exclude): + +quote( rsync -avm --del --include='*.pdf' -f 'hide! */' src/ dest) + +If you didn't want to remove superfluous destination files, the more +time-honored options of "--include='*/' --exclude='*'" would work fine +in place of the hide-filter (if that is more natural to you). + dit(bf(--progress)) This option tells rsync to print information showing the progress of the transfer. This gives a bored user something to watch. @@ -1407,7 +1615,7 @@ client version of this option (above) for some extra details. dit(bf(--config=FILE)) This specifies an alternate config file than the default. This is only relevant when bf(--daemon) is specified. The default is /etc/rsyncd.conf unless the daemon is running over -a remote shell program and the remote user is not root; in that case +a remote shell program and the remote user is not the super-user; in that case the default is rsyncd.conf in the current directory (typically $HOME). dit(bf(--no-detach)) When running as a daemon, this option instructs @@ -1423,6 +1631,9 @@ dit(bf(--port=PORT)) This specifies an alternate TCP port number for the daemon to listen on rather than the default of 873. See also the "port" global option in the rsyncd.conf manpage. +dit(bf(--sockopts)) This overrides the bf(socket options) setting in the +rsyncd.conf file and has the same syntax. + dit(bf(-v, --verbose)) This option increases the amount of information the daemon logs during its startup phase. After the client connects, the daemon's verbosity level will be controlled by the options that the client @@ -1525,18 +1736,27 @@ itemize( of the transfer. it() if the pattern ends with a / then it will only match a directory, not a file, link, or device. - it() if the pattern contains a wildcard character from the set - *?[ then expression matching is applied using the shell filename - matching rules. Otherwise a simple string match is used. - it() the double asterisk pattern "**" will match slashes while a - single asterisk pattern "*" will stop at slashes. - it() if the pattern contains a / (not counting a trailing /) or a "**" + + it() rsync chooses between doing a simple string match and wildcard + matching by checking if the pattern contains one of these three wildcard + characters: '*', '?', and '[' . + it() a '*' matches any non-empty path component (it stops at slashes). + it() use '**' to match anything, including slashes. + it() a '?' matches any character except a slash (/). + it() a '[' introduces a character class, such as [a-z] or [[:alpha:]]. + it() in a wildcard pattern, a backslash can be used to escape a wildcard + character, but it is matched literally when no wildcards are present. + it() if the pattern contains a / (not counting a trailing /) or a "**", then it is matched against the full pathname, including any leading directories. If the pattern doesn't contain a / or a "**", then it is matched only against the final component of the filename. (Remember that the algorithm is applied recursively so "full filename" can actually be any portion of a path from the starting directory on down.) + it() a trailing "dir_name/***" will match both the directory (as if + "dir_name/" had been specified) and all the files in the directory + (as if "dir_name/**" had been specified). (This behavior is new for + version 2.6.7.) ) Note that, when using the bf(--recursive) (bf(-r)) option (which is implied by @@ -1648,10 +1868,12 @@ itemize( The following modifiers are accepted after a "+" or "-": itemize( - it() A "/" specifies that the include/exclude should be treated as an - absolute path, relative to the root of the filesystem. For example, + it() A "/" specifies that the include/exclude rule should be matched + against the absolute pathname of the current item. For example, "-/ /etc/passwd" would exclude the passwd file any time the transfer - was sending files from the "/etc" directory. + was sending files from the "/etc" directory, and "-/ subdir/foo" + would always exclude "foo" when it is in a dir named "subdir", even + if "foo" is at the root of the current transfer. it() A "!" specifies that the include/exclude should take effect if the pattern fails to match. For instance, "-! */" would exclude all non-directories.