From: "Richard W.M. Jones" <rjones(a)redhat.com&gt; The FileIn/FileOut parameters are not passed through to the daemon. Previously we generated incorrect RPC code (an empty 'struct guestfs_<fn>_args') because we didn't account for these FileIn/FileOut parameters correctly. (cherry picked from commit e31c32ce1bc87d164103e79288effc64bb41181f) (cherry picked from commit 1af2e2c9de6920fb1ef9c83d9069cf9a573c5b8f) --- generator/c.ml | 12 +++++++----- generator/daemon.ml | 26 ++++++++++++++++---------- generator/xdr.ml | 11 +++++++---- 3 files changed, 30 insertions(+), 19 deletions(-) diff --git a/generator/c.ml b/generator/c.ml index 143ce22..45dad8f 100644 --- a/generator/c.ml +++ b/generator/c.ml @@ -1305,7 +1305,10 @@ and generate_client_actions hash () = handle_null_optargs optargs c_name; - (match args with + let args_passed_to_daemon = + List.filter (function FileIn _ | FileOut _ -> false | _ -> true) + args in + (match args_passed_to_daemon with | [] -> () | _ -> pr " struct guestfs_%s_args args;\n" name ); @@ -1373,7 +1376,7 @@ and generate_client_actions hash () = pr "\n"; (* Send the main header and arguments. *) - if args = [] && optargs = [] then ( + if args_passed_to_daemon = [] && optargs = [] then ( pr " serial = guestfs___send (g, GUESTFS_PROC_%s, progress_hint, 0,\n" (String.uppercase name); pr " NULL, NULL);\n" @@ -1393,7 +1396,6 @@ and generate_client_actions hash () = pr " args.%s = %s;\n" n n | Int64 n -> pr " args.%s = %s;\n" n n - | FileIn _ | FileOut _ -> () | BufferIn n -> pr " /* Just catch grossly large sizes. XDR encoding will make this precise. */\n"; pr " if (%s_size >= GUESTFS_MESSAGE_MAX) {\n" n; @@ -1404,8 +1406,8 @@ and generate_client_actions hash () = pr " }\n"; pr " args.%s.%s_val = (char *) %s;\n" n n n; pr " args.%s.%s_len = %s_size;\n" n n n - | Pointer _ -> assert false - ) args; + | FileIn _ | FileOut _ | Pointer _ -> assert false + ) args_passed_to_daemon; List.iter ( fun argt -> diff --git a/generator/daemon.ml b/generator/daemon.ml index 9362b3f..5b5504c 100644 --- a/generator/daemon.ml +++ b/generator/daemon.ml @@ -56,7 +56,11 @@ let generate_daemon_actions_h () = List.iter ( fun { name = name; style = ret, args, optargs } -> - let style = ret, args @ args_of_optargs optargs, [] in + let args_passed_to_daemon = args @ args_of_optargs optargs in + let args_passed_to_daemon = + List.filter (function FileIn _ | FileOut _ -> false | _ -> true) + args_passed_to_daemon in + let style = ret, args_passed_to_daemon, [] in generate_prototype ~single_line:true ~newline:true ~in_daemon:true ~prefix:"do_" name style; @@ -107,7 +111,11 @@ and generate_daemon_actions () = pr " char *r;\n" ); - if args <> [] || optargs <> [] then ( + let args_passed_to_daemon = args @ args_of_optargs optargs in + let args_passed_to_daemon = + List.filter (function FileIn _ | FileOut _ -> false | _ -> true) + args_passed_to_daemon in + if args_passed_to_daemon <> [] then ( pr " struct guestfs_%s_args args;\n" name; List.iter ( function @@ -120,12 +128,11 @@ and generate_daemon_actions () = | Bool n -> pr " int %s;\n" n | Int n -> pr " int %s;\n" n | Int64 n -> pr " int64_t %s;\n" n - | FileIn _ | FileOut _ -> () | BufferIn n -> pr " const char *%s;\n" n; pr " size_t %s_size;\n" n - | Pointer _ -> assert false - ) (args @ args_of_optargs optargs) + | FileIn _ | FileOut _ | Pointer _ -> assert false + ) args_passed_to_daemon ); pr "\n"; @@ -175,7 +182,7 @@ and generate_daemon_actions () = pr "\n"; (* Decode arguments. *) - if args <> [] || optargs <> [] then ( + if args_passed_to_daemon <> [] then ( pr " memset (&args, 0, sizeof args);\n"; pr "\n"; pr " if (!xdr_guestfs_%s_args (xdr_in, &args)) {\n" name; @@ -231,12 +238,11 @@ and generate_daemon_actions () = | Bool n -> pr " %s = args.%s;\n" n n | Int n -> pr " %s = args.%s;\n" n n | Int64 n -> pr " %s = args.%s;\n" n n - | FileIn _ | FileOut _ -> () | BufferIn n -> pr " %s = args.%s.%s_val;\n" n n n; pr " %s_size = args.%s.%s_len;\n" n n n - | Pointer _ -> assert false - ) (args @ args_of_optargs optargs); + | FileIn _ | FileOut _ | Pointer _ -> assert false + ) args_passed_to_daemon; pr "\n" ); @@ -341,7 +347,7 @@ and generate_daemon_actions () = (* Free the args. *) pr "done:\n"; - (match args with + (match args_passed_to_daemon with | [] -> () | _ -> pr " xdr_free ((xdrproc_t) xdr_guestfs_%s_args, (char *) &args);\n" diff --git a/generator/xdr.ml b/generator/xdr.ml index c59a30e..bbbfd8b 100644 --- a/generator/xdr.ml +++ b/generator/xdr.ml @@ -98,9 +98,13 @@ let generate_xdr () = (* Ordinary arguments and optional arguments are concatenated * together in the XDR args struct. The optargs_bitmask field * in the header controls which optional arguments are - * meaningful. + * meaningful. FileIn/FileOut parameters are ignored here. *) - (match args @ args_of_optargs optargs with + let args_passed_to_daemon = args @ args_of_optargs optargs in + let args_passed_to_daemon = + List.filter (function FileIn _ | FileOut _ -> false | _ -> true) + args_passed_to_daemon in + (match args_passed_to_daemon with | [] -> () | args -> pr "struct %s_args {\n" name; @@ -115,8 +119,7 @@ let generate_xdr () = | Int64 n -> pr " int64_t %s;\n" n | BufferIn n -> pr " opaque %s<>;\n" n - | FileIn _ | FileOut _ -> () - | Pointer _ -> assert false + | FileIn _ | FileOut _ | Pointer _ -> assert false ) args; pr "};\n\n" ); -- 1.8.3.1

From: "Richard W.M. Jones" <rjones(a)redhat.com&gt; (cherry picked from commit fb282e677c015de65627790a02aceb6ed264ed80) (cherry picked from commit 64b67377b6536b09832ae7ee35573ce44c628365) --- resize/virt-resize.pod | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/resize/virt-resize.pod b/resize/virt-resize.pod index 6bb4612..7221fd5 100644 --- a/resize/virt-resize.pod +++ b/resize/virt-resize.pod @@ -701,6 +701,10 @@ hand-calculating sector offsets, which is something that virt-resize was designed to avoid. If you want to see the guestfish-equivalent commands that virt-resize runs, use the I<--debug> flag. +L<dracut(8)> includes a module called C<dracut-modules-growroot> which +can be used to grow the root partition when the guest first boots up. +There is documentation for this module in an associated README file. + =head1 SHELL QUOTING Libvirt guest names can contain arbitrary characters, some of which -- 1.8.3.1

From: "Richard W.M. Jones" <rjones(a)redhat.com&gt; It was jammed into the Progress module just for convenience. (cherry picked from commit b56990ddf8aa4dc4db3da592783acfe055c05534) (cherry picked from commit 93daf42b52446eb442c595592a053caaa740ba42) --- po/POTFILES | 1 + po/POTFILES-ml | 1 + resize/Makefile.am | 7 ++++++- resize/progress-c.c | 9 --------- resize/progress.ml | 3 +-- resize/tTY.ml | 19 +++++++++++++++++++ resize/tTY.mli | 23 +++++++++++++++++++++++ resize/tty-c.c | 35 +++++++++++++++++++++++++++++++++++ sparsify/Makefile.am | 2 ++ 9 files changed, 88 insertions(+), 12 deletions(-) create mode 100644 resize/tTY.ml create mode 100644 resize/tTY.mli create mode 100644 resize/tty-c.c diff --git a/po/POTFILES b/po/POTFILES index e64492b..a98535e 100644 --- a/po/POTFILES +++ b/po/POTFILES @@ -220,6 +220,7 @@ python/guestfs-py.c rescue/test-virt-rescue.pl rescue/virt-rescue.c resize/progress-c.c +resize/tty-c.c ruby/ext/guestfs/_guestfs.c src/actions-0.c src/actions-1.c diff --git a/po/POTFILES-ml b/po/POTFILES-ml index 566c6ae..34533ea 100644 --- a/po/POTFILES-ml +++ b/po/POTFILES-ml @@ -3,6 +3,7 @@ resize/common_utils.ml resize/common_utils_tests.ml resize/progress.ml resize/resize.ml +resize/tTY.ml sparsify/sparsify.ml sysprep/firstboot.ml sysprep/main.ml diff --git a/resize/Makefile.am b/resize/Makefile.am index ca258b1..2431e34 100644 --- a/resize/Makefile.am +++ b/resize/Makefile.am @@ -32,16 +32,21 @@ SOURCES = \ progress-c.c \ progress.mli \ progress.ml \ - resize.ml + resize.ml \ + tty-c.c \ + tTY.mli \ + tTY.ml if HAVE_OCAML # Note this list must be in dependency order. OBJECTS = \ $(top_builddir)/fish/guestfish-progress.o \ + tty-c.o \ progress-c.o \ common_gettext.cmx \ common_utils.cmx \ + tTY.cmx \ progress.cmx \ resize.cmx diff --git a/resize/progress-c.c b/resize/progress-c.c index 2813d0c..67913eb 100644 --- a/resize/progress-c.c +++ b/resize/progress-c.c @@ -104,12 +104,3 @@ virt_resize_progress_bar_set (value barv, CAMLreturn (Val_unit); } - -/* RHEL 5-era ocaml didn't have Unix.isatty. */ -value -virt_resize_isatty_stdout (value unitv) -{ - CAMLparam1 (unitv); - - CAMLreturn (isatty(1) ? Val_true : Val_false); -} diff --git a/resize/progress.ml b/resize/progress.ml index 1ff73c2..e53e693 100644 --- a/resize/progress.ml +++ b/resize/progress.ml @@ -28,13 +28,12 @@ external progress_bar_reset : progress_bar -> unit = "virt_resize_progress_bar_reset" external progress_bar_set : progress_bar -> int64 -> int64 -> unit = "virt_resize_progress_bar_set" -external isatty_stdout : unit -> bool = "virt_resize_isatty_stdout" let set_up_progress_bar ?(machine_readable = false) (g : Guestfs.guestfs) = (* Only display progress bars if the machine_readable flag is set or * the output is a tty. *) - if machine_readable || isatty_stdout () then ( + if machine_readable || TTY.isatty_stdout () then ( (* Initialize the C mini library. *) let bar = progress_bar_init ~machine_readable in diff --git a/resize/tTY.ml b/resize/tTY.ml new file mode 100644 index 0000000..32c1f54 --- /dev/null +++ b/resize/tTY.ml @@ -0,0 +1,19 @@ +(* virt-resize + * Copyright (C) 2013 Red Hat Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + *) + +external isatty_stdout : unit -> bool = "virt_resize_isatty_stdout" diff --git a/resize/tTY.mli b/resize/tTY.mli new file mode 100644 index 0000000..69441f1 --- /dev/null +++ b/resize/tTY.mli @@ -0,0 +1,23 @@ +(* virt-resize + * Copyright (C) 2013 Red Hat Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + *) + +(** TTY utilities. *) + +val isatty_stdout : unit -> bool +(** RHEL 5-era ocaml didn't have Unix.isatty. This is not needed in + recent OCaml. *) diff --git a/resize/tty-c.c b/resize/tty-c.c new file mode 100644 index 0000000..040a132 --- /dev/null +++ b/resize/tty-c.c @@ -0,0 +1,35 @@ +/* virt-resize - interface to isatty + * Copyright (C) 2013 Red Hat Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#include <config.h> + +#include <stdio.h> +#include <stdlib.h> +#include <unistd.h> + +#include <caml/memory.h> +#include <caml/mlvalues.h> + +/* RHEL 5-era ocaml didn't have Unix.isatty. */ +value +virt_resize_isatty_stdout (value unitv) +{ + CAMLparam1 (unitv); + + CAMLreturn (isatty (1) ? Val_true : Val_false); +} diff --git a/sparsify/Makefile.am b/sparsify/Makefile.am index 61a560d..3bc1d0e 100644 --- a/sparsify/Makefile.am +++ b/sparsify/Makefile.am @@ -33,9 +33,11 @@ if HAVE_OCAML # Note this list must be in dependency order. OBJECTS = \ $(top_builddir)/fish/guestfish-progress.o \ + $(top_builddir)/resize/tty-c.o \ $(top_builddir)/resize/progress-c.o \ $(top_builddir)/resize/common_gettext.cmx \ $(top_builddir)/resize/common_utils.cmx \ + $(top_builddir)/resize/tTY.cmx \ $(top_builddir)/resize/progress.cmx \ sparsify.cmx -- 1.8.3.1

From: "Richard W.M. Jones" <rjones(a)redhat.com&gt; (cherry picked from commit 9268f1487970eb9884ba674ab75dc99f91adc0a7) (cherry picked from commit 5bd7e6cca1c404d4a54f9ce3b231052bd98d86b4) --- examples/guestfs-faq.pod | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/examples/guestfs-faq.pod b/examples/guestfs-faq.pod index d083378..67e7c00 100644 --- a/examples/guestfs-faq.pod +++ b/examples/guestfs-faq.pod @@ -153,6 +153,13 @@ To get further information about the failure, you have to run: If, after using this, you still don't understand the failure, contact us (see previous section). +=head2 libguestfs: error: cannot find any suitable libguestfs supermin, fixed or old-style appliance on LIBGUESTFS_PATH + +If you see this error on Debian/Ubuntu, you need to run the following +command as root: + + update-guestfs-appliance + =head2 Non-ASCII characters don't appear on VFAT filesystems. Typical symptoms of this problem: -- 1.8.3.1

From: "Richard W.M. Jones" <rjones(a)redhat.com&gt; This turns it into an ordinary C call without the unnecessary [in this case] GC frame overhead. See: http://camltastic.blogspot.co.uk/2008/08/tip-calling-c-functions-directly... (cherry picked from commit 3d39549ded3e05df929547bb65ce620e6487a81b) (cherry picked from commit a08b4304d1fc0a02a18daa84d6747f432f495b67) --- resize/tTY.ml | 2 +- resize/tty-c.c | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/resize/tTY.ml b/resize/tTY.ml index 32c1f54..80f0e1e 100644 --- a/resize/tTY.ml +++ b/resize/tTY.ml @@ -16,4 +16,4 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. *) -external isatty_stdout : unit -> bool = "virt_resize_isatty_stdout" +external isatty_stdout : unit -> bool = "virt_resize_isatty_stdout" "noalloc" diff --git a/resize/tty-c.c b/resize/tty-c.c index 040a132..64fa884 100644 --- a/resize/tty-c.c +++ b/resize/tty-c.c @@ -25,11 +25,14 @@ #include <caml/memory.h> #include <caml/mlvalues.h> -/* RHEL 5-era ocaml didn't have Unix.isatty. */ +/* RHEL 5-era ocaml didn't have Unix.isatty. + * + * Note this function is marked as "noalloc" so it must not call any + * OCaml allocation functions: + * http://camltastic.blogspot.co.uk/2008/08/tip-calling-c-functions-directly... + */ value virt_resize_isatty_stdout (value unitv) { - CAMLparam1 (unitv); - - CAMLreturn (isatty (1) ? Val_true : Val_false); + return isatty (1) ? Val_true : Val_false; } -- 1.8.3.1

From: "Richard W.M. Jones" <rjones(a)redhat.com&gt; If timeout doesn't have the -k option, don't use it. (cherry picked from commit 8d68f1c5ceb5ac613393654bde58127e50c0f7bf) (cherry picked from commit 2809754504ab5e7b7e5c8dff7c1e37f1568c8475) --- run.in | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/run.in b/run.in index ed74713..d82ba56 100755 --- a/run.in +++ b/run.in @@ -182,12 +182,17 @@ fi # Originally 1h, but that is not long enough to run the C API # tests on Koji. timeout_period=4h +timeout_kill=30s # Do we have Padraig's timeout utility (from coreutils)? if timeout --help >/dev/null 2>&1; then + # Does this version of timeout have the -k option? (Not on RHEL 6) + if timeout -k 10s 10s true >/dev/null 2>&1; then + timeout_k_opt="-k $timeout_kill" + fi # Timeout (SIGTERM) after $timeout_period. - # Then send a second SIGKILL 30 seconds later. - timeout="timeout -k 30s $timeout_period" + # Then send a second SIGKILL $timeout_kill seconds later. + timeout="timeout $timeout_k_opt $timeout_period" fi pid=$$ -- 1.8.3.1

From: "Richard W.M. Jones" <rjones(a)redhat.com&gt; Display all the information from the handle about errors. (cherry picked from commit f26a0407d2a61ed334b4a9d42b1269feb3cab76e) (cherry picked from commit fde27df3c98ca65a90c82f8d82c9186777b7bb7f) --- daemon/augeas.c | 39 ++++++++++++++++++++++++++++----------- 1 file changed, 28 insertions(+), 11 deletions(-) diff --git a/daemon/augeas.c b/daemon/augeas.c index c0c97e3..54830c7 100644 --- a/daemon/augeas.c +++ b/daemon/augeas.c @@ -64,6 +64,23 @@ optgroup_augeas_available (void) return 1; } +/* Calls reply_with_error, but includes the Augeas error details. */ +#define AUGEAS_ERROR(fs,...) \ + do { \ + int code = aug_error (aug); \ + if (code == AUG_ENOMEM) \ + reply_with_error (fs ": augeas out of memory", ##__VA_ARGS__); \ + else { \ + const char *message = aug_error_message (aug); \ + const char *minor = aug_error_minor_message (aug); \ + const char *details = aug_error_details (aug); \ + reply_with_error (fs ": %s%s%s%s%s", ##__VA_ARGS__, \ + message, \ + minor ? ": " : "", minor ? minor : "", \ + details ? ": " : "", details ? details : ""); \ + } \ + } while (0) + /* We need to rewrite the root path so it is based at /sysroot. */ int do_aug_init (const char *root, int flags) @@ -112,7 +129,7 @@ do_aug_defvar (const char *name, const char *expr) r = aug_defvar (aug, name, expr); if (r == -1) { - reply_with_error ("Augeas defvar failed"); + AUGEAS_ERROR ("aug_defvar: %s: %s", name, expr); return -1; } return r; @@ -133,7 +150,7 @@ do_aug_defnode (const char *name, const char *expr, const char *val) i = aug_defnode (aug, name, expr, val, &created); if (i == -1) { - reply_with_error ("Augeas defnode failed"); + AUGEAS_ERROR ("aug_defnode: %s: %s: %s", name, expr, val); return NULL; } @@ -168,7 +185,7 @@ do_aug_get (const char *path) return NULL; } if (r != 1) { - reply_with_error ("Augeas get failed"); + AUGEAS_ERROR ("aug_get: %s", path); return NULL; } @@ -200,7 +217,7 @@ do_aug_set (const char *path, const char *val) r = aug_set (aug, path, val); if (r == -1) { - reply_with_error ("Augeas set failed"); + AUGEAS_ERROR ("aug_set: %s: %s", path, val); return -1; } @@ -216,7 +233,7 @@ do_aug_clear (const char *path) r = aug_set (aug, path, NULL); if (r == -1) { - reply_with_error ("Augeas clear failed"); + AUGEAS_ERROR ("aug_clear: %s", path); return -1; } @@ -232,7 +249,7 @@ do_aug_insert (const char *path, const char *label, int before) r = aug_insert (aug, path, label, before); if (r == -1) { - reply_with_error ("Augeas insert failed"); + AUGEAS_ERROR ("aug_insert: %s: %s [before=%d]", path, label, before); return -1; } @@ -248,7 +265,7 @@ do_aug_rm (const char *path) r = aug_rm (aug, path); if (r == -1) { - reply_with_error ("Augeas rm failed"); + AUGEAS_ERROR ("aug_rm: %s", path); return -1; } @@ -264,7 +281,7 @@ do_aug_mv (const char *src, const char *dest) r = aug_mv (aug, src, dest); if (r == -1) { - reply_with_error ("Augeas mv failed"); + AUGEAS_ERROR ("aug_mv: %s: %s", src, dest); return -1; } @@ -282,7 +299,7 @@ do_aug_match (const char *path) r = aug_match (aug, path, &matches); if (r == -1) { - reply_with_error ("Augeas match failed"); + AUGEAS_ERROR ("aug_match: %s", path); return NULL; } @@ -307,7 +324,7 @@ do_aug_save (void) NEED_AUG (-1); if (aug_save (aug) == -1) { - reply_with_error ("Augeas save failed"); + AUGEAS_ERROR ("aug_save"); return -1; } @@ -321,7 +338,7 @@ do_aug_load (void) NEED_AUG (-1); if (aug_load (aug) == -1) { - reply_with_error ("Augeas load failed"); + AUGEAS_ERROR ("aug_load"); return -1; } -- 1.8.3.1

From: "Richard W.M. Jones" <rjones(a)redhat.com&gt; (cherry picked from commit 56f613b13003b2ef44b25da360c5dac6eb5b0c71) (cherry picked from commit 7d1c54be145bd8f87d87cfc887c3647ffed723eb) --- .tx/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.tx/config b/.tx/config index 4e21dd5..26fb474 100644 --- a/.tx/config +++ b/.tx/config @@ -1,5 +1,5 @@ [main] -host = https://www.transifex.net +host = https://www.transifex.com [libguestfs.libguestfspot] file_filter = po/<lang>.po -- 1.8.3.1

From: "Richard W.M. Jones" <rjones(a)redhat.com&gt; This is also called implicitly from internal_autosync, ensuring that exit won't fail because of an open handle. libguestfs: error: internal_autosync: umount: /sysroot: umount: /sysroot: target is busy. (In some cases useful info about processes that use the device is found by lsof(8) or fuser(1)) Cherry picked from commit ce6e5738fc4ca9533e73cfe6b5fe3db872b7ec9d and modified to remove references to the journal. (cherry picked from commit 4d5da455cca1e70810af868c523a872c746f45ec) --- daemon/augeas.c | 4 ++-- daemon/daemon.h | 4 ++++ daemon/hivex.c | 4 ++-- daemon/mount.c | 7 +++++++ 4 files changed, 15 insertions(+), 4 deletions(-) diff --git a/daemon/augeas.c b/daemon/augeas.c index 54830c7..b2d1eb2 100644 --- a/daemon/augeas.c +++ b/daemon/augeas.c @@ -39,8 +39,8 @@ static augeas *aug = NULL; /* Clean up the augeas handle on daemon exit. */ -static void aug_finalize (void) __attribute__((destructor)); -static void +void aug_finalize (void) __attribute__((destructor)); +void aug_finalize (void) { if (aug) { diff --git a/daemon/daemon.h b/daemon/daemon.h index 096a3af..8ca0593 100644 --- a/daemon/daemon.h +++ b/daemon/daemon.h @@ -198,6 +198,10 @@ extern void copy_lvm (void); /*-- in zero.c --*/ extern void wipe_device_before_mkfs (const char *device); +/*-- in augeas.c, hivex.c --*/ +extern void aug_finalize (void); +extern void hivex_finalize (void); + /*-- in proto.c --*/ extern void main_loop (int sock) __attribute__((noreturn)); diff --git a/daemon/hivex.c b/daemon/hivex.c index 92e8fc3..ce6164e 100644 --- a/daemon/hivex.c +++ b/daemon/hivex.c @@ -47,8 +47,8 @@ optgroup_hivex_available (void) static hive_h *h = NULL; /* Clean up the hivex handle on daemon exit. */ -static void hivex_finalize (void) __attribute__((destructor)); -static void +void hivex_finalize (void) __attribute__((destructor)); +void hivex_finalize (void) { if (h) { diff --git a/daemon/mount.c b/daemon/mount.c index af92834..2f4674d 100644 --- a/daemon/mount.c +++ b/daemon/mount.c @@ -343,6 +343,13 @@ do_umount_all (void) size_t i; int r; + /* This is called from internal_autosync and generally as a cleanup + * function, and since the umount will definitely fail if any + * handles are open, we may as well close them. + */ + aug_finalize (); + hivex_finalize (); + /* NB: Eventually we should aim to parse /proc/self/mountinfo, but * that requires custom parsing code. */ -- 1.8.3.1

From: "Richard W.M. Jones" <rjones(a)redhat.com&gt; This fixes commit 72afcf450a78b7e58f65b4a7aaf94d71cd25fca5. (cherry picked from commit 7367729ec7a5d016878dd00b32cce45cec372931) (cherry picked from commit 576379a3478ced0483102c797935b57f454a1f7d) --- daemon/command.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/daemon/command.c b/daemon/command.c index fde3826..db82b52 100644 --- a/daemon/command.c +++ b/daemon/command.c @@ -44,7 +44,7 @@ do_command (char *const *argv) CLEANUP_FREE char *err; int r; CLEANUP_FREE char *sysroot_dev = NULL, *sysroot_dev_pts = NULL, - *sysroot_proc = NULL, *sysroot_selinux = NULL, *sysroot_sys = NULL; + *sysroot_proc = NULL, *sysroot_sys = NULL; int dev_ok, dev_pts_ok, proc_ok, sys_ok; /* We need a root filesystem mounted to do this. */ @@ -70,12 +70,10 @@ do_command (char *const *argv) sysroot_dev = sysroot_path ("/dev"); sysroot_dev_pts = sysroot_path ("/dev/pts"); sysroot_proc = sysroot_path ("/proc"); - sysroot_selinux = sysroot_path ("/sys/fs/selinux"); sysroot_sys = sysroot_path ("/sys"); if (sysroot_dev == NULL || sysroot_dev_pts == NULL || - sysroot_proc == NULL || sysroot_selinux == NULL || - sysroot_sys == NULL) { + sysroot_proc == NULL || sysroot_sys == NULL) { reply_with_perror ("malloc"); return NULL; } -- 1.8.3.1

From: "Richard W.M. Jones" <rjones(a)redhat.com&gt; (cherry picked from commit 467fd96e7e7537a5aa706dd5ca2edb513aa833e9) (cherry picked from commit de5faac35b1c4d98f97857bb52bdb78f61662e03) --- src/utils.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/utils.c b/src/utils.c index 7391455..fa60011 100644 --- a/src/utils.c +++ b/src/utils.c @@ -22,7 +22,6 @@ #include <stdlib.h> #include <string.h> #include <unistd.h> -#include <string.h> #include <sys/types.h> #include <sys/wait.h> #include <libintl.h> -- 1.8.3.1

From: "Richard W.M. Jones" <rjones(a)redhat.com&gt; This makes it easier to see error messages printed by qemu. (cherry picked from commit 19ee64303e65766b4a1b1ac55adbbb646a1c3500) (cherry picked from commit 847c515043870bc7b1c785bad747462a84c43f35) --- src/launch-appliance.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/launch-appliance.c b/src/launch-appliance.c index 6b142e6..f0278ce 100644 --- a/src/launch-appliance.c +++ b/src/launch-appliance.c @@ -770,6 +770,8 @@ print_qemu_command_line (guestfs_h *g, char **argv) if (needs_quote) fputc ('\'', stderr); i++; } + + fputc ('\n', stderr); } static void parse_qemu_version (guestfs_h *g); -- 1.8.3.1

From: "Richard W.M. Jones" <rjones(a)redhat.com&gt; It likely means the kernel was compiled without modules support. (cherry picked from commit 8ad634877cf315288497a8580fb4afc7658deae9) (cherry picked from commit 6503aa1681bb44d2beffa7cfd4f0c4c74ed6d820) --- daemon/modprobe.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/daemon/modprobe.c b/daemon/modprobe.c index 24d2a5b..0b7896a 100644 --- a/daemon/modprobe.c +++ b/daemon/modprobe.c @@ -20,6 +20,8 @@ #include <stdio.h> #include <stdlib.h> +#include <unistd.h> +#include <errno.h> #include "daemon.h" #include "actions.h" @@ -30,6 +32,13 @@ GUESTFSD_EXT_CMD(str_modprobe, modprobe); int optgroup_linuxmodules_available (void) { + /* If /proc/modules doesn't exist, then the appliance kernel + * probably has modules support compiled out. This means modprobe + * is not supported. + */ + if (access ("/proc/modules", R_OK) == -1 && errno == ENOENT) + return 0; + return prog_exists (str_modprobe); } @@ -37,7 +46,9 @@ int do_modprobe (const char *module) { CLEANUP_FREE char *err = NULL; - int r = command (NULL, &err, str_modprobe, module, NULL); + int r; + + r = command (NULL, &err, str_modprobe, module, NULL); if (r == -1) { reply_with_error ("%s", err); -- 1.8.3.1

From: "Richard W.M. Jones" <rjones(a)redhat.com&gt; The homebrew function didn't recognize /dev/ubd* device names, and in any case using the API function is shorter and clearer. (cherry picked from commit 42754046269806a6b6385fee0b72115c73461221) (cherry picked from commit b312c245d3efb458609f9064a75a2f02a5181af4) --- tools/virt-list-filesystems | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/tools/virt-list-filesystems b/tools/virt-list-filesystems index 1b58d63..9dcba24 100755 --- a/tools/virt-list-filesystems +++ b/tools/virt-list-filesystems @@ -167,7 +167,7 @@ foreach $dev (sort keys %fses) { $fstype = $fses{$dev}; if ($all || ($fstype ne "swap" && $fstype ne "unknown")) { - print canonicalize($dev); + print $g->canonical_device_name ($dev); if ($long) { print " $fstype"; } @@ -175,18 +175,6 @@ foreach $dev (sort keys %fses) { } } -# The reverse of device name translation, see -# BLOCK DEVICE NAMING in guestfs(3). -sub canonicalize -{ - local $_ = shift; - - if (m{^/dev/[hv]d([a-z]\d)$}) { - return "/dev/sd$1"; - } - $_; -} - =head1 SHELL QUOTING Libvirt guest names can contain arbitrary characters, some of which -- 1.8.3.1

From: "Richard W.M. Jones" <rjones(a)redhat.com&gt; This fixes commit 36d29700dcef01d681d41f0b593a16e7814e3ee1. (cherry picked from commit b1a8733511836591bcf8931f25f0fb5cec7924ff) (cherry picked from commit fc42ba845e39f8583ae6b687fdda59eb0de659bf) --- Makefile.am | 1 - 1 file changed, 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 8fe27d6..b3fe403 100644 --- a/Makefile.am +++ b/Makefile.am @@ -134,7 +134,6 @@ EXTRA_DIST = \ autogen.sh \ bindtests \ contrib/autobuild/autobuild.sh \ - contrib/guestfsd-in-wine.sh \ contrib/intro/libguestfs-intro.html \ contrib/intro/overview.png \ contrib/intro/overview.svg \ -- 1.8.3.1

From: "Richard W.M. Jones" <rjones(a)redhat.com&gt; For some historical reason, it was stuck in src/launch-direct.c and the comment referred to launch-appliance.c! (cherry picked from commit 00cbb5c1854a52a5b4742aa7ca9601a9aaaab529) (cherry picked from commit 750841e389b14318f698dd57b26bdfada5c0c78f) --- src/guestfs-internal-frontend.h | 1 + src/guestfs-internal.h | 3 --- src/launch-appliance.c | 12 ------------ src/utils.c | 23 +++++++++++++++++++++++ 4 files changed, 24 insertions(+), 15 deletions(-) diff --git a/src/guestfs-internal-frontend.h b/src/guestfs-internal-frontend.h index 06ed37f..ca1701f 100644 --- a/src/guestfs-internal-frontend.h +++ b/src/guestfs-internal-frontend.h @@ -96,6 +96,7 @@ extern void guestfs___free_string_list (char **); extern size_t guestfs___count_strings (char *const *); extern char *guestfs___exit_status_to_string (int status, const char *cmd_name, char *buffer, size_t buflen); extern int guestfs___random_string (char *ret, size_t len); +extern char *guestfs___drive_name (size_t index, char *ret); /* These functions are used internally by the CLEANUP_* macros. * Don't call them directly. diff --git a/src/guestfs-internal.h b/src/guestfs-internal.h index 428fdb9..7c37e57 100644 --- a/src/guestfs-internal.h +++ b/src/guestfs-internal.h @@ -521,9 +521,6 @@ extern void guestfs___launch_failed_error (guestfs_h *g); extern char *guestfs___appliance_command_line (guestfs_h *g, const char *appliance_dev, int flags); #define APPLIANCE_COMMAND_LINE_IS_TCG 1 -/* launch-appliance.c */ -extern char *guestfs___drive_name (size_t index, char *ret); - /* inspect.c */ extern void guestfs___free_inspect_info (guestfs_h *g); extern int guestfs___feature_available (guestfs_h *g, const char *feature); diff --git a/src/launch-appliance.c b/src/launch-appliance.c index f0278ce..69c4145 100644 --- a/src/launch-appliance.c +++ b/src/launch-appliance.c @@ -1030,18 +1030,6 @@ qemu_drive_param (guestfs_h *g, const struct drive *drv, size_t index) return r; /* caller frees */ } -/* https://rwmj.wordpress.com/2011/01/09/how-are-linux-drives-named-beyond-d... */ -char * -guestfs___drive_name (size_t index, char *ret) -{ - if (index >= 26) - ret = guestfs___drive_name (index/26 - 1, ret); - index %= 26; - *ret++ = 'a' + index; - *ret = '\0'; - return ret; -} - static int shutdown_appliance (guestfs_h *g, int check_for_errors) { diff --git a/src/utils.c b/src/utils.c index 01c31d6..54d9d7e 100644 --- a/src/utils.c +++ b/src/utils.c @@ -31,6 +31,11 @@ #include "guestfs.h" #include "guestfs-internal-frontend.h" +/* Note that functions in libutils are used by the tools and language + * bindings. Therefore these must not call internal library functions + * such as safe_*, error or perrorf. + */ + void guestfs___free_string_list (char **argv) { @@ -122,3 +127,21 @@ guestfs___random_string (char *ret, size_t len) return 0; } + +/* This turns a drive index (eg. 27) into a drive name (eg. "ab"). + * Drive indexes count from 0. The return buffer has to be large + * enough for the resulting string, and the returned pointer points to + * the *end* of the string. + * + * https://rwmj.wordpress.com/2011/01/09/how-are-linux-drives-named-beyond-d... + */ +char * +guestfs___drive_name (size_t index, char *ret) +{ + if (index >= 26) + ret = guestfs___drive_name (index/26 - 1, ret); + index %= 26; + *ret++ = 'a' + index; + *ret = '\0'; + return ret; +} -- 1.8.3.1

From: "Richard W.M. Jones" <rjones(a)redhat.com&gt; list-filesystems was returning NULL (but not setting an error) if no filesystems were found. Instead return an empty list. (cherry picked from commit f1d2934216d3fca0501946c8ae0e5c7cd370e6b6) (cherry picked from commit 19309661008ef1d13c05fad5401d95f260fbdae2) --- src/listfs.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/listfs.c b/src/listfs.c index 4bcdf51..b87a021 100644 --- a/src/listfs.c +++ b/src/listfs.c @@ -46,7 +46,7 @@ char ** guestfs__list_filesystems (guestfs_h *g) { size_t i; - char **ret = NULL; + char **ret; size_t ret_size = 0; CLEANUP_FREE_STRING_LIST char **devices = NULL; @@ -56,6 +56,13 @@ guestfs__list_filesystems (guestfs_h *g) CLEANUP_FREE_STRING_LIST char **ldmvols = NULL; CLEANUP_FREE_STRING_LIST char **ldmparts = NULL; + /* We need to initialize this with an empty list so that if there + * are no filesystems at all, we return an empty list (not NULL). + * See also add_vfs function below. + */ + ret = safe_malloc (g, sizeof (char *)); + ret[0] = NULL; + /* Look to see if any devices directly contain filesystems * (RHBZ#590167). However vfs-type will fail to tell us anything * useful about devices which just contain partitions, so we also -- 1.8.3.1

From: "Richard W.M. Jones" <rjones(a)redhat.com&gt; (cherry picked from commit f68d5ee16c88df4a3fe2233ba948fb4780fa2a09) (cherry picked from commit 61f4a56c9d8c17d9467ef902b96c5886222be661) --- src/cleanup.c | 8 ++++---- src/guestfs-internal-frontend.h | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/cleanup.c b/src/cleanup.c index ef2e8ed..ebd3446 100644 --- a/src/cleanup.c +++ b/src/cleanup.c @@ -46,9 +46,9 @@ guestfs___cleanup_free (void *ptr) } void -guestfs___cleanup_free_string_list (void *ptr) +guestfs___cleanup_free_string_list (char ***ptr) { - guestfs___free_string_list (* (char ***) ptr); + guestfs___free_string_list (*ptr); } void @@ -61,9 +61,9 @@ guestfs___cleanup_hash_free (void *ptr) } void -guestfs___cleanup_unlink_free (void *ptr) +guestfs___cleanup_unlink_free (char **ptr) { - char *filename = * (char **) ptr; + char *filename = *ptr; if (filename) { unlink (filename); diff --git a/src/guestfs-internal-frontend.h b/src/guestfs-internal-frontend.h index ca1701f..eba1c0e 100644 --- a/src/guestfs-internal-frontend.h +++ b/src/guestfs-internal-frontend.h @@ -102,9 +102,9 @@ extern char *guestfs___drive_name (size_t index, char *ret); * Don't call them directly. */ extern void guestfs___cleanup_free (void *ptr); -extern void guestfs___cleanup_free_string_list (void *ptr); +extern void guestfs___cleanup_free_string_list (char ***ptr); extern void guestfs___cleanup_hash_free (void *ptr); -extern void guestfs___cleanup_unlink_free (void *ptr); +extern void guestfs___cleanup_unlink_free (char **ptr); extern void guestfs___cleanup_xmlBufferFree (void *ptr); extern void guestfs___cleanup_xmlFreeDoc (void *ptr); extern void guestfs___cleanup_xmlFreeURI (void *ptr); -- 1.8.3.1

From: "Richard W.M. Jones" <rjones(a)redhat.com&gt; This was accidentally moved by this commit: commit b8b5ed65c26dd19a0bc9f8282a50c6dff90c456a Author: Richard W.M. Jones <rjones(a)redhat.com&gt; Date: Wed May 23 11:46:23 2012 +0100 FAQ: Add section about using libguestfs in closed source programs. (cherry picked from commit 0a484e868f5f0b7f6245a80f67e09c8210721dac) (cherry picked from commit e02bbeabb1ca73328a94f63258615b48ceb48c51) --- examples/guestfs-faq.pod | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/examples/guestfs-faq.pod b/examples/guestfs-faq.pod index defb9e1..a425678 100644 --- a/examples/guestfs-faq.pod +++ b/examples/guestfs-faq.pod @@ -731,13 +731,6 @@ Once you're familiar with the API overview, you should look at this list of starting points for other language bindings: L<guestfs(3)/USING LIBGUESTFS WITH OTHER PROGRAMMING LANGUAGES>. -=begin html - -<!-- old anchor for the next section --> -<a name="debug"/> - -=end html - =head2 Can I use libguestfs in my proprietary / closed source / commercial program? @@ -749,6 +742,13 @@ In the source tree the license is in the file C<COPYING.LIB> (LGPLv2+ for the library and bindings) and C<COPYING> (GPLv2+ for the standalone programs). +=begin html + +<!-- old anchor for the next section --> +<a name="debug"/> + +=end html + =head1 DEBUGGING LIBGUESTFS B<In summary:> enable debugging by setting these two environment -- 1.8.3.1

From: Or Goshen <oberonc(a)gmail.com&gt; (cherry picked from commit 18b40a88925df737d3552fa646d35a185feb6c62) (cherry picked from commit 5fe8a679eef1339f25c5190bfc15709332c7f116) --- src/proto.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/proto.c b/src/proto.c index f3b27b6..93f5517 100644 --- a/src/proto.c +++ b/src/proto.c @@ -785,7 +785,7 @@ guestfs___send (guestfs_h *g, int proc_nr, { struct guestfs_message_header hdr; XDR xdr; - u_int32_t len; + uint32_t len; int serial = g->msg_next_serial++; int r; CLEANUP_FREE char *msg_out = NULL; @@ -962,7 +962,7 @@ send_file_complete (guestfs_h *g) static int send_file_chunk (guestfs_h *g, int cancel, const char *buf, size_t buflen) { - u_int32_t len; + uint32_t len; int r; guestfs_chunk chunk; XDR xdr; -- 1.8.3.1

From: "Richard W.M. Jones" <rjones(a)redhat.com&gt; (cherry picked from commit 7e396954611d827dc236a114ed22a781687c002d) (cherry picked from commit 23e9cc95fa9cb8046a75613e0cc9ac92ad647c04) --- fish/guestfish.pod | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/fish/guestfish.pod b/fish/guestfish.pod index d1d9827..8c34cbf 100644 --- a/fish/guestfish.pod +++ b/fish/guestfish.pod @@ -1027,6 +1027,24 @@ and cleans up guestfish when the script exits: # ... +=head2 REMOTE CONTROL DOES NOT WORK WITH I<-a> ETC. OPTIONS + +Options such as I<-a>, I<--add>, I<-N>, I<--new> etc don't interact +properly with remote support. They are processed locally, and not +sent through to the remote guestfish. In particular this won't do +what you expect: + + guestfish --remote --add disk.img + +Don't use these options. Use the equivalent commands instead, eg: + + guestfish --remote add-drive disk.img + +or: + + guestfish --remote + ><fs> add disk.img + =head2 REMOTE CONTROL RUN COMMAND HANGING Using the C<run> (or C<launch>) command remotely in a command -- 1.8.3.1

From: "Richard W.M. Jones" <rjones(a)redhat.com&gt; Thanks: Olaf Hering (see previous commit). (cherry picked from commit d188594b11f2a16fe72b963a55edf41d4aa2e3aa) (cherry picked from commit 379ced49de0fc4e4fac3ed701b382e3b0e1bc48a) --- daemon/hivex.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/daemon/hivex.c b/daemon/hivex.c index ce6164e..b47329e 100644 --- a/daemon/hivex.c +++ b/daemon/hivex.c @@ -417,4 +417,9 @@ do_hivex_node_set_value (int64_t nodeh, OPTGROUP_HIVEX_NOT_AVAILABLE +void +hivex_finalize (void) +{ +} + #endif /* !HAVE_HIVEX */ -- 1.8.3.1

From: "Richard W.M. Jones" <rjones(a)redhat.com&gt; --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index e0984ed..c20b978 100644 --- a/configure.ac +++ b/configure.ac @@ -20,7 +20,7 @@ # freeform string. m4_define([libguestfs_major], [1]) m4_define([libguestfs_minor], [20]) -m4_define([libguestfs_release], [10]) +m4_define([libguestfs_release], [11]) AC_INIT([libguestfs],libguestfs_major.libguestfs_minor.libguestfs_release) AC_CONFIG_AUX_DIR([build-aux]) -- 1.8.3.1