From: "Richard W.M. Jones" <rjones(a)redhat.com&gt; (cherry picked from commit 559bd48960f795dc59d889e5776f545f2e0d494a) --- generator/xdr.ml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generator/xdr.ml b/generator/xdr.ml index e2161cd..60e9dad 100644 --- a/generator/xdr.ml +++ b/generator/xdr.ml @@ -92,7 +92,7 @@ let generate_xdr () = pr "/* Function arguments and return values. */\n"; pr "\n"; List.iter ( - fun { name =shortname; style = ret, args, optargs } -> + fun { name = shortname; style = ret, args, optargs } -> let name = "guestfs_" ^ shortname in (* Ordinary arguments and optional arguments are concatenated -- 1.8.3.1

From: "Richard W.M. Jones" <rjones(a)redhat.com&gt; Although g->tmpdir is always set after launch, and none of these calls should be used before launch, it's always possible that a caller would use one of these APIs before launching the handle. If guestfs___lazy_make_tmpdir is not called, then g->tmpdir is NULL, and the constructed filename would look like "(null)/...". In fact it's possible to observe this error (although it seems to have no especially bad effects): $ strace guestfish ls / |& fgrep '(null)' unlink("(null)/ls1") = -1 ENOENT (No such file or directory) (cherry picked from commit 1937108a4a6070750f0d636f7dcc8725441cc4eb) --- src/file.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/file.c b/src/file.c index 7051936..d21a61d 100644 --- a/src/file.c +++ b/src/file.c @@ -88,6 +88,9 @@ guestfs__read_file (guestfs_h *g, const char *path, size_t *size_r) char *ret = NULL; struct stat statbuf; + if (guestfs___lazy_make_tmpdir (g) == -1) + goto err; + tmpfile = safe_asprintf (g, "%s/cat%d", g->tmpdir, ++g->unique); if (guestfs_download (g, path, tmpfile) == -1) @@ -212,6 +215,9 @@ guestfs__find (guestfs_h *g, const char *directory) char **ret = NULL; size_t i, count, size; + if (guestfs___lazy_make_tmpdir (g) == -1) + goto err; + tmpfile = safe_asprintf (g, "%s/find%d", g->tmpdir, ++g->unique); if (guestfs_find0 (g, directory, tmpfile) == -1) @@ -313,6 +319,9 @@ write_or_append (guestfs_h *g, const char *path, (!append ? guestfs_internal_write : guestfs_internal_write_append) (g, path, content, size); + if (guestfs___lazy_make_tmpdir (g) == -1) + goto err; + /* Write the content out to a temporary file. */ tmpfile = safe_asprintf (g, "%s/write%d", g->tmpdir, ++g->unique); @@ -508,6 +517,9 @@ guestfs__ls (guestfs_h *g, const char *directory) char **ret = NULL; size_t i, count, size; + if (guestfs___lazy_make_tmpdir (g) == -1) + goto err; + tmpfile = safe_asprintf (g, "%s/ls%d", g->tmpdir, ++g->unique); if (guestfs_ls0 (g, directory, tmpfile) == -1) -- 1.8.3.1

From: "Richard W.M. Jones" <rjones(a)redhat.com&gt; Return an empty string (instead of an error) if no capabilities are set on a file, and document that in the API. (cherry picked from commit c663ab3bb9ab02fb3ca6209333c2d5402081c4de) --- daemon/cap.c | 12 ++++++++++++ generator/actions.ml | 4 +++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/daemon/cap.c b/daemon/cap.c index d1f0398..1d732c5 100644 --- a/daemon/cap.c +++ b/daemon/cap.c @@ -48,6 +48,18 @@ do_cap_get_file (const char *path) CHROOT_OUT; if (cap == NULL) { + /* The getcap utility (part of libcap) ignores ENODATA. It just + * means there is no capability attached to the file (RHBZ#989356). + */ + if (errno == ENODATA) { + ret = strdup (""); + if (ret == NULL) { + reply_with_perror ("strdup"); + return NULL; + } + return ret; + } + reply_with_perror ("%s", path); return NULL; } diff --git a/generator/actions.ml b/generator/actions.ml index 238553d..d30aec8 100644 --- a/generator/actions.ml +++ b/generator/actions.ml @@ -10928,7 +10928,9 @@ attached to directory C<dir>." }; shortdesc = "get the Linux capabilities attached to a file"; longdesc = "\ This function returns the Linux capabilities attached to C<path>. -The capabilities set is returned in text form (see L<cap_to_text(3)>)." }; +The capabilities set is returned in text form (see L<cap_to_text(3)>). + +If no capabilities are attached to a file, an empty string is returned." }; { defaults with name = "cap_set_file"; -- 1.8.3.1

From: "Richard W.M. Jones" <rjones(a)redhat.com&gt; (cherry picked from commit 0e1ba00059b5ebbca2e137f2685b2eb65ed33b13) --- src/cleanup.c | 10 ++++++++++ src/guestfs-internal-frontend.h | 4 ++++ 2 files changed, 14 insertions(+) diff --git a/src/cleanup.c b/src/cleanup.c index 43d746e..13018f0 100644 --- a/src/cleanup.c +++ b/src/cleanup.c @@ -23,6 +23,7 @@ #include <unistd.h> #include <string.h> +#include <libxml/uri.h> #include <libxml/tree.h> #include <libxml/xpath.h> #include <libxml/xmlwriter.h> @@ -87,6 +88,15 @@ guestfs___cleanup_xmlFreeDoc (void *ptr) } void +guestfs___cleanup_xmlFreeURI (void *ptr) +{ + xmlURIPtr uri = * (xmlURIPtr *) ptr; + + if (uri) + xmlFreeURI (uri); +} + +void guestfs___cleanup_xmlFreeTextWriter (void *ptr) { xmlTextWriterPtr xo = * (xmlTextWriterPtr *) ptr; diff --git a/src/guestfs-internal-frontend.h b/src/guestfs-internal-frontend.h index 9cb3664..db6122f 100644 --- a/src/guestfs-internal-frontend.h +++ b/src/guestfs-internal-frontend.h @@ -47,6 +47,8 @@ __attribute__((cleanup(guestfs___cleanup_xmlBufferFree))) #define CLEANUP_XMLFREEDOC \ __attribute__((cleanup(guestfs___cleanup_xmlFreeDoc))) +#define CLEANUP_XMLFREEURI \ + __attribute__((cleanup(guestfs___cleanup_xmlFreeURI))) #define CLEANUP_XMLFREETEXTWRITER \ __attribute__((cleanup(guestfs___cleanup_xmlFreeTextWriter))) #define CLEANUP_XMLXPATHFREECONTEXT \ @@ -60,6 +62,7 @@ #define CLEANUP_UNLINK_FREE #define CLEANUP_XMLBUFFERFREE #define CLEANUP_XMLFREEDOC +#define CLEANUP_XMLFREEURI #define CLEANUP_XMLFREETEXTWRITER #define CLEANUP_XMLXPATHFREECONTEXT #define CLEANUP_XMLXPATHFREEOBJECT @@ -104,6 +107,7 @@ extern void guestfs___cleanup_hash_free (void *ptr); extern void guestfs___cleanup_unlink_free (void *ptr); extern void guestfs___cleanup_xmlBufferFree (void *ptr); extern void guestfs___cleanup_xmlFreeDoc (void *ptr); +extern void guestfs___cleanup_xmlFreeURI (void *ptr); extern void guestfs___cleanup_xmlFreeTextWriter (void *ptr); extern void guestfs___cleanup_xmlXPathFreeContext (void *ptr); extern void guestfs___cleanup_xmlXPathFreeObject (void *ptr); -- 1.8.3.1

From: "Richard W.M. Jones" <rjones(a)redhat.com&gt; Don't read the global variable optarg. Read arg instead. (In all cases they are the same, so this bug made no difference). (cherry picked from commit 671be806ae79df5d0a9e864d2f9b3461d08c7733) --- fish/options.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fish/options.c b/fish/options.c index 787402c..5c55b38 100644 --- a/fish/options.c +++ b/fish/options.c @@ -61,7 +61,7 @@ option_a (const char *arg, const char *format, struct drv **drvsp) drv->type = drv_a; drv->nr_drives = -1; - drv->a.filename = optarg; + drv->a.filename = (char *) arg; drv->a.format = format; } -- 1.8.3.1

From: "Richard W.M. Jones" <rjones(a)redhat.com&gt; This allows -a options to be parsed from OCaml programs, reusing the same code that is being used by C. (cherry picked from commit 406522d1d2c9108c52f1356cbbb9bb4039d9ce84) --- po/POTFILES | 1 + po/POTFILES-ml | 1 + resize/Makefile.am | 15 ++++++++-- resize/uRI.ml | 26 +++++++++++++++++ resize/uRI.mli | 29 +++++++++++++++++++ resize/uri-c.c | 84 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 154 insertions(+), 2 deletions(-) create mode 100644 resize/uRI.ml create mode 100644 resize/uRI.mli create mode 100644 resize/uri-c.c diff --git a/po/POTFILES b/po/POTFILES index bcefe16..92b9a18 100644 --- a/po/POTFILES +++ b/po/POTFILES @@ -233,6 +233,7 @@ rescue/test-virt-rescue.pl rescue/virt-rescue.c resize/progress-c.c resize/tty-c.c +resize/uri-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 34533ea..ba64fa3 100644 --- a/po/POTFILES-ml +++ b/po/POTFILES-ml @@ -4,6 +4,7 @@ resize/common_utils_tests.ml resize/progress.ml resize/resize.ml resize/tTY.ml +resize/uRI.ml sparsify/sparsify.ml sysprep/firstboot.ml sysprep/main.ml diff --git a/resize/Makefile.am b/resize/Makefile.am index a9c95ff..62e7659 100644 --- a/resize/Makefile.am +++ b/resize/Makefile.am @@ -35,19 +35,25 @@ SOURCES = \ resize.ml \ tty-c.c \ tTY.mli \ - tTY.ml + tTY.ml \ + uri-c.c \ + uRI.mli \ + uRI.ml if HAVE_OCAML # Note this list must be in dependency order. OBJECTS = \ $(top_builddir)/fish/guestfish-progress.o \ + $(top_builddir)/fish/guestfish-uri.o \ tty-c.o \ progress-c.o \ + uri-c.o \ common_gettext.cmx \ common_utils.cmx \ tTY.cmx \ progress.cmx \ + uRI.cmx \ resize.cmx bin_SCRIPTS = virt-resize @@ -63,10 +69,15 @@ endif OCAMLCFLAGS = -g -warn-error CDEFLMPSUVYZX $(OCAMLPACKAGES) OCAMLOPTFLAGS = $(OCAMLCFLAGS) +OCAMLCLIBS = \ + $(LIBXML2_LIBS) -lncurses \ + -L../src/.libs -lutils \ + -L../gnulib/lib/.libs -lgnu + virt-resize: $(OBJECTS) $(OCAMLFIND) ocamlopt $(OCAMLOPTFLAGS) \ mlguestfs.cmxa -linkpkg $^ \ - -cclib -lncurses \ + -cclib '$(OCAMLCLIBS)' \ $(OCAML_GCOV_LDFLAGS) \ -o $@ diff --git a/resize/uRI.ml b/resize/uRI.ml new file mode 100644 index 0000000..272f339 --- /dev/null +++ b/resize/uRI.ml @@ -0,0 +1,26 @@ +(* virt-resize - interface to -a URI option parsing mini library + * 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. + *) + +type uri = { + path : string; + protocol : string; + server : string array option; + username : string option; +} + +external parse_uri : string -> uri = "virt_resize_parse_uri" diff --git a/resize/uRI.mli b/resize/uRI.mli new file mode 100644 index 0000000..efd39dd --- /dev/null +++ b/resize/uRI.mli @@ -0,0 +1,29 @@ +(* virt-resize - interface to -a URI option parsing mini library + * 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. + *) + +(** Interface to [-a] URI option parsing mini library. *) + +type uri = { + path : string; (** path *) + protocol : string; (** protocol, eg. [file], [nbd] *) + server : string array option; (** list of servers *) + username : string option; (** username *) +} + +val parse_uri : string -> uri +(** See [fish/uri.h]. *) diff --git a/resize/uri-c.c b/resize/uri-c.c new file mode 100644 index 0000000..8c9c385 --- /dev/null +++ b/resize/uri-c.c @@ -0,0 +1,84 @@ +/* virt-resize - interface to -a URI option parsing mini library + * 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 <stdint.h> +#include <string.h> +#include <unistd.h> +#include <locale.h> + +#include <caml/alloc.h> +#include <caml/fail.h> +#include <caml/memory.h> +#include <caml/mlvalues.h> + +#include "uri.h" + +value +virt_resize_parse_uri (value argv /* arg value, not an array! */) +{ + CAMLparam1 (argv); + CAMLlocal4 (rv, sv, ssv, ov); + struct uri uri; + int r; + size_t len; + + r = parse_uri (String_val (argv), &uri); + if (r == -1) + caml_invalid_argument ("URI.parse_uri"); + + /* Convert the struct into an OCaml tuple. */ + rv = caml_alloc_tuple (4); + + /* path : string */ + sv = caml_copy_string (uri.path); + free (uri.path); + Store_field (rv, 0, sv); + + /* protocol : string */ + sv = caml_copy_string (uri.protocol); + free (uri.protocol); + Store_field (rv, 1, sv); + + /* server : string array option */ + if (uri.server) { + ssv = caml_copy_string_array (uri.server); + guestfs___free_string_list (uri.server); + ov = caml_alloc (1, 0); + Store_field (ov, 0, ssv); + } + else + ov = Val_int (0); + Store_field (rv, 2, ov); + + /* username : string option */ + if (uri.username) { + sv = caml_copy_string (uri.username); + free (uri.username); + ov = caml_alloc (1, 0); + Store_field (ov, 0, sv); + } + else + ov = Val_int (0); + Store_field (rv, 3, ov); + + CAMLreturn (rv); +} -- 1.8.3.1

From: "Richard W.M. Jones" <rjones(a)redhat.com&gt; Because "sheepdog" is 8 characters, it wasn't recognized before. (cherry picked from commit e3df223a5aed82b7e502bef327d57dd54d98587b) --- fish/uri.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fish/uri.c b/fish/uri.c index 9c0892f..4c235e3 100644 --- a/fish/uri.c +++ b/fish/uri.c @@ -88,7 +88,7 @@ is_uri (const char *arg) if (!p) return 0; - if (p - arg >= 8) + if (p - arg > 8) return 0; for (p--; p >= arg; p--) { -- 1.8.3.1

From: "Richard W.M. Jones" <rjones(a)redhat.com&gt; (cherry picked from commit 9268f1487970eb9884ba674ab75dc99f91adc0a7) --- examples/guestfs-faq.pod | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/examples/guestfs-faq.pod b/examples/guestfs-faq.pod index f992c8f..ce251e6 100644 --- a/examples/guestfs-faq.pod +++ b/examples/guestfs-faq.pod @@ -156,6 +156,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) --- 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; - Use 'op' instead of 'xxx_op' for operation table. - Add a 'defaults' for the operation table and remove any default values. This is just code motion and there is no functional change. (cherry picked from commit 4cdbae926bb336c8d0dea8e7b6e0dcc3fb219c2d) --- sysprep/sysprep_operation.ml | 9 ++++++ sysprep/sysprep_operation.mli | 3 ++ sysprep/sysprep_operation_abrt_data.ml | 17 ++++++------ sysprep/sysprep_operation_bash_history.ml | 17 ++++++------ sysprep/sysprep_operation_blkid_tab.ml | 16 +++++------ sysprep/sysprep_operation_ca_certificates.ml | 16 +++++------ sysprep/sysprep_operation_crash_data.ml | 17 ++++++------ sysprep/sysprep_operation_cron_spool.ml | 16 +++++------ sysprep/sysprep_operation_dhcp_client_state.ml | 16 +++++------ sysprep/sysprep_operation_dhcp_server_state.ml | 16 +++++------ sysprep/sysprep_operation_dovecot_data.ml | 16 +++++------ sysprep/sysprep_operation_firstboot.ml | 32 +++++++++++----------- sysprep/sysprep_operation_flag_reconfiguration.ml | 17 ++++++------ sysprep/sysprep_operation_hostname.ml | 24 ++++++++-------- sysprep/sysprep_operation_kerberos_data.ml | 16 +++++------ sysprep/sysprep_operation_logfiles.ml | 19 ++++++------- sysprep/sysprep_operation_lvm_uuids.ml | 17 ++++++------ sysprep/sysprep_operation_machine_id.ml | 17 ++++++------ sysprep/sysprep_operation_mail_spool.ml | 16 +++++------ sysprep/sysprep_operation_net_hostname.ml | 17 ++++++------ sysprep/sysprep_operation_net_hwaddr.ml | 17 ++++++------ sysprep/sysprep_operation_pacct_log.ml | 17 ++++++------ sysprep/sysprep_operation_package_manager_cache.ml | 16 +++++------ sysprep/sysprep_operation_pam_data.ml | 16 +++++------ sysprep/sysprep_operation_puppet_data_log.ml | 16 +++++------ sysprep/sysprep_operation_random_seed.ml | 17 ++++++------ sysprep/sysprep_operation_rhn_systemid.ml | 16 +++++------ sysprep/sysprep_operation_samba_db_log.ml | 16 +++++------ sysprep/sysprep_operation_script.ml | 28 +++++++++---------- sysprep/sysprep_operation_smolt_uuid.ml | 16 +++++------ sysprep/sysprep_operation_ssh_hostkeys.ml | 17 ++++++------ sysprep/sysprep_operation_ssh_userdir.ml | 17 ++++++------ sysprep/sysprep_operation_sssd_db_log.ml | 16 +++++------ sysprep/sysprep_operation_udev_persistent_net.ml | 17 ++++++------ sysprep/sysprep_operation_user_account.ml | 17 ++++++------ sysprep/sysprep_operation_utmp.ml | 17 ++++++------ sysprep/sysprep_operation_yum_uuid.ml | 17 ++++++------ 37 files changed, 296 insertions(+), 331 deletions(-) diff --git a/sysprep/sysprep_operation.ml b/sysprep/sysprep_operation.ml index 2adddba..64a6390 100644 --- a/sysprep/sysprep_operation.ml +++ b/sysprep/sysprep_operation.ml @@ -35,6 +35,15 @@ type operation = { perform_on_filesystems : callback option; perform_on_devices : callback option; } +let defaults = { + name = ""; + enabled_by_default = false; + heading = ""; + pod_description = None; + extra_args = []; + perform_on_filesystems = None; + perform_on_devices = None; +} let all_operations = ref [] let enabled_by_default_operations = ref [] diff --git a/sysprep/sysprep_operation.mli b/sysprep/sysprep_operation.mli index 87a0b9a..6b792cd 100644 --- a/sysprep/sysprep_operation.mli +++ b/sysprep/sysprep_operation.mli @@ -75,6 +75,9 @@ type operation = { operation to work directly on block devices, LVs etc. *) } +val defaults : operation +(** This is so operations can write [let op = { defaults with ... }]. *) + val register_operation : operation -> unit (** Register an operation. *) diff --git a/sysprep/sysprep_operation_abrt_data.ml b/sysprep/sysprep_operation_abrt_data.ml index c830bd4..d923fec 100644 --- a/sysprep/sysprep_operation_abrt_data.ml +++ b/sysprep/sysprep_operation_abrt_data.ml @@ -32,16 +32,15 @@ let abrt_data_perform g root = ) else [] -let abrt_data_op = { - name = "abrt-data"; - enabled_by_default = true; - heading = s_"Remove the crash data generated by ABRT"; - pod_description = Some (s_"\ +let op = { + defaults with + name = "abrt-data"; + enabled_by_default = true; + heading = s_"Remove the crash data generated by ABRT"; + pod_description = Some (s_"\ Remove the automatically generated ABRT crash data in C</var/spool/abrt/>."); - extra_args = []; - perform_on_filesystems = Some abrt_data_perform; - perform_on_devices = None; + perform_on_filesystems = Some abrt_data_perform; } -let () = register_operation abrt_data_op +let () = register_operation op diff --git a/sysprep/sysprep_operation_bash_history.ml b/sysprep/sysprep_operation_bash_history.ml index 6e1bd3f..56da23e 100644 --- a/sysprep/sysprep_operation_bash_history.ml +++ b/sysprep/sysprep_operation_bash_history.ml @@ -33,16 +33,15 @@ let bash_history_perform g root = ) else [] -let bash_history_op = { - name = "bash-history"; - enabled_by_default = true; - heading = s_"Remove the bash history in the guest"; - pod_description = Some (s_"\ +let op = { + defaults with + name = "bash-history"; + enabled_by_default = true; + heading = s_"Remove the bash history in the guest"; + pod_description = Some (s_"\ Remove the bash history of user \"root\" and any other users who have a C<.bash_history> file in their home directory."); - extra_args = []; - perform_on_filesystems = Some bash_history_perform; - perform_on_devices = None; + perform_on_filesystems = Some bash_history_perform; } -let () = register_operation bash_history_op +let () = register_operation op diff --git a/sysprep/sysprep_operation_blkid_tab.ml b/sysprep/sysprep_operation_blkid_tab.ml index c75c3f3..fe9d10f 100644 --- a/sysprep/sysprep_operation_blkid_tab.ml +++ b/sysprep/sysprep_operation_blkid_tab.ml @@ -43,14 +43,12 @@ let blkid_tab_perform g root = ) else [] -let blkid_tab_op = { - name = "blkid-tab"; - enabled_by_default = true; - heading = s_"Remove blkid tab in the guest"; - pod_description = None; - extra_args = []; - perform_on_filesystems = Some blkid_tab_perform; - perform_on_devices = None; +let op = { + defaults with + name = "blkid-tab"; + enabled_by_default = true; + heading = s_"Remove blkid tab in the guest"; + perform_on_filesystems = Some blkid_tab_perform; } -let () = register_operation blkid_tab_op +let () = register_operation op diff --git a/sysprep/sysprep_operation_ca_certificates.ml b/sysprep/sysprep_operation_ca_certificates.ml index 9b0d396..86a9c54 100644 --- a/sysprep/sysprep_operation_ca_certificates.ml +++ b/sysprep/sysprep_operation_ca_certificates.ml @@ -47,14 +47,12 @@ let ca_certificates_perform g root = ) else [] -let ca_certificates_op = { - name = "ca-certificates"; - enabled_by_default = false; - heading = s_"Remove CA certificates in the guest"; - pod_description = None; - extra_args = []; - perform_on_filesystems = Some ca_certificates_perform; - perform_on_devices = None; +let op = { + defaults with + name = "ca-certificates"; + enabled_by_default = false; + heading = s_"Remove CA certificates in the guest"; + perform_on_filesystems = Some ca_certificates_perform; } -let () = register_operation ca_certificates_op +let () = register_operation op diff --git a/sysprep/sysprep_operation_crash_data.ml b/sysprep/sysprep_operation_crash_data.ml index 1746cac..edeb5e2 100644 --- a/sysprep/sysprep_operation_crash_data.ml +++ b/sysprep/sysprep_operation_crash_data.ml @@ -33,15 +33,14 @@ let crash_data_perform g root = ); [] -let crash_data_op = { - name = "crash-data"; - enabled_by_default = true; - heading = s_"Remove the crash data generated by kexec-tools"; - pod_description = Some (s_"\ +let op = { + defaults with + name = "crash-data"; + enabled_by_default = true; + heading = s_"Remove the crash data generated by kexec-tools"; + pod_description = Some (s_"\ Remove the automatically generated kdump kernel crash data."); - extra_args = []; - perform_on_filesystems = Some crash_data_perform; - perform_on_devices = None; + perform_on_filesystems = Some crash_data_perform; } -let () = register_operation crash_data_op +let () = register_operation op diff --git a/sysprep/sysprep_operation_cron_spool.ml b/sysprep/sysprep_operation_cron_spool.ml index f61769d..1a036dd 100644 --- a/sysprep/sysprep_operation_cron_spool.ml +++ b/sysprep/sysprep_operation_cron_spool.ml @@ -33,14 +33,12 @@ let cron_spool_perform (g : Guestfs.guestfs) root = Array.iter g#rm (g#glob_expand "/var/spool/at/spool/*"); [] -let cron_spool_op = { - name = "cron-spool"; - enabled_by_default = true; - heading = s_"Remove user at-jobs and cron-jobs"; - pod_description = None; - extra_args = []; - perform_on_filesystems = Some cron_spool_perform; - perform_on_devices = None; +let op = { + defaults with + name = "cron-spool"; + enabled_by_default = true; + heading = s_"Remove user at-jobs and cron-jobs"; + perform_on_filesystems = Some cron_spool_perform; } -let () = register_operation cron_spool_op +let () = register_operation op diff --git a/sysprep/sysprep_operation_dhcp_client_state.ml b/sysprep/sysprep_operation_dhcp_client_state.ml index fcda3d5..69c506f 100644 --- a/sysprep/sysprep_operation_dhcp_client_state.ml +++ b/sysprep/sysprep_operation_dhcp_client_state.ml @@ -30,14 +30,12 @@ let dhcp_client_state_perform g root = ); [] -let dhcp_client_state_op = { - name = "dhcp-client-state"; - enabled_by_default = true; - heading = s_"Remove DHCP client leases"; - pod_description = None; - extra_args = []; - perform_on_filesystems = Some dhcp_client_state_perform; - perform_on_devices = None; +let op = { + defaults with + name = "dhcp-client-state"; + enabled_by_default = true; + heading = s_"Remove DHCP client leases"; + perform_on_filesystems = Some dhcp_client_state_perform; } -let () = register_operation dhcp_client_state_op +let () = register_operation op diff --git a/sysprep/sysprep_operation_dhcp_server_state.ml b/sysprep/sysprep_operation_dhcp_server_state.ml index a713cbd..9ef2abf 100644 --- a/sysprep/sysprep_operation_dhcp_server_state.ml +++ b/sysprep/sysprep_operation_dhcp_server_state.ml @@ -25,14 +25,12 @@ let dhcp_server_state_perform g root = Array.iter g#rm_rf (g#glob_expand "/var/lib/dhcpd/*"); [] -let dhcp_server_state_op = { - name = "dhcp-server-state"; - enabled_by_default = true; - heading = s_"Remove DHCP server leases"; - pod_description = None; - extra_args = []; - perform_on_filesystems = Some dhcp_server_state_perform; - perform_on_devices = None; +let op = { + defaults with + name = "dhcp-server-state"; + enabled_by_default = true; + heading = s_"Remove DHCP server leases"; + perform_on_filesystems = Some dhcp_server_state_perform; } -let () = register_operation dhcp_server_state_op +let () = register_operation op diff --git a/sysprep/sysprep_operation_dovecot_data.ml b/sysprep/sysprep_operation_dovecot_data.ml index 8a1fe49..c2004e8 100644 --- a/sysprep/sysprep_operation_dovecot_data.ml +++ b/sysprep/sysprep_operation_dovecot_data.ml @@ -32,14 +32,12 @@ let dovecot_data_perform g root = ) else [] -let dovecot_data_op = { - name = "dovecot-data"; - enabled_by_default = true; - heading = s_"Remove Dovecot (mail server) data"; - pod_description = None; - extra_args = []; - perform_on_filesystems = Some dovecot_data_perform; - perform_on_devices = None; +let op = { + defaults with + name = "dovecot-data"; + enabled_by_default = true; + heading = s_"Remove Dovecot (mail server) data"; + perform_on_filesystems = Some dovecot_data_perform; } -let () = register_operation dovecot_data_op +let () = register_operation op diff --git a/sysprep/sysprep_operation_firstboot.ml b/sysprep/sysprep_operation_firstboot.ml index 1e70c65..7c1c497 100644 --- a/sysprep/sysprep_operation_firstboot.ml +++ b/sysprep/sysprep_operation_firstboot.ml @@ -48,16 +48,17 @@ let firstboot_perform g root = ) !files; [ `Created_files ] -let firstboot_op = { - name = "firstboot"; +let op = { + defaults with + name = "firstboot"; - (* enabled_by_default because we only do anything if the - * --firstboot parameter is used. - *) - enabled_by_default = true; + (* enabled_by_default because we only do anything if the + * --firstboot parameter is used. + *) + enabled_by_default = true; - heading = s_"Add scripts to run once at next boot"; - pod_description = Some (s_"\ + heading = s_"Add scripts to run once at next boot"; + pod_description = Some (s_"\ Supply one of more shell scripts (using the I<--firstboot> option). These are run the first time the guest boots, and then are @@ -71,16 +72,15 @@ C<~root/virt-sysprep-firstboot.log> (in the guest). Currently this is only implemented for Linux guests using either System V init, or systemd."); - extra_args = [ - ("--firstboot", Arg.String (fun s -> files := s :: !files), - s_"script" ^ " " ^ s_"run script once next time guest boots"), - s_"\ + extra_args = [ + ("--firstboot", Arg.String (fun s -> files := s :: !files), + s_"script" ^ " " ^ s_"run script once next time guest boots"), + s_"\ Run script(s) once next time the guest boots. You can supply the I<--firstboot> option as many times as needed." - ]; + ]; - perform_on_filesystems = Some firstboot_perform; - perform_on_devices = None; + perform_on_filesystems = Some firstboot_perform; } -let () = register_operation firstboot_op +let () = register_operation op diff --git a/sysprep/sysprep_operation_flag_reconfiguration.ml b/sysprep/sysprep_operation_flag_reconfiguration.ml index 761d5eb..25abfef 100644 --- a/sysprep/sysprep_operation_flag_reconfiguration.ml +++ b/sysprep/sysprep_operation_flag_reconfiguration.ml @@ -29,16 +29,15 @@ let flag_reconfiguration g root = ) else [] -let flag_reconfiguration_op = { - name = "flag-reconfiguration"; - enabled_by_default = false; - heading = s_"Flag the system for reconfiguration"; - pod_description = Some (s_"\ +let op = { + defaults with + name = "flag-reconfiguration"; + enabled_by_default = false; + heading = s_"Flag the system for reconfiguration"; + pod_description = Some (s_"\ Note that this may require user intervention when the guest is booted."); - extra_args = []; - perform_on_filesystems = Some flag_reconfiguration; - perform_on_devices = None; + perform_on_filesystems = Some flag_reconfiguration; } -let () = register_operation flag_reconfiguration_op; +let () = register_operation op; diff --git a/sysprep/sysprep_operation_hostname.ml b/sysprep/sysprep_operation_hostname.ml index e8767f3..ec199f5 100644 --- a/sysprep/sysprep_operation_hostname.ml +++ b/sysprep/sysprep_operation_hostname.ml @@ -84,23 +84,23 @@ let hostname_perform (g : Guestfs.guestfs) root = | _ -> [] -let hostname_op = { - name = "hostname"; - enabled_by_default = true; - heading = s_"Change the hostname of the guest"; - pod_description = Some (s_"\ +let op = { + defaults with + name = "hostname"; + enabled_by_default = true; + heading = s_"Change the hostname of the guest"; + pod_description = Some (s_"\ This operation changes the hostname of the guest to the value given in the I<--hostname> parameter. If the I<--hostname> parameter is not given, then the hostname is changed to C<localhost.localdomain>."); - extra_args = [ - ("--hostname", Arg.Set_string hostname, s_"hostname" ^ " " ^ s_"New hostname"), - s_"\ + extra_args = [ + ("--hostname", Arg.Set_string hostname, s_"hostname" ^ " " ^ s_"New hostname"), + s_"\ Change the hostname. If not given, defaults to C<localhost.localdomain>." - ]; - perform_on_filesystems = Some hostname_perform; - perform_on_devices = None; + ]; + perform_on_filesystems = Some hostname_perform; } -let () = register_operation hostname_op +let () = register_operation op diff --git a/sysprep/sysprep_operation_kerberos_data.ml b/sysprep/sysprep_operation_kerberos_data.ml index 1e120aa..0652719 100644 --- a/sysprep/sysprep_operation_kerberos_data.ml +++ b/sysprep/sysprep_operation_kerberos_data.ml @@ -40,14 +40,12 @@ let kerberos_data_perform g root = ) else [] -let kerberos_data_op = { - name = "kerberos-data"; - enabled_by_default = false; - heading = s_"Remove Kerberos data in the guest"; - pod_description = None; - extra_args = []; - perform_on_filesystems = Some kerberos_data_perform; - perform_on_devices = None; +let op = { + defaults with + name = "kerberos-data"; + enabled_by_default = false; + heading = s_"Remove Kerberos data in the guest"; + perform_on_filesystems = Some kerberos_data_perform; } -let () = register_operation kerberos_data_op +let () = register_operation op diff --git a/sysprep/sysprep_operation_logfiles.ml b/sysprep/sysprep_operation_logfiles.ml index 88b0977..842b855 100644 --- a/sysprep/sysprep_operation_logfiles.ml +++ b/sysprep/sysprep_operation_logfiles.ml @@ -90,18 +90,17 @@ let logfiles_perform g root = ); [] -let logfiles_op = { - name = "logfiles"; - enabled_by_default = true; - heading = s_"Remove many log files from the guest"; - pod_description = Some ( - sprintf (f_"\ +let op = { + defaults with + name = "logfiles"; + enabled_by_default = true; + heading = s_"Remove many log files from the guest"; + pod_description = Some ( + sprintf (f_"\ On Linux the following files are removed: %s") globs_as_pod); - extra_args = []; - perform_on_filesystems = Some logfiles_perform; - perform_on_devices = None; + perform_on_filesystems = Some logfiles_perform; } -let () = register_operation logfiles_op +let () = register_operation op diff --git a/sysprep/sysprep_operation_lvm_uuids.ml b/sysprep/sysprep_operation_lvm_uuids.ml index b116d66..7790d0b 100644 --- a/sysprep/sysprep_operation_lvm_uuids.ml +++ b/sysprep/sysprep_operation_lvm_uuids.ml @@ -38,16 +38,15 @@ let rec lvm_uuids_perform g root = ); [] -let lvm_uuids_op = { - name = "lvm-uuids"; - enabled_by_default = true; - heading = s_"Change LVM2 PV and VG UUIDs"; - pod_description = Some (s_"\ +let op = { + defaults with + name = "lvm-uuids"; + enabled_by_default = true; + heading = s_"Change LVM2 PV and VG UUIDs"; + pod_description = Some (s_"\ On Linux guests that have LVM2 physical volumes (PVs) or volume groups (VGs), new random UUIDs are generated and assigned to those PVs and VGs."); - extra_args = []; - perform_on_filesystems = None; - perform_on_devices = Some lvm_uuids_perform; + perform_on_devices = Some lvm_uuids_perform; } -let () = register_operation lvm_uuids_op +let () = register_operation op diff --git a/sysprep/sysprep_operation_machine_id.ml b/sysprep/sysprep_operation_machine_id.ml index c826da4..5eadea4 100644 --- a/sysprep/sysprep_operation_machine_id.ml +++ b/sysprep/sysprep_operation_machine_id.ml @@ -31,18 +31,17 @@ let machine_id_perform g root = ) else [] -let machine_id_op = { - name = "machine-id"; - enabled_by_default = true; - heading = s_"Remove the local machine ID"; - pod_description = Some (s_"\ +let op = { + defaults with + name = "machine-id"; + enabled_by_default = true; + heading = s_"Remove the local machine ID"; + pod_description = Some (s_"\ The machine ID is usually generated from a random source during system installation and stays constant for all subsequent boots. Optionally, for stateless systems it is generated during runtime at boot if it is found to be empty."); - extra_args = []; - perform_on_filesystems = Some machine_id_perform; - perform_on_devices = None; + perform_on_filesystems = Some machine_id_perform; } -let () = register_operation machine_id_op +let () = register_operation op diff --git a/sysprep/sysprep_operation_mail_spool.ml b/sysprep/sysprep_operation_mail_spool.ml index 1b0cbe3..fa2b4e7 100644 --- a/sysprep/sysprep_operation_mail_spool.ml +++ b/sysprep/sysprep_operation_mail_spool.ml @@ -30,14 +30,12 @@ let mail_spool_perform g root = ]; [] -let mail_spool_op = { - name = "mail-spool"; - enabled_by_default = true; - heading = s_"Remove email from the local mail spool directory"; - pod_description = None; - extra_args = []; - perform_on_filesystems = Some mail_spool_perform; - perform_on_devices = None; +let op = { + defaults with + name = "mail-spool"; + enabled_by_default = true; + heading = s_"Remove email from the local mail spool directory"; + perform_on_filesystems = Some mail_spool_perform; } -let () = register_operation mail_spool_op +let () = register_operation op diff --git a/sysprep/sysprep_operation_net_hostname.ml b/sysprep/sysprep_operation_net_hostname.ml index 37fb78b..a540357 100644 --- a/sysprep/sysprep_operation_net_hostname.ml +++ b/sysprep/sysprep_operation_net_hostname.ml @@ -43,16 +43,15 @@ let net_hostname_perform g root = | _ -> [] -let net_hostname_op = { - name = "net-hostname"; - enabled_by_default = true; - heading = s_"Remove HOSTNAME in network interface configuration"; - pod_description = Some (s_"\ +let op = { + defaults with + name = "net-hostname"; + enabled_by_default = true; + heading = s_"Remove HOSTNAME in network interface configuration"; + pod_description = Some (s_"\ For Fedora and Red Hat Enterprise Linux, this is removed from C<ifcfg-*> files."); - extra_args = []; - perform_on_filesystems = Some net_hostname_perform; - perform_on_devices = None; + perform_on_filesystems = Some net_hostname_perform; } -let () = register_operation net_hostname_op +let () = register_operation op diff --git a/sysprep/sysprep_operation_net_hwaddr.ml b/sysprep/sysprep_operation_net_hwaddr.ml index fe7fac0..6409767 100644 --- a/sysprep/sysprep_operation_net_hwaddr.ml +++ b/sysprep/sysprep_operation_net_hwaddr.ml @@ -43,16 +43,15 @@ let net_hwaddr_perform g root = | _ -> [] -let net_hwaddr_op = { - name = "net-hwaddr"; - enabled_by_default = true; - heading = s_"Remove HWADDR (hard-coded MAC address) configuration"; - pod_description = Some (s_"\ +let op = { + defaults with + name = "net-hwaddr"; + enabled_by_default = true; + heading = s_"Remove HWADDR (hard-coded MAC address) configuration"; + pod_description = Some (s_"\ For Fedora and Red Hat Enterprise Linux, this is removed from C<ifcfg-*> files."); - extra_args = []; - perform_on_filesystems = Some net_hwaddr_perform; - perform_on_devices = None; + perform_on_filesystems = Some net_hwaddr_perform; } -let () = register_operation net_hwaddr_op +let () = register_operation op diff --git a/sysprep/sysprep_operation_pacct_log.ml b/sysprep/sysprep_operation_pacct_log.ml index f2d47c7..10dc25f 100644 --- a/sysprep/sysprep_operation_pacct_log.ml +++ b/sysprep/sysprep_operation_pacct_log.ml @@ -45,16 +45,15 @@ let pacct_log_perform g root = | _ -> [] -let pacct_log_op = { - name = "pacct-log"; - enabled_by_default = true; - heading = s_"Remove the process accounting log files"; - pod_description = Some (s_"\ +let op = { + defaults with + name = "pacct-log"; + enabled_by_default = true; + heading = s_"Remove the process accounting log files"; + pod_description = Some (s_"\ The system wide process accounting will store to the pacct log files if the process accounting is on."); - extra_args = []; - perform_on_filesystems = Some pacct_log_perform; - perform_on_devices = None; + perform_on_filesystems = Some pacct_log_perform; } -let () = register_operation pacct_log_op +let () = register_operation op diff --git a/sysprep/sysprep_operation_package_manager_cache.ml b/sysprep/sysprep_operation_package_manager_cache.ml index 69c9245..70fed03 100644 --- a/sysprep/sysprep_operation_package_manager_cache.ml +++ b/sysprep/sysprep_operation_package_manager_cache.ml @@ -36,14 +36,12 @@ let package_manager_cache_perform g root = | Some dirs -> Array.iter g#rm_rf dirs; [] | _ -> [] -let package_manager_cache_op = { - name = "package-manager-cache"; - enabled_by_default = true; - heading = s_"Remove package manager cache"; - pod_description = None; - extra_args = []; - perform_on_filesystems = Some package_manager_cache_perform; - perform_on_devices = None; +let op = { + defaults with + name = "package-manager-cache"; + enabled_by_default = true; + heading = s_"Remove package manager cache"; + perform_on_filesystems = Some package_manager_cache_perform; } -let () = register_operation package_manager_cache_op +let () = register_operation op diff --git a/sysprep/sysprep_operation_pam_data.ml b/sysprep/sysprep_operation_pam_data.ml index 931890d..82c88f9 100644 --- a/sysprep/sysprep_operation_pam_data.ml +++ b/sysprep/sysprep_operation_pam_data.ml @@ -40,14 +40,12 @@ let pam_data_perform g root = ) else [] -let pam_data_op = { - name = "pam-data"; - enabled_by_default = true; - heading = s_"Remove the PAM data in the guest"; - pod_description = None; - extra_args = []; - perform_on_filesystems = Some pam_data_perform; - perform_on_devices = None; +let op = { + defaults with + name = "pam-data"; + enabled_by_default = true; + heading = s_"Remove the PAM data in the guest"; + perform_on_filesystems = Some pam_data_perform; } -let () = register_operation pam_data_op +let () = register_operation op diff --git a/sysprep/sysprep_operation_puppet_data_log.ml b/sysprep/sysprep_operation_puppet_data_log.ml index 7c4fd89..8094b83 100644 --- a/sysprep/sysprep_operation_puppet_data_log.ml +++ b/sysprep/sysprep_operation_puppet_data_log.ml @@ -40,14 +40,12 @@ let puppet_data_log_perform g root = ) else [] -let puppet_data_log_op = { - name = "puppet-data-log"; - enabled_by_default = true; - heading = s_"Remove the data and log files of puppet"; - pod_description = None; - extra_args = []; - perform_on_filesystems = Some puppet_data_log_perform; - perform_on_devices = None; +let op = { + defaults with + name = "puppet-data-log"; + enabled_by_default = true; + heading = s_"Remove the data and log files of puppet"; + perform_on_filesystems = Some puppet_data_log_perform; } -let () = register_operation puppet_data_log_op +let () = register_operation op diff --git a/sysprep/sysprep_operation_random_seed.ml b/sysprep/sysprep_operation_random_seed.ml index c3d0dc5..fdb7b11 100644 --- a/sysprep/sysprep_operation_random_seed.ml +++ b/sysprep/sysprep_operation_random_seed.ml @@ -45,18 +45,17 @@ let random_seed_perform (g : Guestfs.guestfs) root = ) else [] -let random_seed_op = { - name = "random-seed"; - enabled_by_default = true; - heading = s_"Generate random seed for guest"; - pod_description = Some (s_"\ +let op = { + defaults with + name = "random-seed"; + enabled_by_default = true; + heading = s_"Generate random seed for guest"; + pod_description = Some (s_"\ Write some random bytes from the host into the random seed file of the guest. See L</RANDOM SEED> below."); - extra_args = []; - perform_on_filesystems = Some random_seed_perform; - perform_on_devices = None; + perform_on_filesystems = Some random_seed_perform; } -let () = register_operation random_seed_op +let () = register_operation op diff --git a/sysprep/sysprep_operation_rhn_systemid.ml b/sysprep/sysprep_operation_rhn_systemid.ml index 99ab5e1..d3401b3 100644 --- a/sysprep/sysprep_operation_rhn_systemid.ml +++ b/sysprep/sysprep_operation_rhn_systemid.ml @@ -31,14 +31,12 @@ let rhn_systemid_perform g root = [] | _ -> [] -let rhn_systemid_op = { - name = "rhn-systemid"; - enabled_by_default = true; - heading = s_"Remove the RHN system ID"; - pod_description = None; - extra_args = []; - perform_on_filesystems = Some rhn_systemid_perform; - perform_on_devices = None; +let op = { + defaults with + name = "rhn-systemid"; + enabled_by_default = true; + heading = s_"Remove the RHN system ID"; + perform_on_filesystems = Some rhn_systemid_perform; } -let () = register_operation rhn_systemid_op +let () = register_operation op diff --git a/sysprep/sysprep_operation_samba_db_log.ml b/sysprep/sysprep_operation_samba_db_log.ml index 2f6370a..8ed86ca 100644 --- a/sysprep/sysprep_operation_samba_db_log.ml +++ b/sysprep/sysprep_operation_samba_db_log.ml @@ -41,14 +41,12 @@ let samba_db_log_perform g root = ) else [] -let samba_db_log_op = { - name = "samba-db-log"; - enabled_by_default = true; - heading = s_"Remove the database and log files of Samba"; - pod_description = None; - extra_args = []; - perform_on_filesystems = Some samba_db_log_perform; - perform_on_devices = None; +let op = { + defaults with + name = "samba-db-log"; + enabled_by_default = true; + heading = s_"Remove the database and log files of Samba"; + perform_on_filesystems = Some samba_db_log_perform; } -let () = register_operation samba_db_log_op +let () = register_operation op diff --git a/sysprep/sysprep_operation_script.ml b/sysprep/sysprep_operation_script.ml index 7dbbf1c..08c8709 100644 --- a/sysprep/sysprep_operation_script.ml +++ b/sysprep/sysprep_operation_script.ml @@ -104,11 +104,12 @@ trap cleanup INT TERM QUIT EXIT ERR\n" ); pid -let script_op = { - name = "script"; - enabled_by_default = true; - heading = s_"Run arbitrary scripts against the guest"; - pod_description = Some (s_"\ +let op = { + defaults with + name = "script"; + enabled_by_default = true; + heading = s_"Run arbitrary scripts against the guest"; + pod_description = Some (s_"\ The C<script> module lets you run arbitrary shell scripts or programs against the guest. @@ -131,9 +132,9 @@ can choose a specific one by using the I<--scriptdir> parameter. B<Note:> This is different from I<--firstboot> scripts (which run in the context of the guest when it is booting first time). I<--script> scripts run on the host, not in the guest."); - extra_args = [ - ("--scriptdir", Arg.String set_scriptdir, s_"dir" ^ " " ^ s_"Mount point on host"), - s_"\ + extra_args = [ + ("--scriptdir", Arg.String set_scriptdir, s_"dir" ^ " " ^ s_"Mount point on host"), + s_"\ The mount point (an empty directory on the host) used when the C<script> operation is enabled and one or more scripts are specified using I<--script> parameter(s). @@ -142,17 +143,16 @@ B<Note:> C<scriptdir> B<must> be an absolute path. If I<--scriptdir> is not specified then a temporary mountpoint will be created."; - ("--script", Arg.String add_script, s_"script" ^ " " ^ s_"Script or program to run on guest"), - s_"\ + ("--script", Arg.String add_script, s_"script" ^ " " ^ s_"Script or program to run on guest"), + s_"\ Run the named C<script> (a shell script or program) against the guest. The script can be any program on the host. The script's current directory will be the guest's root directory. B<Note:> If the script is not on the $PATH, then you must give the full absolute path to the script."; - ]; - perform_on_filesystems = Some script_perform; - perform_on_devices = None; + ]; + perform_on_filesystems = Some script_perform; } -let () = register_operation script_op +let () = register_operation op diff --git a/sysprep/sysprep_operation_smolt_uuid.ml b/sysprep/sysprep_operation_smolt_uuid.ml index 295a260..bb560c4 100644 --- a/sysprep/sysprep_operation_smolt_uuid.ml +++ b/sysprep/sysprep_operation_smolt_uuid.ml @@ -35,14 +35,12 @@ let smolt_uuid_perform g root = ) else [] -let smolt_uuid_op = { - name = "smolt-uuid"; - enabled_by_default = true; - heading = s_"Remove the Smolt hardware UUID"; - pod_description = None; - extra_args = []; - perform_on_filesystems = Some smolt_uuid_perform; - perform_on_devices = None; +let op = { + defaults with + name = "smolt-uuid"; + enabled_by_default = true; + heading = s_"Remove the Smolt hardware UUID"; + perform_on_filesystems = Some smolt_uuid_perform; } -let () = register_operation smolt_uuid_op +let () = register_operation op diff --git a/sysprep/sysprep_operation_ssh_hostkeys.ml b/sysprep/sysprep_operation_ssh_hostkeys.ml index a382c19..6ed7deb 100644 --- a/sysprep/sysprep_operation_ssh_hostkeys.ml +++ b/sysprep/sysprep_operation_ssh_hostkeys.ml @@ -30,11 +30,12 @@ let ssh_hostkeys_perform g root = ) else [] -let ssh_hostkeys_op = { - name = "ssh-hostkeys"; - enabled_by_default = true; - heading = s_"Remove the SSH host keys in the guest"; - pod_description = Some (s_"\ +let op = { + defaults with + name = "ssh-hostkeys"; + enabled_by_default = true; + heading = s_"Remove the SSH host keys in the guest"; + pod_description = Some (s_"\ The SSH host keys are regenerated (differently) next time the guest is booted. @@ -45,9 +46,7 @@ you a stark warning about the host key changing: @ WARNING: REMOTE HOST IDENTIFICATION HAS CHANGED! @ @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ IT IS POSSIBLE THAT SOMEONE IS DOING SOMETHING NASTY!"); - extra_args = []; - perform_on_filesystems = Some ssh_hostkeys_perform; - perform_on_devices = None; + perform_on_filesystems = Some ssh_hostkeys_perform; } -let () = register_operation ssh_hostkeys_op +let () = register_operation op diff --git a/sysprep/sysprep_operation_ssh_userdir.ml b/sysprep/sysprep_operation_ssh_userdir.ml index 280e365..54216f3 100644 --- a/sysprep/sysprep_operation_ssh_userdir.ml +++ b/sysprep/sysprep_operation_ssh_userdir.ml @@ -33,16 +33,15 @@ let ssh_userdir_perform g root = ) else [] -let ssh_userdir_op = { - name = "ssh-userdir"; - enabled_by_default = true; - heading = s_"Remove \".ssh\" directories in the guest"; - pod_description = Some (s_"\ +let op = { + defaults with + name = "ssh-userdir"; + enabled_by_default = true; + heading = s_"Remove \".ssh\" directories in the guest"; + pod_description = Some (s_"\ Remove the C<.ssh> directory of user \"root\" and any other users who have a C<.ssh> directory in their home directory."); - extra_args = []; - perform_on_filesystems = Some ssh_userdir_perform; - perform_on_devices = None; + perform_on_filesystems = Some ssh_userdir_perform; } -let () = register_operation ssh_userdir_op +let () = register_operation op diff --git a/sysprep/sysprep_operation_sssd_db_log.ml b/sysprep/sysprep_operation_sssd_db_log.ml index 0e3c518..70c0c44 100644 --- a/sysprep/sysprep_operation_sssd_db_log.ml +++ b/sysprep/sysprep_operation_sssd_db_log.ml @@ -39,14 +39,12 @@ let sssd_db_log_perform g root = ) else [] -let sssd_db_log_op = { - name = "sssd-db-log"; - enabled_by_default = true; - heading = s_"Remove the database and log files of sssd"; - pod_description = None; - extra_args = []; - perform_on_filesystems = Some sssd_db_log_perform; - perform_on_devices = None; +let op = { + defaults with + name = "sssd-db-log"; + enabled_by_default = true; + heading = s_"Remove the database and log files of sssd"; + perform_on_filesystems = Some sssd_db_log_perform; } -let () = register_operation sssd_db_log_op +let () = register_operation op diff --git a/sysprep/sysprep_operation_udev_persistent_net.ml b/sysprep/sysprep_operation_udev_persistent_net.ml index 652b9ab..235ef98 100644 --- a/sysprep/sysprep_operation_udev_persistent_net.ml +++ b/sysprep/sysprep_operation_udev_persistent_net.ml @@ -30,11 +30,12 @@ let udev_persistent_net_perform g root = ) else [] -let udev_persistent_net_op = { - name = "udev-persistent-net"; - enabled_by_default = true; - heading = s_"Remove udev persistent net rules"; - pod_description = Some (s_"\ +let op = { + defaults with + name = "udev-persistent-net"; + enabled_by_default = true; + heading = s_"Remove udev persistent net rules"; + pod_description = Some (s_"\ Remove udev persistent net rules which map the guest's existing MAC address to a fixed ethernet device (eg. eth0). @@ -42,9 +43,7 @@ After a guest is cloned, the MAC address usually changes. Since the old MAC address occupies the old name (eg. eth0), this means the fresh MAC address is assigned to a new name (eg. eth1) and this is usually undesirable. Erasing the udev persistent net rules avoids this."); - extra_args = []; - perform_on_filesystems = Some udev_persistent_net_perform; - perform_on_devices = None; + perform_on_filesystems = Some udev_persistent_net_perform; } -let () = register_operation udev_persistent_net_op +let () = register_operation op diff --git a/sysprep/sysprep_operation_user_account.ml b/sysprep/sysprep_operation_user_account.ml index c97b9f4..0be7772 100644 --- a/sysprep/sysprep_operation_user_account.ml +++ b/sysprep/sysprep_operation_user_account.ml @@ -58,16 +58,15 @@ let user_account_perform g root = ) else [] -let user_account_op = { - name = "user-account"; - enabled_by_default = false; - heading = s_"Remove the user accounts in the guest"; - pod_description = Some (s_"\ +let op = { + defaults with + name = "user-account"; + enabled_by_default = false; + heading = s_"Remove the user accounts in the guest"; + pod_description = Some (s_"\ Remove all the user accounts and their home directories. The \"root\" account is not removed."); - extra_args = []; - perform_on_filesystems = Some user_account_perform; - perform_on_devices = None; + perform_on_filesystems = Some user_account_perform; } -let () = register_operation user_account_op +let () = register_operation op diff --git a/sysprep/sysprep_operation_utmp.ml b/sysprep/sysprep_operation_utmp.ml index 3e1cab5..be73e16 100644 --- a/sysprep/sysprep_operation_utmp.ml +++ b/sysprep/sysprep_operation_utmp.ml @@ -29,17 +29,16 @@ let utmp_perform g root = ); [] -let utmp_op = { - name = "utmp"; - enabled_by_default = true; - heading = s_"Remove the utmp file"; - pod_description = Some (s_"\ +let op = { + defaults with + name = "utmp"; + enabled_by_default = true; + heading = s_"Remove the utmp file"; + pod_description = Some (s_"\ This file records who is currently logged in on a machine. In modern Linux distros it is stored in a ramdisk and hence not part of the virtual machine's disk, but it was stored on disk in older distros."); - extra_args = []; - perform_on_filesystems = Some utmp_perform; - perform_on_devices = None; + perform_on_filesystems = Some utmp_perform; } -let () = register_operation utmp_op +let () = register_operation op diff --git a/sysprep/sysprep_operation_yum_uuid.ml b/sysprep/sysprep_operation_yum_uuid.ml index 8a864b1..8ffe664 100644 --- a/sysprep/sysprep_operation_yum_uuid.ml +++ b/sysprep/sysprep_operation_yum_uuid.ml @@ -29,16 +29,15 @@ let yum_uuid_perform g root = ) else [] -let yum_uuid_op = { - name = "yum-uuid"; - enabled_by_default = true; - heading = s_"Remove the yum UUID"; - pod_description = Some (s_"\ +let op = { + defaults with + name = "yum-uuid"; + enabled_by_default = true; + heading = s_"Remove the yum UUID"; + pod_description = Some (s_"\ Yum creates a fresh UUID the next time it runs when it notices that the original UUID has been erased."); - extra_args = []; - perform_on_filesystems = Some yum_uuid_perform; - perform_on_devices = None; + perform_on_filesystems = Some yum_uuid_perform; } -let () = register_operation yum_uuid_op +let () = register_operation op -- 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) --- run.in | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/run.in b/run.in index bd10d4e..5ab008b 100755 --- a/run.in +++ b/run.in @@ -204,12 +204,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) --- 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 3197a2687c0b1d9ba5b9b3d32b5f0200e630628f) --- .gnulib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gnulib b/.gnulib index 9ceceed..03e96cc 160000 --- a/.gnulib +++ b/.gnulib @@ -1 +1 @@ -Subproject commit 9ceceed274f83094127f9ff0bf061293c9fe1e7f +Subproject commit 03e96cc338b5237e15fce73e9423526969ee768a -- 1.8.3.1

From: Paul Mackerras <paulus(a)samba.org&gt; The code in do_part_get_bootable() assumes that if a partition has the bootable flag set, then that is the only flag. It compares the entire flags field with the string "boot". However, the boot flag isn't always the only flag. For instance, POWER systems typically have a bootable partition of type 0x41 (PPC PReP boot), which parted -m displays as: # parted -m -- f18.img unit b print BYT; /root/f18.img:16106127360B:file:512:512:msdos::; 1:1048576B:5242879B:4194304B:::boot, prep; That is, the flags field contains "boot, prep", and thus libguestfs fails to see that this partition is bootable. Ultimately this causes virt-resize to fail to set the bootable flag on the boot partition of the destination image, resulting in an image that won't boot. This patch fixes the problem by searching for the string "boot" within the flags field, instead of comparing the whole flags field. (cherry picked from commit 7c535c501b1ce131ae98dd948b22fc260d659d1b) --- daemon/parted.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/daemon/parted.c b/daemon/parted.c index 7b1afb1..2ada40f 100644 --- a/daemon/parted.c +++ b/daemon/parted.c @@ -628,7 +628,7 @@ do_part_get_bootable (const char *device, int partnum) if (boot == NULL) return -1; - return STREQ (boot, "boot"); + return strstr (boot, "boot") != NULL; } else { /* Old-style: First look for the line matching "^Number". */ -- 1.8.3.1

From: "Richard W.M. Jones" <rjones(a)redhat.com&gt; Useful for debugging kernel / architecture issues. Note this has no effect if debugging is disabled. (cherry picked from commit 6c2fad11ac9a68dcfd42ee18681dc9a552625be9) --- appliance/init | 1 + 1 file changed, 1 insertion(+) diff --git a/appliance/init b/appliance/init index 5c9f04a..681e59b 100755 --- a/appliance/init +++ b/appliance/init @@ -116,6 +116,7 @@ ldmtool create all # These are useful when debugging. if grep -sq guestfs_verbose=1 /proc/cmdline; then + uname -a ls -lR /dev cat /proc/mounts lvm pvs -- 1.8.3.1

From: "Richard W.M. Jones" <rjones(a)redhat.com&gt; Don't add the "valgrind channel" to the appliance. Just dump out the valgrind.log to stderr while the daemon is running. Ensure that if valgrind tests fail in the appliance, that we don't exit with success in the library by checking for a canary message in the verbose daemon logs. This allows the option to be used routinely by developers. (cherry picked from commit 55e3b8711f340a2f8bdb8ee8ff99deb40b4e9108) --- appliance/init | 12 ++++-------- configure.ac | 1 - src/conn-socket.c | 14 ++++++++++++++ src/launch-direct.c | 10 ---------- src/launch.c | 3 +++ 5 files changed, 21 insertions(+), 19 deletions(-) diff --git a/appliance/init b/appliance/init index 681e59b..79083a4 100755 --- a/appliance/init +++ b/appliance/init @@ -135,21 +135,17 @@ fi if ! grep -sq guestfs_rescue=1 /proc/cmdline; then # Run the daemon under valgrind if ./configure --enable-valgrind-daemon - vg_channel=/dev/virtio-ports/org.libguestfs.valgrind - if [ -w $vg_channel ]; then + if grep -sq guestfs_valgrind_daemon=1 /proc/cmdline; then if [ -r /etc/guestfsd.suppressions ]; then suppressions="--suppressions=/etc/guestfsd.suppressions" fi - exec 3>$vg_channel - vg="valgrind --leak-check=full --log-fd=3 --error-exitcode=119 --max-stackframe=8388608 --child-silent-after-fork=yes $suppressions" + vg="valgrind --leak-check=full --error-exitcode=119 --max-stackframe=8388608 --child-silent-after-fork=yes $suppressions" echo "enabling valgrind: $vg" fi - # The host will kill qemu abruptly if guestfsd shuts down normally + # Run guestfsd, under valgrind if asked. $vg guestfsd - - # Otherwise we try to clean up gracefully. For example, this ensures that a - # core dump generated by the guest daemon will be written to disk. + if [ $? -eq 119 ]; then echo "DAEMON VALGRIND FAILED"; fi else # Use appliance in rescue mode, also used by the virt-rescue command. eval $(grep -Eo 'TERM=[^[:space:]]+' /proc/cmdline) diff --git a/configure.ac b/configure.ac index 396d9fd..61cae54 100644 --- a/configure.ac +++ b/configure.ac @@ -385,7 +385,6 @@ if test "x$enable_daemon" = "xyes"; then if test "x$enable_valgrind_daemon" = "xyes"; then AC_DEFINE([VALGRIND_DAEMON],[1],[Define to 1 to run the daemon under valgrind.]) - AC_DEFINE_UNQUOTED([VALGRIND_LOG_PATH],["$(pwd)"],[Path to save valgrind log files.]) fi dnl Which directory should we put the daemon in? NOTE: This diff --git a/src/conn-socket.c b/src/conn-socket.c index 2b3f222..e37ac23 100644 --- a/src/conn-socket.c +++ b/src/conn-socket.c @@ -321,6 +321,20 @@ handle_log_message (guestfs_h *g, /* It's an actual log message, send it upwards. */ guestfs___log_message_callback (g, buf, n); +#ifdef VALGRIND_DAEMON + /* Find the canary printed by appliance/init if valgrinding of the + * daemon fails, and exit abruptly. Note this is only used in + * developer builds, and should never be enabled in ordinary/ + * production builds. + */ + if (g->verbose) { + const char *valgrind_canary = "DAEMON VALGRIND FAILED"; + + if (memmem (buf, n, valgrind_canary, strlen (valgrind_canary)) != NULL) + exit (119); + } +#endif + return 1; } diff --git a/src/launch-direct.c b/src/launch-direct.c index 6414f60..8d05221 100644 --- a/src/launch-direct.c +++ b/src/launch-direct.c @@ -434,16 +434,6 @@ launch_direct (guestfs_h *g, const char *arg) add_cmdline (g, "-device"); add_cmdline (g, "virtserialport,chardev=channel0,name=org.libguestfs.channel.0"); -#ifdef VALGRIND_DAEMON - /* Set up virtio-serial channel for valgrind messages. */ - add_cmdline (g, "-chardev"); - snprintf (buf, sizeof buf, "file,path=%s/valgrind.log.%d,id=valgrind", - VALGRIND_LOG_PATH, getpid ()); - add_cmdline (g, buf); - add_cmdline (g, "-device"); - add_cmdline (g, "virtserialport,chardev=valgrind,name=org.libguestfs.valgrind"); -#endif - /* Enable user networking. */ if (g->enable_network) { add_cmdline (g, "-netdev"); diff --git a/src/launch.c b/src/launch.c index 894ca15..415edc2 100644 --- a/src/launch.c +++ b/src/launch.c @@ -320,6 +320,9 @@ guestfs___appliance_command_line (guestfs_h *g, const char *appliance_dev, ret = safe_asprintf (g, "panic=1" /* force kernel to panic if daemon exits */ +#ifdef VALGRIND_DAEMON + " guestfs_valgrind_daemon=1" +#endif #ifdef __i386__ " noapic" /* workaround for RHBZ#857026 */ #endif -- 1.8.3.1

From: "Richard W.M. Jones" <rjones(a)redhat.com&gt; This updates commit 55e3b8711f340a2f8bdb8ee8ff99deb40b4e9108. (cherry picked from commit e7b06f7cf84d0a87d0c80d56b06e7e0017e55adc) --- src/conn-socket.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/conn-socket.c b/src/conn-socket.c index e37ac23..1ad92cf 100644 --- a/src/conn-socket.c +++ b/src/conn-socket.c @@ -330,8 +330,14 @@ handle_log_message (guestfs_h *g, if (g->verbose) { const char *valgrind_canary = "DAEMON VALGRIND FAILED"; - if (memmem (buf, n, valgrind_canary, strlen (valgrind_canary)) != NULL) + if (memmem (buf, n, valgrind_canary, strlen (valgrind_canary)) != NULL) { + fprintf (stderr, + "Detected valgrind failure in the daemon! Exiting with exit code 119.\n" + "See log messages printed above.\n" + "Note: This happens because libguestfs was configured with\n" + "'--enable-valgrind-daemon' which should not be used in production builds.\n"); exit (119); + } } #endif -- 1.8.3.1

From: "Richard W.M. Jones" <rjones(a)redhat.com&gt; Better error messages (for diagnosis) when this test fails. Also this fixes the line endings which were broken before. (cherry picked from commit d9694362059e869da67c1333d62adb66f7d0aa1e) --- tests/mountable/test-internal-parse-mountable.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/tests/mountable/test-internal-parse-mountable.c b/tests/mountable/test-internal-parse-mountable.c index e33db76..b12869b 100644 --- a/tests/mountable/test-internal-parse-mountable.c +++ b/tests/mountable/test-internal-parse-mountable.c @@ -92,9 +92,10 @@ main (int argc, char *argv[]) if (mountable == NULL) goto error; if (mountable->im_type != MOUNTABLE_DEVICE || - !STREQ ("/dev/VG/LV", mountable->im_device)) + STRNEQ ("/dev/VG/LV", mountable->im_device)) { - fprintf (stderr, "incorrectly parsed /dev/VG/LV"); + fprintf (stderr, "incorrectly parsed /dev/VG/LV: im_device=%s\n", + mountable->im_device); goto error; } @@ -104,10 +105,11 @@ main (int argc, char *argv[]) if (mountable == NULL) goto error; if (mountable->im_type != MOUNTABLE_BTRFSVOL || - !STREQ ("/dev/VG/LV", mountable->im_device) || - !STREQ ("sv", mountable->im_volume)) + STRNEQ ("/dev/VG/LV", mountable->im_device) || + STRNEQ ("sv", mountable->im_volume)) { - fprintf (stderr, "incorrectly parsed /dev/VG/LV/sv"); + fprintf (stderr, "incorrectly parsed /dev/VG/LV/sv: im_device=%s, im_volume=%s\n", + mountable->im_device, mountable->im_volume); goto error; } guestfs_free_internal_mountable (mountable); -- 1.8.3.1

From: "Richard W.M. Jones" <rjones(a)redhat.com&gt; (cherry picked from commit 2089f7a21a307402c3efa43e5d10ee8d5ff554fb) --- daemon/daemon.h | 2 ++ daemon/guestfsd.c | 14 ++++++++++++-- daemon/ldm.c | 23 +++++++++++++++++++++++ 3 files changed, 37 insertions(+), 2 deletions(-) diff --git a/daemon/daemon.h b/daemon/daemon.h index d3a0d01..9a32bea 100644 --- a/daemon/daemon.h +++ b/daemon/daemon.h @@ -105,6 +105,8 @@ extern char *join_strings (const char *separator, char *const *argv); extern char **split_lines (char *str); +extern char **empty_list (void); + #define command(out,err,name,...) commandf((out),(err),0,(name),__VA_ARGS__) #define commandr(out,err,name,...) commandrf((out),(err),0,(name),__VA_ARGS__) #define commandv(out,err,argv) commandvf((out),(err),0,(argv)) diff --git a/daemon/guestfsd.c b/daemon/guestfsd.c index 580315a..343c489 100644 --- a/daemon/guestfsd.c +++ b/daemon/guestfsd.c @@ -1019,7 +1019,7 @@ split_lines (char *str) char *p, *pend; if (STREQ (str, "")) - goto empty_list; + return empty_list (); p = str; while (p) { @@ -1040,13 +1040,23 @@ split_lines (char *str) p = pend; } - empty_list: if (end_stringsbuf (&lines) == -1) return NULL; return lines.argv; } +char ** +empty_list (void) +{ + DECLARE_STRINGSBUF (ret); + + if (end_stringsbuf (&ret) == -1) + return NULL; + + return ret.argv; +} + /* Skip leading and trailing whitespace, updating the original string * in-place. */ diff --git a/daemon/ldm.c b/daemon/ldm.c index b7ef301..aed8a0d 100644 --- a/daemon/ldm.c +++ b/daemon/ldm.c @@ -20,6 +20,9 @@ #include <stdio.h> #include <stdlib.h> +#include <unistd.h> +#include <sys/types.h> +#include <sys/stat.h> #include <glob.h> #if HAVE_YAJL @@ -91,6 +94,16 @@ get_devices (const char *pattern) char ** do_list_ldm_volumes (void) { + struct stat buf; + + /* If /dev/mapper doesn't exist at all, don't give an error. */ + if (stat ("/dev/mapper", &buf) == -1) { + if (errno == ENOENT) + return empty_list (); + reply_with_perror ("/dev/mapper"); + return NULL; + } + return get_devices ("/dev/mapper/ldm_vol_*"); } @@ -98,6 +111,16 @@ do_list_ldm_volumes (void) char ** do_list_ldm_partitions (void) { + struct stat buf; + + /* If /dev/mapper doesn't exist at all, don't give an error. */ + if (stat ("/dev/mapper", &buf) == -1) { + if (errno == ENOENT) + return empty_list (); + reply_with_perror ("/dev/mapper"); + return NULL; + } + return get_devices ("/dev/mapper/ldm_part_*"); } -- 1.8.3.1

From: "Richard W.M. Jones" <rjones(a)redhat.com&gt; (cherry picked from commit e5285cc4210683887a5a4a853fe4e6a72c23e74d) --- src/guestfs-internal-frontend.h | 1 + src/launch-libvirt.c | 34 ++-------------------------------- src/utils.c | 39 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 42 insertions(+), 32 deletions(-) diff --git a/src/guestfs-internal-frontend.h b/src/guestfs-internal-frontend.h index db6122f..2070fa8 100644 --- a/src/guestfs-internal-frontend.h +++ b/src/guestfs-internal-frontend.h @@ -97,6 +97,7 @@ extern size_t guestfs___count_strings (char *const *); extern char *guestfs___concat_strings (char *const *); extern char *guestfs___join_strings (const char *sep, 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); /* These functions are used internally by the CLEANUP_* macros. * Don't call them directly. diff --git a/src/launch-libvirt.c b/src/launch-libvirt.c index 826d40d..de725e0 100644 --- a/src/launch-libvirt.c +++ b/src/launch-libvirt.c @@ -131,7 +131,6 @@ static void debug_socket_permissions (guestfs_h *g); static void libvirt_error (guestfs_h *g, const char *fs, ...) __attribute__((format (printf,2,3))); static int is_custom_qemu (guestfs_h *g); static int is_blk (const char *path); -static int random_chars (char *ret, size_t len); static void ignore_errors (void *ignore, virErrorPtr ignore2); static char *make_qcow2_overlay (guestfs_h *g, const char *backing_device, const char *format, const char *selinux_imagelabel); static int make_drive_priv (guestfs_h *g, struct drive *drv, const char *selinux_imagelabel); @@ -791,8 +790,8 @@ construct_libvirt_xml_name (guestfs_h *g, { char name[DOMAIN_NAME_LEN+1]; - if (random_chars (name, DOMAIN_NAME_LEN) == -1) { - perrorf (g, "/dev/urandom"); + if (guestfs___random_string (name, DOMAIN_NAME_LEN) == -1) { + perrorf (g, "guestfs___random_string"); return -1; } @@ -1487,35 +1486,6 @@ is_blk (const char *path) return S_ISBLK (statbuf.st_mode); } -static int -random_chars (char *ret, size_t len) -{ - int fd; - size_t i; - unsigned char c; - int saved_errno; - - fd = open ("/dev/urandom", O_RDONLY|O_CLOEXEC); - if (fd == -1) - return -1; - - for (i = 0; i < len; ++i) { - if (read (fd, &c, 1) != 1) { - saved_errno = errno; - close (fd); - errno = saved_errno; - return -1; - } - ret[i] = "0123456789abcdefghijklmnopqrstuvwxyz"[c % 36]; - } - ret[len] = '\0'; - - if (close (fd) == -1) - return -1; - - return 0; -} - static void ignore_errors (void *ignore, virErrorPtr ignore2) { diff --git a/src/utils.c b/src/utils.c index 358c124..4a9ae96 100644 --- a/src/utils.c +++ b/src/utils.c @@ -22,6 +22,8 @@ #include <stdlib.h> #include <string.h> #include <unistd.h> +#include <fcntl.h> +#include <errno.h> #include <sys/types.h> #include <sys/wait.h> #include <libintl.h> @@ -125,3 +127,40 @@ guestfs___exit_status_to_string (int status, const char *cmd_name, return buffer; } + +/* Notes: + * + * The 'ret' buffer must have length len+1 in order to store the final + * \0 character. + * + * There is about 5 bits of randomness per output character (so about + * 5*len bits of randomness in the resulting string). + */ +int +guestfs___random_string (char *ret, size_t len) +{ + int fd; + size_t i; + unsigned char c; + int saved_errno; + + fd = open ("/dev/urandom", O_RDONLY|O_CLOEXEC); + if (fd == -1) + return -1; + + for (i = 0; i < len; ++i) { + if (read (fd, &c, 1) != 1) { + saved_errno = errno; + close (fd); + errno = saved_errno; + return -1; + } + ret[i] = "0123456789abcdefghijklmnopqrstuvwxyz"[c % 36]; + } + ret[len] = '\0'; + + if (close (fd) == -1) + return -1; + + return 0; +} -- 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) --- src/launch-direct.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/launch-direct.c b/src/launch-direct.c index 8d05221..ce39e0c 100644 --- a/src/launch-direct.c +++ b/src/launch-direct.c @@ -748,6 +748,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; (cherry picked from commit 42abbf096932bd1e6c9c1bef64f602a67107d088) --- tests/md/test-list-filesystems.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/md/test-list-filesystems.sh b/tests/md/test-list-filesystems.sh index 642e033..b4e41e9 100755 --- a/tests/md/test-list-filesystems.sh +++ b/tests/md/test-list-filesystems.sh @@ -73,7 +73,7 @@ expected="/dev/sda1: ext3 # Check the output of list-filesystems if [ "$(cat test.output)" != "$expected" ]; then echo "$0: error: output of list-filesystems did not match expected output" - printf "%s\n" "$output" + cat list-fs.output exit 1; fi -- 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) --- 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) --- 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 197308b..7b472ae 100755 --- a/tools/virt-list-filesystems +++ b/tools/virt-list-filesystems @@ -172,7 +172,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"; } @@ -180,18 +180,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) --- Makefile.am | 1 - 1 file changed, 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index a96581d..071fc43 100644 --- a/Makefile.am +++ b/Makefile.am @@ -141,7 +141,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) --- src/guestfs-internal-frontend.h | 1 + src/guestfs-internal.h | 3 --- src/launch-direct.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 2070fa8..3e2c433 100644 --- a/src/guestfs-internal-frontend.h +++ b/src/guestfs-internal-frontend.h @@ -98,6 +98,7 @@ extern char *guestfs___concat_strings (char *const *); extern char *guestfs___join_strings (const char *sep, 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 28e40a2..1c3fea9 100644 --- a/src/guestfs-internal.h +++ b/src/guestfs-internal.h @@ -641,9 +641,6 @@ extern void guestfs___launch_send_progress (guestfs_h *g, int perdozen); 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 char *guestfs___download_to_tmp (guestfs_h *g, struct inspect_fs *fs, const char *filename, const char *basename, uint64_t max_size); diff --git a/src/launch-direct.c b/src/launch-direct.c index ce39e0c..ac4f7fc 100644 --- a/src/launch-direct.c +++ b/src/launch-direct.c @@ -1003,18 +1003,6 @@ qemu_drive_param (guestfs_h *g, const struct drive *drv, size_t index) iface); } -/* 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_direct (guestfs_h *g, int check_for_errors) { diff --git a/src/utils.c b/src/utils.c index 4a9ae96..f8d2509 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) { @@ -164,3 +169,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) --- src/listfs.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/listfs.c b/src/listfs.c index eb4019d..bd3ee71 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; const char *lvm2[] = { "lvm2", NULL }; const char *ldm[] = { "ldm", NULL }; @@ -58,6 +58,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; This is just code refactoring. (cherry picked from commit d2ae632d3bc0a4fcdbf4150a33406d7646f8cdf9) --- src/command.c | 38 ++++++++------------------- src/drives.c | 18 ++++--------- src/inspect.c | 59 +++++++++++------------------------------ src/libvirt-auth.c | 14 +++++----- src/listfs.c | 77 ++++++++++++++++++------------------------------------ 5 files changed, 63 insertions(+), 143 deletions(-) diff --git a/src/command.c b/src/command.c index 7c0da6e..02e5801 100644 --- a/src/command.c +++ b/src/command.c @@ -108,10 +108,7 @@ struct command enum command_style style; union { /* COMMAND_STYLE_EXECV */ - struct { - char **args; - size_t len, alloc; - } argv; + struct stringsbuf argv; /* COMMAND_STYLE_SYSTEM */ struct { char *str; @@ -161,16 +158,7 @@ add_arg_no_strdup (struct command *cmd, char *arg) assert (cmd->style != COMMAND_STYLE_SYSTEM); cmd->style = COMMAND_STYLE_EXECV; - if (cmd->argv.len >= cmd->argv.alloc) { - if (cmd->argv.alloc == 0) - cmd->argv.alloc = 16; - else - cmd->argv.alloc *= 2; - cmd->argv.args = safe_realloc (cmd->g, cmd->argv.args, - cmd->argv.alloc * sizeof (char *)); - } - cmd->argv.args[cmd->argv.len] = arg; - cmd->argv.len++; + guestfs___add_string_nodup (cmd->g, &cmd->argv, arg); } static void @@ -328,7 +316,7 @@ finish_command (struct command *cmd) { switch (cmd->style) { case COMMAND_STYLE_EXECV: - add_arg_no_strdup (cmd, NULL); + guestfs___end_stringsbuf (cmd->g, &cmd->argv); break; case COMMAND_STYLE_SYSTEM: @@ -347,17 +335,17 @@ debug_command (struct command *cmd) switch (cmd->style) { case COMMAND_STYLE_EXECV: - debug (cmd->g, "command: run: %s", cmd->argv.args[0]); - last = cmd->argv.len-1; /* omit final NULL pointer */ + debug (cmd->g, "command: run: %s", cmd->argv.argv[0]); + last = cmd->argv.size-1; /* omit final NULL pointer */ for (i = 1; i < last; ++i) { if (i < last-1 && - cmd->argv.args[i][0] == '-' && cmd->argv.args[i+1][0] != '-') { + cmd->argv.argv[i][0] == '-' && cmd->argv.argv[i+1][0] != '-') { debug (cmd->g, "command: run: \\ %s %s", - cmd->argv.args[i], cmd->argv.args[i+1]); + cmd->argv.argv[i], cmd->argv.argv[i+1]); i++; } else - debug (cmd->g, "command: run: \\ %s", cmd->argv.args[i]); + debug (cmd->g, "command: run: \\ %s", cmd->argv.argv[i]); } break; @@ -472,8 +460,8 @@ run_command (struct command *cmd) /* Run the command. */ switch (cmd->style) { case COMMAND_STYLE_EXECV: - execvp (cmd->argv.args[0], cmd->argv.args); - perror (cmd->argv.args[0]); + execvp (cmd->argv.argv[0], cmd->argv.argv); + perror (cmd->argv.argv[0]); _exit (EXIT_FAILURE); case COMMAND_STYLE_SYSTEM: @@ -638,8 +626,6 @@ guestfs___cmd_run (struct command *cmd) void guestfs___cmd_close (struct command *cmd) { - size_t i; - if (!cmd) return; @@ -649,9 +635,7 @@ guestfs___cmd_close (struct command *cmd) break; case COMMAND_STYLE_EXECV: - for (i = 0; i < cmd->argv.len; ++i) - free (cmd->argv.args[i]); - free (cmd->argv.args); + guestfs___free_stringsbuf (&cmd->argv); break; case COMMAND_STYLE_SYSTEM: diff --git a/src/drives.c b/src/drives.c index cb2360a..df6f7e0 100644 --- a/src/drives.c +++ b/src/drives.c @@ -1167,25 +1167,17 @@ guestfs___rollback_drives (guestfs_h *g, size_t old_i) char ** guestfs__debug_drives (guestfs_h *g) { - size_t i, count; - char **ret; + size_t i; + DECLARE_STRINGSBUF (ret); struct drive *drv; - count = 0; ITER_DRIVES (g, i, drv) { - count++; + guestfs___add_string_nodup (g, &ret, drive_to_string (g, drv)); } - ret = safe_malloc (g, sizeof (char *) * (count + 1)); + guestfs___end_stringsbuf (g, &ret); - count = 0; - ITER_DRIVES (g, i, drv) { - ret[count++] = drive_to_string (g, drv); - } - - ret[count] = NULL; - - return ret; /* caller frees */ + return ret.argv; /* caller frees */ } /* The drive_source struct is also used in the backends, so we diff --git a/src/inspect.c b/src/inspect.c index 6c8dcda..46bb4ab 100644 --- a/src/inspect.c +++ b/src/inspect.c @@ -84,34 +84,21 @@ compare_strings (const void *vp1, const void *vp2) char ** guestfs__inspect_get_roots (guestfs_h *g) { + size_t i; + DECLARE_STRINGSBUF (ret); + /* NB. Doesn't matter if g->nr_fses == 0. We just return an empty * list in this case. */ - - size_t i; - size_t count = 0; - for (i = 0; i < g->nr_fses; ++i) + for (i = 0; i < g->nr_fses; ++i) { if (g->fses[i].is_root) - count++; - - char **ret = calloc (count+1, sizeof (char *)); - if (ret == NULL) { - perrorf (g, "calloc"); - return NULL; - } - - count = 0; - for (i = 0; i < g->nr_fses; ++i) { - if (g->fses[i].is_root) { - ret[count] = safe_strdup (g, g->fses[i].mountable); - count++; - } + guestfs___add_string (g, &ret, g->fses[i].mountable); } - ret[count] = NULL; + guestfs___end_stringsbuf (g, &ret); - qsort (ret, count, sizeof (char *), compare_strings); + qsort (ret.argv, ret.size-1, sizeof (char *), compare_strings); - return ret; + return ret.argv; } char * @@ -392,37 +379,21 @@ guestfs__inspect_get_filesystems (guestfs_h *g, const char *root) char ** guestfs__inspect_get_drive_mappings (guestfs_h *g, const char *root) { - char **ret; - size_t i, count; + DECLARE_STRINGSBUF (ret); + size_t i; struct inspect_fs *fs; fs = guestfs___search_for_root (g, root); if (!fs) return NULL; - /* If no drive mappings, return an empty hashtable. */ - if (!fs->drive_mappings) - count = 0; - else { - for (count = 0; fs->drive_mappings[count] != NULL; count++) - ; + if (fs->drive_mappings) { + for (i = 0; fs->drive_mappings[i] != NULL; ++i) + guestfs___add_string (g, &ret, fs->drive_mappings[i]); } - ret = calloc (count+1, sizeof (char *)); - if (ret == NULL) { - perrorf (g, "calloc"); - return NULL; - } - - /* We need to make a deep copy of the hashtable since the caller - * will free it. - */ - for (i = 0; i < count; ++i) - ret[i] = safe_strdup (g, fs->drive_mappings[i]); - - ret[count] = NULL; - - return ret; + guestfs___end_stringsbuf (g, &ret); + return ret.argv; } char * diff --git a/src/libvirt-auth.c b/src/libvirt-auth.c index cd90378..fb18f8a 100644 --- a/src/libvirt-auth.c +++ b/src/libvirt-auth.c @@ -215,20 +215,18 @@ guestfs___open_libvirt_connection (guestfs_h *g, const char *uri, char ** guestfs__get_libvirt_requested_credentials (guestfs_h *g) { - char **ret; + DECLARE_STRINGSBUF (ret); size_t i; CHECK_IN_EVENT_HANDLER (NULL); /* Convert the requested_credentials types to a list of strings. */ - ret = safe_malloc (g, sizeof (char *) * (g->nr_requested_credentials+1)); - for (i = 0; i < g->nr_requested_credentials; ++i) { - ret[i] = safe_strdup (g, - get_string_of_credtype (g->requested_credentials[i].type)); - } - ret[i] = NULL; + for (i = 0; i < g->nr_requested_credentials; ++i) + guestfs___add_string (g, &ret, + get_string_of_credtype (g->requested_credentials[i].type)); + guestfs___end_stringsbuf (g, &ret); - return ret; /* caller frees */ + return ret.argv; /* caller frees */ } char * diff --git a/src/listfs.c b/src/listfs.c index bd3ee71..9102c55 100644 --- a/src/listfs.c +++ b/src/listfs.c @@ -39,15 +39,14 @@ */ static void remove_from_list (char **list, const char *item); -static void check_with_vfs_type (guestfs_h *g, const char *dev, char ***ret, size_t *ret_size); +static void check_with_vfs_type (guestfs_h *g, const char *dev, struct stringsbuf *sb); static int is_mbr_partition_type_42 (guestfs_h *g, const char *partition); char ** guestfs__list_filesystems (guestfs_h *g) { size_t i; - char **ret; - size_t ret_size = 0; + DECLARE_STRINGSBUF (ret); const char *lvm2[] = { "lvm2", NULL }; const char *ldm[] = { "ldm", NULL }; @@ -58,13 +57,6 @@ 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 @@ -86,17 +78,17 @@ guestfs__list_filesystems (guestfs_h *g) /* Use vfs-type to check for filesystems on devices. */ for (i = 0; devices[i] != NULL; ++i) - check_with_vfs_type (g, devices[i], &ret, &ret_size); + check_with_vfs_type (g, devices[i], &ret); /* Use vfs-type to check for filesystems on partitions. */ for (i = 0; partitions[i] != NULL; ++i) { if (! is_mbr_partition_type_42 (g, partitions[i])) - check_with_vfs_type (g, partitions[i], &ret, &ret_size); + check_with_vfs_type (g, partitions[i], &ret); } /* Use vfs-type to check for filesystems on md devices. */ for (i = 0; mds[i] != NULL; ++i) - check_with_vfs_type (g, mds[i], &ret, &ret_size); + check_with_vfs_type (g, mds[i], &ret); if (guestfs_feature_available (g, (char **) lvm2)) { /* Use vfs-type to check for filesystems on LVs. */ @@ -104,7 +96,7 @@ guestfs__list_filesystems (guestfs_h *g) if (lvs == NULL) goto error; for (i = 0; lvs[i] != NULL; ++i) - check_with_vfs_type (g, lvs[i], &ret, &ret_size); + check_with_vfs_type (g, lvs[i], &ret); } if (guestfs_feature_available (g, (char **) ldm)) { @@ -113,19 +105,21 @@ guestfs__list_filesystems (guestfs_h *g) if (ldmvols == NULL) goto error; for (i = 0; ldmvols[i] != NULL; ++i) - check_with_vfs_type (g, ldmvols[i], &ret, &ret_size); + check_with_vfs_type (g, ldmvols[i], &ret); ldmparts = guestfs_list_ldm_partitions (g); if (ldmparts == NULL) goto error; for (i = 0; ldmparts[i] != NULL; ++i) - check_with_vfs_type (g, ldmparts[i], &ret, &ret_size); + check_with_vfs_type (g, ldmparts[i], &ret); } - return ret; + /* Finish off the list and return it. */ + guestfs___end_stringsbuf (g, &ret); + return ret.argv; error: - if (ret) guestfs___free_string_list (ret); + guestfs___free_stringsbuf (&ret); return NULL; } @@ -145,50 +139,34 @@ remove_from_list (char **list, const char *item) } } -static void -add_vfs (guestfs_h *g, char *mountable, char *vfs_type, - char ***ret, size_t *ret_size) -{ - /* Extend the return array. */ - size_t i = *ret_size; - *ret_size += 2; - *ret = safe_realloc (g, *ret, (*ret_size + 1) * sizeof (char *)); - - (*ret)[i] = mountable; - (*ret)[i+1] = vfs_type; - (*ret)[i+2] = NULL; -} - /* Use vfs-type to look for a filesystem of some sort on 'dev'. * Apart from some types which we ignore, add the result to the * 'ret' string list. */ static void -check_with_vfs_type (guestfs_h *g, const char *device, - char ***ret, size_t *ret_size) +check_with_vfs_type (guestfs_h *g, const char *device, struct stringsbuf *sb) { - char *v; - char *vfs_type; + const char *v; + CLEANUP_FREE char *vfs_type = NULL; guestfs_push_error_handler (g, NULL, NULL); vfs_type = guestfs_vfs_type (g, device); guestfs_pop_error_handler (g); if (!vfs_type) - v = safe_strdup (g, "unknown"); - else if (STREQ (vfs_type, "")) { - v = safe_strdup (g, "unknown"); - free (vfs_type); - } + v = "unknown"; + else if (STREQ (vfs_type, "")) + v = "unknown"; else if (STREQ (vfs_type, "btrfs")) { CLEANUP_FREE_BTRFSSUBVOLUME_LIST struct guestfs_btrfssubvolume_list *vols = guestfs_btrfs_subvolume_list (g, device); for (size_t i = 0; i < vols->len; i++) { struct guestfs_btrfssubvolume *this = &vols->val[i]; - char *mountable = safe_asprintf (g, "btrfsvol:%s/%s", - device, this->btrfssubvolume_path); - add_vfs (g, mountable, safe_strdup (g, "btrfs"), ret, ret_size); + guestfs___add_sprintf (g, sb, + "btrfsvol:%s/%s", + device, this->btrfssubvolume_path); + guestfs___add_string (g, sb, "btrfs"); } v = vfs_type; @@ -199,21 +177,18 @@ check_with_vfs_type (guestfs_h *g, const char *device, * importantly "LVM2_member" which is a PV. */ size_t n = strlen (vfs_type); - if (n >= 7 && STREQ (&vfs_type[n-7], "_member")) { - free (vfs_type); + if (n >= 7 && STREQ (&vfs_type[n-7], "_member")) return; - } /* Ignore LUKS-encrypted partitions. These are also containers. */ - if (STREQ (vfs_type, "crypto_LUKS")) { - free (vfs_type); + if (STREQ (vfs_type, "crypto_LUKS")) return; - } v = vfs_type; } - add_vfs (g, safe_strdup (g, device), v, ret, ret_size); + guestfs___add_string (g, sb, device); + guestfs___add_string (g, sb, v); } /* We should ignore partitions that have MBR type byte 0x42, because -- 1.8.3.1

From: "Richard W.M. Jones" <rjones(a)redhat.com&gt; The link was broken, and we don't support Ubuntu 10.04 (maybe the 'oldlinux' branch does). (cherry picked from commit 937a9a35320edb781721de5537d750c004872c98) --- examples/guestfs-faq.pod | 5 ----- 1 file changed, 5 deletions(-) diff --git a/examples/guestfs-faq.pod b/examples/guestfs-faq.pod index c563569..2171b81 100644 --- a/examples/guestfs-faq.pod +++ b/examples/guestfs-faq.pod @@ -322,11 +322,6 @@ So every user should do this: =over 4 -=item Ubuntu 10.04 - -See: -L<http://libguestfs.org/download/binaries/ubuntu1004-packages/> - =item Ubuntu 12.04 libguestfs in this version of Ubuntu works, but you need to update -- 1.8.3.1

From: "Richard W.M. Jones" <rjones(a)redhat.com&gt; (cherry picked from commit abc59d776a12fb96de6ff927054f3db2a9ed4fc4) --- examples/guestfs-faq.pod | 39 ++++++++++++++++++++++++++++++--------- 1 file changed, 30 insertions(+), 9 deletions(-) diff --git a/examples/guestfs-faq.pod b/examples/guestfs-faq.pod index cf2f67f..071fd0f 100644 --- a/examples/guestfs-faq.pod +++ b/examples/guestfs-faq.pod @@ -755,26 +755,47 @@ standalone programs). =head1 DEBUGGING LIBGUESTFS -B<In summary:> enable debugging by setting these two environment -variables before running the program: +=head2 Help, it's not working! + +Please supply all the information in this checklist, in an +email sent to C<libguestfs> @ C<redhat.com>: + +=over 4 + +=item * + +What are you trying to achieve? + +=item * + +What exact commands did you run? + +=item * + +What was the precise error / output of these commands? + +=item * + +Enable debugging, run the commands again, and capture the B<complete> +output. B<Do not edit the output.> export LIBGUESTFS_DEBUG=1 export LIBGUESTFS_TRACE=1 -This will produce a lot of output. Put the B<complete> output in an -email message or pastebin and send it -L<to the mailing list|/What mailing lists or chat rooms are available?>. -B<Do not edit the output.> +=item * Include the version of libguestfs, the operating system version, and how you installed libguestfs (eg. from source, C<yum install>, etc.) -If no libguestfs program works, run the program below and paste the -B<complete, unedited> output into an email or pastebin and send it to -the mailing list: +=item * + +If no libguestfs program seems to work at all, run the program below +and paste the B<complete, unedited> output into the email: libguestfs-test-tool +=back + =head2 How do I debug when using any libguestfs program or tool (eg. virt-v2v or virt-df)? -- 1.8.3.1

From: "Richard W.M. Jones" <rjones(a)redhat.com&gt; When using guestfish --remote, libguestfs is not the parent of qemu, so waitpid is expected to return -ECHILD. And indeed guestfish --remote would print a bogus error message in this case: libguestfs: error: waitpid (qemu): No child processes If the parent process forked into the background, then it should have called 'set_recovery_proc 0' so we can use this to determine if we need to wait for qemu. Thanks: Kazuya Saito for reporting and identifying the issue. (cherry picked from commit a843b5e5e32c151e7b0c74bb4f7be1030f9ac85b) --- src/launch-direct.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/launch-direct.c b/src/launch-direct.c index ac4f7fc..f1edb53 100644 --- a/src/launch-direct.c +++ b/src/launch-direct.c @@ -1017,7 +1017,7 @@ shutdown_direct (guestfs_h *g, int check_for_errors) if (g->direct.recoverypid > 0) kill (g->direct.recoverypid, 9); /* Wait for subprocess(es) to exit. */ - if (g->direct.pid > 0) { + if (g->recovery_proc /* RHBZ#998482 */ && g->direct.pid > 0) { if (waitpid (g->direct.pid, &status, 0) == -1) { perrorf (g, "waitpid (qemu)"); ret = -1; -- 1.8.3.1

From: Olaf Hering <olaf(a)aepfle.de&gt; This change avoids the hard requirement for qemu-tools during package build. Signed-off-by: Olaf Hering <olaf(a)aepfle.de&gt; (cherry picked from commit cb7b1c56b7cf447dd9f2ea4dde5cf65e9f9f8cf8) --- tests/data/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am index 03315de..5aa3219 100644 --- a/tests/data/Makefile.am +++ b/tests/data/Makefile.am @@ -82,7 +82,7 @@ images_files_build = \ initrd-x86_64.img.gz \ test-grep.txt.gz -noinst_DATA = $(images_files_build) test.iso +check_DATA = $(images_files_build) test.iso CLEANFILES = $(images_files_build) test.iso -- 1.8.3.1

From: "Richard W.M. Jones" <rjones(a)redhat.com&gt; Thanks: Olaf Hering. (cherry picked from commit fc2947b1125aa34b5f04efd2d39cb82b2ebba586) --- daemon/command.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/daemon/command.c b/daemon/command.c index db82b52..99a58c1 100644 --- a/daemon/command.c +++ b/daemon/command.c @@ -41,7 +41,7 @@ char * do_command (char *const *argv) { char *out; - CLEANUP_FREE char *err; + CLEANUP_FREE char *err = NULL; int r; CLEANUP_FREE char *sysroot_dev = NULL, *sysroot_dev_pts = NULL, *sysroot_proc = NULL, *sysroot_sys = NULL; -- 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 61cae54..f48f3a3 100644 --- a/configure.ac +++ b/configure.ac @@ -20,7 +20,7 @@ # freeform string. m4_define([libguestfs_major], [1]) m4_define([libguestfs_minor], [22]) -m4_define([libguestfs_release], [5]) +m4_define([libguestfs_release], [6]) AC_INIT([libguestfs],libguestfs_major.libguestfs_minor.libguestfs_release) AC_CONFIG_AUX_DIR([build-aux]) -- 1.8.3.1