search for: have_fus

...file.am +++ b/fish/Makefile.am @@ -297,7 +297,6 @@ TESTS += \ test-find0.sh \ test-inspect.sh \ test-glob.sh \ - test-mount-local.sh \ test-prep.sh \ test-read-file.sh \ test-remote.sh \ @@ -306,6 +305,11 @@ TESTS += \ test-run.sh \ test-stringlist.sh \ test-upload-to-dir.sh + +if HAVE_FUSE +TESTS += \ + test-mount-local.sh +endif endif check-valgrind: diff --git a/sysprep/Makefile.am b/sysprep/Makefile.am index b3ad3c3..50eda8f 100644 --- a/sysprep/Makefile.am +++ b/sysprep/Makefile.am @@ -213,8 +213,12 @@ TESTS_ENVIRONMENT = \ if ENABLE_APPLIANCE TESTS = \ test-virt-sysprep...

...ng Gao <gaowanlong at cn.fujitsu.com> --- src/fuse.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/fuse.c b/src/fuse.c index 2bd6787..349a5b9 100644 --- a/src/fuse.c +++ b/src/fuse.c @@ -25,6 +25,7 @@ #include <sys/types.h> #include <sys/wait.h> +#if HAVE_FUSE /* See <attr/xattr.h> */ #ifndef ENOATTR #define ENOATTR ENODATA @@ -32,7 +33,6 @@ #define FUSE_USE_VERSION 26 -#if HAVE_FUSE #include <fuse.h> #include <fuse_lowlevel.h> #endif -- 1.7.11.2.249.g31c7954

...r more details. images/ Some guest images to test against. These are gzipped to save diff --git a/configure.ac b/configure.ac index 8587f46..e16ead8 100644 --- a/configure.ac +++ b/configure.ac @@ -424,8 +424,8 @@ AC_SUBST([LIBXML2_LIBS]) dnl FUSE is optional to build the FUSE module. HAVE_FUSE=yes PKG_CHECK_MODULES([FUSE],[fuse],,[ - HAVE_FUSE=no - AC_MSG_WARN([FUSE library and headers are missing, so optional FUSE module won't be built])]) + HAVE_FUSE=no + AC_MSG_WARN([FUSE library and headers are missing, so optional FUSE module won't be built])]) AM_CONDITIONA...

...-- lib/handle.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/handle.c b/lib/handle.c index bc45d29b2..a47aaafab 100644 --- a/lib/handle.c +++ b/lib/handle.c @@ -399,7 +399,9 @@ guestfs_close (guestfs_h *g) free (g->hv); free (g->backend); free (g->backend_data); +#if HAVE_FUSE free (g->localmountpoint); +#endif guestfs_int_free_string_list (g->backend_settings); free (g->append); guestfs_int_free_error_data_list (g); -- 2.17.1

...ttr.h> -#else #ifdef HAVE_SYS_XATTR_H #include <sys/xattr.h> #endif -#endif #include <guestfs.h> #include "guestfs-utils.h" diff --git a/lib/fuse.c b/lib/fuse.c index 1ac42330d3e7..52dc0bd99d11 100644 --- a/lib/fuse.c +++ b/lib/fuse.c @@ -35,7 +35,7 @@ #endif #if HAVE_FUSE -/* See <attr/xattr.h> */ +/* See <sys/xattr.h> */ #ifndef ENOATTR #define ENOATTR ENODATA #endif diff --git a/m4/guestfs-libraries.m4 b/m4/guestfs-libraries.m4 index 095dd38bf43b..6b2e8db9456d 100644 --- a/m4/guestfs-libraries.m4 +++ b/m4/guestfs-libraries.m4 @@ -36,7 +36,6 @@ AC_D...

...crypt-c.c \ + ../customize/perl_edit-c.c \ + ../fish/uri.c \ + ../fish/file-edit.c if HAVE_OCAML diff --git a/tests/mount-local/Makefile.am b/tests/mount-local/Makefile.am index 172fff9..809019e 100644 --- a/tests/mount-local/Makefile.am +++ b/tests/mount-local/Makefile.am @@ -27,8 +27,8 @@ if HAVE_FUSE test_parallel_mount_local_SOURCES = \ test-parallel-mount-local.c \ - $(top_srcdir)/df/estimate-max-threads.c \ - $(top_srcdir)/df/estimate-max-threads.h + ../../df/estimate-max-threads.c \ + ../../df/estimate-max-threads.h test_parallel_mount_local_CPPFLAGS = \ -DGUESTFS_WARN_DEPRECATED=1...

...e.am b/Makefile.am index 0067d7b7b..cf9ca512e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -169,10 +169,12 @@ SUBDIRS += get-kernel SUBDIRS += resize SUBDIRS += sparsify SUBDIRS += sysprep +if HAVE_LIBVIRT SUBDIRS += v2v if HAVE_OCAML_PKG_LIBVIRT SUBDIRS += v2v/test-harness endif +endif if HAVE_FUSE SUBDIRS += dib endif diff --git a/v2v/Makefile.am b/v2v/Makefile.am index 39511022e..5999a6b50 100644 --- a/v2v/Makefile.am +++ b/v2v/Makefile.am @@ -423,6 +423,7 @@ stamp-virt-v2v-support.pod: virt-v2v-support.pod TESTS_ENVIRONMENT = $(top_builddir)/run --test TESTS = \ + test-v2v-copy-to-l...

This changes the proposed API slightly. Previously 'mount-local' generating a 'mounted' event when the filesystem was ready, and from the 'mounted' event you had to effectively do a fork. Now, 'mount-local' just initializes the mountpoint and you have to call 'mount-local-run' to enter the FUSE main loop. Between these calls you can do a fork or whatever

...+++ b/lib/fuse.c @@ -26,7 +26,13 @@ #include <sys/wait.h> #include <string.h> #include <libintl.h> + +#if MAJOR_IN_MKDEV +#include <sys/mkdev.h> +#elif MAJOR_IN_SYSMACROS #include <sys/sysmacros.h> +/* else it's in sys/types.h, included above */ +#endif #if HAVE_FUSE /* See <attr/xattr.h> */ diff --git a/m4/guestfs_libraries.m4 b/m4/guestfs_libraries.m4 index 0882d27..c265b29 100644 --- a/m4/guestfs_libraries.m4 +++ b/m4/guestfs_libraries.m4 @@ -82,6 +82,9 @@ AC_CHECK_FUNCS([\ statvfs \ sync]) +dnl Which header file defines major, minor, mak...

...t;name>.ml in alphabetical order. operations = \ abrt_data \ + backup_files \ bash_history \ blkid_tab \ ca_certificates \ @@ -179,6 +180,7 @@ TESTS = \ if ENABLE_APPLIANCE TESTS += \ test-virt-sysprep.sh \ + test-virt-sysprep-backup-files.sh \ test-virt-sysprep-passwords.sh if HAVE_FUSE diff --git a/sysprep/sysprep_operation_backup_files.ml b/sysprep/sysprep_operation_backup_files.ml new file mode 100644 index 0000000..4c002c8 --- /dev/null +++ b/sysprep/sysprep_operation_backup_files.ml @@ -0,0 +1,98 @@ +(* virt-sysprep + * Copyright (C) 2012-2016 Red Hat Inc. + * + * This progr...

This version doesn't crash or cause hung processes or stuck mountpoints, so that's an improvement. Rich.

This patch is just for review. It enables FUSE support in the API via two new calls, 'guestfs_mount_local' and 'guestfs_umount_local'. FUSE turns out to be very easy to deadlock (necessitating that the machine be rebooted). Running the test from the third patch is usually an effective way to demonstrate this. However I have not yet managed to produce a simple reproducer that

Since we switched to using parallel tests, our valgrind tests would definitely have found leaks in the /usr/bin/env program if it had any. Not so much in some of our own programs. Let's fix that. Rich.

...m index 4b5babb..acc6bd4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -147,7 +147,6 @@ SUBDIRS += \ mllib \ customize \ builder builder/website \ - dib \ get-kernel \ resize \ sparsify \ @@ -156,6 +155,9 @@ SUBDIRS += \ if HAVE_OCAML_PKG_LIBVIRT SUBDIRS += v2v/test-harness endif +if HAVE_FUSE +SUBDIRS += dib +endif endif # Perl tools. diff --git a/dib/dib.ml b/dib/dib.ml index 87af4eb..17775d8 100644 --- a/dib/dib.ml +++ b/dib/dib.ml @@ -69,13 +69,15 @@ let envvars_string l = let prepare_external ~envvars ~dib_args ~dib_vars ~out_name ~root_label ~rootfs_uuid ~image_cache ~ar...

...fuse], + AS_HELP_STRING([--disable-fuse], [disable FUSE (guestmount) support]), + [], + [enable_fuse=yes]) +AS_IF([test "x$enable_fuse" != "xno"],[ + PKG_CHECK_MODULES([FUSE],[fuse],[ + AC_SUBST([FUSE_CFLAGS]) + AC_SUBST([FUSE_LIBS]) + AC_DEFINE([HAVE_FUSE],[1],[Define to 1 if you have FUSE.]) + ],[ + enable_fuse=no + AC_MSG_WARN([FUSE library and headers are missing, so optional FUSE module won't be built]) + ]) +]) +AM_CONDITIONAL([HAVE_FUSE],[test "x$enable_fuse" != "xno"]) + dnl Check we have enough t...

...t; +#include <libintl.h> #include <pcre.h> diff --git a/src/fuse.c b/src/fuse.c index 332c1be..9fb84ae 100644 --- a/src/fuse.c +++ b/src/fuse.c @@ -25,6 +25,7 @@ #include <sys/types.h> #include <sys/wait.h> #include <string.h> +#include <libintl.h> #if HAVE_FUSE /* See <attr/xattr.h> */ diff --git a/src/guestfs-internal.h b/src/guestfs-internal.h index 9c7175f..5776a6e 100644 --- a/src/guestfs-internal.h +++ b/src/guestfs-internal.h @@ -21,8 +21,6 @@ #include <stdbool.h> -#include <libintl.h> - #include <rpc/types.h> #inclu...

...$(LIBXML2_LIBS) \ $(LIBVIRT_LIBS) \ + $(LTLIBINTL) \ ../gnulib/lib/libgnu.la test_guestunmount_fd_SOURCES = \ @@ -191,6 +194,7 @@ test_guestunmount_fd_LDADD = \ $(top_builddir)/src/libguestfs.la \ $(LIBXML2_LIBS) \ $(LIBVIRT_LIBS) \ + $(LTLIBINTL) \ ../gnulib/lib/libgnu.la endif HAVE_FUSE diff --git a/inspector/Makefile.am b/inspector/Makefile.am index 86e0cd7..e1f5acd 100644 --- a/inspector/Makefile.am +++ b/inspector/Makefile.am @@ -84,6 +84,7 @@ virt_inspector_LDADD = \ $(top_builddir)/src/libguestfs.la \ $(LIBXML2_LIBS) \ $(LIBVIRT_LIBS) \ + $(LTLIBINTL) \ ../gnulib/lib...

This is just an initial version of the patch, not to be applied. It implements just the diskgroup functions, ie. corresponding to these ldmtool commands: * ldmtool scan * ldmtool show diskgroup <guid> I have chosen yajl as the JSON parsing library (don't worry, this is optional). You will also, of course, need ldmtool which is not packaged in anything except Fedora. Rich.

...CRYPT_H ?? HAVE_CTYPE_H ?? HAVE_CUPS_CUPS_H ?? HAVE_CUPS_LANGUAGE_H ?? HAVE_CURSES_H ?? HAVE_DBUS_DBUS_H ?? HAVE_DIRENT_H ?? HAVE_DLFCN_H ?? HAVE_ENDIAN_H ?? HAVE_ERRNO_H ?? HAVE_ERR_H ?? HAVE_EXECINFO_H ?? HAVE_FAM_H ?? HAVE_FCNTL_H ?? HAVE_FLOAT_H ?? HAVE_FNMATCH_H ?? HAVE_FORM_H ?? HAVE_FTW_H ?? HAVE_FUSE_FUSE_LOWLEVEL_H ?? HAVE_GCRYPT_H ?? HAVE_GETOPT_H ?? HAVE_GLOB_H ?? HAVE_GLUSTERFS_API_GLFS_H ?? HAVE_GNUTLS_GNUTLS_H ?? HAVE_GNUTLS_X509_H ?? HAVE_GPGME_H ?? HAVE_GRP_H ?? HAVE_GSSAPI_GSSAPI_H ?? HAVE_GSSAPI_GSSAPI_KRB5_H ?? HAVE_GSSAPI_GSSAPI_SPNEGO_H ?? HAVE_ICONV_H ?? HAVE_IFADDRS_H ?? HAVE_IN...

Move the OCaml binding to C _exit to an own module. Just code motion, adapting v2v in the process. --- docs/C_SOURCE_FILES | 2 +- mllib/Makefile.am | 5 ++++- mllib/exit-c.c | 33 +++++++++++++++++++++++++++++++++ mllib/exit.ml | 19 +++++++++++++++++++ mllib/exit.mli | 20 ++++++++++++++++++++ v2v/Makefile.am | 1 - v2v/changeuid-c.c | 33