New upstream version 1.50.1

diff --git a/builder/builder.ml b/builder/builder.ml
index 727aa8b2375d24e7243d7410b1266cc58de3bebd..15ece4e60bafab00e6ee548dbcd2b10e29a15381 100644 (file)
--- a/builder/builder.ml
+++ b/builder/builder.ml
@@ -723,8 +723,8 @@ let main () =
   let g =
     let g = open_guestfs () in
 
-    Option.may g#set_memsize cmdline.memsize;
-    Option.may g#set_smp cmdline.smp;
+    Option.iter g#set_memsize cmdline.memsize;
+    Option.iter g#set_smp cmdline.smp;
     g#set_network cmdline.network;
 
     (* The output disk is being created, so use cache=unsafe here. *)
@@ -818,6 +818,6 @@ let main () =
   Pervasives.flush Pervasives.stdout;
   Pervasives.flush Pervasives.stderr;
 
-  Option.may print_string stats
+  Option.iter print_string stats
 
 let () = run_main_and_handle_errors main

diff --git a/builder/index.ml b/builder/index.ml
index 03680f051796ed5658547370deded63b77faf2c5..341a62356f8661a8f5de2b6bc40a0ea560f39c39 100644 (file)
--- a/builder/index.ml
+++ b/builder/index.ml
@@ -58,12 +58,12 @@ let print_entry chan (name, { printable_name; file_uri; arch; osinfo;
                               notes; aliases; hidden }) =
   let fp fs = fprintf chan fs in
   fp "[%s]\n" name;
-  Option.may (fp "name=%s\n") printable_name;
-  Option.may (fp "osinfo=%s\n") osinfo;
+  Option.iter (fp "name=%s\n") printable_name;
+  Option.iter (fp "osinfo=%s\n") osinfo;
   fp "file=%s\n" file_uri;
   fp "arch=%s\n" (string_of_arch arch);
-  Option.may (fp "sig=%s\n") signature_uri;
-  Option.may (
+  Option.iter (fp "sig=%s\n") signature_uri;
+  Option.iter (
     List.iter (
       fun c ->
         fp "checksum[%s]=%s\n"
@@ -71,16 +71,16 @@ let print_entry chan (name, { printable_name; file_uri; arch; osinfo;
     )
   ) checksums;
   fp "revision=%s\n" (string_of_revision revision);
-  Option.may (fp "format=%s\n") format;
+  Option.iter (fp "format=%s\n") format;
   fp "size=%Ld\n" size;
-  Option.may (fp "compressed_size=%Ld\n") compressed_size;
-  Option.may (fp "expand=%s\n") expand;
-  Option.may (fp "lvexpand=%s\n") lvexpand;
+  Option.iter (fp "compressed_size=%Ld\n") compressed_size;
+  Option.iter (fp "expand=%s\n") expand;
+  Option.iter (fp "lvexpand=%s\n") lvexpand;
   List.iter (
     fun (lang, notes) ->
       match lang with
       | "" -> fp "notes=%s\n" notes
       | lang -> fp "notes[%s]=%s\n" lang notes
   ) notes;
-  Option.may (fun l -> fp "aliases=%s\n" (String.concat " " l)) aliases;
+  Option.iter (fun l -> fp "aliases=%s\n" (String.concat " " l)) aliases;
   if hidden then fp "hidden=true\n"

diff --git a/builder/index_parser.ml b/builder/index_parser.ml
index b4cb81e78a6573b24402883b47eeaa8cbc229f6e..1c5bc26cab4689c5884795c6644a22f4494811cd 100644 (file)
--- a/builder/index_parser.ml
+++ b/builder/index_parser.ml
@@ -284,11 +284,11 @@ let write_entry chan (name, { Index.printable_name; file_uri; arch; osinfo;
                               aliases; hidden}) =
   let fp fs = fprintf chan fs in
   fp "[%s]\n" name;
-  Option.may (fp "name=%s\n") printable_name;
-  Option.may (fp "osinfo=%s\n") osinfo;
+  Option.iter (fp "name=%s\n") printable_name;
+  Option.iter (fp "osinfo=%s\n") osinfo;
   fp "file=%s\n" file_uri;
   fp "arch=%s\n" (Index.string_of_arch arch);
-  Option.may (fp "sig=%s\n") signature_uri;
+  Option.iter (fp "sig=%s\n") signature_uri;
   (match checksums with
   | None -> ()
   | Some checksums ->
@@ -299,11 +299,11 @@ let write_entry chan (name, { Index.printable_name; file_uri; arch; osinfo;
     ) checksums
   );
   fp "revision=%s\n" (string_of_revision revision);
-  Option.may (fp "format=%s\n") format;
+  Option.iter (fp "format=%s\n") format;
   fp "size=%Ld\n" size;
-  Option.may (fp "compressed_size=%Ld\n") compressed_size;
-  Option.may (fp "expand=%s\n") expand;
-  Option.may (fp "lvexpand=%s\n") lvexpand;
+  Option.iter (fp "compressed_size=%Ld\n") compressed_size;
+  Option.iter (fp "expand=%s\n") expand;
+  Option.iter (fp "lvexpand=%s\n") lvexpand;
 
   let format_notes notes =
     String.concat "\n " (String.nsplit "\n" notes) in

diff --git a/builder/list_entries.ml b/builder/list_entries.ml
index 470d1b6edffbc1a680224b32a468f3b18a199efa..0690d58585916c1ea539164d818e56c1057ae183 100644 (file)
--- a/builder/list_entries.ml
+++ b/builder/list_entries.ml
@@ -47,7 +47,7 @@ and list_entries_short index =
       if not hidden then (
         printf "%-24s" name;
         printf " %-10s" (Index.string_of_arch arch);
-        Option.may (printf " %s") printable_name;
+        Option.iter (printf " %s") printable_name;
         printf "\n"
       )
   ) index
@@ -73,13 +73,13 @@ and list_entries_long ~sources index =
                  notes; aliases; hidden }) ->
       if not hidden then (
         printf "%-24s %s\n" "os-version:" name;
-        Option.may (printf "%-24s %s\n" (s_"Full name:")) printable_name;
+        Option.iter (printf "%-24s %s\n" (s_"Full name:")) printable_name;
         printf "%-24s %s\n" (s_"Architecture:") (Index.string_of_arch arch);
         printf "%-24s %s\n" (s_"Minimum/default size:") (human_size size);
-        Option.may (fun size ->
+        Option.iter (fun size ->
             printf "%-24s %s\n" (s_"Download size:") (human_size size)
         ) compressed_size;
-        Option.may (
+        Option.iter (
             fun l -> printf "%-24s %s\n" (s_"Aliases:") (String.concat " " l)
         ) aliases;
         let notes = Languages.find_notes langs notes in

diff --git a/common/mlcustomize/inject_virtio_win.ml b/common/mlcustomize/inject_virtio_win.ml
index 5f4aab72d04936c36a5b92c3ae059ac49e297e63..2a30b20081294d8c41ef62247ba5a21b508ad1f0 100644 (file)
--- a/common/mlcustomize/inject_virtio_win.ml
+++ b/common/mlcustomize/inject_virtio_win.ml
@@ -49,9 +49,12 @@ type t = {
       of libosinfo.  Although this behaviour is documented, IMHO it has
       always been a bad idea.  We should change this in future to allow
       the user to select where they want to get drivers from. XXX *)
+
+  mutable block_driver_priority : string list
+  (** List of block drivers *)
 }
 
-type block_type = Virtio_blk | IDE
+type block_type = Virtio_blk | Virtio_SCSI | IDE
 and net_type = Virtio_net | E1000 | RTL8139
 and machine_type = I440FX | Q35 | Virt
 
@@ -107,13 +110,17 @@ and get_inspection g root =
   { g; root;
     i_arch; i_major_version; i_minor_version; i_osinfo;
     i_product_variant; i_windows_current_control_set; i_windows_systemroot;
-    virtio_win = ""; was_set = false }
+    virtio_win = ""; was_set = false;
+    block_driver_priority = ["virtio_blk"; "vrtioblk"; "viostor"] }
+
+let get_block_driver_priority t   = t.block_driver_priority
+let set_block_driver_priority t v = t.block_driver_priority <- v
 
 let scsi_class_guid = "{4D36E97B-E325-11CE-BFC1-08002BE10318}"
-let viostor_legacy_pciid = "VEN_1AF4&DEV_1001&SUBSYS_00021AF4&REV_00"
-let viostor_modern_pciid = "VEN_1AF4&DEV_1042&SUBSYS_11001AF4&REV_01"
-let vioscsi_legacy_pciid = "VEN_1AF4&DEV_1004&SUBSYS_00081AF4&REV_00"
-let vioscsi_modern_pciid = "VEN_1AF4&DEV_1048&SUBSYS_11001AF4&REV_01"
+let viostor_legacy_pciid = "VEN_1AF4&DEV_1001&REV_00"
+let viostor_modern_pciid = "VEN_1AF4&DEV_1042&REV_01"
+let vioscsi_legacy_pciid = "VEN_1AF4&DEV_1004&REV_00"
+let vioscsi_modern_pciid = "VEN_1AF4&DEV_1048&REV_01"
 
 let rec inject_virtio_win_drivers ({ g } as t) reg =
   (* Copy the virtio drivers to the guest. *)
@@ -176,14 +183,13 @@ let rec inject_virtio_win_drivers ({ g } as t) reg =
   else (
     (* Can we install the block driver? *)
     let block : block_type =
-      let filenames = ["virtio_blk"; "vrtioblk"; "viostor"] in
       let viostor_driver = try (
         Some (
           List.find (
             fun driver_file ->
               let source = driverdir // driver_file ^ ".sys" in
               g#exists source
-          ) filenames
+          ) t.block_driver_priority
         )
       ) with Not_found -> None in
       match viostor_driver with
@@ -194,16 +200,22 @@ let rec inject_virtio_win_drivers ({ g } as t) reg =
         IDE
 
       | Some driver_name ->
-        (* Block driver needs tweaks to allow booting; the rest is set up by PnP
-         * manager *)
+        (* Block driver needs tweaks to allow booting;
+         * the rest is set up by PnP manager.
+         *)
         let source = driverdir // (driver_name ^ ".sys") in
         let target = sprintf "%s/system32/drivers/%s.sys"
                              t.i_windows_systemroot driver_name in
         let target = g#case_sensitive_path target in
+        let installed_block_type, legacy_pciid, modern_pciid =
+          match driver_name with
+          | "vioscsi" -> Virtio_SCSI, vioscsi_legacy_pciid, vioscsi_modern_pciid
+          | _ -> Virtio_blk, viostor_legacy_pciid, viostor_modern_pciid
+        in
         g#cp source target;
-        add_guestor_to_registry t reg driver_name viostor_legacy_pciid;
-        add_guestor_to_registry t reg driver_name viostor_modern_pciid;
-        Virtio_blk in
+        add_guestor_to_registry t reg driver_name legacy_pciid;
+        add_guestor_to_registry t reg driver_name modern_pciid;
+        installed_block_type in
 
     (* Can we install the virtio-net driver? *)
     let net : net_type =

diff --git a/common/mlcustomize/inject_virtio_win.mli b/common/mlcustomize/inject_virtio_win.mli
index 0ced02e803b6bbf50cadd8d75623dc004652713d..d14f04973a1925dc35a9d25a5ea762f2369b3760 100644 (file)
--- a/common/mlcustomize/inject_virtio_win.mli
+++ b/common/mlcustomize/inject_virtio_win.mli
@@ -20,7 +20,7 @@
 
 type t (** Handle *)
 
-type block_type = Virtio_blk | IDE
+type block_type = Virtio_blk | Virtio_SCSI | IDE
 and net_type = Virtio_net | E1000 | RTL8139
 and machine_type = I440FX | Q35 | Virt
 
@@ -64,6 +64,16 @@ val from_environment : Guestfs.guestfs -> string -> string -> t
 
     This should only be used by [virt-v2v] and is considered a legacy method. *)
 
+val get_block_driver_priority : t -> string list
+val set_block_driver_priority : t -> string list -> unit
+(** Get or set the current block driver priority list.  This is
+    a list of virtio-win block driver names (eg. ["viostor"]) that
+    we search until we come to the first [name ^ ".sys"] that
+    we find, and that is the block driver which gets installed.
+
+    This module contains a default priority list which should
+    be suitable for most use cases. *)
+
 val inject_virtio_win_drivers : t -> Registry.t -> virtio_win_installed
 (** [inject_virtio_win_drivers t reg]
     installs virtio drivers from the driver directory or driver

diff --git a/common/mldrivers/linux_kernels.ml b/common/mldrivers/linux_kernels.ml
index a46146a132d771fb871134567dbafb2b6a3e5942..23ff76a5504c09a9c425c11d68075bf0bce3330e 100644 (file)
--- a/common/mldrivers/linux_kernels.ml
+++ b/common/mldrivers/linux_kernels.ml
@@ -125,9 +125,9 @@ let detect_kernels (g : G.guestfs) root bootloader apps =
             *)
            let modpath, version =
              let prefix = "/lib/modules/" in
+             let prefix_len = String.length prefix in
              try
-               let prefix_len = String.length prefix in
-               List.find_map (
+               let modpath, version = List.find_map (
                  fun filename ->
                    let filename_len = String.length filename in
                    if filename_len > prefix_len &&
@@ -137,17 +137,29 @@ let detect_kernels (g : G.guestfs) root bootloader apps =
                      Some (filename, version)
                    ) else
                      None
-               ) files
+               ) files in
+               (* Fall back to the version in the vmlinuz file name not only if
+                * a candidate pathname couldn't be found under /lib/modules/,
+                * but also in case the candidate pathname doesn't reference a
+                * directory. See RHBZ#2175703.
+                *
+                * Note that this "is_dir" check is deliberately kept outside of
+                * the "find_map"'s mapper function above: we want the first
+                * candidate *to be* a directory, and not the first candidate
+                * *that is* a directory.
+                *)
+               if not (g#is_dir ~followsymlinks:true modpath) then
+                 raise Not_found;
+               modpath, version
              with Not_found ->
                let version =
                  String.sub vmlinuz 14 (String.length vmlinuz - 14) in
                let modpath = prefix ^ version in
+               (* Check that the modpath exists. *)
+               if not (g#is_dir ~followsymlinks:true modpath) then
+                 raise Not_found;
                modpath, version in
 
-           (* Check that the modpath exists. *)
-           if not (g#is_dir ~followsymlinks:true modpath) then
-             raise Not_found;
-
            (* Find the initramfs which corresponds to the kernel.
             * Since the initramfs is built at runtime, and doesn't have
             * to be covered by the RPM file list, this is basically

diff --git a/common/mlstdutils/std_utils.ml b/common/mlstdutils/std_utils.ml
index ab6e71cbb30333d6b1d792045c58839e7bbf84c5..0d2fa22f81e6537789f4f7665e3eec7e92f4e908 100644 (file)
--- a/common/mlstdutils/std_utils.ml
+++ b/common/mlstdutils/std_utils.ml
@@ -139,13 +139,19 @@ module String = struct
       done;
       if not !r then s else Bytes.to_string b2
 
+    let break n str =
+      let len = String.length str in
+      if n < 0 then "", str
+      else if n >= len then str, ""
+      else sub str 0 n, sub str n (len-n)
+
     let rec split sep str =
-      let len = length sep in
-      let seplen = length str in
+      let seplen = length sep in
+      let strlen = length str in
       let i = find str sep in
       if i = -1 then str, ""
       else (
-        sub str 0 i, sub str (i + len) (seplen - i - len)
+        sub str 0 i, sub str (i + seplen) (strlen - i - seplen)
       )
 
     and nsplit ?(max = 0) sep str =
@@ -287,6 +293,25 @@ module List = struct
       | x :: xs when f x -> x :: takewhile f xs
       | _ -> []
 
+    let take n xs =
+      if n <= 0 then []
+      else (
+        (* This optimisation avoids copying xs. *)
+        let len = List.length xs in
+        if len <= n then xs
+        else (
+          let rec take n = function
+            | x :: xs when n >= 1 -> x :: take (n-1) xs
+            | _ -> []
+          in
+          take n xs
+        )
+      )
+    let rec drop n xs =
+      if n <= 0 then xs
+      else if xs = [] then []
+      else drop (n-1) (List.tl xs)
+
     let rec filter_map f = function
       | [] -> []
       | x :: xs ->
@@ -368,7 +393,7 @@ module List = struct
 end
 
 module Option = struct
-    let may f = function
+    let iter f = function
       | None -> ()
       | Some x -> f x
 
@@ -376,8 +401,9 @@ module Option = struct
       | None -> None
       | Some x -> Some (f x)
 
-    let default def = function
-      | None -> def
+    let value x ~default =
+      match x with
+      | None -> default
       | Some x -> x
 end
 

diff --git a/common/mlstdutils/std_utils.mli b/common/mlstdutils/std_utils.mli
index 782d8fd392da3524a80c404d3e93fc366b0bb874..a39ac5f3b79af2563debef839dc45612b6fd7fe8 100644 (file)
--- a/common/mlstdutils/std_utils.mli
+++ b/common/mlstdutils/std_utils.mli
@@ -87,6 +87,10 @@ module String : sig
         [str] with [s2]. *)
     val replace_char : string -> char -> char -> string
     (** Replace character in string. *)
+    val break : int -> string -> string * string
+    (** [break n str] breaks a string at the nth byte, returning the
+        first and second parts.  If [n] is beyond the end of the
+        string it returns [(str, "")]. *)
     val split : string -> string -> string * string
     (** [split sep str] splits [str] at the first occurrence of the
         separator [sep], returning the part before and the part after.
@@ -193,6 +197,16 @@ module List : sig
 
         For any list [xs] and function [f],
         [xs = takewhile f xs @ dropwhile f xs] *)
+
+    val take : int -> 'a list -> 'a list
+    (** [take n xs] returns the first [n] elements of [xs].  If [xs] is
+        shorter than [n], then it returns [xs].  Note it never fails
+        for any input. *)
+    val drop : int -> 'a list -> 'a list
+    (** [drop n xs] returns the suffix of [xs] after the first [n]
+        elements.  If [xs] is shorter than [n], then it returns the empty
+        list.  Note it never fails for any input. *)
+
     val filter_map : ('a -> 'b option) -> 'a list -> 'b list
     (** [filter_map f xs] applies [f] to each element of [xs].  If
         [f x] returns [Some y] then [y] is added to the returned list. *)
@@ -277,16 +291,19 @@ end
 (** Override the List module from stdlib. *)
 
 module Option : sig
-    val may : ('a -> unit) -> 'a option -> unit
-    (** [may f (Some x)] runs [f x].  [may f None] does nothing. *)
+    val iter : ('a -> unit) -> 'a option -> unit
+    (** [iter f o] is [f v] if [o] is [Some v] and [()] otherwise *)
 
     val map : ('a -> 'b) -> 'a option -> 'b option
     (** [map f (Some x)] returns [Some (f x)].  [map f None] returns [None]. *)
 
-    val default : 'a -> 'a option -> 'a
-    (** [default x (Some y)] returns [y].  [default x None] returns [x]. *)
+    val value : 'a option -> default:'a -> 'a
+    (** [value o ~default] is [v] if [o] is [Some v] and [default] otherwise. *)
 end
-(** Functions for dealing with option types. *)
+(** Functions for dealing with option types.
+
+    This module will be removed when we can use baseline OCaml 4.08
+    since that version introduces a compatible [Option] module. *)
 
 val ( // ) : string -> string -> string
 (** Concatenate directory and filename. *)

diff --git a/common/mlstdutils/std_utils_tests.ml b/common/mlstdutils/std_utils_tests.ml
index d161b5e7ef8914c52c50af45881407b672f0dc2b..3f5bb1a862a87e4c9c47ae5ae069d80e94502d17 100644 (file)
--- a/common/mlstdutils/std_utils_tests.ml
+++ b/common/mlstdutils/std_utils_tests.ml
@@ -85,6 +85,18 @@ let test_string_find ctx =
   assert_equal_int (-1) (String.find "" "baz");
   assert_equal_int (-1) (String.find "foobar" "baz")
 
+(* Test Std_utils.String.break. *)
+let test_string_break ctx =
+  assert_equal_stringpair ("a", "b") (String.break 1 "ab");
+  assert_equal_stringpair ("", "ab") (String.break 0 "ab");
+  assert_equal_stringpair ("", "ab") (String.break (-1) "ab");
+  assert_equal_stringpair ("ab", "") (String.break 2 "ab");
+  assert_equal_stringpair ("ab", "") (String.break 3 "ab");
+  assert_equal_stringpair ("abc", "def") (String.break 3 "abcdef");
+  assert_equal_stringpair ("", "") (String.break 0 "");
+  assert_equal_stringpair ("", "") (String.break (-2) "");
+  assert_equal_stringpair ("", "") (String.break 2 "")
+
 (* Test Std_utils.String.split. *)
 let test_string_split ctx =
   assert_equal_stringpair ("a", "b") (String.split " " "a b");
@@ -169,6 +181,7 @@ let suite =
       "char.mem" >:: test_char_mem;
       "strings.is_prefix" >:: test_string_is_prefix;
       "strings.is_suffix" >:: test_string_is_suffix;
+      "strings.break" >:: test_string_break;
       "strings.find" >:: test_string_find;
       "strings.split" >:: test_string_split;
       "strings.nsplit" >:: test_string_nsplit;

diff --git a/common/mltools/tools_utils.ml b/common/mltools/tools_utils.ml
index 562bfadc18a8af036793a3e8a96bdb1bff83fbdb..8b611e77eac215ea025109d3976a99665705fd69 100644 (file)
--- a/common/mltools/tools_utils.ml
+++ b/common/mltools/tools_utils.ml
@@ -218,7 +218,7 @@ let open_guestfs ?identifier () =
   g#parse_environment ();
   if trace () then g#set_trace true;
   if verbose () then g#set_verbose true;
-  Option.may g#set_identifier identifier;
+  Option.iter g#set_identifier identifier;
   g
 
 (* All the OCaml virt-* programs use this wrapper to catch exceptions
@@ -523,8 +523,8 @@ and do_run ?(echo_cmd = true) ?stdout_fd ?stderr_fd args =
      Or 127
 
 and do_teardown app outfd errfd exitstat =
-  Option.may Unix.close outfd;
-  Option.may Unix.close errfd;
+  Option.iter Unix.close outfd;
+  Option.iter Unix.close errfd;
   match exitstat with
   | Unix.WEXITED i ->
     i

diff --git a/common/progress/progress.c b/common/progress/progress.c
index 4d52b97ea127a241104f1188b2078cfef93a7d36..e4b30663f7ba72e23033198f8ec532111b3fbbc9 100644 (file)
--- a/common/progress/progress.c
+++ b/common/progress/progress.c
@@ -318,7 +318,8 @@ progress_bar_set (struct progress_bar *bar,
        * (b) it's just not possible to use tputs in a sane way here.
        */
       /*tputs (UP, 2, putchar);*/
-      fprintf (fp, "%s", UP);
+      if (UP)
+        fprintf (fp, "%s", UP);
     }
     bar->count++;
 

diff --git a/configure b/configure
index 10c114c782f0ae002a98bfbf4abaa54b3777b9e1..bdd272bd7e8fbf13a567561091d6328c00602840 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.71 for guestfs-tools 1.50.0.
+# Generated by GNU Autoconf 2.71 for guestfs-tools 1.50.1.
 #
 #
 # Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation,
@@ -618,8 +618,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='guestfs-tools'
 PACKAGE_TARNAME='guestfs-tools'
-PACKAGE_VERSION='1.50.0'
-PACKAGE_STRING='guestfs-tools 1.50.0'
+PACKAGE_VERSION='1.50.1'
+PACKAGE_STRING='guestfs-tools 1.50.1'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -1498,7 +1498,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures guestfs-tools 1.50.0 to adapt to many kinds of systems.
+\`configure' configures guestfs-tools 1.50.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1569,7 +1569,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of guestfs-tools 1.50.0:";;
+     short | recursive ) echo "Configuration of guestfs-tools 1.50.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1742,7 +1742,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-guestfs-tools configure 1.50.0
+guestfs-tools configure 1.50.1
 generated by GNU Autoconf 2.71
 
 Copyright (C) 2021 Free Software Foundation, Inc.
@@ -2282,7 +2282,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by guestfs-tools $as_me 1.50.0, which was
+It was created by guestfs-tools $as_me 1.50.1, which was
 generated by GNU Autoconf 2.71.  Invocation command line was
 
   $ $0$ac_configure_args_raw
@@ -4860,7 +4860,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='guestfs-tools'
- VERSION='1.50.0'
+ VERSION='1.50.1'
 
 
 printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h
@@ -21933,7 +21933,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by guestfs-tools $as_me 1.50.0, which was
+This file was extended by guestfs-tools $as_me 1.50.1, which was
 generated by GNU Autoconf 2.71.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -22001,7 +22001,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config='$ac_cs_config_escaped'
 ac_cs_version="\\
-guestfs-tools config.status 1.50.0
+guestfs-tools config.status 1.50.1
 configured by $0, generated by GNU Autoconf 2.71,
   with options \\"\$ac_cs_config\\"
 

diff --git a/configure.ac b/configure.ac
index 1f8acced2ddd8d00f670cb5ca3736b66f9889d93..24a89d64048f1cd51c2464611c98178b8d6c583d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -15,7 +15,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-AC_INIT([guestfs-tools], [1.50.0])
+AC_INIT([guestfs-tools], [1.50.1])
 
 dnl The common/ subdirectory assumes this.  In libguestfs it contains
 dnl the --with-extra parameter.  Here we just define it to the version.

diff --git a/customize/customize_main.ml b/customize/customize_main.ml
index f05375e1d197ceb82f0396dfda07d6ab27bee39e..8622715ab799ca8bface16630db5e0c19d94c5d4 100644 (file)
--- a/customize/customize_main.ml
+++ b/customize/customize_main.ml
@@ -163,8 +163,8 @@ read the man page virt-customize(1).
   (* Connect to libguestfs. *)
   let g =
     let g = open_guestfs () in
-    Option.may g#set_memsize memsize;
-    Option.may g#set_smp smp;
+    Option.iter g#set_memsize memsize;
+    Option.iter g#set_smp smp;
     (* [--no-network] from the command line takes precedence over the automatic
      * network enablement for [--key ID:clevis], so here we intentionally
      * don't check [key_store_requires_network opthandle.ks].

diff --git a/dib/dib.ml b/dib/dib.ml
index a4ba360400bc070b931f0ace6c43861839712e5a..9ae154b865e390f04d9fa4977574f0991a1e62bd 100644 (file)
--- a/dib/dib.ml
+++ b/dib/dib.ml
@@ -721,8 +721,8 @@ let main () =
 
   let g, tmpdisk, tmpdiskfmt, drive_partition =
     let g = open_guestfs () in
-    Option.may g#set_memsize cmdline.memsize;
-    Option.may g#set_smp cmdline.smp;
+    Option.iter g#set_memsize cmdline.memsize;
+    Option.iter g#set_smp cmdline.smp;
     g#set_network cmdline.network;
 
     (* Main disk with the built image. *)

diff --git a/drivers/drivers.mli b/drivers/drivers.mli
index 4437e461c3aececf70eb4fe1beaeca92073eca83..8a67b77a275cbb9a05f3ebb8d381d01e15cfae86 100644 (file)
--- a/drivers/drivers.mli
+++ b/drivers/drivers.mli
@@ -1,4 +1,4 @@
-(* virt-get-kernel
+(* virt-drivers
  * Copyright (C) 2013-2023 Red Hat Inc.
  *
  * This program is free software; you can redistribute it and/or modify

diff --git a/drivers/test-virt-drivers-linux.sh b/drivers/test-virt-drivers-linux.sh
index df3f36c641f6bdc164a46ceacbe5dd65fe8f8e02..5404db1e516a4ad663d63ebaa02c7a9d2f9f6bfa 100755 (executable)
--- a/drivers/test-virt-drivers-linux.sh
+++ b/drivers/test-virt-drivers-linux.sh
@@ -20,11 +20,11 @@ set -e
 
 $TEST_FUNCTIONS
 skip_if_skipped
-skip_unless_phony_guest windows.img
+skip_unless_phony_guest fedora.img
 
-rm -f actual-windows.xml
+rm -f actual-fedora.xml
 
-$VG virt-drivers --format=raw -a ../test-data/phony-guests/windows.img > actual-windows.xml
-diff -ur -I "generated by" expected-windows.xml actual-windows.xml
+$VG virt-drivers --format=raw -a ../test-data/phony-guests/fedora.img > actual-fedora.xml
+diff -ur -I "generated by" expected-fedora.xml actual-fedora.xml
 
-rm actual-windows.xml
+rm actual-fedora.xml

diff --git a/drivers/test-virt-drivers-windows.sh b/drivers/test-virt-drivers-windows.sh
index 5404db1e516a4ad663d63ebaa02c7a9d2f9f6bfa..df3f36c641f6bdc164a46ceacbe5dd65fe8f8e02 100755 (executable)
--- a/drivers/test-virt-drivers-windows.sh
+++ b/drivers/test-virt-drivers-windows.sh
@@ -20,11 +20,11 @@ set -e
 
 $TEST_FUNCTIONS
 skip_if_skipped
-skip_unless_phony_guest fedora.img
+skip_unless_phony_guest windows.img
 
-rm -f actual-fedora.xml
+rm -f actual-windows.xml
 
-$VG virt-drivers --format=raw -a ../test-data/phony-guests/fedora.img > actual-fedora.xml
-diff -ur -I "generated by" expected-fedora.xml actual-fedora.xml
+$VG virt-drivers --format=raw -a ../test-data/phony-guests/windows.img > actual-windows.xml
+diff -ur -I "generated by" expected-windows.xml actual-windows.xml
 
-rm actual-fedora.xml
+rm actual-windows.xml

diff --git a/ocaml-dep.sh.in b/ocaml-dep.sh.in
index a97403e186d0f53846e96a0d959b3080c737daf2..9546a1d49e429fc3df7315c7783fe9aba97beeb6 100755 (executable)
--- a/ocaml-dep.sh.in
+++ b/ocaml-dep.sh.in
@@ -43,7 +43,6 @@ common/mlutils
 common/mlvisit
 common/mlxml
 customize
-ocaml
 "
 
 # Output file is always created in the current directory.

diff --git a/po-docs/ja/virt-alignment-scan.1 b/po-docs/ja/virt-alignment-scan.1
index 57d389389d20818beb4863610a45ffdbdbf6b813..2b939a50fdaa6d0bb71823e6a1e30a04fb924f68 100644 (file)
--- a/po-docs/ja/virt-alignment-scan.1
+++ b/po-docs/ja/virt-alignment-scan.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Podwrapper::Man 1.50.0 (Pod::Simple 3.43)
+.\" Automatically generated by Podwrapper::Man 1.50.1 (Pod::Simple 3.43)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -71,7 +71,7 @@
 .\" ========================================================================
 .\"
 .IX Title "virt-alignment-scan 1"
-.TH virt-alignment-scan 1 "2023-02-07" "guestfs-tools-1.50.0" "Virtualization Support"
+.TH virt-alignment-scan 1 "2023-04-06" "guestfs-tools-1.50.1" "Virtualization Support"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l

diff --git a/po-docs/ja/virt-builder.1 b/po-docs/ja/virt-builder.1
index c0c2b21f9e94403bbcf3375d267d967210e63deb..89c5fb4228480a4e1a9b19c1dd0eb84ae8aa2cd2 100644 (file)
--- a/po-docs/ja/virt-builder.1
+++ b/po-docs/ja/virt-builder.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Podwrapper::Man 1.50.0 (Pod::Simple 3.43)
+.\" Automatically generated by Podwrapper::Man 1.50.1 (Pod::Simple 3.43)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -71,7 +71,7 @@
 .\" ========================================================================
 .\"
 .IX Title "virt-builder 1"
-.TH virt-builder 1 "2023-02-07" "guestfs-tools-1.50.0" "Virtualization Support"
+.TH virt-builder 1 "2023-04-06" "guestfs-tools-1.50.1" "Virtualization Support"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l

diff --git a/po-docs/ja/virt-cat.1 b/po-docs/ja/virt-cat.1
index 5c3706be0c76e1079f80de2de72fc17c2156a882..89d80ed968bb201a23ba62121cd88af83d45e56d 100644 (file)
--- a/po-docs/ja/virt-cat.1
+++ b/po-docs/ja/virt-cat.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Podwrapper::Man 1.50.0 (Pod::Simple 3.43)
+.\" Automatically generated by Podwrapper::Man 1.50.1 (Pod::Simple 3.43)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -71,7 +71,7 @@
 .\" ========================================================================
 .\"
 .IX Title "virt-cat 1"
-.TH virt-cat 1 "2023-02-07" "guestfs-tools-1.50.0" "Virtualization Support"
+.TH virt-cat 1 "2023-04-06" "guestfs-tools-1.50.1" "Virtualization Support"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l

diff --git a/po-docs/ja/virt-customize.1 b/po-docs/ja/virt-customize.1
index ccf3c154afb09bbb15b66dffe34ee85682c8a703..96f6bc1b0f195e4e808f91fabac9eadbfd17a84c 100644 (file)
--- a/po-docs/ja/virt-customize.1
+++ b/po-docs/ja/virt-customize.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Podwrapper::Man 1.50.0 (Pod::Simple 3.43)
+.\" Automatically generated by Podwrapper::Man 1.50.1 (Pod::Simple 3.43)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -71,7 +71,7 @@
 .\" ========================================================================
 .\"
 .IX Title "virt-customize 1"
-.TH virt-customize 1 "2023-02-07" "guestfs-tools-1.50.0" "Virtualization Support"
+.TH virt-customize 1 "2023-04-06" "guestfs-tools-1.50.1" "Virtualization Support"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l

diff --git a/po-docs/ja/virt-df.1 b/po-docs/ja/virt-df.1
index 613f9c040987a2e991a518f4fa8c96145244476b..d050cd4c00a2410b4b8cedcc5859790865ab7e5d 100644 (file)
--- a/po-docs/ja/virt-df.1
+++ b/po-docs/ja/virt-df.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Podwrapper::Man 1.50.0 (Pod::Simple 3.43)
+.\" Automatically generated by Podwrapper::Man 1.50.1 (Pod::Simple 3.43)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -71,7 +71,7 @@
 .\" ========================================================================
 .\"
 .IX Title "virt-df 1"
-.TH virt-df 1 "2023-02-07" "guestfs-tools-1.50.0" "Virtualization Support"
+.TH virt-df 1 "2023-04-06" "guestfs-tools-1.50.1" "Virtualization Support"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l

diff --git a/po-docs/ja/virt-dib.1 b/po-docs/ja/virt-dib.1
index 5eed0175a770c2052176e09acae27d88a229db87..b33c3e656e81c1f5d4e0462c1d9d83368ba053a8 100644 (file)
--- a/po-docs/ja/virt-dib.1
+++ b/po-docs/ja/virt-dib.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Podwrapper::Man 1.50.0 (Pod::Simple 3.43)
+.\" Automatically generated by Podwrapper::Man 1.50.1 (Pod::Simple 3.43)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -71,7 +71,7 @@
 .\" ========================================================================
 .\"
 .IX Title "virt-dib 1"
-.TH virt-dib 1 "2023-02-07" "guestfs-tools-1.50.0" "Virtualization Support"
+.TH virt-dib 1 "2023-04-06" "guestfs-tools-1.50.1" "Virtualization Support"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l

diff --git a/po-docs/ja/virt-diff.1 b/po-docs/ja/virt-diff.1
index 65fa8fc8a4b79db40d66ba6db9a8cc4702be3c03..d2ab0f04c2025afc0e1106092aafac295b85c0b1 100644 (file)
--- a/po-docs/ja/virt-diff.1
+++ b/po-docs/ja/virt-diff.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Podwrapper::Man 1.50.0 (Pod::Simple 3.43)
+.\" Automatically generated by Podwrapper::Man 1.50.1 (Pod::Simple 3.43)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -71,7 +71,7 @@
 .\" ========================================================================
 .\"
 .IX Title "virt-diff 1"
-.TH virt-diff 1 "2023-02-07" "guestfs-tools-1.50.0" "Virtualization Support"
+.TH virt-diff 1 "2023-04-06" "guestfs-tools-1.50.1" "Virtualization Support"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l

diff --git a/po-docs/ja/virt-edit.1 b/po-docs/ja/virt-edit.1
index 1c10c5da0d65af45f5a56499eb61b8e7764c8489..f3227661204044bff9b7444a349b525e458bc0a0 100644 (file)
--- a/po-docs/ja/virt-edit.1
+++ b/po-docs/ja/virt-edit.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Podwrapper::Man 1.50.0 (Pod::Simple 3.43)
+.\" Automatically generated by Podwrapper::Man 1.50.1 (Pod::Simple 3.43)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -71,7 +71,7 @@
 .\" ========================================================================
 .\"
 .IX Title "virt-edit 1"
-.TH virt-edit 1 "2023-02-07" "guestfs-tools-1.50.0" "Virtualization Support"
+.TH virt-edit 1 "2023-04-06" "guestfs-tools-1.50.1" "Virtualization Support"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l

diff --git a/po-docs/ja/virt-filesystems.1 b/po-docs/ja/virt-filesystems.1
index c4c1553f070bd567c003596596778a1ece9aae98..05a293937991264019b676175667e721204b294d 100644 (file)
--- a/po-docs/ja/virt-filesystems.1
+++ b/po-docs/ja/virt-filesystems.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Podwrapper::Man 1.50.0 (Pod::Simple 3.43)
+.\" Automatically generated by Podwrapper::Man 1.50.1 (Pod::Simple 3.43)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -71,7 +71,7 @@
 .\" ========================================================================
 .\"
 .IX Title "virt-filesystems 1"
-.TH virt-filesystems 1 "2023-02-07" "guestfs-tools-1.50.0" "Virtualization Support"
+.TH virt-filesystems 1 "2023-04-06" "guestfs-tools-1.50.1" "Virtualization Support"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l

diff --git a/po-docs/ja/virt-format.1 b/po-docs/ja/virt-format.1
index 4e6c1b06f5c35d4bff3fa157dc2132c34ea4856b..10435717fe5df3202d6207d63bfd31386d340016 100644 (file)
--- a/po-docs/ja/virt-format.1
+++ b/po-docs/ja/virt-format.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Podwrapper::Man 1.50.0 (Pod::Simple 3.43)
+.\" Automatically generated by Podwrapper::Man 1.50.1 (Pod::Simple 3.43)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -71,7 +71,7 @@
 .\" ========================================================================
 .\"
 .IX Title "virt-format 1"
-.TH virt-format 1 "2023-02-07" "guestfs-tools-1.50.0" "Virtualization Support"
+.TH virt-format 1 "2023-04-06" "guestfs-tools-1.50.1" "Virtualization Support"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l

diff --git a/po-docs/ja/virt-get-kernel.1 b/po-docs/ja/virt-get-kernel.1
index 07df4e7772a4025b1dbfd923095ac9090b303c35..f0e545793e19bb6b58d0c0d9ebf8c7682ac02dbd 100644 (file)
--- a/po-docs/ja/virt-get-kernel.1
+++ b/po-docs/ja/virt-get-kernel.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Podwrapper::Man 1.50.0 (Pod::Simple 3.43)
+.\" Automatically generated by Podwrapper::Man 1.50.1 (Pod::Simple 3.43)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -71,7 +71,7 @@
 .\" ========================================================================
 .\"
 .IX Title "virt-get-kernel 1"
-.TH virt-get-kernel 1 "2023-02-07" "guestfs-tools-1.50.0" "Virtualization Support"
+.TH virt-get-kernel 1 "2023-04-06" "guestfs-tools-1.50.1" "Virtualization Support"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l

diff --git a/po-docs/ja/virt-index-validate.1 b/po-docs/ja/virt-index-validate.1
index 20c997be1c0551bd3055a2fb4cd66e986eff1e01..655dbb87c79b1fb22175c5a8fdc03628896d6b30 100644 (file)
--- a/po-docs/ja/virt-index-validate.1
+++ b/po-docs/ja/virt-index-validate.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Podwrapper::Man 1.50.0 (Pod::Simple 3.43)
+.\" Automatically generated by Podwrapper::Man 1.50.1 (Pod::Simple 3.43)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -71,7 +71,7 @@
 .\" ========================================================================
 .\"
 .IX Title "virt-index-validate 1"
-.TH virt-index-validate 1 "2023-02-07" "guestfs-tools-1.50.0" "Virtualization Support"
+.TH virt-index-validate 1 "2023-04-06" "guestfs-tools-1.50.1" "Virtualization Support"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l

diff --git a/po-docs/ja/virt-inspector.1 b/po-docs/ja/virt-inspector.1
index 260eefacc87f8a7eab3492a57f0f03403bf02acd..a4e3b4ebe44920a6908bc54acbb50aad8cdadb32 100644 (file)
--- a/po-docs/ja/virt-inspector.1
+++ b/po-docs/ja/virt-inspector.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Podwrapper::Man 1.50.0 (Pod::Simple 3.43)
+.\" Automatically generated by Podwrapper::Man 1.50.1 (Pod::Simple 3.43)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -71,7 +71,7 @@
 .\" ========================================================================
 .\"
 .IX Title "virt-inspector 1"
-.TH virt-inspector 1 "2023-02-07" "guestfs-tools-1.50.0" "Virtualization Support"
+.TH virt-inspector 1 "2023-04-06" "guestfs-tools-1.50.1" "Virtualization Support"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l

diff --git a/po-docs/ja/virt-log.1 b/po-docs/ja/virt-log.1
index 4e02ecb2852085115560b281d1befd7ad4cbb3ec..7163621b0e1acd04b009d7ff3629304035b09e7d 100644 (file)
--- a/po-docs/ja/virt-log.1
+++ b/po-docs/ja/virt-log.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Podwrapper::Man 1.50.0 (Pod::Simple 3.43)
+.\" Automatically generated by Podwrapper::Man 1.50.1 (Pod::Simple 3.43)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -71,7 +71,7 @@
 .\" ========================================================================
 .\"
 .IX Title "virt-log 1"
-.TH virt-log 1 "2023-02-07" "guestfs-tools-1.50.0" "Virtualization Support"
+.TH virt-log 1 "2023-04-06" "guestfs-tools-1.50.1" "Virtualization Support"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l

diff --git a/po-docs/ja/virt-ls.1 b/po-docs/ja/virt-ls.1
index 1aa3ad9701ebeb45ce4f2f32addfcf9db643461d..a614ac672d6de3c6396b272400067458247f86bc 100644 (file)
--- a/po-docs/ja/virt-ls.1
+++ b/po-docs/ja/virt-ls.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Podwrapper::Man 1.50.0 (Pod::Simple 3.43)
+.\" Automatically generated by Podwrapper::Man 1.50.1 (Pod::Simple 3.43)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -71,7 +71,7 @@
 .\" ========================================================================
 .\"
 .IX Title "virt-ls 1"
-.TH virt-ls 1 "2023-02-07" "guestfs-tools-1.50.0" "Virtualization Support"
+.TH virt-ls 1 "2023-04-06" "guestfs-tools-1.50.1" "Virtualization Support"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l

diff --git a/po-docs/ja/virt-make-fs.1 b/po-docs/ja/virt-make-fs.1
index 318a11937cbc52ee6c7e74b8232a3840d4b7d260..eed3e0d2077e87e0ca0e9822f4783c4d52a04f53 100644 (file)
--- a/po-docs/ja/virt-make-fs.1
+++ b/po-docs/ja/virt-make-fs.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Podwrapper::Man 1.50.0 (Pod::Simple 3.43)
+.\" Automatically generated by Podwrapper::Man 1.50.1 (Pod::Simple 3.43)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -71,7 +71,7 @@
 .\" ========================================================================
 .\"
 .IX Title "virt-make-fs 1"
-.TH virt-make-fs 1 "2023-02-07" "guestfs-tools-1.50.0" "Virtualization Support"
+.TH virt-make-fs 1 "2023-04-06" "guestfs-tools-1.50.1" "Virtualization Support"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l

diff --git a/po-docs/ja/virt-resize.1 b/po-docs/ja/virt-resize.1
index bef0c944fb2919360d84959f0813017007ceaa60..38cc2436cb66d034bf63c1f35af6f328bd8b63f4 100644 (file)
--- a/po-docs/ja/virt-resize.1
+++ b/po-docs/ja/virt-resize.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Podwrapper::Man 1.50.0 (Pod::Simple 3.43)
+.\" Automatically generated by Podwrapper::Man 1.50.1 (Pod::Simple 3.43)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -71,7 +71,7 @@
 .\" ========================================================================
 .\"
 .IX Title "virt-resize 1"
-.TH virt-resize 1 "2023-02-07" "guestfs-tools-1.50.0" "Virtualization Support"
+.TH virt-resize 1 "2023-04-06" "guestfs-tools-1.50.1" "Virtualization Support"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l

diff --git a/po-docs/ja/virt-sparsify.1 b/po-docs/ja/virt-sparsify.1
index 7ffa2029a5dc382e4e41c855eb282c6fbf363454..6781fea007f2b00437c07de31ae1b2fbf901449e 100644 (file)
--- a/po-docs/ja/virt-sparsify.1
+++ b/po-docs/ja/virt-sparsify.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Podwrapper::Man 1.50.0 (Pod::Simple 3.43)
+.\" Automatically generated by Podwrapper::Man 1.50.1 (Pod::Simple 3.43)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -71,7 +71,7 @@
 .\" ========================================================================
 .\"
 .IX Title "virt-sparsify 1"
-.TH virt-sparsify 1 "2023-02-07" "guestfs-tools-1.50.0" "Virtualization Support"
+.TH virt-sparsify 1 "2023-04-06" "guestfs-tools-1.50.1" "Virtualization Support"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l

diff --git a/po-docs/ja/virt-sysprep.1 b/po-docs/ja/virt-sysprep.1
index d1d182b877599ad511865a4d46955386c2b344a5..65dabdd90557fb6887ae24d44e9508ce8a113cce 100644 (file)
--- a/po-docs/ja/virt-sysprep.1
+++ b/po-docs/ja/virt-sysprep.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Podwrapper::Man 1.50.0 (Pod::Simple 3.43)
+.\" Automatically generated by Podwrapper::Man 1.50.1 (Pod::Simple 3.43)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -71,7 +71,7 @@
 .\" ========================================================================
 .\"
 .IX Title "virt-sysprep 1"
-.TH virt-sysprep 1 "2023-02-07" "guestfs-tools-1.50.0" "Virtualization Support"
+.TH virt-sysprep 1 "2023-04-06" "guestfs-tools-1.50.1" "Virtualization Support"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l

diff --git a/po-docs/ja/virt-win-reg.1 b/po-docs/ja/virt-win-reg.1
index 9e79174180aa91258f7783dfe18b3b931f0cccda..21019c1341dea3ac2c98bd2a3d30fc18aeb14834 100644 (file)
--- a/po-docs/ja/virt-win-reg.1
+++ b/po-docs/ja/virt-win-reg.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Podwrapper::Man 1.50.0 (Pod::Simple 3.43)
+.\" Automatically generated by Podwrapper::Man 1.50.1 (Pod::Simple 3.43)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -71,7 +71,7 @@
 .\" ========================================================================
 .\"
 .IX Title "virt-win-reg 1"
-.TH virt-win-reg 1 "2023-02-07" "guestfs-tools-1.50.0" "Virtualization Support"
+.TH virt-win-reg 1 "2023-04-06" "guestfs-tools-1.50.1" "Virtualization Support"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l

diff --git a/po-docs/uk/virt-alignment-scan.1 b/po-docs/uk/virt-alignment-scan.1
index 087c51e04f31e224f640c30a4a77ed1374f1f84f..c99b9277f5780f51b7905e4bdc72f985f1243d6b 100644 (file)
--- a/po-docs/uk/virt-alignment-scan.1
+++ b/po-docs/uk/virt-alignment-scan.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Podwrapper::Man 1.50.0 (Pod::Simple 3.43)
+.\" Automatically generated by Podwrapper::Man 1.50.1 (Pod::Simple 3.43)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -71,7 +71,7 @@
 .\" ========================================================================
 .\"
 .IX Title "virt-alignment-scan 1"
-.TH virt-alignment-scan 1 "2023-02-07" "guestfs-tools-1.50.0" "Virtualization Support"
+.TH virt-alignment-scan 1 "2023-04-06" "guestfs-tools-1.50.1" "Virtualization Support"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l

diff --git a/po-docs/uk/virt-builder.1 b/po-docs/uk/virt-builder.1
index 22d5a7c400a3fa65c07be05c95eea149bfa0a4fc..ee23c1e6b9e5a58e647a69c6e0cfaee04e8a0eba 100644 (file)
--- a/po-docs/uk/virt-builder.1
+++ b/po-docs/uk/virt-builder.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Podwrapper::Man 1.50.0 (Pod::Simple 3.43)
+.\" Automatically generated by Podwrapper::Man 1.50.1 (Pod::Simple 3.43)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -71,7 +71,7 @@
 .\" ========================================================================
 .\"
 .IX Title "virt-builder 1"
-.TH virt-builder 1 "2023-02-07" "guestfs-tools-1.50.0" "Virtualization Support"
+.TH virt-builder 1 "2023-04-06" "guestfs-tools-1.50.1" "Virtualization Support"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l

diff --git a/po-docs/uk/virt-cat.1 b/po-docs/uk/virt-cat.1
index 2faa6f3f94ece5a4988756b9d97ea8ca2d111809..ba3583d7d83809e0a829d67e0c3567abe00ff20a 100644 (file)
--- a/po-docs/uk/virt-cat.1
+++ b/po-docs/uk/virt-cat.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Podwrapper::Man 1.50.0 (Pod::Simple 3.43)
+.\" Automatically generated by Podwrapper::Man 1.50.1 (Pod::Simple 3.43)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -71,7 +71,7 @@
 .\" ========================================================================
 .\"
 .IX Title "virt-cat 1"
-.TH virt-cat 1 "2023-02-07" "guestfs-tools-1.50.0" "Virtualization Support"
+.TH virt-cat 1 "2023-04-06" "guestfs-tools-1.50.1" "Virtualization Support"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l

diff --git a/po-docs/uk/virt-customize.1 b/po-docs/uk/virt-customize.1
index 484460c952b49ec92d12950ee8e792594c8a5d7b..1de8886169cf11fbfcfda4afd342f047deddb4d9 100644 (file)
--- a/po-docs/uk/virt-customize.1
+++ b/po-docs/uk/virt-customize.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Podwrapper::Man 1.50.0 (Pod::Simple 3.43)
+.\" Automatically generated by Podwrapper::Man 1.50.1 (Pod::Simple 3.43)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -71,7 +71,7 @@
 .\" ========================================================================
 .\"
 .IX Title "virt-customize 1"
-.TH virt-customize 1 "2023-02-07" "guestfs-tools-1.50.0" "Virtualization Support"
+.TH virt-customize 1 "2023-04-06" "guestfs-tools-1.50.1" "Virtualization Support"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l

diff --git a/po-docs/uk/virt-df.1 b/po-docs/uk/virt-df.1
index b6608ce86b8fb5296c8bb75af879e76806722975..5a5ef7f508d401e7e858dc3def6707a2b17c9cfd 100644 (file)
--- a/po-docs/uk/virt-df.1
+++ b/po-docs/uk/virt-df.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Podwrapper::Man 1.50.0 (Pod::Simple 3.43)
+.\" Automatically generated by Podwrapper::Man 1.50.1 (Pod::Simple 3.43)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -71,7 +71,7 @@
 .\" ========================================================================
 .\"
 .IX Title "virt-df 1"
-.TH virt-df 1 "2023-02-07" "guestfs-tools-1.50.0" "Virtualization Support"
+.TH virt-df 1 "2023-04-06" "guestfs-tools-1.50.1" "Virtualization Support"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l

diff --git a/po-docs/uk/virt-dib.1 b/po-docs/uk/virt-dib.1
index d4a06c4a0a23352b9e315e088e6f902a8be08e82..38134f21f8f8edfddcd229d62adfc4b6f87e8c20 100644 (file)
--- a/po-docs/uk/virt-dib.1
+++ b/po-docs/uk/virt-dib.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Podwrapper::Man 1.50.0 (Pod::Simple 3.43)
+.\" Automatically generated by Podwrapper::Man 1.50.1 (Pod::Simple 3.43)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -71,7 +71,7 @@
 .\" ========================================================================
 .\"
 .IX Title "virt-dib 1"
-.TH virt-dib 1 "2023-02-07" "guestfs-tools-1.50.0" "Virtualization Support"
+.TH virt-dib 1 "2023-04-06" "guestfs-tools-1.50.1" "Virtualization Support"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l

diff --git a/po-docs/uk/virt-diff.1 b/po-docs/uk/virt-diff.1
index d44c64c2e6de60fb4299d056c72d5162308a051c..94850367fce1123cbffe1be5ed7ac3999d324937 100644 (file)
--- a/po-docs/uk/virt-diff.1
+++ b/po-docs/uk/virt-diff.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Podwrapper::Man 1.50.0 (Pod::Simple 3.43)
+.\" Automatically generated by Podwrapper::Man 1.50.1 (Pod::Simple 3.43)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -71,7 +71,7 @@
 .\" ========================================================================
 .\"
 .IX Title "virt-diff 1"
-.TH virt-diff 1 "2023-02-07" "guestfs-tools-1.50.0" "Virtualization Support"
+.TH virt-diff 1 "2023-04-06" "guestfs-tools-1.50.1" "Virtualization Support"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l

diff --git a/po-docs/uk/virt-edit.1 b/po-docs/uk/virt-edit.1
index 6f5e9dc78ae9b2be82d88b1eaff2413c232e2fc8..5945873c5dbd336e205bf005580b02a042b0960d 100644 (file)
--- a/po-docs/uk/virt-edit.1
+++ b/po-docs/uk/virt-edit.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Podwrapper::Man 1.50.0 (Pod::Simple 3.43)
+.\" Automatically generated by Podwrapper::Man 1.50.1 (Pod::Simple 3.43)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -71,7 +71,7 @@
 .\" ========================================================================
 .\"
 .IX Title "virt-edit 1"
-.TH virt-edit 1 "2023-02-07" "guestfs-tools-1.50.0" "Virtualization Support"
+.TH virt-edit 1 "2023-04-06" "guestfs-tools-1.50.1" "Virtualization Support"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l

diff --git a/po-docs/uk/virt-filesystems.1 b/po-docs/uk/virt-filesystems.1
index 7e1e7da65a377b4f419e2cf03c5c1955b8ce31c8..d9eb1d7cbf74d6f05d1347995443a8f2c3eb6a80 100644 (file)
--- a/po-docs/uk/virt-filesystems.1
+++ b/po-docs/uk/virt-filesystems.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Podwrapper::Man 1.50.0 (Pod::Simple 3.43)
+.\" Automatically generated by Podwrapper::Man 1.50.1 (Pod::Simple 3.43)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -71,7 +71,7 @@
 .\" ========================================================================
 .\"
 .IX Title "virt-filesystems 1"
-.TH virt-filesystems 1 "2023-02-07" "guestfs-tools-1.50.0" "Virtualization Support"
+.TH virt-filesystems 1 "2023-04-06" "guestfs-tools-1.50.1" "Virtualization Support"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l

diff --git a/po-docs/uk/virt-format.1 b/po-docs/uk/virt-format.1
index 59c8553c359f2f455bdbfbcce939500680ed346a..3993b9da35d0b974bd414503bd4d146d97a25da5 100644 (file)
--- a/po-docs/uk/virt-format.1
+++ b/po-docs/uk/virt-format.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Podwrapper::Man 1.50.0 (Pod::Simple 3.43)
+.\" Automatically generated by Podwrapper::Man 1.50.1 (Pod::Simple 3.43)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -71,7 +71,7 @@
 .\" ========================================================================
 .\"
 .IX Title "virt-format 1"
-.TH virt-format 1 "2023-02-07" "guestfs-tools-1.50.0" "Virtualization Support"
+.TH virt-format 1 "2023-04-06" "guestfs-tools-1.50.1" "Virtualization Support"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l

diff --git a/po-docs/uk/virt-get-kernel.1 b/po-docs/uk/virt-get-kernel.1
index ed655f0d6a44c856833696760e01e157740bbdaf..68acda84a95517e1eb5203cfa21d5afb7021b3e0 100644 (file)
--- a/po-docs/uk/virt-get-kernel.1
+++ b/po-docs/uk/virt-get-kernel.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Podwrapper::Man 1.50.0 (Pod::Simple 3.43)
+.\" Automatically generated by Podwrapper::Man 1.50.1 (Pod::Simple 3.43)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -71,7 +71,7 @@
 .\" ========================================================================
 .\"
 .IX Title "virt-get-kernel 1"
-.TH virt-get-kernel 1 "2023-02-07" "guestfs-tools-1.50.0" "Virtualization Support"
+.TH virt-get-kernel 1 "2023-04-06" "guestfs-tools-1.50.1" "Virtualization Support"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l

diff --git a/po-docs/uk/virt-index-validate.1 b/po-docs/uk/virt-index-validate.1
index 9cfd34c177bb571c2723fe3c811857d07160fccb..9fff36242fdcba8ac85769579d2a935acc7b9776 100644 (file)
--- a/po-docs/uk/virt-index-validate.1
+++ b/po-docs/uk/virt-index-validate.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Podwrapper::Man 1.50.0 (Pod::Simple 3.43)
+.\" Automatically generated by Podwrapper::Man 1.50.1 (Pod::Simple 3.43)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -71,7 +71,7 @@
 .\" ========================================================================
 .\"
 .IX Title "virt-index-validate 1"
-.TH virt-index-validate 1 "2023-02-07" "guestfs-tools-1.50.0" "Virtualization Support"
+.TH virt-index-validate 1 "2023-04-06" "guestfs-tools-1.50.1" "Virtualization Support"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l

diff --git a/po-docs/uk/virt-inspector.1 b/po-docs/uk/virt-inspector.1
index 8c73656d33e595c79d45e4cddbe7ff65a098af84..cb9055090a6f5d0dc2764bcd63ac00edfaf5073a 100644 (file)
--- a/po-docs/uk/virt-inspector.1
+++ b/po-docs/uk/virt-inspector.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Podwrapper::Man 1.50.0 (Pod::Simple 3.43)
+.\" Automatically generated by Podwrapper::Man 1.50.1 (Pod::Simple 3.43)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -71,7 +71,7 @@
 .\" ========================================================================
 .\"
 .IX Title "virt-inspector 1"
-.TH virt-inspector 1 "2023-02-07" "guestfs-tools-1.50.0" "Virtualization Support"
+.TH virt-inspector 1 "2023-04-06" "guestfs-tools-1.50.1" "Virtualization Support"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l

diff --git a/po-docs/uk/virt-log.1 b/po-docs/uk/virt-log.1
index 163f408e01b6ff12656d87ade08275a848c422d2..3755009f8536b417c149c08cd9ddada9f7e2d634 100644 (file)
--- a/po-docs/uk/virt-log.1
+++ b/po-docs/uk/virt-log.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Podwrapper::Man 1.50.0 (Pod::Simple 3.43)
+.\" Automatically generated by Podwrapper::Man 1.50.1 (Pod::Simple 3.43)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -71,7 +71,7 @@
 .\" ========================================================================
 .\"
 .IX Title "virt-log 1"
-.TH virt-log 1 "2023-02-07" "guestfs-tools-1.50.0" "Virtualization Support"
+.TH virt-log 1 "2023-04-06" "guestfs-tools-1.50.1" "Virtualization Support"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l

diff --git a/po-docs/uk/virt-ls.1 b/po-docs/uk/virt-ls.1
index 4d59ea81619d5f39d49807b3520b7a6d6e07d5cb..5c3d4ed66e5b0d8288ca12840c184541cd013ff1 100644 (file)
--- a/po-docs/uk/virt-ls.1
+++ b/po-docs/uk/virt-ls.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Podwrapper::Man 1.50.0 (Pod::Simple 3.43)
+.\" Automatically generated by Podwrapper::Man 1.50.1 (Pod::Simple 3.43)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -71,7 +71,7 @@
 .\" ========================================================================
 .\"
 .IX Title "virt-ls 1"
-.TH virt-ls 1 "2023-02-07" "guestfs-tools-1.50.0" "Virtualization Support"
+.TH virt-ls 1 "2023-04-06" "guestfs-tools-1.50.1" "Virtualization Support"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l

diff --git a/po-docs/uk/virt-make-fs.1 b/po-docs/uk/virt-make-fs.1
index c6adbeb462fc2edde040833857986d10576b8c26..0282f6172081ec8970fd179f9490ba1cf8e7b187 100644 (file)
--- a/po-docs/uk/virt-make-fs.1
+++ b/po-docs/uk/virt-make-fs.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Podwrapper::Man 1.50.0 (Pod::Simple 3.43)
+.\" Automatically generated by Podwrapper::Man 1.50.1 (Pod::Simple 3.43)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -71,7 +71,7 @@
 .\" ========================================================================
 .\"
 .IX Title "virt-make-fs 1"
-.TH virt-make-fs 1 "2023-02-07" "guestfs-tools-1.50.0" "Virtualization Support"
+.TH virt-make-fs 1 "2023-04-06" "guestfs-tools-1.50.1" "Virtualization Support"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l

diff --git a/po-docs/uk/virt-resize.1 b/po-docs/uk/virt-resize.1
index 4796c1091f8cbdb0ce754577741c3cc905b2df71..a53210cf58bb55805eb5a118f888438e3f21c043 100644 (file)
--- a/po-docs/uk/virt-resize.1
+++ b/po-docs/uk/virt-resize.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Podwrapper::Man 1.50.0 (Pod::Simple 3.43)
+.\" Automatically generated by Podwrapper::Man 1.50.1 (Pod::Simple 3.43)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -71,7 +71,7 @@
 .\" ========================================================================
 .\"
 .IX Title "virt-resize 1"
-.TH virt-resize 1 "2023-02-07" "guestfs-tools-1.50.0" "Virtualization Support"
+.TH virt-resize 1 "2023-04-06" "guestfs-tools-1.50.1" "Virtualization Support"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l

diff --git a/po-docs/uk/virt-sparsify.1 b/po-docs/uk/virt-sparsify.1
index 180bb6cefcfb501689201b3f299678ee8f3fb5b7..21cf7446e335fe2a31cb74eb6a3ca5ed8ba0da77 100644 (file)
--- a/po-docs/uk/virt-sparsify.1
+++ b/po-docs/uk/virt-sparsify.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Podwrapper::Man 1.50.0 (Pod::Simple 3.43)
+.\" Automatically generated by Podwrapper::Man 1.50.1 (Pod::Simple 3.43)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -71,7 +71,7 @@
 .\" ========================================================================
 .\"
 .IX Title "virt-sparsify 1"
-.TH virt-sparsify 1 "2023-02-07" "guestfs-tools-1.50.0" "Virtualization Support"
+.TH virt-sparsify 1 "2023-04-06" "guestfs-tools-1.50.1" "Virtualization Support"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l

diff --git a/po-docs/uk/virt-sysprep.1 b/po-docs/uk/virt-sysprep.1
index ece8fc70304c6cf9c665d5f7db926adf4624433e..6e08176847b009e992addf8a90fc13d0ca2dcbfd 100644 (file)
--- a/po-docs/uk/virt-sysprep.1
+++ b/po-docs/uk/virt-sysprep.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Podwrapper::Man 1.50.0 (Pod::Simple 3.43)
+.\" Automatically generated by Podwrapper::Man 1.50.1 (Pod::Simple 3.43)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -71,7 +71,7 @@
 .\" ========================================================================
 .\"
 .IX Title "virt-sysprep 1"
-.TH virt-sysprep 1 "2023-02-07" "guestfs-tools-1.50.0" "Virtualization Support"
+.TH virt-sysprep 1 "2023-04-06" "guestfs-tools-1.50.1" "Virtualization Support"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l

diff --git a/po-docs/uk/virt-win-reg.1 b/po-docs/uk/virt-win-reg.1
index f654138bbbd29dca9a7b78359e2df3c0e51fe4e5..7ac380397133203c9c7ba57bf074682c68808f7d 100644 (file)
--- a/po-docs/uk/virt-win-reg.1
+++ b/po-docs/uk/virt-win-reg.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Podwrapper::Man 1.50.0 (Pod::Simple 3.43)
+.\" Automatically generated by Podwrapper::Man 1.50.1 (Pod::Simple 3.43)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -71,7 +71,7 @@
 .\" ========================================================================
 .\"
 .IX Title "virt-win-reg 1"
-.TH virt-win-reg 1 "2023-02-07" "guestfs-tools-1.50.0" "Virtualization Support"
+.TH virt-win-reg 1 "2023-04-06" "guestfs-tools-1.50.1" "Virtualization Support"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l

diff --git a/po/guestfs-tools.pot b/po/guestfs-tools.pot
index 5f13f5db296504dd6269ff36dfa802cf3d902064..ed3b061cb1d10f6cc503e767a735be85bf3ecb77 100644 (file)
--- a/po/guestfs-tools.pot
+++ b/po/guestfs-tools.pot
@@ -6,10 +6,10 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: guestfs-tools 1.50.0\n"
+"Project-Id-Version: guestfs-tools 1.50.1\n"
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2023-02-07 11:12+0000\n"
+"POT-Creation-Date: 2023-04-06 12:44+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -186,7 +186,7 @@ msgstr ""
 msgid "%s: cannot determine the virtual size of %s due to compression"
 msgstr ""
 
-#: common/mlcustomize/inject_virtio_win.ml:389
+#: common/mlcustomize/inject_virtio_win.ml:401
 msgid "%s: cannot open virtio-win ISO file: %s"
 msgstr ""
 
@@ -2741,7 +2741,7 @@ msgstr ""
 msgid "ignore|warn|error"
 msgstr ""
 
-#: common/mldrivers/linux_kernels.ml:328
+#: common/mldrivers/linux_kernels.ml:340
 msgid "ignoring kernel %s in bootloader, as it does not exist."
 msgstr ""
 
@@ -2901,11 +2901,11 @@ msgid ""
 "This is a failure of the source repository.  Use -v for more information."
 msgstr ""
 
-#: common/mldrivers/linux_kernels.ml:181
+#: common/mldrivers/linux_kernels.ml:193
 msgid "no initrd was found in /boot matching %s %s."
 msgstr ""
 
-#: common/mldrivers/linux_kernels.ml:303
+#: common/mldrivers/linux_kernels.ml:315
 msgid ""
 "no installed kernel packages were found.\n"
 "\n"
@@ -2916,7 +2916,7 @@ msgstr ""
 msgid "no kernel found in %s"
 msgstr ""
 
-#: common/mldrivers/linux_kernels.ml:340
+#: common/mldrivers/linux_kernels.ml:352
 msgid ""
 "no kernels were found in the bootloader configuration.\n"
 "\n"
@@ -3067,8 +3067,8 @@ msgstr ""
 msgid "resize2fs"
 msgstr ""
 
-#. common/mlcustomize/inject_virtio_win.ml:335
-#: common/mlcustomize/inject_virtio_win.ml:340
+#. common/mlcustomize/inject_virtio_win.ml:347
+#: common/mlcustomize/inject_virtio_win.ml:352
 msgid ""
 "root directory ‘/’ is missing from the virtio-win directory or ISO.\n"
 "\n"
@@ -3221,7 +3221,7 @@ msgstr ""
 msgid "the value of the key ‘%s’ is not an object"
 msgstr ""
 
-#: common/mlcustomize/inject_virtio_win.ml:168
+#: common/mlcustomize/inject_virtio_win.ml:175
 msgid ""
 "there are no virtio drivers available for this version of Windows (%d.%d %s "
 "%s %s).  virt-v2v looks for drivers in %s\n"
@@ -3237,7 +3237,7 @@ msgid ""
 "are susceptible to man-in-the-middle attacks."
 msgstr ""
 
-#: common/mlcustomize/inject_virtio_win.ml:191
+#: common/mlcustomize/inject_virtio_win.ml:197
 msgid ""
 "there is no virtio block device driver for this version of Windows (%d.%d "
 "%s).  virt-v2v looks for this driver in %s\n"
@@ -3245,7 +3245,7 @@ msgid ""
 "The guest will be configured to use a slower emulated device."
 msgstr ""
 
-#: common/mlcustomize/inject_virtio_win.ml:216
+#: common/mlcustomize/inject_virtio_win.ml:228
 msgid ""
 "there is no virtio network driver for this version of Windows (%d.%d %s).  "
 "virt-v2v looks for this driver in %s\n"

diff --git a/resize/resize.ml b/resize/resize.ml
index ee2fb2d920dda95d5ae61b435e9242fa1f34c03f..3c3a5d7e3d6987d9a44fd7f3f6e3c4efc41f395a 100644 (file)
--- a/resize/resize.ml
+++ b/resize/resize.ml
@@ -1072,7 +1072,7 @@ read the man page virt-resize(1).
       let ok =
         try
           g#part_init "/dev/sdb" parttype_string;
-          Option.may (g#part_set_disk_guid "/dev/sdb") disk_guid;
+          Option.iter (g#part_set_disk_guid "/dev/sdb") disk_guid;
           true
         with G.Error error -> last_error := error; false in
       if ok then g, true
@@ -1266,9 +1266,9 @@ read the man page virt-resize(1).
       if p.p_bootable then
         g#part_set_bootable "/dev/sdb" p.p_target_partnum true;
 
-      Option.may (g#part_set_name "/dev/sdb" p.p_target_partnum) p.p_label;
-      Option.may (g#part_set_gpt_guid "/dev/sdb" p.p_target_partnum) p.p_guid;
-      Option.may (g#part_set_gpt_attributes "/dev/sdb" p.p_target_partnum)
+      Option.iter (g#part_set_name "/dev/sdb" p.p_target_partnum) p.p_label;
+      Option.iter (g#part_set_gpt_guid "/dev/sdb" p.p_target_partnum) p.p_guid;
+      Option.iter (g#part_set_gpt_attributes "/dev/sdb" p.p_target_partnum)
         p.p_attributes;
 
       match parttype, p.p_id with

diff --git a/sysprep/sysprep_operation.ml b/sysprep/sysprep_operation.ml
index 17c0440d4670a15e420a71d36e4ea8b2e4ea2bea..0a5fce065059cedf307417067624d14a4ed950e3 100644 (file)
--- a/sysprep/sysprep_operation.ml
+++ b/sysprep/sysprep_operation.ml
@@ -190,8 +190,8 @@ let dump_pod () =
       if op.enabled_by_default then printf "*\n";
       printf "\n";
       printf "%s.\n\n" op.heading;
-      Option.may (printf "%s\n\n") op.pod_description;
-      Option.may (fun notes ->
+      Option.iter (printf "%s\n\n") op.pod_description;
+      Option.iter (fun notes ->
           printf "=head3 ";
           printf (f_"Notes on %s") op.name;
           printf "\n\n";

diff --git a/valgrind-suppressions b/valgrind-suppressions
index 4c8e37886138a66dff1c4c5e89f5ab81ab8a7a13..a13d82fb7028604ecbd3c9301029bafcc25763f5 100644 (file)
--- a/valgrind-suppressions
+++ b/valgrind-suppressions
@@ -197,7 +197,7 @@
    ocaml_pcre_globals
    Memcheck:Leak
    fun:malloc
-   fun:pcre_compile2
+   fun:pcre2_compile_8
    ...
 }
 
@@ -329,6 +329,16 @@
    fun:virDataTypesOnce
 }
 
+{
+   libvirt_leak_10
+   Memcheck:Leak
+   ...
+   fun:g_malloc0
+   fun:virClassNew
+   ...
+   fun:virOnce
+}
+
 # FUSE leaks the per-thread context (although the code looks
 # like it attempts to clean it up).  In older fuse, it uses
 # malloc.  In newer fuse it uses calloc.