search for: check_tmpdir

The first patch is just some simple refactoring. See the second patch for a description of the new virt-sparsify --tmp option. I tested this using a loopback device as my temporary block device, and it seems to work fine for me. Federico .. this needs a BZ :-) Rich.

This still isn't working at the moment. See: http://marc.info/?t=139457409300003&r=1&w=2 This set of patches: - Adds new APIs to support discard in libguestfs. - Adds discard support to virt-format. - Adds discard support to virt-sysprep. - Implements virt-sparsify --in-place. Rich.

...+++++++++++++++++++++++-------------------------- 1 file changed, 23 insertions(+), 26 deletions(-) diff --git a/sparsify/cmdline.ml b/sparsify/cmdline.ml index ce2b913..bd49e71 100644 --- a/sparsify/cmdline.ml +++ b/sparsify/cmdline.ml @@ -98,6 +98,7 @@ read the man page virt-sparsify(1). let check_tmpdir = !check_tmpdir in let compress = !compress in let convert = match !convert with "" -> None | str -> Some str in + let disks = List.rev !disks in let format = match !format with "" -> None | str -> Some str in let ignores = List.rev !ignores in let in...

...y.ml @@ -30,15 +30,16 @@ module G = Guestfs let () = Random.self_init () let rec main () = - let indisk, format, ignores, machine_readable, zeroes, mode = - parse_cmdline () in + let cmdline = parse_cmdline () in - (match mode with + (match cmdline.mode with | Mode_copying (outdisk, check_tmpdir, compress, convert, option, tmp) -> - Copying.run indisk outdisk check_tmpdir compress convert - format ignores machine_readable option tmp zeroes + Copying.run cmdline.indisk outdisk check_tmpdir compress convert + cmdline.format cmdline.ignores cmdline.machine_readabl...

..."/dev/null"; g#launch (); if g#feature_available [| "ntfsprogs"; "ntfs3g" |] then diff --git a/sparsify/copying.ml b/sparsify/copying.ml index ef196f6..bef0664 100644 --- a/sparsify/copying.ml +++ b/sparsify/copying.ml @@ -60,7 +60,7 @@ let run indisk outdisk check_tmpdir compress convert | Some fmt -> fmt (* user specified input format, use that *) | None -> (* Don't know, so we must autodetect. *) - match (new G.guestfs ())#disk_format indisk with + match (open_guestfs ())#disk_format indisk with | &quot...

...-89,7 +89,7 @@ read the man page virt-sparsify(1). ") prog in let opthandle = create_standard_options argspec ~anon_fun ~key_opts:true ~machine_readable:true usage_msg in - Getopt.parse opthandle; + Getopt.parse opthandle.getopt; (* Dereference the rest of the args. *) let check_tmpdir = !check_tmpdir in diff --git a/sysprep/main.ml b/sysprep/main.ml index 980b62a35..37fe6be01 100644 --- a/sysprep/main.ml +++ b/sysprep/main.ml @@ -149,7 +149,7 @@ read the man page virt-sysprep(1). ") prog in let opthandle = create_standard_options args ~key_opts:true usage_msg...

...t; mode : mode_t; } diff --git a/sparsify/copying.ml b/sparsify/copying.ml index 8c8924241..a4bfcaa2a 100644 --- a/sparsify/copying.ml +++ b/sparsify/copying.ml @@ -37,7 +37,7 @@ type tmp_place = | Directory of string | Block_device of string | Prebuilt_file of string let run indisk outdisk check_tmpdir compress convert - format ignores machine_readable option tmp_param zeroes = + format ignores option tmp_param zeroes = (* Once we have got past argument parsing and start to create * temporary files (including the potentially massive overlay file), we @@ -179,7 +179,7 @@ You can ign...

...: Run a rescue shell on a virtual machine\n" diff --git a/sparsify/cmdline.ml b/sparsify/cmdline.ml index 5403d92d7..09e013555 100644 --- a/sparsify/cmdline.ml +++ b/sparsify/cmdline.ml @@ -51,7 +51,7 @@ let parse_cmdline () = | "warn" | "warning" | "w" -> check_tmpdir := `Warn | "fail" | "f" | "error" -> check_tmpdir := `Fail | str -> - error (f_"--check-tmpdir: unknown argument `%s'") str + error (f_"--check-tmpdir: unknown argument ‘%s’") str in let compress = ref false in...

...se_cmdline () = let compress = ref false in let convert = ref "" in - let debug_gc = ref false in let format = ref "" in let ignores = ref [] in let in_place = ref false in @@ -60,7 +59,7 @@ let parse_cmdline () = "--check-tmpdir", Arg.String set_check_tmpdir, "ignore|..." ^ " " ^ s_"Check there is enough space in $TMPDIR"; "--compress", Arg.Set compress, " " ^ s_"Compressed output format"; "--convert", Arg.Set_string convert, s_"format" ^ " "...

Store the machine-readable flag globally, just like done for verbose/debug/etc, and enhance create_standard_options to provide --machine-readable automatically. --- common/mlstdutils/std_utils.ml | 4 ++++ common/mlstdutils/std_utils.mli | 7 +++++-- common/mltools/tools_utils.ml | 7 ++++++- common/mltools/tools_utils.mli | 5 ++++- 4 files changed, 19 insertions(+), 4 deletions(-) diff

Hi, the following series adds a --key option in the majority of tools: this makes it possible to pass LUKS credentials programmatically, avoid the need to manually input them, or unsafely pass them via stdin. Thanks, Pino Toscano (2): mltools: create a cmdline_options struct Introduce a --key option in tools that accept keys builder/cmdline.ml | 2 +-

This set of patches: - Adds new APIs to support discard in libguestfs. - Adds discard support to virt-format. - Adds discard support to virt-sysprep. - Implements virt-sparsify --in-place. This is now working, after fixing the rather stupid bug in fstrim. I've pushed the ones which were ACKed previously + the fstrim fix. Rich.

...ore; } and mode_t = diff --git a/sparsify/copying.ml b/sparsify/copying.ml index a33b91e69..43fb15e77 100644 --- a/sparsify/copying.ml +++ b/sparsify/copying.ml @@ -37,7 +37,7 @@ type tmp_place = | Directory of string | Block_device of string | Prebuilt_file of string let run indisk outdisk check_tmpdir compress convert - format ignores option tmp_param zeroes = + format ignores option tmp_param zeroes ks = (* Once we have got past argument parsing and start to create * temporary files (including the potentially massive overlay file), we @@ -188,7 +188,7 @@ You can ignore this warni...

...disk larger by at least this amount or adjust your resizing requests") deficit (human_size deficit) ); diff --git a/sparsify/copying.ml b/sparsify/copying.ml index 3940f1f..a4a82f1 100644 --- a/sparsify/copying.ml +++ b/sparsify/copying.ml @@ -67,7 +67,7 @@ let run indisk outdisk check_tmpdir compress convert (* Compression is not supported by raw output (RHBZ#852194). *) if output_format = "raw" && compress then - error (f_"--compress cannot be used for raw output. Remove this option or use --convert qcow2."); + error (f_"--compress canno...

....c daemon/squashfs.c daemon/stat.c -daemon/statvfs.c daemon/strings.c daemon/structs-cleanups.c daemon/stubs-0.c diff --git a/sparsify/copying.ml b/sparsify/copying.ml index 7d004b550..0c0b27c94 100644 --- a/sparsify/copying.ml +++ b/sparsify/copying.ml @@ -99,7 +99,7 @@ let run indisk outdisk check_tmpdir compress convert virtual_size (human_size virtual_size); let print_warning () = - let free_space = StatVFS.free_space tmpdir in + let free_space = StatVFS.free_space (StatVFS.statvfs tmpdir) in let extra_needed = virtual_size -^ free_space in if extra_neede...

v2 -> v3: - Drop gnulib fallback.

...format, ignores, machine_readable, - quiet, verbose, trace, zeroes, mode + quiet, zeroes, mode diff --git a/sparsify/copying.ml b/sparsify/copying.ml index 9f788b9..9f20fa3 100644 --- a/sparsify/copying.ml +++ b/sparsify/copying.ml @@ -39,7 +39,7 @@ type tmp_place = let run indisk outdisk check_tmpdir compress convert format ignores machine_readable option tmp_param - quiet verbose trace zeroes = + quiet zeroes = (* Once we have got past argument parsing and start to create * temporary files (including the potentially massive overlay file), we @@ -81,8 +81,8 @@ let run indisk...

It started out as "this'll be just a simple fix ..." and turned into something a bit over-engineered in the end. Here it is anyway. Rich.

v1 -> v2: - Removed the f_type field from StatVFS.statvfs structure. - New function StatVFS.filesystem_is_remote, written in C. [Thinking about it, this should probably be called ?is_network_filesystem?, but I can change that before pushing]. - Use statvfs instead of fstatvfs, and statfs instead of fstatfs. - Rejigged the comments in builder/builder.ml to make them simpler

Fix some quoting issues by introducing Unicode quotes. Note this intentionally only affects end-user messages and documentation. Rich.