Signed-off-by: Hu Tao <hutao@cn.fujitsu.com> --- resize/resize.ml | 10 +++++----- sparsify/copying.ml | 2 +- src/fuse.c | 2 +- src/launch-libvirt.c | 4 ++-- src/libvirt-domain.c | 2 +- v2v/convert_linux.ml | 6 +++--- v2v/input_libvirt.ml | 4 ++-- v2v/lib_ovf.ml | 2 +- v2v/output_glance.ml | 2 +- v2v/output_rhev.ml | 6 +++--- v2v/v2v.ml | 6 +++--- 11 files changed, 23 insertions(+), 23 deletions(-) diff --git a/resize/resize.ml b/resize/resize.ml index 81bb270..a3ea9be 100644 --- a/resize/resize.ml +++ b/resize/resize.ml @@ -310,7 +310,7 @@ read the man page virt-resize(1). let infile = try (infile, URI.parse_uri infile) with Invalid_argument "URI.parse_uri" -> - error (f_"error parsing URI '%s'. Look for error messages printed above.") + error (f_"error parsing URI '%s'. Look for error messages printed above") infile in infile, outfile, align_first, alignment, copy_boot_loader, @@ -406,7 +406,7 @@ read the man page virt-resize(1). | "msdos" -> MBR, "msdos" | "gpt" -> GPT, "gpt" | _ -> - error (f_"%s: unknown partition table type\nvirt-resize only supports MBR (DOS) and GPT partition tables.") + error (f_"%s: unknown partition table type\nvirt-resize only supports MBR (DOS) and GPT partition tables") (fst infile) in (* Build a data structure describing the source disk's partition layout. *) @@ -767,7 +767,7 @@ read the man page virt-resize(1). | None -> () | Some dev -> if surplus < 0L then - error (f_"You cannot use --expand when there is no surplus space to expand into. You need to make the target disk larger by at least %s.") + error (f_"You cannot use --expand when there is no surplus space to expand into. You need to make the target disk larger by at least %s") (human_size (Int64.neg surplus)); let option = "--expand" in @@ -779,7 +779,7 @@ read the man page virt-resize(1). | None -> () | Some dev -> if surplus > 0L then - error (f_"You cannot use --shrink when there is no deficit (see 'deficit' in the virt-resize(1) man page)."); + error (f_"You cannot use --shrink when there is no deficit (see 'deficit' in the virt-resize(1) man page)"); let option = "--shrink" in let p = find_partition ~option dev in @@ -796,7 +796,7 @@ read the man page virt-resize(1). if surplus < 0L then ( let deficit = Int64.neg surplus in - error (f_"There is a deficit of %Ld bytes (%s). You need to make the target disk larger by at least this amount or adjust your resizing requests.") + error (f_"There is a deficit of %Ld bytes (%s). You need to make the target disk larger by at least this amount or adjust your resizing requests") deficit (human_size deficit) ); diff --git a/sparsify/copying.ml b/sparsify/copying.ml index 3940f1f..a4a82f1 100644 --- a/sparsify/copying.ml +++ b/sparsify/copying.ml @@ -67,7 +67,7 @@ let run indisk outdisk check_tmpdir compress convert (* Compression is not supported by raw output (RHBZ#852194). *) if output_format = "raw" && compress then - error (f_"--compress cannot be used for raw output. Remove this option or use --convert qcow2."); + error (f_"--compress cannot be used for raw output. Remove this option or use --convert qcow2"); (* Use TMPDIR or --tmp parameter? *) let tmp_place = diff --git a/src/fuse.c b/src/fuse.c index 08a8784..f7a6e71 100644 --- a/src/fuse.c +++ b/src/fuse.c @@ -1065,7 +1065,7 @@ guestfs__mount_local_run (guestfs_h *g) r = guestfs_exists (g, "/"); guestfs_pop_error_handler (g); if (r == -1) { - error (g, _("you must call 'guestfs_mount' first to mount a filesystem on '/'.\nNote: '%s' is still mounted. Use 'guestunmount %s' to clean up."), + error (g, _("you must call 'guestfs_mount' first to mount a filesystem on '/'.\nNote: '%s' is still mounted. Use 'guestunmount %s' to clean up"), g->localmountpoint, g->localmountpoint); return -1; } diff --git a/src/launch-libvirt.c b/src/launch-libvirt.c index 706ae38..5a3159d 100644 --- a/src/launch-libvirt.c +++ b/src/launch-libvirt.c @@ -1404,14 +1404,14 @@ construct_libvirt_xml_disk (guestfs_h *g, if (STREQ (format, "unknown")) { error (g, _("could not auto-detect the format.\n" "If the format is known, pass the format to libguestfs, eg. using the\n" - "'--format' option, or via the optional 'format' argument to 'add-drive'.")); + "'--format' option, or via the optional 'format' argument to 'add-drive'")); return -1; } } else { error (g, _("could not auto-detect the format when using a non-file protocol.\n" "If the format is known, pass the format to libguestfs, eg. using the\n" - "'--format' option, or via the optional 'format' argument to 'add-drive'.")); + "'--format' option, or via the optional 'format' argument to 'add-drive'")); return -1; } diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c index 7e0a0d9..d4176f7 100644 --- a/src/libvirt-domain.c +++ b/src/libvirt-domain.c @@ -743,7 +743,7 @@ connect_live (guestfs_h *g, virDomainPtr dom) if (path == NULL) { error (g, _("this guest has no libvirt <channel> definition for guestfsd\n" - "See ATTACHING TO RUNNING DAEMONS in guestfs(3) for further information.")); + "See ATTACHING TO RUNNING DAEMONS in guestfs(3) for further information")); return -1; } diff --git a/v2v/convert_linux.ml b/v2v/convert_linux.ml index 2cd1688..9b25f69 100644 --- a/v2v/convert_linux.ml +++ b/v2v/convert_linux.ml @@ -265,7 +265,7 @@ let rec convert ~verbose ~keep_serial_console (g : G.guestfs) inspect source = ); if installed_kernels = [] then - error (f_"no installed kernel packages were found.\n\nThis probably indicates that %s was unable to inspect this guest properly.") + error (f_"no installed kernel packages were found.\n\nThis probably indicates that %s was unable to inspect this guest properly") prog; (* Now the difficult bit. Get the grub kernels. The first in this @@ -376,7 +376,7 @@ let rec convert ~verbose ~keep_serial_console (g : G.guestfs) inspect source = ); if grub_kernels = [] then - error (f_"no kernels were found in the grub configuration.\n\nThis probably indicates that %s was unable to parse the grub configuration of this guest.") + error (f_"no kernels were found in the grub configuration.\n\nThis probably indicates that %s was unable to parse the grub configuration of this guest") prog; (*----------------------------------------------------------------------*) @@ -730,7 +730,7 @@ let rec convert ~verbose ~keep_serial_console (g : G.guestfs) inspect source = fun { ki_is_xen_kernel = is_xen_kernel } -> is_xen_kernel ) grub_kernels in if only_xen_kernels then - error (f_"only Xen kernels are installed in this guest.\n\nRead the %s(1) manual, section \"XEN PARAVIRTUALIZED GUESTS\", to see what to do.") prog; + error (f_"only Xen kernels are installed in this guest.\n\nRead the %s(1) manual, section \"XEN PARAVIRTUALIZED GUESTS\", to see what to do") prog; (* Enable the best non-Xen kernel, where "best" means the one with * the highest version which supports virtio. diff --git a/v2v/input_libvirt.ml b/v2v/input_libvirt.ml index 9e8b510..ead10ec 100644 --- a/v2v/input_libvirt.ml +++ b/v2v/input_libvirt.ml @@ -30,7 +30,7 @@ open Utils let error_if_libvirt_backend () = let libguestfs_backend = (new Guestfs.guestfs ())#get_backend () in if libguestfs_backend = "libvirt" then ( - error (f_"because of libvirt bug https://bugzilla.redhat.com/show_bug.cgi?id=1134592 you must set this environment variable:\n\nexport LIBGUESTFS_BACKEND=direct\n\nand then rerun the virt-v2v command.") + error (f_"because of libvirt bug https://bugzilla.redhat.com/show_bug.cgi?id=1134592 you must set this environment variable:\n\nexport LIBGUESTFS_BACKEND=direct\n\nand then rerun the virt-v2v command") ) (* xen+ssh URLs use the SSH driver in CURL. Currently this requires @@ -40,7 +40,7 @@ let error_if_libvirt_backend () = let error_if_no_ssh_agent () = try ignore (Sys.getenv "SSH_AUTH_SOCK") with Not_found -> - error (f_"ssh-agent authentication has not been set up ($SSH_AUTH_SOCK is not set). Please read \"INPUT FROM RHEL 5 XEN\" in the virt-v2v(1) man page.") + error (f_"ssh-agent authentication has not been set up ($SSH_AUTH_SOCK is not set). Please read \"INPUT FROM RHEL 5 XEN\" in the virt-v2v(1) man page") class input_libvirt verbose libvirt_uri guest = object diff --git a/v2v/lib_ovf.ml b/v2v/lib_ovf.ml index fcba087..dec2ef8 100644 --- a/v2v/lib_ovf.ml +++ b/v2v/lib_ovf.ml @@ -161,7 +161,7 @@ let create_meta_files verbose output_alloc sd_uuid image_uuid targets = fun ({ target_overlay = ov } as t) -> let size_in_sectors = if ov.ov_virtual_size &^ 511L <> 0L then - error (f_"the virtual size of the input disk %s is not an exact multiple of 512 bytes. The virtual size is: %Ld.\n\nThis probably means something unexpected is going on, so please file a bug about this issue.") + error (f_"the virtual size of the input disk %s is not an exact multiple of 512 bytes. The virtual size is: %Ld.\n\nThis probably means something unexpected is going on, so please file a bug about this issue") ov.ov_source.s_qemu_uri ov.ov_virtual_size; ov.ov_virtual_size /^ 512L in diff --git a/v2v/output_glance.ml b/v2v/output_glance.ml index c2b1a32..4b05214 100644 --- a/v2v/output_glance.ml +++ b/v2v/output_glance.ml @@ -47,7 +47,7 @@ object * program exits early. *) if Sys.command "glance image-list > /dev/null" <> 0 then - error (f_"glance: glance client is not installed or set up correctly. You may need to set environment variables or source a script to enable authentication. See preceding messages for details."); + error (f_"glance: glance client is not installed or set up correctly. You may need to set environment variables or source a script to enable authentication. See preceding messages for details"); (* OpenStack only supports single image VMs, I think? *) let nr_targets = List.length targets in diff --git a/v2v/output_rhev.ml b/v2v/output_rhev.ml index bb77787..cfdc76e 100644 --- a/v2v/output_rhev.ml +++ b/v2v/output_rhev.ml @@ -49,7 +49,7 @@ let rec mount_and_check_storage_domain verbose domain_class os = sprintf "mount %s:%s %s" (quote server) (quote export) (quote mp) in if verbose then printf "%s\n%!" cmd; if Sys.command cmd <> 0 then - error (f_"mount command failed, see earlier errors.\n\nThis probably means you didn't specify the right %s path [-os %s], or else you need to rerun virt-v2v as root.") domain_class os; + error (f_"mount command failed, see earlier errors.\n\nThis probably means you didn't specify the right %s path [-os %s], or else you need to rerun virt-v2v as root") domain_class os; (* Make sure it is unmounted at exit. *) at_exit (fun () -> @@ -86,7 +86,7 @@ and check_storage_domain verbose domain_class os mp = | [] -> error (f_"there are no UUIDs in the %s (%s). Is it really an OVirt or RHEV-M %s?") domain_class os domain_class | _::_ -> - error (f_"there are multiple UUIDs in the %s (%s). This is unexpected, and may be a bug in virt-v2v or OVirt.") domain_class os in + error (f_"there are multiple UUIDs in the %s (%s). This is unexpected, and may be a bug in virt-v2v or OVirt") domain_class os in (* Check that the domain has been attached to a Data Center by * checking that the master/vms directory exists. @@ -94,7 +94,7 @@ and check_storage_domain verbose domain_class os mp = let () = let master_vms_dir = mp // uuid // "master" // "vms" in if not (is_directory master_vms_dir) then - error (f_"%s does not exist or is not a directory.\n\nMost likely cause: Either the %s (%s) has not been attached to any Data Center, or the path %s is not an %s at all.\n\nYou have to attach the %s to a Data Center using the RHEV-M / OVirt user interface first.\n\nIf you don't know what the %s mount point should be then you can also find this out through the RHEV-M user interface.") + error (f_"%s does not exist or is not a directory.\n\nMost likely cause: Either the %s (%s) has not been attached to any Data Center, or the path %s is not an %s at all.\n\nYou have to attach the %s to a Data Center using the RHEV-M / OVirt user interface first.\n\nIf you don't know what the %s mount point should be then you can also find this out through the RHEV-M user interface") master_vms_dir domain_class os os domain_class domain_class domain_class in diff --git a/v2v/v2v.ml b/v2v/v2v.ml index 110c092..44639b6 100644 --- a/v2v/v2v.ml +++ b/v2v/v2v.ml @@ -176,7 +176,7 @@ let rec main () = * early, not below, later. *) if format <> "raw" && format <> "qcow2" then - error (f_"output format should be 'raw' or 'qcow2'.\n\nUse the '-of <format>' option to select a different output format for the converted guest.\n\nOther output formats are not supported at the moment, although might be considered in future."); + error (f_"output format should be 'raw' or 'qcow2'.\n\nUse the '-of <format>' option to select a different output format for the converted guest.\n\nOther output formats are not supported at the moment, although might be considered in future"); (* output#prepare_targets will fill in the target_file field. * estimate_target_size will fill in the target_estimated_size field. @@ -348,7 +348,7 @@ and inspect_source g root_choice = let root = match roots with | [] -> - error (f_"no root device found in this operating system image."); + error (f_"no root device found in this operating system image"); | [root] -> root | roots -> match root_choice with @@ -378,7 +378,7 @@ and inspect_source g root_choice = List.nth roots (!i - 1) | `Single -> - error (f_"multi-boot operating systems are not supported by virt-v2v. Use the --root option to change how virt-v2v handles this.") + error (f_"multi-boot operating systems are not supported by virt-v2v. Use the --root option to change how virt-v2v handles this") | `First -> List.hd roots -- 1.9.3

Signed-off-by: Hu Tao <hutao@cn.fujitsu.com> --- align/Makefile.am | 2 +- builder/Makefile.am | 2 +- builder/website/Makefile.am | 2 +- cat/Makefile.am | 4 ++-- common-rules.mk | 8 ++++---- customize/Makefile.am | 2 +- df/Makefile.am | 4 ++-- diff/Makefile.am | 2 +- erlang/examples/Makefile.am | 4 ++-- examples/Makefile.am | 16 ++++++++-------- fish/Makefile.am | 2 +- format/Makefile.am | 2 +- golang/examples/Makefile.am | 4 ++-- inspector/Makefile.am | 4 ++-- java/examples/Makefile.am | 4 ++-- lua/Makefile.am | 2 +- lua/examples/Makefile.am | 4 ++-- make-fs/Makefile.am | 2 +- mllib/Makefile.am | 2 +- ocaml/Makefile.am | 2 +- ocaml/examples/Makefile.am | 4 ++-- perl/examples/Makefile.am | 4 ++-- python/examples/Makefile.am | 4 ++-- rescue/Makefile.am | 2 +- resize/Makefile.am | 2 +- ruby/examples/Makefile.am | 4 ++-- sparsify/Makefile.am | 2 +- src/Makefile.am | 2 +- sysprep/Makefile.am | 4 ++-- test-tool/Makefile.am | 2 +- tests/c-api/Makefile.am | 2 +- tests/fuzz/Makefile.am | 2 +- tests/mount-local/Makefile.am | 2 +- tests/parallel/Makefile.am | 2 +- tests/relative-paths/Makefile.am | 2 +- v2v/Makefile.am | 2 +- 36 files changed, 58 insertions(+), 58 deletions(-) diff --git a/align/Makefile.am b/align/Makefile.am index 4ecbf7e..ed59c7a 100644 --- a/align/Makefile.am +++ b/align/Makefile.am @@ -98,4 +98,4 @@ TESTS += \ endif check-valgrind: - $(MAKE) VG="$(top_builddir)/run @VG@" check + $(MAKE) VG="$(top_builddir)/run $(VG)" check diff --git a/builder/Makefile.am b/builder/Makefile.am index eb6295a..843bac1 100644 --- a/builder/Makefile.am +++ b/builder/Makefile.am @@ -245,7 +245,7 @@ TESTS += test-virt-builder.sh endif ENABLE_APPLIANCE check-valgrind: - $(MAKE) VG="$(top_builddir)/run @VG@" check + $(MAKE) VG="$(top_builddir)/run $(VG)" check check-slow: $(MAKE) TESTS="test-virt-builder-planner.sh" check diff --git a/builder/website/Makefile.am b/builder/website/Makefile.am index a2d29df..967a4fb 100644 --- a/builder/website/Makefile.am +++ b/builder/website/Makefile.am @@ -41,4 +41,4 @@ TESTS_ENVIRONMENT = $(top_builddir)/run --test TESTS = validate.sh check-valgrind: - $(MAKE) VG="$(top_builddir)/run @VG@" check + $(MAKE) VG="$(top_builddir)/run $(VG)" check diff --git a/cat/Makefile.am b/cat/Makefile.am index 14b8e81..8165589 100644 --- a/cat/Makefile.am +++ b/cat/Makefile.am @@ -198,9 +198,9 @@ TESTS = \ endif ENABLE_APPLIANCE check-valgrind: - $(MAKE) VG="$(top_builddir)/run @VG@" check + $(MAKE) VG="$(top_builddir)/run $(VG)" check check-valgrind-local-guests: for g in $(GUESTS); do \ - $(top_builddir)/run --test @VG@ ./virt-filesystems -c "$(libvirt_ro_uri)" -d "$$g" --all --long -h --uuid || exit $$?; \ + $(top_builddir)/run --test $(VG) ./virt-filesystems -c "$(libvirt_ro_uri)" -d "$$g" --all --long -h --uuid || exit $$?; \ done diff --git a/common-rules.mk b/common-rules.mk index 312107e..abee902 100644 --- a/common-rules.mk +++ b/common-rules.mk @@ -23,7 +23,7 @@ # Old RHEL 5 autoconf defines these, but RHEL 5 automake doesn't # create variables for them. So define them here if they're not # defined already. -builddir ?= @builddir@ -abs_builddir ?= @abs_builddir@ -srcdir ?= @srcdir@ -abs_srcdir ?= @abs_srcdir@ +builddir ?= $(builddir) +abs_builddir ?= $(abs_builddir) +srcdir ?= $(srcdir) +abs_srcdir ?= $(abs_srcdir) diff --git a/customize/Makefile.am b/customize/Makefile.am index 746375d..0f2571b 100644 --- a/customize/Makefile.am +++ b/customize/Makefile.am @@ -182,7 +182,7 @@ TESTS = test-virt-customize.sh endif check-valgrind: - $(MAKE) VG="$(top_builddir)/run @VG@" check + $(MAKE) VG="$(top_builddir)/run $(VG)" check # Dependencies. depend: .depend diff --git a/df/Makefile.am b/df/Makefile.am index 29e0bf5..e6ab953 100644 --- a/df/Makefile.am +++ b/df/Makefile.am @@ -101,7 +101,7 @@ TESTS += \ endif ENABLE_APPLIANCE check-valgrind: - $(MAKE) VG="$(top_builddir)/run @VG@" check + $(MAKE) VG="$(top_builddir)/run $(VG)" check check-valgrind-local-guests: - $(top_builddir)/run --test @VG@ ./virt-df -c "$(libvirt_ro_uri)" + $(top_builddir)/run --test $(VG) ./virt-df -c "$(libvirt_ro_uri)" diff --git a/diff/Makefile.am b/diff/Makefile.am index 3c2c211..2735626 100644 --- a/diff/Makefile.am +++ b/diff/Makefile.am @@ -84,4 +84,4 @@ TESTS = \ endif ENABLE_APPLIANCE check-valgrind: - $(MAKE) VG="$(top_builddir)/run @VG@" check + $(MAKE) VG="$(top_builddir)/run $(VG)" check diff --git a/erlang/examples/Makefile.am b/erlang/examples/Makefile.am index 92e2c2d..c803d2c 100644 --- a/erlang/examples/Makefile.am +++ b/erlang/examples/Makefile.am @@ -35,8 +35,8 @@ stamp-guestfs-erlang.pod: guestfs-erlang.pod create_disk.erl inspect_vm.erl --section 3 \ --man guestfs-erlang.3 \ --html $(top_builddir)/html/guestfs-erlang.3.html \ - --verbatim $(srcdir)/create_disk.erl:@EXAMPLE1@ \ - --verbatim $(srcdir)/inspect_vm.erl:@EXAMPLE2@ \ + --verbatim $(srcdir)/create_disk.erl:$(EXAMPLE1) \ + --verbatim $(srcdir)/inspect_vm.erl:$(EXAMPLE2) \ --license examples \ $< touch $@ diff --git a/examples/Makefile.am b/examples/Makefile.am index e150a58..70363af 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -159,14 +159,14 @@ stamp-guestfs-examples.pod: guestfs-examples.pod copy-over.c create-disk.c debug --section 3 \ --man guestfs-examples.3 \ --html $(top_builddir)/html/guestfs-examples.3.html \ - --verbatim $(srcdir)/copy-over.c:@COPY_OVER@ \ - --verbatim $(srcdir)/create-disk.c:@CREATE_DISK@ \ - --verbatim $(srcdir)/debug-logging.c:@DEBUG_LOGGING@ \ - --verbatim $(srcdir)/display-icon.c:@DISPLAY_ICON@ \ - --verbatim $(srcdir)/inspect-vm.c:@INSPECT_VM@ \ - --verbatim $(srcdir)/libvirt-auth.c:@LIBVIRT_AUTH@ \ - --verbatim $(srcdir)/mount-local.c:@MOUNT_LOCAL@ \ - --verbatim $(srcdir)/virt-dhcp-address.c:@VIRT_DHCP_ADDRESS@ \ + --verbatim $(srcdir)/copy-over.c:$(COPY_OVER) \ + --verbatim $(srcdir)/create-disk.c:$(CREATE_DISK) \ + --verbatim $(srcdir)/debug-logging.c:$(DEBUG_LOGGING) \ + --verbatim $(srcdir)/display-icon.c:$(DISPLAY_ICON) \ + --verbatim $(srcdir)/inspect-vm.c:$(INSPECT_VM) \ + --verbatim $(srcdir)/libvirt-auth.c:$(LIBVIRT_AUTH) \ + --verbatim $(srcdir)/mount-local.c:$(MOUNT_LOCAL) \ + --verbatim $(srcdir)/virt-dhcp-address.c:$(VIRT_DHCP_ADDRESS) \ --license examples \ $< touch $@ diff --git a/fish/Makefile.am b/fish/Makefile.am index d28a94b..12909d1 100644 --- a/fish/Makefile.am +++ b/fish/Makefile.am @@ -297,7 +297,7 @@ TESTS += \ endif check-valgrind: - $(MAKE) TESTS="test-a.sh test-add-domain.sh test-add-uri.sh test-copy.sh test-d.sh test-edit.sh test-escapes.sh test-events.sh test-find0.sh test-glob.sh test-inspect.sh test-prep.sh test-read-file.sh test-remote.sh test-remote-events.sh test-reopen.sh test-run.sh test-stringlist.sh test-tilde.sh test-upload-to-dir.sh" VG="$(top_builddir)/run @VG@" check + $(MAKE) TESTS="test-a.sh test-add-domain.sh test-add-uri.sh test-copy.sh test-d.sh test-edit.sh test-escapes.sh test-events.sh test-find0.sh test-glob.sh test-inspect.sh test-prep.sh test-read-file.sh test-remote.sh test-remote-events.sh test-reopen.sh test-run.sh test-stringlist.sh test-tilde.sh test-upload-to-dir.sh" VG="$(top_builddir)/run $(VG)" check EXTRA_DIST += \ test-a.sh \ diff --git a/format/Makefile.am b/format/Makefile.am index 178c391..d7e8eeb 100644 --- a/format/Makefile.am +++ b/format/Makefile.am @@ -82,6 +82,6 @@ TESTS = test-virt-format.sh endif ENABLE_APPLIANCE check-valgrind: - $(MAKE) VG="$(top_builddir)/run @VG@" check + $(MAKE) VG="$(top_builddir)/run $(VG)" check EXTRA_DIST += test-virt-format.sh diff --git a/golang/examples/Makefile.am b/golang/examples/Makefile.am index b5093ef..39ca35b 100644 --- a/golang/examples/Makefile.am +++ b/golang/examples/Makefile.am @@ -35,8 +35,8 @@ stamp-guestfs-golang.pod: guestfs-golang.pod create-disk.go inspect-vm.go --section 3 \ --man guestfs-golang.3 \ --html $(top_builddir)/html/guestfs-golang.3.html \ - --verbatim $(srcdir)/create-disk.go:@EXAMPLE1@ \ - --verbatim $(srcdir)/inspect-vm.go:@EXAMPLE2@ \ + --verbatim $(srcdir)/create-disk.go:$(EXAMPLE1) \ + --verbatim $(srcdir)/inspect-vm.go:$(EXAMPLE2) \ --license examples \ $< touch $@ diff --git a/inspector/Makefile.am b/inspector/Makefile.am index 86e0cd7..d383d8d 100644 --- a/inspector/Makefile.am +++ b/inspector/Makefile.am @@ -107,9 +107,9 @@ TESTS += test-xmllint.sh endif check-valgrind: - $(MAKE) TESTS="test-virt-inspector.sh" VG="$(top_builddir)/run @VG@" check + $(MAKE) TESTS="test-virt-inspector.sh" VG="$(top_builddir)/run $(VG)" check check-valgrind-local-guests: for g in $(GUESTS); do \ - $(top_builddir)/run --test @VG@ ./virt-inspector -c "$(libvirt_ro_uri)" -d "$$g" || exit $$?; \ + $(top_builddir)/run --test $(VG) ./virt-inspector -c "$(libvirt_ro_uri)" -d "$$g" || exit $$?; \ done diff --git a/java/examples/Makefile.am b/java/examples/Makefile.am index f494190..e02cc94 100644 --- a/java/examples/Makefile.am +++ b/java/examples/Makefile.am @@ -37,8 +37,8 @@ stamp-guestfs-java.pod: guestfs-java.pod CreateDisk.java InspectVM.java --section 3 \ --man guestfs-java.3 \ --html $(top_builddir)/html/guestfs-java.3.html \ - --verbatim $(srcdir)/CreateDisk.java:@EXAMPLE1@ \ - --verbatim $(srcdir)/InspectVM.java:@EXAMPLE2@ \ + --verbatim $(srcdir)/CreateDisk.java:$(EXAMPLE1) \ + --verbatim $(srcdir)/InspectVM.java:$(EXAMPLE2) \ --license examples \ $< touch $@ diff --git a/lua/Makefile.am b/lua/Makefile.am index 2833e20..a5ff65e 100644 --- a/lua/Makefile.am +++ b/lua/Makefile.am @@ -102,7 +102,7 @@ EXTRA_DIST += \ # https://bugs.kde.org/show_bug.cgi?id=79362 # http://valgrind.org/docs/manual/faq.html#faq.unhelpful #check-valgrind: -# $(MAKE) VG="@VG@" check +# $(MAKE) VG="$(VG)" check # Custom install rule. install-data-hook: diff --git a/lua/examples/Makefile.am b/lua/examples/Makefile.am index 93ba2c5..7751eb3 100644 --- a/lua/examples/Makefile.am +++ b/lua/examples/Makefile.am @@ -35,8 +35,8 @@ stamp-guestfs-lua.pod: guestfs-lua.pod create_disk.lua inspect_vm.lua --section 3 \ --man guestfs-lua.3 \ --html $(top_builddir)/html/guestfs-lua.3.html \ - --verbatim $(srcdir)/create_disk.lua:@EXAMPLE1@ \ - --verbatim $(srcdir)/inspect_vm.lua:@EXAMPLE2@ \ + --verbatim $(srcdir)/create_disk.lua:$(EXAMPLE1) \ + --verbatim $(srcdir)/inspect_vm.lua:$(EXAMPLE2) \ --license examples \ $< touch $@ diff --git a/make-fs/Makefile.am b/make-fs/Makefile.am index 03e30ba..45d021b 100644 --- a/make-fs/Makefile.am +++ b/make-fs/Makefile.am @@ -78,4 +78,4 @@ TESTS = \ endif ENABLE_APPLIANCE check-valgrind: - $(MAKE) VG="$(top_builddir)/run @VG@" check + $(MAKE) VG="$(top_builddir)/run $(VG)" check diff --git a/mllib/Makefile.am b/mllib/Makefile.am index 210fc64..8aa74dd 100644 --- a/mllib/Makefile.am +++ b/mllib/Makefile.am @@ -162,7 +162,7 @@ TESTS_ENVIRONMENT = $(top_builddir)/run --test TESTS = common_utils_tests check-valgrind: - $(MAKE) VG="$(top_builddir)/run @VG@" check + $(MAKE) VG="$(top_builddir)/run $(VG)" check # Dependencies. depend: .depend diff --git a/ocaml/Makefile.am b/ocaml/Makefile.am index 94f11ef..23c66c4 100644 --- a/ocaml/Makefile.am +++ b/ocaml/Makefile.am @@ -153,7 +153,7 @@ if HAVE_OCAMLOPT endif check-valgrind: - $(MAKE) VG="$(top_builddir)/run @VG@" check + $(MAKE) VG="$(top_builddir)/run $(VG)" check # Dependencies. %.cmi: %.mli diff --git a/ocaml/examples/Makefile.am b/ocaml/examples/Makefile.am index de647fc..b3bfdb5 100644 --- a/ocaml/examples/Makefile.am +++ b/ocaml/examples/Makefile.am @@ -37,8 +37,8 @@ stamp-guestfs-ocaml.pod: guestfs-ocaml.pod create_disk.ml inspect_vm.ml --section 3 \ --man guestfs-ocaml.3 \ --html $(top_builddir)/html/guestfs-ocaml.3.html \ - --verbatim $(srcdir)/create_disk.ml:@EXAMPLE1@ \ - --verbatim $(srcdir)/inspect_vm.ml:@EXAMPLE2@ \ + --verbatim $(srcdir)/create_disk.ml:$(EXAMPLE1) \ + --verbatim $(srcdir)/inspect_vm.ml:$(EXAMPLE2) \ --license examples \ $< touch $@ diff --git a/perl/examples/Makefile.am b/perl/examples/Makefile.am index 9b04123..349525b 100644 --- a/perl/examples/Makefile.am +++ b/perl/examples/Makefile.am @@ -35,8 +35,8 @@ stamp-guestfs-perl.pod: guestfs-perl.pod create_disk.pl inspect_vm.pl --section 3 \ --man guestfs-perl.3 \ --html $(top_builddir)/html/guestfs-perl.3.html \ - --verbatim $(srcdir)/create_disk.pl:@EXAMPLE1@ \ - --verbatim $(srcdir)/inspect_vm.pl:@EXAMPLE2@ \ + --verbatim $(srcdir)/create_disk.pl:$(EXAMPLE1) \ + --verbatim $(srcdir)/inspect_vm.pl:$(EXAMPLE2) \ --license examples \ $< touch $@ diff --git a/python/examples/Makefile.am b/python/examples/Makefile.am index 008a668..b15b65c 100644 --- a/python/examples/Makefile.am +++ b/python/examples/Makefile.am @@ -35,8 +35,8 @@ stamp-guestfs-python.pod: guestfs-python.pod create_disk.py inspect_vm.py --section 3 \ --man guestfs-python.3 \ --html $(top_builddir)/html/guestfs-python.3.html \ - --verbatim $(srcdir)/create_disk.py:@EXAMPLE1@ \ - --verbatim $(srcdir)/inspect_vm.py:@EXAMPLE2@ \ + --verbatim $(srcdir)/create_disk.py:$(EXAMPLE1) \ + --verbatim $(srcdir)/inspect_vm.py:$(EXAMPLE2) \ --license examples \ $< touch $@ diff --git a/rescue/Makefile.am b/rescue/Makefile.am index 505b327..5394172 100644 --- a/rescue/Makefile.am +++ b/rescue/Makefile.am @@ -88,4 +88,4 @@ TESTS += \ endif ENABLE_APPLIANCE check-valgrind: - $(MAKE) TESTS="test-virt-rescue-suggest.sh" VG="$(top_builddir)/run @VG@" check + $(MAKE) TESTS="test-virt-rescue-suggest.sh" VG="$(top_builddir)/run $(VG)" check diff --git a/resize/Makefile.am b/resize/Makefile.am index d1bc46f..eb21e0c 100644 --- a/resize/Makefile.am +++ b/resize/Makefile.am @@ -140,7 +140,7 @@ TESTS += test-virt-resize.sh endif check-valgrind: - $(MAKE) VG="$(top_builddir)/run @VG@" check + $(MAKE) VG="$(top_builddir)/run $(VG)" check # Dependencies. depend: .depend diff --git a/ruby/examples/Makefile.am b/ruby/examples/Makefile.am index 1329a2a..c3b7d74 100644 --- a/ruby/examples/Makefile.am +++ b/ruby/examples/Makefile.am @@ -35,8 +35,8 @@ stamp-guestfs-ruby.pod: guestfs-ruby.pod create_disk.rb inspect_vm.rb --section 3 \ --man guestfs-ruby.3 \ --html $(top_builddir)/html/guestfs-ruby.3.html \ - --verbatim $(srcdir)/create_disk.rb:@EXAMPLE1@ \ - --verbatim $(srcdir)/inspect_vm.rb:@EXAMPLE2@ \ + --verbatim $(srcdir)/create_disk.rb:$(EXAMPLE1) \ + --verbatim $(srcdir)/inspect_vm.rb:$(EXAMPLE2) \ --license examples \ $< touch $@ diff --git a/sparsify/Makefile.am b/sparsify/Makefile.am index fc2777d..4657394 100644 --- a/sparsify/Makefile.am +++ b/sparsify/Makefile.am @@ -129,7 +129,7 @@ TESTS = \ endif ENABLE_APPLIANCE check-valgrind: - $(MAKE) VG="$(top_builddir)/run @VG@" check + $(MAKE) VG="$(top_builddir)/run $(VG)" check # Dependencies. depend: .depend diff --git a/src/Makefile.am b/src/Makefile.am index 3d06203..4aeae5a 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -268,7 +268,7 @@ test_utils_LDADD = \ $(top_builddir)/gnulib/lib/libgnu.la check-valgrind: - $(MAKE) VG="@VG@" check + $(MAKE) VG="$(VG)" check # Pkgconfig. diff --git a/sysprep/Makefile.am b/sysprep/Makefile.am index d6dae86..8d8a6f8 100644 --- a/sysprep/Makefile.am +++ b/sysprep/Makefile.am @@ -215,11 +215,11 @@ TESTS = \ endif ENABLE_APPLIANCE check-valgrind: - $(MAKE) TESTS="test-virt-sysprep.sh" VG="$(top_builddir)/run @VG@" check + $(MAKE) TESTS="test-virt-sysprep.sh" VG="$(top_builddir)/run $(VG)" check check-valgrind-local-guests: for g in $(GUESTS); do \ - $(top_builddir)/run --test @VG@ ./virt-sysprep -n -c "$(libvirt_ro_uri)" -d "$$g" || exit $$?; \ + $(top_builddir)/run --test $(VG) ./virt-sysprep -n -c "$(libvirt_ro_uri)" -d "$$g" || exit $$?; \ done # Dependencies. diff --git a/test-tool/Makefile.am b/test-tool/Makefile.am index c0e958c..86c34c5 100644 --- a/test-tool/Makefile.am +++ b/test-tool/Makefile.am @@ -50,4 +50,4 @@ stamp-libguestfs-test-tool.pod: libguestfs-test-tool.pod touch $@ check-valgrind: - $(top_builddir)/run --test @VG@ ./libguestfs-test-tool + $(top_builddir)/run --test $(VG) ./libguestfs-test-tool diff --git a/tests/c-api/Makefile.am b/tests/c-api/Makefile.am index 6ea22e9..4ad1692 100644 --- a/tests/c-api/Makefile.am +++ b/tests/c-api/Makefile.am @@ -229,4 +229,4 @@ test_event_string_LDADD = \ #endif check-valgrind: - $(MAKE) VG="$(top_builddir)/run @VG@" check + $(MAKE) VG="$(top_builddir)/run $(VG)" check diff --git a/tests/fuzz/Makefile.am b/tests/fuzz/Makefile.am index 67793d5..121e7a9 100644 --- a/tests/fuzz/Makefile.am +++ b/tests/fuzz/Makefile.am @@ -28,4 +28,4 @@ TESTS = \ TESTS_ENVIRONMENT = $(top_builddir)/run --test $(VG) check-valgrind: - $(MAKE) VG="@VG@" check + $(MAKE) VG="$(VG)" check diff --git a/tests/mount-local/Makefile.am b/tests/mount-local/Makefile.am index 17cfa73..c521048 100644 --- a/tests/mount-local/Makefile.am +++ b/tests/mount-local/Makefile.am @@ -47,6 +47,6 @@ test_parallel_mount_local_LDADD = \ $(top_builddir)/gnulib/lib/libgnu.la check-valgrind: - $(MAKE) VG="$(top_builddir)/run @VG@" check + $(MAKE) VG="$(top_builddir)/run $(VG)" check endif diff --git a/tests/parallel/Makefile.am b/tests/parallel/Makefile.am index be63256..b5f09ba 100644 --- a/tests/parallel/Makefile.am +++ b/tests/parallel/Makefile.am @@ -38,7 +38,7 @@ test_parallel_LDADD = \ $(top_builddir)/gnulib/lib/libgnu.la #check-valgrind: -# $(MAKE) VG="$(top_builddir)/run @VG@" TESTS="test-parallel" check +# $(MAKE) VG="$(top_builddir)/run $(VG)" TESTS="test-parallel" check check-slow: $(MAKE) TESTS="test-parallel" check diff --git a/tests/relative-paths/Makefile.am b/tests/relative-paths/Makefile.am index beb60d9..3908cec 100644 --- a/tests/relative-paths/Makefile.am +++ b/tests/relative-paths/Makefile.am @@ -31,7 +31,7 @@ TESTS = \ TESTS_ENVIRONMENT = $(top_builddir)/run --test check-valgrind: - $(MAKE) VG="$(top_builddir)/run @VG@" check + $(MAKE) VG="$(top_builddir)/run $(VG)" check EXTRA_DIST = \ $(TESTS) diff --git a/v2v/Makefile.am b/v2v/Makefile.am index 4b57aca..00f788c 100644 --- a/v2v/Makefile.am +++ b/v2v/Makefile.am @@ -236,7 +236,7 @@ endif ENABLE_APPLIANCE check_DATA = test-v2v-networks-and-bridges.xml check-valgrind: - $(MAKE) VG="$(top_builddir)/run @VG@" check + $(MAKE) VG="$(top_builddir)/run $(VG)" check SLOW_TESTS = \ test-v2v-real-conversions.sh -- 1.9.3

Signed-off-by: Hu Tao <hutao@cn.fujitsu.com> --- p2v/config.c | 1 - p2v/conversion.c | 1 - p2v/main.c | 1 - 3 files changed, 3 deletions(-) diff --git a/p2v/config.c b/p2v/config.c index b4abb40..abc91be 100644 --- a/p2v/config.c +++ b/p2v/config.c @@ -24,7 +24,6 @@ #include <inttypes.h> #include <unistd.h> #include <errno.h> -#include <assert.h> #include <locale.h> #include <libintl.h> diff --git a/p2v/conversion.c b/p2v/conversion.c index 8e6aa6c..ced9026 100644 --- a/p2v/conversion.c +++ b/p2v/conversion.c @@ -28,7 +28,6 @@ #include <time.h> #include <errno.h> #include <locale.h> -#include <assert.h> #include <libintl.h> #include <sys/types.h> #include <sys/wait.h> diff --git a/p2v/main.c b/p2v/main.c index 75a18c3..9c34413c 100644 --- a/p2v/main.c +++ b/p2v/main.c @@ -28,7 +28,6 @@ #include <errno.h> #include <dirent.h> #include <locale.h> -#include <assert.h> #include <libintl.h> #include <sys/types.h> #include <sys/stat.h> -- 1.9.3

Signed-off-by: Hu Tao <hutao@cn.fujitsu.com> --- src/appliance.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/appliance.c b/src/appliance.c index a3a083e..d7aa6b1 100644 --- a/src/appliance.c +++ b/src/appliance.c @@ -19,7 +19,6 @@ #include <config.h> #include <errno.h> -#include <dirent.h> #include <stdio.h> #include <stdlib.h> #include <stdarg.h> -- 1.9.3

Signed-off-by: Hu Tao <hutao@cn.fujitsu.com> --- builder/website/ubuntu.preseed | 1 - guestfs-release-notes.txt | 1 - p2v/issue | 1 - tests/guests/guest-aux/debian-packages | 1 - 4 files changed, 4 deletions(-) diff --git a/builder/website/ubuntu.preseed b/builder/website/ubuntu.preseed index 236e174..dbe4f79 100644 --- a/builder/website/ubuntu.preseed +++ b/builder/website/ubuntu.preseed @@ -373,4 +373,3 @@ xserver-xorg xserver-xorg/config/monitor/mode-list \ # directly, or use the apt-install and in-target commands to easily install # packages and run commands in the target system. #d-i preseed/late_command string apt-install zsh; in-target chsh -s /bin/zsh - diff --git a/guestfs-release-notes.txt b/guestfs-release-notes.txt index 1baa447..3eada81 100644 --- a/guestfs-release-notes.txt +++ b/guestfs-release-notes.txt @@ -3248,4 +3248,3 @@ BUGS * Run libguestfs-test-tool(1) and paste the complete, unedited output into the bug report. - diff --git a/p2v/issue b/p2v/issue index ae0930f..9b2839e 100644 --- a/p2v/issue +++ b/p2v/issue @@ -11,4 +11,3 @@ If virt-p2v didn't start automatically, look for logs: systemctl status p2v -l *** - diff --git a/tests/guests/guest-aux/debian-packages b/tests/guests/guest-aux/debian-packages index 38afc97..cdd0d27 100644 --- a/tests/guests/guest-aux/debian-packages +++ b/tests/guests/guest-aux/debian-packages @@ -45,4 +45,3 @@ Description: this is a test package . Don't confuse it with a real package. Homepage: http://libguestfs.org/ - -- 1.9.3

Signed-off-by: Hu Tao <hutao@cn.fujitsu.com> --- align/test-virt-alignment-scan-guests.sh | 2 +- align/test-virt-alignment-scan.sh | 2 +- builder/test-virt-builder-planner.sh | 2 +- builder/website/ubuntu.sh | 2 +- configure.ac | 2 +- fish/test-mount-local.sh | 2 +- make-fs/test-virt-make-fs.sh | 2 +- src/api-support/update-from-tarballs.sh | 2 +- sysprep/test-virt-sysprep-script.sh | 2 +- tests/qemu/qemu-snapshot-isolation.sh | 2 +- tests/regressions/rhbz563450.sh | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/align/test-virt-alignment-scan-guests.sh b/align/test-virt-alignment-scan-guests.sh index 99e2585..50b9260 100755 --- a/align/test-virt-alignment-scan-guests.sh +++ b/align/test-virt-alignment-scan-guests.sh @@ -30,6 +30,6 @@ $VG virt-alignment-scan -c "$libvirt_uri" r=$? # 0, 2 and 3 are reasonable non-error exit codes. Others are errors. -if [ $r -ne 0 -a $r -ne 2 -a $r -ne 3 ]; then +if [ $r -ne 0 && $r -ne 2 && $r -ne 3 ]; then exit $r fi diff --git a/align/test-virt-alignment-scan.sh b/align/test-virt-alignment-scan.sh index 293a9ef..7f02ba9 100755 --- a/align/test-virt-alignment-scan.sh +++ b/align/test-virt-alignment-scan.sh @@ -22,6 +22,6 @@ $VG virt-alignment-scan -a ../tests/guests/fedora.img r=$? # 0, 2 and 3 are reasonable non-error exit codes. Others are errors. -if [ $r -ne 0 -a $r -ne 2 -a $r -ne 3 ]; then +if [ $r -ne 0 && $r -ne 2 && $r -ne 3 ]; then exit $r fi diff --git a/builder/test-virt-builder-planner.sh b/builder/test-virt-builder-planner.sh index f974c27..adf461e 100755 --- a/builder/test-virt-builder-planner.sh +++ b/builder/test-virt-builder-planner.sh @@ -24,7 +24,7 @@ abs_builddir=$(pwd) export XDG_CONFIG_HOME= export XDG_CONFIG_DIRS="$abs_builddir/test-config" -if [ ! -f fedora.xz -o ! -f fedora.qcow2 -o ! -f fedora.qcow2.xz ]; then +if [ ! -f fedora.xz || ! -f fedora.qcow2 || ! -f fedora.qcow2.xz ]; then echo "$0: test skipped because there is no fedora.xz, fedora.qcow2 or fedora.qcow2.xz in the build directory" exit 77 fi diff --git a/builder/website/ubuntu.sh b/builder/website/ubuntu.sh index 0863fb0..16cf91f 100755 --- a/builder/website/ubuntu.sh +++ b/builder/website/ubuntu.sh @@ -26,7 +26,7 @@ export LANG=C set -e set -x -if [ $# -lt 2 -o $# -gt 3 ]; then +if [ $# -lt 2 || $# -gt 3 ]; then echo "$0 VERSION DIST [OSVARIANT]" exit 1 fi diff --git a/configure.ac b/configure.ac index 9578b59..47272fe 100644 --- a/configure.ac +++ b/configure.ac @@ -1531,7 +1531,7 @@ AS_IF([test "x$enable_gobject" != "xno"],[ [AC_MSG_WARN([gio library not found, gobject binding will be disabled])]) ]) AM_CONDITIONAL([HAVE_GOBJECT], - [test "x$GOBJECT_LIBS" != "x" -a "x$GIO_LIBS" != "x"]) + [test "x$GOBJECT_LIBS" != "x" && "x$GIO_LIBS" != "x"]) AC_CHECK_PROG([GJS],[gjs],[gjs]) AS_IF([test "x$GJS" = "x"], diff --git a/fish/test-mount-local.sh b/fish/test-mount-local.sh index 845f707..0bc4f5d 100755 --- a/fish/test-mount-local.sh +++ b/fish/test-mount-local.sh @@ -33,7 +33,7 @@ test -w /dev/fuse || { set -e -if [ $# -gt 0 -a "$1" = "--run-test" ]; then +if [ $# -gt 0 && "$1" = "--run-test" ]; then # Create some files and read them back. echo 'hello' > test-mount-local-mp/hello chmod 0600 test-mount-local-mp/hello diff --git a/make-fs/test-virt-make-fs.sh b/make-fs/test-virt-make-fs.sh index 2ed3ce9..067e665 100755 --- a/make-fs/test-virt-make-fs.sh +++ b/make-fs/test-virt-make-fs.sh @@ -57,7 +57,7 @@ function random_choice # in the appliance fails when trying to change the UID of # the files to some non-zero value (not supported by FAT). choices=(--type=ext2 --type=ext3 --type=ext4) -if [ "$ntfs3g_available" = "yes" -a "$ntfsprogs_available" = "yes" ]; then +if [ "$ntfs3g_available" = "yes" && "$ntfsprogs_available" = "yes" ]; then choices[${#choices[*]}]="--type=ntfs" fi if [ "$btrfs_available" = "yes" ]; then diff --git a/src/api-support/update-from-tarballs.sh b/src/api-support/update-from-tarballs.sh index 328b11b..e2160c7 100755 --- a/src/api-support/update-from-tarballs.sh +++ b/src/api-support/update-from-tarballs.sh @@ -36,7 +36,7 @@ for t in $tarballs; do # x.y.z v=$(echo $p | sed 's/^libguestfs-//') - if [ $v != "1.2.0" -a $v != "1.3.0" -a ! -f $v ]; then + if [ $v != "1.2.0" && $v != "1.3.0" && ! -f $v ]; then rm -rf "$tmpdir/*" tar -C "$tmpdir" \ -zxf $t $p/src/*.c 2>/dev/null ||: diff --git a/sysprep/test-virt-sysprep-script.sh b/sysprep/test-virt-sysprep-script.sh index 10ba1d1..65813d5 100755 --- a/sysprep/test-virt-sysprep-script.sh +++ b/sysprep/test-virt-sysprep-script.sh @@ -37,7 +37,7 @@ if ! virt-sysprep -q -n -a ../tests/guests/fedora.img --enable script \ echo "$0: virt-sysprep wasn't expected to exit with error." exit 1 fi -if [ ! -f stamp-script1.sh -o ! -f stamp-script2.sh ]; then +if [ ! -f stamp-script1.sh || ! -f stamp-script2.sh ]; then echo "$0: one of the two test scripts did not run." exit 1 fi diff --git a/tests/qemu/qemu-snapshot-isolation.sh b/tests/qemu/qemu-snapshot-isolation.sh index daa210f..31b3562 100755 --- a/tests/qemu/qemu-snapshot-isolation.sh +++ b/tests/qemu/qemu-snapshot-isolation.sh @@ -98,7 +98,7 @@ fi if [ "$(md5sum isolation2.img | awk '{print $1}')" != "$isolation2_md5sum" ]; then serious_error fi -if [ "$supports_qcow2" = "yes" -a \ +if [ "$supports_qcow2" = "yes" && \ "$(md5sum isolation3.img | awk '{print $1}')" != "$isolation3_md5sum" ]; then serious_error fi diff --git a/tests/regressions/rhbz563450.sh b/tests/regressions/rhbz563450.sh index d7cf751..cc3591b 100755 --- a/tests/regressions/rhbz563450.sh +++ b/tests/regressions/rhbz563450.sh @@ -22,7 +22,7 @@ set -e export LANG=C -if [ ! -s ../guests/fedora.img -o ! -s ../data/test.iso -o ! -s ../guests/debian.img ]; then +if [ ! -s ../guests/fedora.img || ! -s ../data/test.iso || ! -s ../guests/debian.img ]; then echo "$0: test skipped because there is no fedora.img nor test.iso nor debian.img" exit 77 fi -- 1.9.3

Signed-off-by: Hu Tao <hutao@cn.fujitsu.com> --- BUGS | 6 +++--- guestfs-release-notes.pod | 8 ++++---- guestfs-release-notes.txt | 8 ++++---- po-docs/ja.po | 8 ++++---- po-docs/libguestfs-docs.pot | 8 ++++---- po-docs/uk.po | 8 ++++---- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/BUGS b/BUGS index 0a5a151..8a4d76f 100644 --- a/BUGS +++ b/BUGS @@ -306,10 +306,10 @@ Bugs in NEW or ASSIGNED state are open and waiting for someone to fix. virt-builder gives GPG warning message 1100138 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1100138 - some operation cause "lvremove" can not find the object + some operation cause "lvremove" cannot find the object 1100140 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1100140 - some operation cause "lvremove" can not find the object + some operation cause "lvremove" cannot find the object 1100528 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1100528 These APIs also need to add to `guestfish -h` command list @@ -513,7 +513,7 @@ You can help by testing the fixes. Disable libguestfs UML backend mode in RHEL7 1144201 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1144201 - guestfish can not restore terminal's output colour when exit guestfish, if the terminal's background colour is black then it will make a inconvenient + guestfish cannot restore terminal's output colour when exit guestfish, if the terminal's background colour is black then it will make a inconvenient (22 bugs) diff --git a/guestfs-release-notes.pod b/guestfs-release-notes.pod index a956c87..02c293c 100644 --- a/guestfs-release-notes.pod +++ b/guestfs-release-notes.pod @@ -2199,7 +2199,7 @@ the git repository, or the ChangeLog file distributed in the tarball. - 811650 guestfs_last_error not set when qemu fails early during launch - 811649 libguestfs cannot open disk images which are symlinks to files that contain ':' (colon) character - 811117 [RFE][virt-sysprep] net-hwaddr not removed from "ifcfg-*" files on rhel - - 811112 [RFE][virt-sysprep] hostname can not be changed on rhel system + - 811112 [RFE][virt-sysprep] hostname cannot be changed on rhel system - 809361 inspection doesn't recognize Fedora 18 (grub2 + GPT) - 807905 mkfs blocksize option breaks when creating btrfs - 805070 virt-filesystems should show 'parents' of LV and RAID devices @@ -3268,7 +3268,7 @@ the git repository, or the ChangeLog file distributed in the tarball. - 596776 virt-inspector doesn't discover modprobe aliases on RHEL 3 guests - 596763 Updates to Spanish translation - 593292 Updates to Spanish translation - - 592883 can not edit files on images mounted with guestmount cmd + - 592883 cannot edit files on images mounted with guestmount cmd - 592360 Updates to Spanish translation - 591250 virt-tar prints "tar_in: tar subcommand failed on directory" if the archive is compressed or not in the right format - 591155 virt-tar prints "tar_in: tar subcommand failed on directory" if a disk image is not writable @@ -3295,7 +3295,7 @@ the git repository, or the ChangeLog file distributed in the tarball. - 582899 guestfish:sparse is missed from command autocomplete list - 582891 [Feature Request] behavior and return value of guestfish umask cmd should be changed - 582548 [mknod] umask shouldn't take effect when mode is set explicitly - - 582484 some guestfish sub commands can not handle special files properly + - 582484 some guestfish sub commands cannot handle special files properly - 582252 Updates to Spanish translation - 581501 Updates to Spanish translation - 580650 virt-inspector warns "No grub default specified at /usr/lib/perl5/Sys/Guestfs/Lib.pm at [...]" @@ -3303,7 +3303,7 @@ the git repository, or the ChangeLog file distributed in the tarball. - 580246 tar-in command hangs if uploading more than available space - 580016 aug-ls in guestfish does not take augeas variable as argument - 579664 guestfish doesn't report error when there is not enough space for image allocation - - 579608 multiple commands in guestfish can not work for symbol links + - 579608 multiple commands in guestfish cannot work for symbol links - 579155 libguestfs hangs if qemu doesn't start (in null vmchannel mode) - 578407 the prefix '-' in sub-command isn't handled by guestfish in remote control mode - 576879 libguestfs protocol loses synchronization if you 'upload' before mounting disks diff --git a/guestfs-release-notes.txt b/guestfs-release-notes.txt index 3eada81..60c6f14 100644 --- a/guestfs-release-notes.txt +++ b/guestfs-release-notes.txt @@ -2069,7 +2069,7 @@ RELEASE NOTES FOR LIBGUESTFS 1.18 - 811650 guestfs_last_error not set when qemu fails early during launch - 811649 libguestfs cannot open disk images which are symlinks to files that contain ':' (colon) character - 811117 [RFE][virt-sysprep] net-hwaddr not removed from "ifcfg-*" files on rhel - - 811112 [RFE][virt-sysprep] hostname can not be changed on rhel system + - 811112 [RFE][virt-sysprep] hostname cannot be changed on rhel system - 809361 inspection doesn't recognize Fedora 18 (grub2 + GPT) - 807905 mkfs blocksize option breaks when creating btrfs - 805070 virt-filesystems should show 'parents' of LV and RAID devices @@ -3124,7 +3124,7 @@ RELEASE NOTES FOR LIBGUESTFS 1.4 - 596776 virt-inspector doesn't discover modprobe aliases on RHEL 3 guests - 596763 Updates to Spanish translation - 593292 Updates to Spanish translation - - 592883 can not edit files on images mounted with guestmount cmd + - 592883 cannot edit files on images mounted with guestmount cmd - 592360 Updates to Spanish translation - 591250 virt-tar prints "tar_in: tar subcommand failed on directory" if the archive is compressed or not in the right format - 591155 virt-tar prints "tar_in: tar subcommand failed on directory" if a disk image is not writable @@ -3151,7 +3151,7 @@ RELEASE NOTES FOR LIBGUESTFS 1.4 - 582899 guestfish:sparse is missed from command autocomplete list - 582891 [Feature Request] behavior and return value of guestfish umask cmd should be changed - 582548 [mknod] umask shouldn't take effect when mode is set explicitly - - 582484 some guestfish sub commands can not handle special files properly + - 582484 some guestfish sub commands cannot handle special files properly - 582252 Updates to Spanish translation - 581501 Updates to Spanish translation - 580650 virt-inspector warns "No grub default specified at /usr/lib/perl5/Sys/Guestfs/Lib.pm at [...]" @@ -3159,7 +3159,7 @@ RELEASE NOTES FOR LIBGUESTFS 1.4 - 580246 tar-in command hangs if uploading more than available space - 580016 aug-ls in guestfish does not take augeas variable as argument - 579664 guestfish doesn't report error when there is not enough space for image allocation - - 579608 multiple commands in guestfish can not work for symbol links + - 579608 multiple commands in guestfish cannot work for symbol links - 579155 libguestfs hangs if qemu doesn't start (in null vmchannel mode) - 578407 the prefix '-' in sub-command isn't handled by guestfish in remote control mode - 576879 libguestfs protocol loses synchronization if you 'upload' before mounting disks diff --git a/po-docs/ja.po b/po-docs/ja.po index 7eb6610..cd21a2e 100644 --- a/po-docs/ja.po +++ b/po-docs/ja.po @@ -47164,7 +47164,7 @@ msgid "" " - 811650 guestfs_last_error not set when qemu fails early during launch\n" " - 811649 libguestfs cannot open disk images which are symlinks to files that contain ':' (colon) character\n" " - 811117 [RFE][virt-sysprep] net-hwaddr not removed from \"ifcfg-*\" files on rhel\n" -" - 811112 [RFE][virt-sysprep] hostname can not be changed on rhel system\n" +" - 811112 [RFE][virt-sysprep] hostname cannot be changed on rhel system\n" " - 809361 inspection doesn't recognize Fedora 18 (grub2 + GPT)\n" " - 807905 mkfs blocksize option breaks when creating btrfs\n" " - 805070 virt-filesystems should show 'parents' of LV and RAID devices\n" @@ -49814,7 +49814,7 @@ msgid "" " - 596776 virt-inspector doesn't discover modprobe aliases on RHEL 3 guests\n" " - 596763 Updates to Spanish translation\n" " - 593292 Updates to Spanish translation\n" -" - 592883 can not edit files on images mounted with guestmount cmd\n" +" - 592883 cannot edit files on images mounted with guestmount cmd\n" " - 592360 Updates to Spanish translation\n" " - 591250 virt-tar prints \"tar_in: tar subcommand failed on directory\" if the archive is compressed or not in the right format\n" " - 591155 virt-tar prints \"tar_in: tar subcommand failed on directory\" if a disk image is not writable\n" @@ -49841,7 +49841,7 @@ msgid "" " - 582899 guestfish:sparse is missed from command autocomplete list\n" " - 582891 [Feature Request] behavior and return value of guestfish umask cmd should be changed\n" " - 582548 [mknod] umask shouldn't take effect when mode is set explicitly\n" -" - 582484 some guestfish sub commands can not handle special files properly\n" +" - 582484 some guestfish sub commands cannot handle special files properly\n" " - 582252 Updates to Spanish translation\n" " - 581501 Updates to Spanish translation\n" " - 580650 virt-inspector warns \"No grub default specified at /usr/lib/perl5/Sys/Guestfs/Lib.pm at [...]\"\n" @@ -49849,7 +49849,7 @@ msgid "" " - 580246 tar-in command hangs if uploading more than available space\n" " - 580016 aug-ls in guestfish does not take augeas variable as argument\n" " - 579664 guestfish doesn't report error when there is not enough space for image allocation\n" -" - 579608 multiple commands in guestfish can not work for symbol links\n" +" - 579608 multiple commands in guestfish cannot work for symbol links\n" " - 579155 libguestfs hangs if qemu doesn't start (in null vmchannel mode)\n" " - 578407 the prefix '-' in sub-command isn't handled by guestfish in remote control mode\n" " - 576879 libguestfs protocol loses synchronization if you 'upload' before mounting disks\n" diff --git a/po-docs/libguestfs-docs.pot b/po-docs/libguestfs-docs.pot index 47b2dc2..70859ca 100644 --- a/po-docs/libguestfs-docs.pot +++ b/po-docs/libguestfs-docs.pot @@ -42816,7 +42816,7 @@ msgid "" "that contain ':' (colon) character\n" " - 811117 [RFE][virt-sysprep] net-hwaddr not removed from \"ifcfg-*\" files " "on rhel\n" -" - 811112 [RFE][virt-sysprep] hostname can not be changed on rhel system\n" +" - 811112 [RFE][virt-sysprep] hostname cannot be changed on rhel system\n" " - 809361 inspection doesn't recognize Fedora 18 (grub2 + GPT)\n" " - 807905 mkfs blocksize option breaks when creating btrfs\n" " - 805070 virt-filesystems should show 'parents' of LV and RAID devices\n" @@ -45526,7 +45526,7 @@ msgid "" "guests\n" " - 596763 Updates to Spanish translation\n" " - 593292 Updates to Spanish translation\n" -" - 592883 can not edit files on images mounted with guestmount cmd\n" +" - 592883 cannot edit files on images mounted with guestmount cmd\n" " - 592360 Updates to Spanish translation\n" " - 591250 virt-tar prints \"tar_in: tar subcommand failed on directory\" if " "the archive is compressed or not in the right format\n" @@ -45562,7 +45562,7 @@ msgid "" " - 582891 [Feature Request] behavior and return value of guestfish umask cmd " "should be changed\n" " - 582548 [mknod] umask shouldn't take effect when mode is set explicitly\n" -" - 582484 some guestfish sub commands can not handle special files " +" - 582484 some guestfish sub commands cannot handle special files " "properly\n" " - 582252 Updates to Spanish translation\n" " - 581501 Updates to Spanish translation\n" @@ -45573,7 +45573,7 @@ msgid "" " - 580016 aug-ls in guestfish does not take augeas variable as argument\n" " - 579664 guestfish doesn't report error when there is not enough space for " "image allocation\n" -" - 579608 multiple commands in guestfish can not work for symbol links\n" +" - 579608 multiple commands in guestfish cannot work for symbol links\n" " - 579155 libguestfs hangs if qemu doesn't start (in null vmchannel mode)\n" " - 578407 the prefix '-' in sub-command isn't handled by guestfish in remote " "control mode\n" diff --git a/po-docs/uk.po b/po-docs/uk.po index a079dff..1f4aa13 100644 --- a/po-docs/uk.po +++ b/po-docs/uk.po @@ -46084,7 +46084,7 @@ msgid "" " - 811650 guestfs_last_error not set when qemu fails early during launch\n" " - 811649 libguestfs cannot open disk images which are symlinks to files that contain ':' (colon) character\n" " - 811117 [RFE][virt-sysprep] net-hwaddr not removed from \"ifcfg-*\" files on rhel\n" -" - 811112 [RFE][virt-sysprep] hostname can not be changed on rhel system\n" +" - 811112 [RFE][virt-sysprep] hostname cannot be changed on rhel system\n" " - 809361 inspection doesn't recognize Fedora 18 (grub2 + GPT)\n" " - 807905 mkfs blocksize option breaks when creating btrfs\n" " - 805070 virt-filesystems should show 'parents' of LV and RAID devices\n" @@ -48784,7 +48784,7 @@ msgid "" " - 596776 virt-inspector doesn't discover modprobe aliases on RHEL 3 guests\n" " - 596763 Updates to Spanish translation\n" " - 593292 Updates to Spanish translation\n" -" - 592883 can not edit files on images mounted with guestmount cmd\n" +" - 592883 cannot edit files on images mounted with guestmount cmd\n" " - 592360 Updates to Spanish translation\n" " - 591250 virt-tar prints \"tar_in: tar subcommand failed on directory\" if the archive is compressed or not in the right format\n" " - 591155 virt-tar prints \"tar_in: tar subcommand failed on directory\" if a disk image is not writable\n" @@ -48811,7 +48811,7 @@ msgid "" " - 582899 guestfish:sparse is missed from command autocomplete list\n" " - 582891 [Feature Request] behavior and return value of guestfish umask cmd should be changed\n" " - 582548 [mknod] umask shouldn't take effect when mode is set explicitly\n" -" - 582484 some guestfish sub commands can not handle special files properly\n" +" - 582484 some guestfish sub commands cannot handle special files properly\n" " - 582252 Updates to Spanish translation\n" " - 581501 Updates to Spanish translation\n" " - 580650 virt-inspector warns \"No grub default specified at /usr/lib/perl5/Sys/Guestfs/Lib.pm at [...]\"\n" @@ -48819,7 +48819,7 @@ msgid "" " - 580246 tar-in command hangs if uploading more than available space\n" " - 580016 aug-ls in guestfish does not take augeas variable as argument\n" " - 579664 guestfish doesn't report error when there is not enough space for image allocation\n" -" - 579608 multiple commands in guestfish can not work for symbol links\n" +" - 579608 multiple commands in guestfish cannot work for symbol links\n" " - 579155 libguestfs hangs if qemu doesn't start (in null vmchannel mode)\n" " - 578407 the prefix '-' in sub-command isn't handled by guestfish in remote control mode\n" " - 576879 libguestfs protocol loses synchronization if you 'upload' before mounting disks\n" -- 1.9.3

Signed-off-by: Hu Tao <hutao@cn.fujitsu.com> --- python/guestfs-py-byhand.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/python/guestfs-py-byhand.c b/python/guestfs-py-byhand.c index b071f81..5d2d858 100644 --- a/python/guestfs-py-byhand.c +++ b/python/guestfs-py-byhand.c @@ -24,11 +24,11 @@ /* This has to be included first, else definitions conflict with * glibc header files. Python is broken. */ +#include <config.h> + #define PY_SSIZE_T_CLEAN 1 #include <Python.h> -#include <config.h> - #include <stdio.h> #include <stdlib.h> -- 1.9.3

Signed-off-by: Hu Tao <hutao@cn.fujitsu.com> --- builder/website/debian.preseed | 2 +- builder/website/index | 120 +++++----- builder/website/index.asc | 120 +++++----- customize/customize_run.mli | 2 +- daemon/mount.c | 2 +- fish/test-file-attrs.sh | 10 +- generator/c.ml | 2 +- guestfs-release-notes.txt | 520 ++++++++++++++++++++--------------------- podwrapper.pl.in | 6 +- tools/virt-win-reg | 2 +- v2v/test-v2v-print-source.sh | 4 +- 11 files changed, 395 insertions(+), 395 deletions(-) diff --git a/builder/website/debian.preseed b/builder/website/debian.preseed index faa4430..d3158a5 100644 --- a/builder/website/debian.preseed +++ b/builder/website/debian.preseed @@ -227,7 +227,7 @@ d-i partman/confirm_nooverwrite boolean true # so this will only work if the disks are the same size. #d-i partman-auto/disk string /dev/sda /dev/sdb -# Next you need to specify the physical partitions that will be used. +# Next you need to specify the physical partitions that will be used. #d-i partman-auto/expert_recipe string \ # multiraid :: \ # 1000 5000 4000 raid \ diff --git a/builder/website/index b/builder/website/index index 5645ddf..aea33aa 100644 --- a/builder/website/index +++ b/builder/website/index @@ -10,14 +10,14 @@ size=6442450944 compressed_size=197139324 expand=/dev/sda3 notes=CentOS 6.5 - + This CentOS image contains only unmodified @Core group packages. - + It is thus very minimal. The kickstart and install script can be found in the libguestfs source tree: - + builder/website/centos.sh - + Note that `virt-builder centos-6' will always install the latest 6.x release. @@ -32,12 +32,12 @@ size=6442450944 compressed_size=213203844 expand=/dev/sda3 notes=CentOS 7.0 - + This CentOS image contains only unmodified @Core group packages. - + It is thus very minimal. The kickstart and install script can be found in the libguestfs source tree: - + builder/website/centos.sh [cirros-0.3.1] @@ -50,13 +50,13 @@ size=41126400 compressed_size=11419004 expand=/dev/sda1 notes=CirrOS 0.3.1 - + CirrOS is a commonly used test image, ideal because it is very small and boots into a minimally usable Linux system. - + Note this is not a real Linux distribution, and several virt-builder features such as installing packages will not (and cannot) work. - + This CirrOS image comes from https://launchpad.net/cirros [debian-6] @@ -71,24 +71,24 @@ size=4294967296 compressed_size=139615908 expand=/dev/sda1 notes=Debian 6 (Squeeze). - + This is a default Debian install. - + The preseed and virt-install scripts that produced this image can be found in the libguestfs source tree: - + builder/website/debian.preseed builder/website/debian.sh - + This image is so very minimal that it only includes an ssh server and no virtual consoles. To enable virtual consoles use this virt-builder option: - + virt-builder debian-6 \ --edit '/etc/inittab: s,^#([1-9].*respawn.*/sbin/getty.*),$1,' - + This image does not contain SSH host keys. To regenerate them use: - + --firstboot-command "dpkg-reconfigure openssh-server" [debian-7] @@ -103,24 +103,24 @@ size=4294967296 compressed_size=150734028 expand=/dev/sda1 notes=Debian 7 (Wheezy). - + This is a default Debian install. - + The preseed and virt-install scripts that produced this image can be found in the libguestfs source tree: - + builder/website/debian.preseed builder/website/debian.sh - + This image is so very minimal that it only includes an ssh server and no virtual consoles. To enable virtual consoles use this virt-builder option: - + virt-builder debian-7 \ --edit '/etc/inittab: s,^#([1-9].*respawn.*/sbin/getty.*),$1,' - + This image does not contain SSH host keys. To regenerate them use: - + --firstboot-command "dpkg-reconfigure openssh-server" [fedora-18] @@ -134,14 +134,14 @@ size=6442450944 compressed_size=148947524 expand=/dev/sda3 notes=Fedora 18. - + This Fedora image contains only unmodified @Core group packages. - + It is thus very minimal. The kickstart and install script can be found in the libguestfs source tree: - + builder/website/fedora.sh - + Fedora and the Infinity design logo are trademarks of Red Hat, Inc. Source and further information is available from http://fedoraproject.org/ @@ -157,14 +157,14 @@ size=4294967296 compressed_size=169531628 expand=/dev/sda3 notes=Fedora 19. - + This Fedora image contains only unmodified @Core group packages. - + It is thus very minimal. The kickstart and install script can be found in the libguestfs source tree: - + builder/website/fedora.sh - + Fedora and the Infinity design logo are trademarks of Red Hat, Inc. Source and further information is available from http://fedoraproject.org/ @@ -180,14 +180,14 @@ size=4294967296 compressed_size=181164220 expand=/dev/sda3 notes=Fedora 20. - + This Fedora image contains only unmodified @Core group packages. - + It is thus very minimal. The kickstart and install script can be found in the libguestfs source tree: - + builder/website/fedora.sh - + Fedora and the Infinity design logo are trademarks of Red Hat, Inc. Source and further information is available from http://fedoraproject.org/ @@ -201,14 +201,14 @@ size=6442450944 compressed_size=210202084 expand=/dev/sda3 notes=Red Hat Enterprise Linux® 7 Release Candidate - + This image contains only unmodified @Core group packages. - + It is thus very minimal. The kickstart and install script can be found in the libguestfs source tree: - + builder/website/rhel.sh - + Red Hat Enterprise Linux is a trademark of Red Hat, Inc. Source and further information is available from ftp://ftp.redhat.com @@ -224,14 +224,14 @@ size=6442450944 compressed_size=191667880 expand=/dev/sda3 notes=Scientific Linux 6.5 - + This Scientific Linux image contains only unmodified @Core group packages. - + It is thus very minimal. The kickstart and install script can be found in the libguestfs source tree: - + builder/website/scientificlinux.sh - + Note that `virt-builder scientificlinux-6' will always install the latest 6.x release. @@ -246,18 +246,18 @@ size=4294967296 compressed_size=149728112 expand=/dev/sda1 notes=Ubuntu 10.04 (Lucid). - + This is a minimal Ubuntu 10.04 (Lucid) install. - + Only the openssh-server package is selected in tasksel. The preseed and virt-install scripts that produced this image can be found in the libguestfs source tree: - + builder/website/ubuntu.preseed builder/website/ubuntu.sh - + This image does not contain SSH host keys. To regenerate them use: - + --firstboot-command "dpkg-reconfigure openssh-server" [ubuntu-12.04] @@ -271,18 +271,18 @@ size=4294967296 compressed_size=168593316 expand=/dev/sda1 notes=Ubuntu 12.04 (Precise). - + This is a minimal Ubuntu 12.04 (Precise) install. - + Only the openssh-server package is selected in tasksel. The preseed and virt-install scripts that produced this image can be found in the libguestfs source tree: - + builder/website/ubuntu.preseed builder/website/ubuntu.sh - + This image does not contain SSH host keys. To regenerate them use: - + --firstboot-command "dpkg-reconfigure openssh-server" [ubuntu-14.04] @@ -296,20 +296,20 @@ size=4294967296 compressed_size=206250764 expand=/dev/sda1 notes=Ubuntu 14.04 (Trusty). - + This is a minimal Ubuntu 14.04 (Trusty) install. - + Only the openssh-server package is selected in tasksel. The preseed and virt-install scripts that produced this image can be found in the libguestfs source tree: - + builder/website/ubuntu.preseed builder/website/ubuntu.sh - + This image does not contain SSH host keys. To regenerate them use: - + --firstboot-command "dpkg-reconfigure openssh-server" - + IMPORTANT NOTE: It seems to be impossible to create an Ubuntu >= 14.04 image using preseed without creating a user account. Therefore this image contains a user account 'builder'. I have disabled it, so that diff --git a/builder/website/index.asc b/builder/website/index.asc index 0452e8b..e33f70c 100644 --- a/builder/website/index.asc +++ b/builder/website/index.asc @@ -13,14 +13,14 @@ size=6442450944 compressed_size=197139324 expand=/dev/sda3 notes=CentOS 6.5 - + This CentOS image contains only unmodified @Core group packages. - + It is thus very minimal. The kickstart and install script can be found in the libguestfs source tree: - + builder/website/centos.sh - + Note that `virt-builder centos-6' will always install the latest 6.x release. @@ -35,12 +35,12 @@ size=6442450944 compressed_size=213203844 expand=/dev/sda3 notes=CentOS 7.0 - + This CentOS image contains only unmodified @Core group packages. - + It is thus very minimal. The kickstart and install script can be found in the libguestfs source tree: - + builder/website/centos.sh [cirros-0.3.1] @@ -53,13 +53,13 @@ size=41126400 compressed_size=11419004 expand=/dev/sda1 notes=CirrOS 0.3.1 - + CirrOS is a commonly used test image, ideal because it is very small and boots into a minimally usable Linux system. - + Note this is not a real Linux distribution, and several virt-builder features such as installing packages will not (and cannot) work. - + This CirrOS image comes from https://launchpad.net/cirros [debian-6] @@ -74,24 +74,24 @@ size=4294967296 compressed_size=139615908 expand=/dev/sda1 notes=Debian 6 (Squeeze). - + This is a default Debian install. - + The preseed and virt-install scripts that produced this image can be found in the libguestfs source tree: - + builder/website/debian.preseed builder/website/debian.sh - + This image is so very minimal that it only includes an ssh server and no virtual consoles. To enable virtual consoles use this virt-builder option: - + virt-builder debian-6 \ --edit '/etc/inittab: s,^#([1-9].*respawn.*/sbin/getty.*),$1,' - + This image does not contain SSH host keys. To regenerate them use: - + --firstboot-command "dpkg-reconfigure openssh-server" [debian-7] @@ -106,24 +106,24 @@ size=4294967296 compressed_size=150734028 expand=/dev/sda1 notes=Debian 7 (Wheezy). - + This is a default Debian install. - + The preseed and virt-install scripts that produced this image can be found in the libguestfs source tree: - + builder/website/debian.preseed builder/website/debian.sh - + This image is so very minimal that it only includes an ssh server and no virtual consoles. To enable virtual consoles use this virt-builder option: - + virt-builder debian-7 \ --edit '/etc/inittab: s,^#([1-9].*respawn.*/sbin/getty.*),$1,' - + This image does not contain SSH host keys. To regenerate them use: - + --firstboot-command "dpkg-reconfigure openssh-server" [fedora-18] @@ -137,14 +137,14 @@ size=6442450944 compressed_size=148947524 expand=/dev/sda3 notes=Fedora 18. - + This Fedora image contains only unmodified @Core group packages. - + It is thus very minimal. The kickstart and install script can be found in the libguestfs source tree: - + builder/website/fedora.sh - + Fedora and the Infinity design logo are trademarks of Red Hat, Inc. Source and further information is available from http://fedoraproject.org/ @@ -160,14 +160,14 @@ size=4294967296 compressed_size=169531628 expand=/dev/sda3 notes=Fedora 19. - + This Fedora image contains only unmodified @Core group packages. - + It is thus very minimal. The kickstart and install script can be found in the libguestfs source tree: - + builder/website/fedora.sh - + Fedora and the Infinity design logo are trademarks of Red Hat, Inc. Source and further information is available from http://fedoraproject.org/ @@ -183,14 +183,14 @@ size=4294967296 compressed_size=181164220 expand=/dev/sda3 notes=Fedora 20. - + This Fedora image contains only unmodified @Core group packages. - + It is thus very minimal. The kickstart and install script can be found in the libguestfs source tree: - + builder/website/fedora.sh - + Fedora and the Infinity design logo are trademarks of Red Hat, Inc. Source and further information is available from http://fedoraproject.org/ @@ -204,14 +204,14 @@ size=6442450944 compressed_size=210202084 expand=/dev/sda3 notes=Red Hat Enterprise Linux® 7 Release Candidate - + This image contains only unmodified @Core group packages. - + It is thus very minimal. The kickstart and install script can be found in the libguestfs source tree: - + builder/website/rhel.sh - + Red Hat Enterprise Linux is a trademark of Red Hat, Inc. Source and further information is available from ftp://ftp.redhat.com @@ -227,14 +227,14 @@ size=6442450944 compressed_size=191667880 expand=/dev/sda3 notes=Scientific Linux 6.5 - + This Scientific Linux image contains only unmodified @Core group packages. - + It is thus very minimal. The kickstart and install script can be found in the libguestfs source tree: - + builder/website/scientificlinux.sh - + Note that `virt-builder scientificlinux-6' will always install the latest 6.x release. @@ -249,18 +249,18 @@ size=4294967296 compressed_size=149728112 expand=/dev/sda1 notes=Ubuntu 10.04 (Lucid). - + This is a minimal Ubuntu 10.04 (Lucid) install. - + Only the openssh-server package is selected in tasksel. The preseed and virt-install scripts that produced this image can be found in the libguestfs source tree: - + builder/website/ubuntu.preseed builder/website/ubuntu.sh - + This image does not contain SSH host keys. To regenerate them use: - + --firstboot-command "dpkg-reconfigure openssh-server" [ubuntu-12.04] @@ -274,18 +274,18 @@ size=4294967296 compressed_size=168593316 expand=/dev/sda1 notes=Ubuntu 12.04 (Precise). - + This is a minimal Ubuntu 12.04 (Precise) install. - + Only the openssh-server package is selected in tasksel. The preseed and virt-install scripts that produced this image can be found in the libguestfs source tree: - + builder/website/ubuntu.preseed builder/website/ubuntu.sh - + This image does not contain SSH host keys. To regenerate them use: - + --firstboot-command "dpkg-reconfigure openssh-server" [ubuntu-14.04] @@ -299,20 +299,20 @@ size=4294967296 compressed_size=206250764 expand=/dev/sda1 notes=Ubuntu 14.04 (Trusty). - + This is a minimal Ubuntu 14.04 (Trusty) install. - + Only the openssh-server package is selected in tasksel. The preseed and virt-install scripts that produced this image can be found in the libguestfs source tree: - + builder/website/ubuntu.preseed builder/website/ubuntu.sh - + This image does not contain SSH host keys. To regenerate them use: - + --firstboot-command "dpkg-reconfigure openssh-server" - + IMPORTANT NOTE: It seems to be impossible to create an Ubuntu >= 14.04 image using preseed without creating a user account. Therefore this image contains a user account 'builder'. I have disabled it, so that diff --git a/customize/customize_run.mli b/customize/customize_run.mli index 0b375eb..acfcccf 100644 --- a/customize/customize_run.mli +++ b/customize/customize_run.mli @@ -18,7 +18,7 @@ (* After command line arguments have been parsed, call this function * to perform the operations on a guest handle. - * + * * Note that inspection must have been done on the handle, and * filesystems must be mounted up. *) diff --git a/daemon/mount.c b/daemon/mount.c index c5b7d89..9647b35 100644 --- a/daemon/mount.c +++ b/daemon/mount.c @@ -166,7 +166,7 @@ mount_vfs_nochroot (const char *options, const char *vfstype, return -1; } } - + else { if (asprintf (&options_plus, "subvol=%s", mountable->volume) == -1) { reply_with_perror ("asprintf"); diff --git a/fish/test-file-attrs.sh b/fish/test-file-attrs.sh index 55d602c..bd0c5fa 100755 --- a/fish/test-file-attrs.sh +++ b/fish/test-file-attrs.sh @@ -85,7 +85,7 @@ uid: 10 gid: 11 ----- [0] = { - attrname: + attrname: attrval: 2\x00 } [1] = { @@ -97,7 +97,7 @@ gid: 11 attrval: secondtest } [3] = { - attrname: + attrname: attrval: 1\x00 } [4] = { @@ -105,7 +105,7 @@ gid: 11 attrval: another } [0] = { - attrname: + attrname: attrval: 2\x00 } [1] = { @@ -117,7 +117,7 @@ gid: 11 attrval: secondtest } [3] = { - attrname: + attrname: attrval: 3\x00 } [4] = { @@ -137,7 +137,7 @@ mode: 32841 uid: 10 gid: 11 [0] = { - attrname: + attrname: attrval: 2\x00 } [1] = { diff --git a/generator/c.ml b/generator/c.ml index 1fa05ab..135be91 100644 --- a/generator/c.ml +++ b/generator/c.ml @@ -1734,7 +1734,7 @@ and generate_client_actions hash () = ) else ( List.iter ( function - | Pathname n | Device n | Mountable n | Dev_or_Path n + | Pathname n | Device n | Mountable n | Dev_or_Path n | Mountable_or_Path n | String n | Key n | GUID n -> pr " args.%s = (char *) %s;\n" n n diff --git a/guestfs-release-notes.txt b/guestfs-release-notes.txt index 60c6f14..818e8a5 100644 --- a/guestfs-release-notes.txt +++ b/guestfs-release-notes.txt @@ -1874,55 +1874,55 @@ RELEASE NOTES FOR LIBGUESTFS 1.18 - virt-sysprep has been rewritten and expanded (thanks Wanlong Gao) http://libguestfs.org/virt-sysprep.1.html - + - virt-sparsify --zero is a new option that zeroes the named partition or filesystem - + - virt-sparsify can now safely sparsify Linux swap partitions - + - virt-sparsify fixed so it cleans up after ^C http://libguestfs.org/virt-sparsify.1.html - + - a new tool 'libguestfs-make-fixed-appliance' is provided to build fixed appliances that can be copied to other machines that don't have febootstrap support http://libguestfs.org/libguestfs-make-fixed-appliance.1.html - + - virt-filesystems now displays the parents (containers) of MD devices and volume groups - + - virt-alignment-scan, run with no args, displays alignment information for all libvirt domains - + - virt-df and virt-alignment-scan will display information from all guests even when a disk is inaccessible - + - virt-rescue new --scratch option to make scratch disks https://rwmj.wordpress.com/2012/04/26/virt-rescue-scratch/#content - + - virt-make-fs can now be used to create btrfs - + - virt-edit preserves permissions, UID, GID and SELinux context when editing files - + - guestfish passes the close event over stdout and remote correctly - + - guestfish new '--pipe-error' option lets you detect errors in pipe commands - + - guestfish globs now expand device names - + - comma and colon characters in filenames now handled correctly by all virt tools inspection - added support for Fedora 17+ - + - added support for FreeDOS - + - added support for Buildroot and Cirros - + - inspection is now compatible with Windows guests that have been sysprepped (thanks Grant Williamson). @@ -1930,27 +1930,27 @@ RELEASE NOTES FOR LIBGUESTFS 1.18 - broad support for btrfs added, including adding multiple devices, fsck, snapshots (thanks Wanlong Gao) - + - the new 'mount-local' API brings FUSE support directly into the core libguestfs API https://rwmj.wordpress.com/2012/05/14/tip-using-mount-local-api-from-c/#cont... - + - new man page: guestfs-performance(1), which contains performance tuning tips http://libguestfs.org/guestfs-performance.1.html - + - new man page: guestfs-faq(1), Frequently Asked Questions http://libguestfs.org/guestfs-faq.1.html - + - ENOTSUP (from guestfs_last_errno) is now returned for APIs that are not supported examples - 'copy_over' example showing how to copy between two handles - + - 'display_icon' program displays the icon associated with a guest - + - 'mount_local.c' example shows how to use the mount-local API Security @@ -1993,71 +1993,71 @@ RELEASE NOTES FOR LIBGUESTFS 1.18 the official Debian packages made by Hilko Bengen. http://people.debian.org/~bengen/libguestfs/ http://packages.debian.org/search?keywords=libguestfs - + - O_CLOEXEC / SOCK_CLOEXEC is now used for almost all file descriptors that the library opens. - + - posix_fadvise is called when sequentially reading or writing large files. - + - close all file descriptors and remove all signal handlers in the recovery process - + - multiple gcc warnings and Coverity bugs have been fixed; many strict-overflow bugs have also been fixed - + - use ./configure --enable-valgrind-daemon to use valgrind on the daemon; many errors have been fixed - + - use ./configure --with-qemu-options to pass extra options to qemu - + - the daemon now has a growable strings buffer type (DECLARE_STRINGSBUF) - + - the <guestfs.h> header file works with C++ and we have a regression test for this - + - multiple APIs which should only be called in the CONFIG state now give an error if they are not - + - .gitignore fixed to use absolute paths - + - gobject bindings have been expanded, including mapping libguestfs events to gobject signals (thanks Matt Booth) - + - gobject documentation is generated properly (thanks Matt Booth) - + - gobject header files now live in a subdirectory - + - CompareWithString test in the generator now works - + - FUInt32, FUInt64 struct field types now use the correct XDR type - + - OCaml tests are now run on bytecode and native code. - + - java -Xlint:all is used, and all warnings have been fixed - + - bmptopng, wrestool (etc) missing or failure no longer prints warning messages - + - ruby: Use RbConfig instead of Config. - + - PYTHONPATH is set by the ./run script. - + - appliance building is now thread-safe. - + - appliance now uses 'ip' instead of 'ifconfig' and 'netstat' commands - + - several fixes to make parallel builds work properly - + - guestfish --listen now cleans up properly - + - the BUSY state has been removed - + - gettextize has been removed, replaced by a simple Makefile.am - + - gettext support now covers virt-resize, virt-sparsify and virt-sysprep - + - better support for the arm architecture Bugs fixed @@ -2110,18 +2110,18 @@ RELEASE NOTES FOR LIBGUESTFS 1.16 - allow XFS filesystems to be created over an existing filesystem (Wanlong Gao) - + - the (unspecified) default alignment for part-disk has been changed to 64K for better support of high-end network-attached storage - + - new guestfs-testing(1) man page - + - list-filesystems returns MD devices containing filesystems (Matthew Booth) - + - support for GCC >= 4.7 (Jim Meyering) - + - check user does not add the same drive twice (Wanlong Gao). language bindings @@ -2130,52 +2130,52 @@ RELEASE NOTES FOR LIBGUESTFS 1.16 Introspection. You can now use libguestfs from Javascript. Please note these are not stable and final in this release. (Matthew Booth). - + - support for Ruby >= 1.9 - + - Ruby bindings can be disabled individually (Hilko Bengen) - + - support for Python 2.6, 3.x (Richard Jones, Hilko Bengen) - + - support for PHP >= 5.4 - + - new %guestfs_introspection hash is available in Perl bindings so you can query which optional arguments are available inspection - guests with MD devices can be inspected (Matthew Booth) - + - support for GNU/Hurd guests guestfish - libguestfs events (such as progress bar events and log messages) can be trapped and processed by user-defined shell scripts. - + - MD devices are tab-completed (Matthew Booth) virt tools - New tool virt-format for erasing and making blank disks - + - virt-sparsify new --compress and -o options to allow for compressed and different format output - + - virt-sparsify can now detect and sparsify .vdi files - + - virt-sysprep no longer requires xmlstarlet; a new virt-inspector --xpath option has been added to replace this functionality - + - virt-rescue has a new --suggest option which suggests mount commands for the guest - + - virt-resize no longer requires OCaml pcre library libguestfs live - daemon will no longer try to edit your live /etc/lvm configuration - + - fix a potential security problem with predictable /tmp names (Steve Kemp) Security @@ -2197,31 +2197,31 @@ RELEASE NOTES FOR LIBGUESTFS 1.16 Internals Git hosting has moved to http://github.com/libguestfs - + The various test directories have been rearranged logically, and now all appear under 'tests/'. - + There is a 'make extra-tests' rule which runs ordinary tests and additional tests, using valgrind to check for memory problems. - + Multiple memory leaks and other problems found by valgrind and fixed. - + Support for optional arguments in the generator has been rewritten to provide more features and safety (Matthew Booth). - + With gcc -fvisibility=hidden is used for internal symbols, avoiding call indirection via the PLT. - + RHashtable functions can be tested in the generator. - + ADD_ARG macro in daemon allows arg lists to be constructed without risk of stack smashing. - + Fix generation of OCaml functions that have more than 10 arguments. - + psmisc has been added to the appliance, allowing use of 'fuser', 'killall' and 'pstree' for debugging. - + bindtests now cover RBufferOut and optional arguments (Matthew Booth). Bugs fixed @@ -2245,22 +2245,22 @@ RELEASE NOTES FOR LIBGUESTFS 1.14 New features Erlang bindings. - + virt-alignment-scan is a new tool to check the alignment of partitions within virtual machines or disk images. - + virt-sparsify is a new tool to make virtual machine disk images sparse. - + virt-sysprep is a new tool to make cloning guests from a template simpler. guestfish - New commands setenv, unsetenv, to set environment variables. - + - The input file and line number is printed in error messages. - + - guestfish progress bars are now a "mini-library" used by other tools too. @@ -2285,14 +2285,14 @@ RELEASE NOTES FOR LIBGUESTFS 1.14 - virt-resize can now work with guests using extended and logical partitions, in particular Ubuntu guests. - + - virt-resize can now align the first partition of Windows guests, improving performance. The new virt-resize --align-first option controls this behaviour. - + - The virt-resize --machine-readable flag makes it possible to use virt-resize from other programs. - + - Partitions are now aligned to 128 sectors (usually 64K) by default. This improves efficiency on high-end storage. The new virt-resize --alignment option allows the alignment to be @@ -2306,29 +2306,29 @@ RELEASE NOTES FOR LIBGUESTFS 1.14 library - non-printing characters are escaped correctly in debug output. - + - GUESTFS_EVENT_ENTER is a new event type generated whenever a libguestfs function is called. - + - the library contains systemtap/DTrace probes. - + - the library can now be compiled without hivex (RHBZ#723474). inspection - Improve detection of Windows disks. - + - Adds support for: ttylinux - a minimal Linux Mageia (thanks Michael Scherer) OpenSUSE and zypper (thanks Michael Scherer, Vincent Untz) Ubuntu logos (thanks Michael Scherer) NetBSD and pkgsrc (thanks Michael Scherer) - + - Handle some guest types that use /dev/root in /etc/fstab. - + - Fix handling of guests with > 26 disks (thanks Matthew Booth) - + - Add support for guests with HP Smart Array disks (thanks Matthew Booth) febootstrap @@ -2339,7 +2339,7 @@ RELEASE NOTES FOR LIBGUESTFS 1.14 misc - ArchLinux support now working with Linux 3.0 (thanks Erik Nolte) - + - libvirt disks marked <readonly/> are now added readonly when using the virt-tools '-d' option. @@ -2352,9 +2352,9 @@ RELEASE NOTES FOR LIBGUESTFS 1.14 compress-out, compress-device-out, copy-device-to-device, copy-device-to-file, copy-file-to-device, copy-file-to-file, get-smp, part-to-partnum, set-smp. - + The mount API no longer implicitly adds -o sync,noatime options. - + add-domain has a new 'readonlydisk' optional parameter to control how <readonly/> disks are handled. @@ -2362,23 +2362,23 @@ RELEASE NOTES FOR LIBGUESTFS 1.14 - Coverity was run on the source and more bugs were identified and fixed. - + - PCRE library is now required to build libguestfs. - + - APIC is now the default for the appliance. You can also enable SMP support in the appliance. - + - OCaml bindings now correctly acquire GC lock during callbacks. - + - Out of tree builds should now work correctly (thanks Hilko Bengen). - + - ./configure --with-extra="..." can be used by packagers to set the extra version string. - + - zero, zero-device APIs: if the blocks already contain zeroes, don't write zeroes, so that we don't unnecessarily make the underlying storage non-sparse. - + - is-zero, is-zero-device APIs: optimize these so zero detection is faster. @@ -2415,33 +2415,33 @@ RELEASE NOTES FOR LIBGUESTFS 1.12 - guestfish strings can use escapes, eg. ><fs> write /foo "line 1\nline 2\n" - + - guestfish write-append command can be used to append to files. - + - Long-running file uploads and downloads can be cancelled through the API or by hitting ^C in guestfish. - + - New guestfish "display" command for displaying graphical files inside guests. - + - In guestfish, tab completion now works on /dev/mapper devices. virt-inspector - Inspection API can get an icon or logo for certain guests. - + - virt-inspector includes the logo and hostname for certain guests. - + - virt-inspector can now get the version and release numbers for RPM packages. - + - CentOS and Scientific Linux are now treated as separate distros by the inspection API. virt-resize - virt-resize can now handle btrfs. - + - New virt-resize --ntfsresize-force option allows Windows VMs to be resized multiple times. @@ -2451,43 +2451,43 @@ RELEASE NOTES FOR LIBGUESTFS 1.12 virt-inspector, virt-ls and virt-rescue now allow you to use "-d UUID" option to specify a guest by UUID. This makes them more robust to use from other programs. - + - virt-ls -lR option allows complex file iteration and guest analysis. - + - virt-win-reg supports HKEY_USERS\<SID> and HKEY_USERS\<username>. - + - virt-win-reg new option --unsafe-printable-strings allows printable strings to be displayed in the output (unsafely: read the documentation before using). - + - virt-edit has been rewritten in C. API and language bindings - Java is now completely supported. See http://libguestfs.org/guestfs-java.3.html - + - JRuby is supported via the Java bindings. - + - guestfs_close now appears in trace messages. - + - Python binding adds explicit g.close() method. - + - Python programs can now use the new event API. - + - Python GIL is released during libguestfs calls, allowing multithreaded Python programs to work properly. - + - 9pfs (Plan 9 filesystems exported from the host) are now supported. - + - Add -DGUESTFS_WARN_DEPRECATED=1 to warn about use of deprecated API functions in C programs. - + - New manual page guestfs-recipes(1) with recipes. - + - mkfs-opts can now set inode size and sector size on created filesystems (thanks Nikita Menkovich). - + - guestfs_last_errno is now accessible from OCaml (as g#last_errno ()). Security @@ -2506,22 +2506,22 @@ RELEASE NOTES FOR LIBGUESTFS 1.12 - Coverity (a static analysis tool) was run across the codebase and many fixes were made. - + - Generator can handle functions that return RBufferOut and have optional arguments. - + - Compatible with Perl 5.14. - + - Compatible with gcc 4.6. - + - Perform safety checks on QEMU. - + - C API tests can now fully test calls that have optional arguments. - + - Use ./configure --enable-install-daemon to install /usr/sbin/guestfsd. - + - po-docs directory now covers all man pages. - + - stderr from qemu process is now captured by the event subsystem. Bugs fixed @@ -2546,83 +2546,83 @@ Release notes for libguestfs 1.10.0 See the 'guestfish --live' and 'guestmount --live' options, and (for the low-level interface) the new APIs set-attach-method and get-attach-method. - + - New virt tools: virt-copy-in, virt-copy-out, virt-tar-in, virt-tar-out. - + - libguestfs can get the drive letter mappings for Windows guests. - + - virt-inspector displays drive letter mappings for Windows guests. - + - Drive letters can now be used in virt-edit and guestfish programs when operating on Windows guests. - + - virt-resize now works on 32 bit hosts. - + - You can now inspect the install disks and live CDs of many different operating systems. - + - guestfish <! cmd which executes a shell cmd and inlines the result. - + - guestfish, guestmount, virt-rescue now all support --ro and --rw options, and the default for this can be chosen via a configuration file (/etc/libguestfs-tools.conf). - + - New event API allows more than one callback to be registered for each event, makes it possible to call the API from other languages, and allows nearly all log, debug and trace messages to be rerouted from stderr. - + - Greater FHS compliance for temporary files, including using /var/tmp for large cached files that should survive reboot (instead of /tmp). - + - guestfish, guestmount -m option allows mount options to be passed through to the underlying filesystem. - + - mkfs-opts allows filesystem features to be specified. - + - More intelligent handling of mountpoints, allowing mkmountpoint, mount and umount-all commands to work together properly. - + - Trace messages are prefixed with a distinct string, allowing them to be easily 'grepped' out from debug output. - + - guestfs_launch (guestfish 'run' command) now produces progress messages (a guestfish progress bar) if it takes longer than 5 seconds to run. - + - Several long-running commands where we are unable to estimate time to completion generate "pulse mode" progress events. Progress bar in guestfish has been updated to display these. - + - Publish new example code in: C, Perl, Python, OCaml, Ruby. - + - New virt-dhcp-address example program. - + - The Java and Ruby bindings have been improved greatly. - + - Perl includes a way to get the errno of the last error. - + - Python bindings now compatible with rpyc (thanks Erez Shinan). - + - Transifex is now being used to manage translations. http://www.transifex.net/projects/p/libguestfs/ - + - Inspection now supports Red Hat Desktop, Slackware distributions. - + - Inspection no longer fails for Windows guests that have two or more disks. - + - Inspection can now tell the difference between Windows 2008 Server and Windows 7. - + - Inspection can detect 32 bit applications installed in 64 bit Windows, running on the WOW64 emulator. - + - A series of protocol fixes has fixed the old bug RHBZ#576879 which used to cause errors during the upload command to lose protocol synchronization. - + - New logo! Security @@ -2640,15 +2640,15 @@ Release notes for libguestfs 1.10.0 - The 'HACKING' file is obsolete. The contents have been moved into a section of the guestfs(3) manual page. - + - libguestfs-test-tool simplified. It no longer needs the static binary or tries to construct an ISO. - + - rpcgen-generated files are compiled with -fno-strict-aliasing which should be safer (thanks Matt Booth). - + - virt-resize was rewritten in OCaml. - + - guestfish and other tools tested with valgrind; some memory leaks were fixed. @@ -2683,78 +2683,78 @@ Release notes for libguestfs 1.8 New features - Support and packages for Debian and Ubuntu. - + - Daily builds from git repository on Debian and Ubuntu to reduce risk of regressions. - + - Port to ArchLinux 'pacman' (thanks Thomas S Hatch). - + - The following tools have been rewritten in C (originally in Perl): - + . virt-cat . virt-df . virt-inspector . virt-ls . virt-rescue - + - Some C tools support encrypted guests automatically. This is supported in: guestfish, guestmount, virt-cat, virt-inspector, virt-ls. - + - New tool virt-filesystems (in C) which is a replacement for virt-list-filesystems and virt-list-partitions, and has a superset of the functionality of those tools. - + - guestfish, guestmount and the C tools use unified command line option parsing, so they support many common options such as '-a disk.img', '-d libvirt-domain', '-x', '-v'. The old command line option parsing is preserved for compatibility in scripts etc. - + - guestfish no longer has any dependencies on Perl - + - New man pages containing programming examples: guestfs-examples(3) (C/C++), guestfs-ocaml(3), guestfs-python(3), guestfs-ruby(3). - + - Trace mode prints return values from API functions. - + - virt-inspector can list applications installed in Windows guests, along with a great deal of information about those applications. - + - Add support for inspecting: Linux Mint, Mandriva, FreeBSD. - + - guestfish --rw option (with no effect currently) to make potentially dangerous write access explicit. - + - guestfish --listen --csh for compatibility with csh, tcsh (thanks Eric Blake). - + - The first upstream version that introduced each API function is now documented in guestfs(3). - + - guestfs_last_errno allows you to retrieve the errno from the daemon, correctly translated to the local operating system. - + - Functions can now have optional parameters. - + - Progress bars and progress notifications can now happen for upload commands. - + - Appliance builder more careful about not leaving temporary files around in /tmp. - + - getfattr/setfattr commands added to virt-rescue. - + - ROADMAP file covers roadmap and goals for future releases. Security - New SECURITY section in guestfs(3) API documentation. - + - virt-inspector no longer runs any guest commands. - + - Inspection code is more careful about avoiding very large files from guests which might previously have caused a denial of service. - + - FUSE calls into guestmount are now traced when using guestmount -x. New APIs @@ -2773,35 +2773,35 @@ Release notes for libguestfs 1.8 Internals - C programs now only link precisely with the libraries that they use. - + - PCRE, libmagic, hivex and libvirt libraries are now completely optional for building. - + - Multiple memory leaks and file descriptor leaks fixed. - + - Add a POD wrapper to unify generation of man pages and HTML files across all programs. - + - Source includes phony images of Fedora, Debian, Ubuntu and Windows guests. - + - Ruby bindings have 'make install' rule. - + - <guestfs.h> is now a single file. - + - <guestfs.h> does not require XDR headers. - + - ocaml xml-light library is no longer required to build (thanks Maxim Koltsov). - + - ./configure --disable-[...] for each language binding (thanks Maxim Koltsov). - + - Old ocaml-viewer program removed (use guestfs-browser instead). - + - New C API test type 'InitScratchFS' makes the tests run a little more quickly. - + - Excluded packages in the appliance are now listed in a separate file appliance/excludelist.in, and can be customized per-distro. @@ -2825,84 +2825,84 @@ RELEASE NOTES FOR LIBGUESTFS 1.6 - Use a new method for creating and caching the appliance. This greatly improves the performance of libguestfs, often by a factor of x 4 to x 5. - + - Support for guest inspection (like virt-inspector) via the ordinary API and all language bindings. 'guestfish -i' option is as a side- effect much quicker. - + - virt-inspector and core inspection API can now detect guests running: Fedora, Debian, Ubuntu, Windows, Red Hat Enterprise Linux, CentOS, Scientific Linux, Gentoo, Pardus, Arch Linux, MeeGo. - + - Support for LUKS whole-disk encryption in guests. - + - PHP bindings. - + - Progress messages (and progress bars in guestfish and virt-resize) for certain long-running operations. - + - virt-df is now much more efficient. Use '--one-per-guest' to restore the old per-guest isolation behaviour. - + - guestfish 'copy-in' and 'copy-out' commands for copying files and directories recursively in and out of the guest. - + - guestfish 'hexedit' command for doing binary edits to devices and files. - + - Change guestfish -i syntax to allow commands to be specified on the command line (retaining backwards compatibility). - + - guestfish '-d <domain>' for adding disks from libvirt domains. - + - guestfish '-N' option supports several new prepared disk image types: lvfs : disk with LV formatted with filesystem lv : disk with LV bootroot : boot+root bootrootlv : boot and root on LV - + - guestfish 'more' and 'edit' commands now work with arbitrary files. - + - guestfish '--echo-keys' option allows you to echo keys/passphrases while typing them. - + - guestmount now supports -a / -d / -i options, like guestfish. - + - Use virtio-serial for communications with the appliance. This also has a major performance benefit. - + - virt-edit '-b' option to create a backup of edited files. - + - virt-edit '-e' option for non-interactive edits to files. - + - Ability to capture core dumps from the appliance (thanks Matthew Booth). - + - virt-rescue now shuts down cleanly (thanks Matthew Booth). - + - virt-rescue now has a --network option to enable network access. - + - virt-resize can now handle guests which use GPT partition table format. - + - virt-resize has better support for shrinking guests. - + - virt-resize supports qcow2-format guests. - + - $TMPDIR can be used to override almost all temporary directory usage. - + - OCaml users can use an alternate OO-style of coding, eg. g#launch () - + - The API supports calls which take optional parameters, eg. $g->add_drive_opts ("disk", readonly => 1); - + - Trace output now escapes and shortens large strings (thanks Matthew Booth). - + - Autosync is now on by default, resulting in more reliable behaviour when the handle is closed. - + - virt-df --uuid option allows you to follow a domain across migration and renaming. - + - Translations of manual pages. Security @@ -2911,7 +2911,7 @@ RELEASE NOTES FOR LIBGUESTFS 1.6 https://www.redhat.com/archives/libguestfs/2010-October/msg00036.html This is comprehensively fixed in this release, and the fix will be backported to the other stable branches after more testing. - + - virt-inspector no longer relies on untrusted guest code to list applications in some guests. @@ -2989,73 +2989,73 @@ RELEASE NOTES FOR LIBGUESTFS 1.4 - guestfish lets you choose a prepared disk image, eg: guestfish -N fs:ext4 - + - Add write support to guestmount (FUSE) module. - + - virt-resize can now resize the content of partitions and logical volumes in the guest, and we have better support for shrinking guests. - + - Bash tab-completion script for guestfish. - + - Add ZFS support to virt-rescue. - + - New tool 'virt-make-fs' for creating filesystems with content. - + - Allow suffixes on any guestfish number parameter, eg. "1M". - + - guestfish 'man' command opens the manual page. - + - guestfish supports a "heredoc" syntax for uploading files: upload -<<_end_ /foo content _end_ - + - Some guestfish commands now print their output in octal or hex where appropriate (RHBZ#583242). - + - Allow dash prefix on guestfish command line. This ignores any error from the second command: (RHBZ#578407) guestfish -- cmd1 : -cmd2 : cmd3 - + - guestfish -h / help command now returns an error for non-existent commands (RHBZ#597145). - + - New 'supported' command in guestfish to list optional groups of commands which are supported by the daemon / configuration. - + - virt-inspector and guestfish -i now work for filenames which contain spaces (RHBZ#507810). - + - Change the protocol to use link-local addresses, to avoid conflicting with any address that the host might be using (RHBZ#588763). - + - libguestfs now sets the correct time and timezone on filesystem modifications. - + - Sort the domains into alphabetical order in virt-df. - + - Make mkfs-b command work for FAT and NTFS by mapping the blocksize parameter to the cluster size (RHBZ#599464). - + - Add version numbers to Perl modules (RHBZ#521674). - + - Localization now works for all the libguestfs tools (RHBZ#559963). - + - Tools now support filesystem-on-image VMs (RHBZ#590167). - + - virt-list-partitions has a '-t' option to show the total size of disks. - + - Include extra Augeas lenses in the supermin appliance (Matthew Booth). - + - Add error and close callbacks. - + - Add explicit close method in the Perl API. - + - Multiple fixes for RHEL 5 compatibility. - + - Multiple fixes for Debian/Ubuntu compatibility. - + - Multiple revisions to improve the documentation. Security diff --git a/podwrapper.pl.in b/podwrapper.pl.in index c2894da..b2eeb25 100755 --- a/podwrapper.pl.in +++ b/podwrapper.pl.in @@ -38,9 +38,9 @@ podwrapper.pl - Generate libguestfs documentation from POD input files =head1 SYNOPSIS man_MANS = virt-foo.1 - + virt-foo.1 $(top_builddir)/html/virt-foo.1.html: stamp-virt-foo.pod - + stamp-virt-foo.pod: virt-foo.pod $(PODWRAPPER) \ --section 1 \ @@ -49,7 +49,7 @@ podwrapper.pl - Generate libguestfs documentation from POD input files --license GPLv2+ \ $< touch $@ - + CLEANFILES += stamp-virt-foo.pod =head1 DESCRIPTION diff --git a/tools/virt-win-reg b/tools/virt-win-reg index 3c6f600..f3e5447 100755 --- a/tools/virt-win-reg +++ b/tools/virt-win-reg @@ -741,7 +741,7 @@ needed because I am using the RHSrvAny service wrapper. "ImagePath"="c:\\rhsrvany.exe" "DisplayName"="RHSrvAny" "ObjectName"="NetworkService" - + [HKLM\SYSTEM\ControlSet001\services\RHSrvAny\Parameters] "CommandLine"="c:\\test.exe" "PWD"="c:\\Temp" diff --git a/v2v/test-v2v-print-source.sh b/v2v/test-v2v-print-source.sh index 82b2550..cf6ce32 100755 --- a/v2v/test-v2v-print-source.sh +++ b/v2v/test-v2v-print-source.sh @@ -57,8 +57,8 @@ if [ "$(cat $d/output)" != " source name: windows hypervisor type: test memory: 1073741824 (bytes) nr vCPUs: 1 - CPU features: - display: + CPU features: + display: disks: /windows.img (raw) [vda] removable media: -- 1.9.3