From e20c5e95217d6af8b6c737540087ae1fb53f5faa Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Mon, 24 Jan 2000 05:52:44 +0000 Subject: [PATCH] -a now implies -o and -D whether you are root or not --- options.c | 8 +++----- rsync.yo | 5 +---- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/options.c b/options.c index 642a9f28..00cfc0be 100644 --- a/options.c +++ b/options.c @@ -108,7 +108,7 @@ void usage(int F) rprintf(F," -r, --recursive recurse into directories\n"); rprintf(F," -R, --relative use relative path names\n"); rprintf(F," -b, --backup make backups (default %s suffix)\n",BACKUP_SUFFIX); - rprintf(F," --backup-dir make backups into this directory"); + rprintf(F," --backup-dir make backups into this directory\n"); rprintf(F," --suffix=SUFFIX override backup suffix\n"); rprintf(F," -u, --update update only (don't overwrite newer files)\n"); rprintf(F," -l, --links preserve soft links\n"); @@ -460,10 +460,8 @@ int parse_arguments(int argc, char *argv[], int frommain) preserve_perms=1; preserve_times=1; preserve_gid=1; - if (am_root) { - preserve_devices=1; - preserve_uid=1; - } + preserve_uid=1; + preserve_devices=1; break; case OPT_SERVER: diff --git a/rsync.yo b/rsync.yo index 90406aec..0f9d4034 100644 --- a/rsync.yo +++ b/rsync.yo @@ -319,12 +319,9 @@ explicitly checked on the receiver and any files of the same name which already exist and have the same checksum and size on the receiver are skipped. This option can be quite slow. -dit(bf(-a, --archive)) This is equivalent to -rlptg. It is a quick way +dit(bf(-a, --archive)) This is equivalent to -rlptgoD. It is a quick way of saying you want recursion and want to preserve everything. -Note: if the user launching rsync is root then the -o (preserve -uid) and -D (preserve devices) options are also implied. - dit(bf(-r, --recursive)) This tells rsync to copy directories recursively. If you don't specify this then rsync won't copy directories at all. -- 2.34.1