search for: files_from

See patch #2 for more explanation. Pino Toscano (2): prepare: keep config_files available for longer prepare: create a really empty base.tar.gz with no config files src/mode_prepare.ml | 87 +++++++++++++++++++++++++++------------------ 1 file changed, 52 insertions(+), 35 deletions(-) -- 2.17.2

...e_prepare.ml b/src/mode_prepare.ml index 7759c58..8a09315 100644 --- a/src/mode_prepare.ml +++ b/src/mode_prepare.ml @@ -149,20 +149,37 @@ let prepare debug (copy_kernel, format, host_cpu, printf "supermin: there are %d config files\n" (List.length config_files); - let files_from = - (* Put the list of config files into a file, for tar to read. *) - let files_from = tmpdir // "files-from.txt" in - let chan = open_out files_from in - List.iter (fprintf chan ".%s\n") config_files; (* "./filename" *) - close_out chan; - - files_f...

This is a "merge" of two previous series: https://www.redhat.com/archives/libguestfs/2018-December/msg00015.html https://www.redhat.com/archives/libguestfs/2018-December/msg00020.html The goal is to handle better situations like: - empty file in the appliance directory - no config files available in the packages to include in an appliance Compared to the two series, the changes are: -

Hiya. While merging the 2.6.0 changes into our modified version of rsync, I noticed the following bit of code in 2.6.0's options.c: extern int sanitize_paths; if (sanitize_paths) sanitize_path(strdup(files_from), NULL); filesfrom_fd = open(files_from, O_RDONLY|O_BINARY); Since sanitize_path modifies its first argument in place, the path that open() gets there hasn't been sanitized, which could be a security issue -- plus it leaks memory. Shouldn't that be something like this? ex...

...b/src/mode_prepare.ml index 7c8221e..7759c58 100644 --- a/src/mode_prepare.ml +++ b/src/mode_prepare.ml @@ -128,28 +128,28 @@ let prepare debug (copy_kernel, format, host_cpu, * be missing either from the package or from the filesystem (the * latter case with --use-installed). *) - let files_from = - let config_files = - List.map ( - fun (_, files) -> - filter_map ( - function - | { ft_config = true; ft_path = path } -> Some path - | { ft_config = false } -> None - ) files - ) packages in - let config_files =...

...07:40:54 -0000 1.197 --- b/main.c 17 Jun 2004 04:01:56 -0000 *************** *** 735,743 **** return start_socket_client(host, path, argc-1, argv+1); } ! if (!read_batch) { p = find_colon(argv[0]); ! if (p) { if (remote_filesfrom_file && remote_filesfrom_file != files_from + 1 && strncmp(files_from, argv[0], p-argv[0]+1) != 0) { --- 735,743 ---- return start_socket_client(host, path, argc-1, argv+1); } ! if (!read_batch) { /* for read_batch, NO source is specified */ p = find_colon(argv[0]); ! if (p) { /* source is remote */ if (re...

..., "[%c] add_exclude(%s,%s)\n", + *who_am_i, pattern, include ? "include" : "exclude"); } --- flist.c 27 Jan 2004 01:47:41 -0000 1.174 +++ flist.c 27 Jan 2004 07:36:30 -0000 @@ -46,6 +46,7 @@ extern int recurse; extern char curr_dir[MAXPATHLEN]; extern char *files_from; extern int filesfrom_fd; +extern char *who_am_i; extern int one_file_system; extern int make_backups; @@ -342,7 +343,8 @@ static void flist_expand(struct file_lis } if (verbose >= 2) { - rprintf(FINFO, "expand file_list to %.0f bytes, did%s move\n", + rprintf(FINFO, &...

..., 0 }, {"sender", 0, POPT_ARG_NONE, 0, OPT_SENDER, 0, 0 }, {"recursive", 'r', POPT_ARG_NONE, &recurse, 0, 0, 0 }, @@ -699,7 +702,7 @@ return 0; } - if (archive_mode) { + if (archive_mode || archive_delete_mode) { if (!files_from) recurse = 1; #if SUPPORT_LINKS @@ -712,6 +715,9 @@ preserve_devices = 1; } + if (archive_delete_mode) + delete_mode = 1; + if (relative_paths < 0) relative_paths = files_from? 1 : 0;

I'm having an issue with the --suffix and -b flags - I've tried the following commands: rsync -avbr --backup-dir=/rsyncbackup rsynctest user@server.com::module rsync -avbr --backup-dir=/rsyncbackup --suffix="" rsynctest user@server.com::module and either way, I wind up with a tilde as a suffix on all the files moved into the backup directory at time of synchronization.

Hello folks, trying to make use of the new --keep-dirlinks feature for a synch port; it works excellent but feels incomplete without a way for rsync to ignore recursive links. Example: # ls -la . total 6 drwxrwxr-x 2 bldmstr staff 512 Aug 16 21:42 . drwxrwxr-x 8 bldmstr staff 512 Aug 16 21:41 .. lrwxrwxrwx 1 bldmstr staff 2 Aug 20 12:07 bogus -> .. if you use

...basis_dir[i], 1) == M_EXCLUDE) goto options_rejected; } if (backup_dir) { clean_fname(backup_dir, 1); - if (check_filter(elp, backup_dir, 1) < 0) + if (check_filter(elp, backup_dir, 1) == M_EXCLUDE) goto options_rejected; } } if (server_filter_list.head && files_from) { clean_fname(files_from, 1); - if (check_filter(&server_filter_list, files_from, 0) < 0) { + if (check_filter(&server_filter_list, files_from, 0) == M_EXCLUDE) { options_rejected: snprintf(err_buf, sizeof err_buf, "Your options have been rejected by the ser...

...(_)--OOo--------------------------- -------------- next part -------------- --- rsync-2.6.0/flist.c.orig 2004-01-06 16:16:09.000000000 +0100 +++ rsync-2.6.0/flist.c 2004-01-06 16:30:15.000000000 +0100 @@ -76,15 +76,12 @@ static int show_filelist_p(void) { - return verbose && (recurse || files_from) && !am_server; + return do_progress && verbose && (recurse || files_from) && !am_server; } static void start_filelist_progress(char *kind) { - rprintf(FINFO, "%s ... ", kind); - if ((verbose > 1) || do_progress) - rprintf(FINFO, "\n"); -...

...progress = 1; + break; + case OPT_WRITE_BATCH: /* popt stores the filename in batch_prefix for us */ write_batch = 1; @@ -629,6 +633,10 @@ if (relative_paths < 0) relative_paths = files_from? 1 : 0; + + if (do_progress & (!verbose)) { + verbose++; + } if (!backup_suffix) backup_suffix = backup_dir? "" : BACKUP_SUFFIX;

Using rsync 2.6.0 on both ends, I ran rsync -v --files-from files andrew@pimlott.net: . and got an error from the remote rsync. The reason is that the remote rsync is run as rsync --server --sender -vvR --files-from=- --from0 . which conflicts with a check in options.c that rsync must have two non-option arguments when --files-from is used. I tried again with the latest nightly

https://bugzilla.samba.org/show_bug.cgi?id=11253 Bug ID: 11253 Summary: --exclude=dir doesn't work with --files-from= Product: rsync Version: 3.1.1 Hardware: All OS: All Status: NEW Severity: normal Priority: P5 Component: core Assignee: wayned at samba.org

...- args[ac++] = link_dest ? "--link-dest" : "--compare-dest"; - args[ac++] = compare_dest; + int i; + for (i = 0; i < num_comp_dest; i++) { + args[ac++] = link_dest ? "--link-dest" : "--compare-dest"; + args[ac++] = compare_dest[i]; + } } if (files_from && (!am_sender || remote_filesfrom_file)) { Only in rsync-2.6.1pre-1-vidar: options.c~ Only in rsync-2.6.1pre-1-vidar/popt: dummy diff -ru rsync-2.6.1pre-1/receiver.c rsync-2.6.1pre-1-vidar/receiver.c --- rsync-2.6.1pre-1/receiver.c 2004-03-23 17:50:40.000000000 +0100 +++ rsync-2.6.1pre-1-v...

Dear rsync folks, I'd like to request/suggest that cli options to set TCP send/receive buffers be added to rsync client-side. Summary: I'm aware that a daemon's config-file can set socket options for the server side (e.g. SO_SNDBUF, SO_RCVBUF). That is useful. But when trying to get high-throughput rsync over long paths (i.e. large bandwidth*delay product), since

..., &preserve_hard_links, 0, 0, 0 }, {"read-batch", 0, POPT_ARG_STRING, &batch_prefix, OPT_READ_BATCH, 0, 0 }, {"write-batch", 0, POPT_ARG_STRING, &batch_prefix, OPT_WRITE_BATCH, 0, 0 }, {"files-from", 0, POPT_ARG_STRING, &files_from, 0, 0, 0 }, {"from0", '0', POPT_ARG_NONE, &eol_nulls, 0, 0, 0}, {"no-implied-dirs", 0, POPT_ARG_VAL, &implied_dirs, 0, 0, 0 }, + {"backup-only", 0, POPT_ARG_NONE, &backup_only , 0, 0, 0 }, #ifdef INET6 {0,...

...buf); + return 0; +#endif + default: /* FIXME: If --daemon is specified, then errors for later @@ -889,6 +904,11 @@ args[ac++] = compare_dest; } + if (link_by_hash_dir && am_sender) { + args[ac++] = "--link-by-hash"; + args[ac++] = link_by_hash_dir; + } + if (files_from && (!am_sender || remote_filesfrom_file)) { if (remote_filesfrom_file) { args[ac++] = "--files-from"; patchwork diff rsync.c --- rsync.c 2004-02-09 15:42:40.000000000 -0500 +++ rsync.c 2004-02-09 15:42:40.000000000 -0500 @@ -30,6 +30,7 @@ extern int preserve_gid; extern i...

...large opt value means that set_refuse_options() * turned this option off (opt-BASE is its index). */ @@ -934,6 +950,11 @@ args[ac++] = compare_dest; } + if (link_by_hash_dir && am_sender) { + args[ac++] = "--link-by-hash"; + args[ac++] = link_by_hash_dir; + } + if (files_from && (!am_sender || remote_filesfrom_file)) { if (remote_filesfrom_file) { args[ac++] = "--files-from"; patchwork diff proto.h --- proto.h 2004-02-23 10:22:51.000000000 -0500 +++ proto.h 2004-02-23 10:22:51.000000000 -0500 @@ -93,6 +93,12 @@ void write_sum_head(int f, struct...