search for: btrfs_replace

...ng, 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...

...(+), 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...

...s-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...

...f7..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 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...

...(+), 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...

...mon/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...

This is a follow-up to the other generator changes in: https://www.redhat.com/archives/libguestfs/2017-February/msg00217.html Rich.

..."partnum"], []; tests = [ InitEmpty, Always, TestResultString ( [["part_init"; "/dev/sda"; "mbr"]; @@ -9391,7 +9391,7 @@ It returns C<primary>, C<logical>, or C<extended>." }; { defaults with name = "btrfs_replace"; added = (1, 29, 48); - style = RErr, [Device "srcdev"; Device "targetdev"; Pathname "mntpoint"], []; + style = RErr, [String (Device, "srcdev"); String (Device, "targetdev"); String (Pathname, "mntpoint")], []; optional =...

Very large but mechanical change to the generator. Rich.

Split up the huge generator/actions.ml into several smaller files. Rich.