search for: do_btrfs_replace

...rsing, so subcommand options must appear now before the subcommand arguments. --- daemon/btrfs.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/daemon/btrfs.c b/daemon/btrfs.c index 23513a9..ae2310b 100644 --- a/daemon/btrfs.c +++ b/daemon/btrfs.c @@ -2185,11 +2185,11 @@ do_btrfs_replace (const char *srcdev, const char *targetdev, ADD_ARG (argv, i, str_btrfs); ADD_ARG (argv, i, "replace"); ADD_ARG (argv, i, "start"); - ADD_ARG (argv, i, srcdev); - ADD_ARG (argv, i, targetdev); - ADD_ARG (argv, i, path_buf); ADD_ARG (argv, i, "-B"); AD...

...ons(+), 1 deletion(-) create mode 100755 tests/btrfs/test-btrfs-replace.sh diff --git a/daemon/btrfs.c b/daemon/btrfs.c index 20e5e6b..509a323 100644 --- a/daemon/btrfs.c +++ b/daemon/btrfs.c @@ -2060,3 +2060,39 @@ do_btrfs_image (char *const *sources, const char *image, return 0; } + +int +do_btrfs_replace (const char *srcdev, const char *targetdev, + const char* mntpoint) +{ + const size_t MAX_ARGS = 64; + const char *argv[MAX_ARGS]; + size_t i = 0; + CLEANUP_FREE char *err = NULL; + CLEANUP_FREE char *path_buf = NULL; + int r; + + path_buf = sysroot_path (mntpo...

...daemon.h | 1 + daemon/fs-min-size.c | 34 ++++++++++++++++++++++++- generator/actions.ml | 6 ++++- 4 files changed, 110 insertions(+), 2 deletions(-) diff --git a/daemon/btrfs.c b/daemon/btrfs.c index ddb029d..652a17e 100644 --- a/daemon/btrfs.c +++ b/daemon/btrfs.c @@ -2190,3 +2190,74 @@ do_btrfs_replace (const char *srcdev, const char *targetdev, return 0; } + +/* btrfs command add a new command + * inspect-internal min-dev-size <path> + * since v4.2 + * We could check whether 'btrfs' supports + * 'min-dev-size' command by checking the output of + * 'btrfs --help'...

...ons(+), 1 deletion(-) create mode 100755 tests/btrfs/test-btrfs-replace.sh diff --git a/daemon/btrfs.c b/daemon/btrfs.c index 39392f7..eba336b 100644 --- a/daemon/btrfs.c +++ b/daemon/btrfs.c @@ -2083,3 +2083,40 @@ do_btrfs_image (char *const *sources, const char *image, return 0; } + +int +do_btrfs_replace (const char *srcdev, const char *targetdev, + const char* mntpoint) +{ + const size_t MAX_ARGS = 64; + const char *argv[MAX_ARGS]; + size_t i = 0; + CLEANUP_FREE char *err = NULL; + CLEANUP_FREE char *path_buf = NULL; + int r; + + path_buf = sysroot_path (mntpo...

...daemon/btrfs.c b/daemon/btrfs.c >> index 39392f7..eba336b 100644 >> --- a/daemon/btrfs.c >> +++ b/daemon/btrfs.c >> @@ -2083,3 +2083,40 @@ do_btrfs_image (char *const *sources, const char *image, >> >> return 0; >> } >> + >> +int >> +do_btrfs_replace (const char *srcdev, const char *targetdev, >> + const char* mntpoint) >> +{ >> + const size_t MAX_ARGS = 64; >> + const char *argv[MAX_ARGS]; >> + size_t i = 0; >> + CLEANUP_FREE char *err = NULL; >> + CLEANUP_FREE char...

...+++++++++++++++++++++++++++++++ generator/actions.ml | 27 ++++++++++++++++++ src/MAX_PROC_NR | 2 +- 3 files changed, 106 insertions(+), 1 deletion(-) diff --git a/daemon/btrfs.c b/daemon/btrfs.c index 2a20cb0..62bdac7 100644 --- a/daemon/btrfs.c +++ b/daemon/btrfs.c @@ -2203,6 +2203,84 @@ do_btrfs_replace (const char *srcdev, const char *targetdev, return 0; } +char ** +do_btrfs_filesystem_show (const char *device) +{ + CLEANUP_FREE_STRINGSBUF DECLARE_STRINGSBUF (ret); + const size_t MAX_ARGS = 16; + const char *argv[MAX_ARGS]; + size_t i = 0; + CLEANUP_FREE char *out = NULL; + CLEANUP_F...

...ons(+), 1 deletion(-) create mode 100755 tests/btrfs/test-btrfs-replace.sh diff --git a/daemon/btrfs.c b/daemon/btrfs.c index 20e5e6b..509a323 100644 --- a/daemon/btrfs.c +++ b/daemon/btrfs.c @@ -2060,3 +2060,39 @@ do_btrfs_image (char *const *sources, const char *image, return 0; } + +int +do_btrfs_replace (const char *srcdev, const char *targetdev, + const char* mntpoint) +{ + const size_t MAX_ARGS = 64; + const char *argv[MAX_ARGS]; + size_t i = 0; + CLEANUP_FREE char *err = NULL; + CLEANUP_FREE char *path_buf = NULL; + int r; + + path_buf = sysroot_path (mntpo...

.../daemon.h | 1 + daemon/fs-min-size.c | 33 ++++++++++++++++++++---- generator/actions.ml | 6 ++++- 4 files changed, 106 insertions(+), 6 deletions(-) diff --git a/daemon/btrfs.c b/daemon/btrfs.c index ddb029d..1e0a9a2 100644 --- a/daemon/btrfs.c +++ b/daemon/btrfs.c @@ -2190,3 +2190,75 @@ do_btrfs_replace (const char *srcdev, const char *targetdev, return 0; } + +/* btrfs command add a new command + * inspect-internal min-dev-size <path> + * since v4.2 + * We could check whether 'btrfs' supports + * 'min-dev-size' command by checking the output of + * 'btrfs --help'...

...trfs-replace.sh > > diff --git a/daemon/btrfs.c b/daemon/btrfs.c > index 39392f7..eba336b 100644 > --- a/daemon/btrfs.c > +++ b/daemon/btrfs.c > @@ -2083,3 +2083,40 @@ do_btrfs_image (char *const *sources, const char *image, > > return 0; > } > + > +int > +do_btrfs_replace (const char *srcdev, const char *targetdev, > + const char* mntpoint) > +{ > + const size_t MAX_ARGS = 64; > + const char *argv[MAX_ARGS]; > + size_t i = 0; > + CLEANUP_FREE char *err = NULL; > + CLEANUP_FREE char *path_buf = NULL; > + in...

...392f7..eba336b 100644 >>> --- a/daemon/btrfs.c >>> +++ b/daemon/btrfs.c >>> @@ -2083,3 +2083,40 @@ do_btrfs_image (char *const *sources, const >>> char *image, >>> >>> return 0; >>> } >>> + >>> +int >>> +do_btrfs_replace (const char *srcdev, const char *targetdev, >>> + const char* mntpoint) >>> +{ >>> + const size_t MAX_ARGS = 64; >>> + const char *argv[MAX_ARGS]; >>> + size_t i = 0; >>> + CLEANUP_FREE char *err = NULL; >&g...

...-- a/daemon/btrfs.c >>>> +++ b/daemon/btrfs.c >>>> @@ -2083,3 +2083,40 @@ do_btrfs_image (char *const *sources, const >>>> char *image, >>>> >>>> return 0; >>>> } >>>> + >>>> +int >>>> +do_btrfs_replace (const char *srcdev, const char *targetdev, >>>> + const char* mntpoint) >>>> +{ >>>> + const size_t MAX_ARGS = 64; >>>> + const char *argv[MAX_ARGS]; >>>> + size_t i = 0; >>>> + CLEANUP_FREE...

...| 1 + daemon/fs-min-size.c | 50 ++++++++++++++++++++++++++++++++++++- generator/actions.ml | 6 ++++- 4 files changed, 124 insertions(+), 2 deletions(-) diff --git a/daemon/btrfs.c b/daemon/btrfs.c index ddb029d..d2d85f3 100644 --- a/daemon/btrfs.c +++ b/daemon/btrfs.c @@ -2190,3 +2190,72 @@ do_btrfs_replace (const char *srcdev, const char *targetdev, return 0; } + +/* btrfs command add a new command + * inspect-internal min-dev-size <path> + * since v4.2 + * We could check whether 'btrfs' supports + * 'min-dev-size' command by checking the output of + * 'btrfs --help'...

Various changes/fixes to use smaller stack frames. Rich.

...image (char *const *sources, const char *image, int compresslevel) @@ -2140,6 +2163,10 @@ do_btrfs_image (char *const *sources, const char *image, return 0; } +#if defined(__GNUC__) && GUESTFS_GCC_VERSION >= 40800 /* gcc >= 4.8.0 */ +#pragma GCC diagnostic pop +#endif + int do_btrfs_replace (const char *srcdev, const char *targetdev, const char* mntpoint) diff --git a/daemon/checksum.c b/daemon/checksum.c index eec45e2..3045948 100644 --- a/daemon/checksum.c +++ b/daemon/checksum.c @@ -132,12 +132,23 @@ do_checksums_out (const char *csumtype, const char *dir) { struct stat st...

...rfs_image (char *const *sources, const char *image, return -1; } - ADD_ARG (argv, i, str_btrfsimage); + ADD_ARG (argv, i, "btrfs-image"); if ((optargs_bitmask & GUESTFS_BTRFS_IMAGE_COMPRESSLEVEL_BITMASK) && compresslevel >= 0) { @@ -2182,7 +2175,7 @@ do_btrfs_replace (const char *srcdev, const char *targetdev, return -1; } - ADD_ARG (argv, i, str_btrfs); + ADD_ARG (argv, i, "btrfs"); ADD_ARG (argv, i, "replace"); ADD_ARG (argv, i, "start"); ADD_ARG (argv, i, "-B"); @@ -2213,7 +2206,7 @@ do_btrfs_files...

...trfs_image (char *const *sources, const char *image, return -1; } - ADD_ARG (argv, i, str_btrfsimage); + ADD_ARG (argv, i, "btrfsimage"); if ((optargs_bitmask & GUESTFS_BTRFS_IMAGE_COMPRESSLEVEL_BITMASK) && compresslevel >= 0) { @@ -2182,7 +2178,7 @@ do_btrfs_replace (const char *srcdev, const char *targetdev, return -1; } - ADD_ARG (argv, i, str_btrfs); + ADD_ARG (argv, i, "btrfs"); ADD_ARG (argv, i, "replace"); ADD_ARG (argv, i, "start"); ADD_ARG (argv, i, "-B"); @@ -2213,7 +2209,7 @@ do_btrfs_files...

...+ && compresslevel >= 0) { snprintf (compresslevel_s, sizeof compresslevel_s, "%d", compresslevel); ADD_ARG (argv, i, "-c"); ADD_ARG (argv, i, compresslevel_s); @@ -2157,7 +2157,7 @@ do_btrfs_image (char *const *sources, const char *image, int do_btrfs_replace (const char *srcdev, const char *targetdev, - const char* mntpoint) + const char* mntpoint) { const size_t MAX_ARGS = 64; const char *argv[MAX_ARGS]; diff --git a/daemon/devsparts.c b/daemon/devsparts.c index aebc213..46ca4c1 100644 --- a/daemon/devsparts.c...

Result of earlier copy and paste. --- align/scan.c | 35 ++++++++++--------- cat/cat.c | 39 +++++++++++---------- cat/filesystems.c | 69 +++++++++++++++++++------------------- cat/log.c | 35 ++++++++++--------- cat/ls.c | 61 +++++++++++++++++---------------- df/main.c | 43 ++++++++++++------------ diff/diff.c | 67

This is a simpler patch that removes GUESTFSD_EXT_CMD completely.

Replace GUESTFSD_EXT_CMD with a command line option ‘./guestfsd --print-external-commands’