Version 1.29.21.

gobject: fix printf conversion specifier
Use PRIu64 to correctly handle uint64_t.
2026-03-22 16:26:17 +00:00 · 2015-01-19 19:19:12 +00:00 · 2015-01-19 19:05:23 +00:00 · 2015-01-19 16:06:16 +00:00 · 2015-01-19 16:47:54 +01:00 · 2015-01-19 16:47:54 +01:00
779 changed files with 167220 additions and 70008 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 *~
 *.a
+*.annot
 *.bak
 *.class
 *.cma
@@ -58,6 +59,7 @@ Makefile.in
 /builder/index-parse.h
 /builder/index-scan.c
 /builder/libguestfs.conf
+/builder/link.sh
 /builder/*.qcow2
 /builder/stamp-virt-builder.pod
 /builder/stamp-virt-index-validate.pod
@@ -93,6 +95,7 @@ Makefile.in
 /customize/customize_cmdline.mli
 /customize/customize-options.pod
 /customize/customize-synopsis.pod
+/customize/link.sh
 /customize/stamp-virt-customize.pod
 /customize/virt-customize
 /customize/virt-customize.1
@@ -184,6 +187,7 @@ Makefile.in
 /fuse/guestunmount.1
 /fuse/stamp-guestmount.pod
 /fuse/stamp-guestunmount.pod
+/fuse/test-fuse
 /fuse/test-guestmount-fd
 /fuse/test-guestunmount-fd
 /generator/.depend
@@ -219,7 +223,6 @@ Makefile.in
 /html/guestfs-java.3.html
 /html/guestfs-lua.3.html
 /html/guestfs-ocaml.3.html
-/html/guestfs-p2v-iso.1.html
 /html/guestfs-performance.1.html
 /html/guestfs-perl.3.html
 /html/guestfs-python.3.html
@@ -252,6 +255,8 @@ Makefile.in
 /html/virt-ls.1.html
 /html/virt-make-fs.1.html
 /html/virt-p2v.1.html
+/html/virt-p2v-make-disk.1.html
+/html/virt-p2v-make-kickstart.1.html
 /html/virt-rescue.1.html
 /html/virt-resize.1.html
 /html/virt-sparsify.1.html
@@ -304,12 +309,14 @@ Makefile.in
 /mllib/config.ml
 /mllib/dummy
 /mllib/libdir.ml
+/mllib/link.sh
 /ocaml/bindtests.bc
 /ocaml/bindtests.opt
 /ocaml/bindtests.ml
 /ocaml/.depend
 /ocaml/dllmlguestfs.so
 /ocaml/examples/create_disk
+/ocaml/examples/debug_logging
 /ocaml/examples/guestfs-ocaml.3
 /ocaml/examples/inspect_vm
 /ocaml/examples/stamp-guestfs-ocaml.pod
@@ -321,16 +328,16 @@ Makefile.in
 /ocaml/stamp-mlguestfs
 /ocaml/t/*.bc
 /ocaml/t/*.opt
+/p2v/launch-virt-p2v
 /p2v/stamp-virt-p2v.pod
+/p2v/stamp-virt-p2v-make-disk.pod
+/p2v/stamp-virt-p2v-make-kickstart.pod
 /p2v/virt-p2v
 /p2v/virt-p2v.1
-/p2v-iso/guestfs-p2v-iso.1
-/p2v-iso/guestfs-p2v-iso.txt
-/p2v-iso/kickstart-target.sh
-/p2v-iso/launch-virt-p2v
-/p2v-iso/p2v.ks
-/p2v-iso/stamp-guestfs-p2v-iso.pod
-/p2v-iso/virt-builder-target.sh
+/p2v/virt-p2v-make-disk
+/p2v/virt-p2v-make-disk.1
+/p2v/virt-p2v-make-kickstart
+/p2v/virt-p2v-make-kickstart.1
 /perl/bindtests.pl
 /perl/blib
 /perl/examples/guestfs-perl.3
@@ -412,6 +419,7 @@ Makefile.in
 /rescue/virt-rescue
 /rescue/virt-rescue.1
 /resize/.depend
+/resize/link.sh
 /resize/stamp-virt-resize.pod
 /resize/virt-resize
 /resize/virt-resize.1
@@ -463,6 +471,7 @@ Makefile.in
 /stamp-guestfs-release-notes.pod
 /stamp-h1
 /sysprep/.depend
+/sysprep/link.sh
 /sysprep/stamp-script1.sh
 /sysprep/stamp-script2.sh
 /sysprep/stamp-script4.sh
@@ -480,6 +489,7 @@ Makefile.in
 /tests/c-api/test-config
 /tests/c-api/test-create-handle
 /tests/c-api/test-debug-to-file
+/tests/c-api/test-dlopen
 /tests/c-api/test-environment
 /tests/c-api/test-event-string
 /tests/c-api/test*.img
@@ -524,6 +534,7 @@ Makefile.in
 /tests/guests/guest-aux/windows-system
 /tests/guests/stamp-fedora-md.img
 /tests/guests/ubuntu.img
+/tests/guests/archlinux.img
 /tests/guests/windows.img
 /tests/mount-local/test-parallel-mount-local
 /tests/mountable/test-internal-parse-mountable
@@ -553,5 +564,6 @@ Makefile.in
 /v2v/rhel-6.5.img
 /v2v/rhel-7.0.img
 /v2v/stamp-virt-v2v.pod
+/v2v/test-v2v-networks-and-bridges.xml
 /v2v/virt-v2v
 /v2v/virt-v2v.1
--- a/.gnulib
+++ b/.gnulib
--- a/7
+++ b/7
@@ -10,13 +10,16 @@ Daniel Berrange
 Daniel Cabrera
 Daniel Exner
 Dave Vasilevsky
+David Sommerseth
 Douglas Schilling Landgraf
 Eric Blake
 Erik Nolte
 Evaggelos Balaskas
+Gabriele Cerami
 Geert Warrink
 Guido Günther
 Hilko Bengen
+Hu Tao
 infernix
 Jaswinder Singh
 Jim Meyering
@@ -24,6 +27,7 @@ Jiri Popelka
 John Eckersberg
 Joseph Wang
 Karel Klíč
+Kashyap Chamarthy
 Lee Yarwood
 Marcin Gibula
 Maros Zatko
@@ -31,7 +35,9 @@ Martin Kletzander
 Masami HIRATA
 Matthew Booth
 Maxim Koltsov
+Menanteau Guy
 Michael Scherer
+Mike Frysinger
 Mike Kelly
 Nicholas Strugnell
 Nikita A Menkovich
@@ -46,6 +52,7 @@ Qin Guan
 Rajesh Ranjan
 Richard W.M. Jones
 Sandeep Shedmake
+Shahar Havivi
 Shankar Prasad
 Thomas S Hatch
 Török Edwin
--- a/679
+++ b/679
@@ -1,5 +1,5 @@
 NOTE: This file is automatically generated from "update-bugs.sh".
-Last updated: 2014-08-13
+Last updated: 2015-01-19

 This contains a local list of the bugs that are open against
 libguestfs.  Bugs are tracked in the Red Hat Bugzilla database
@@ -23,9 +23,6 @@ Bugs in NEW or ASSIGNED state are open and waiting for someone to fix.
 507278 NEW https://bugzilla.redhat.com/show_bug.cgi?id=507278
  libguestfs fails to build on Fedora sparc64

-547488 NEW https://bugzilla.redhat.com/show_bug.cgi?id=547488
-  guestfish cannot tab complete filenames that contain spaces
-
 554829 NEW https://bugzilla.redhat.com/show_bug.cgi?id=554829
  SELinux handling could be done better.

@@ -101,6 +98,9 @@ Bugs in NEW or ASSIGNED state are open and waiting for someone to fix.
 848464 NEW https://bugzilla.redhat.com/show_bug.cgi?id=848464
  gobject javascript bindings cannot use 64 bit integers

+848926 NEW https://bugzilla.redhat.com/show_bug.cgi?id=848926
+  virt-v2v should verify that the RHEV-M domain is an export storage domain
+
 857763 NEW https://bugzilla.redhat.com/show_bug.cgi?id=857763
  libguestfs 'file-architecture' returns 'ARM' for arm binaries

@@ -131,6 +131,9 @@ Bugs in NEW or ASSIGNED state are open and waiting for someone to fix.
 910115 NEW https://bugzilla.redhat.com/show_bug.cgi?id=910115
  RFE: support ntfsresize --bad-sectors option in virt-resize

+910117 NEW https://bugzilla.redhat.com/show_bug.cgi?id=910117
+  virt-v2v removes serial console from securetty list
+
 910269 NEW https://bugzilla.redhat.com/show_bug.cgi?id=910269
  Tracker: Bugs in other packages that stop libguestfs working

@@ -143,18 +146,21 @@ Bugs in NEW or ASSIGNED state are open and waiting for someone to fix.
 920617 NEW https://bugzilla.redhat.com/show_bug.cgi?id=920617
  RFE: virt-inspector (or another tool) should produce OVF output for oVirt / RHEV

+921604 NEW https://bugzilla.redhat.com/show_bug.cgi?id=921604
+  RFE: virt-v2v: add option to specify spice or VNC and whether to add USB connections
+
 927447 NEW https://bugzilla.redhat.com/show_bug.cgi?id=927447
  [suse] virt tools hang on disk image, but libguestfs-test-tool runs OK

+963232 NEW https://bugzilla.redhat.com/show_bug.cgi?id=963232
+  RFE: v2v: a --no-cleanup would be useful for debugging of disk images that guestfs has issues converting
+
 973138 NEW https://bugzilla.redhat.com/show_bug.cgi?id=973138
  RFE: sh & debug sh should be able to capture all output and error return code

 979392 NEW https://bugzilla.redhat.com/show_bug.cgi?id=979392
  [abrt] virt-manager crash from libguestfs launch_libvirt

-980790 NEW https://bugzilla.redhat.com/show_bug.cgi?id=980790
-  fstrim returns error "FITRIM ioctl failed: Inappropriate ioctl for device"
-
 982516 NEW https://bugzilla.redhat.com/show_bug.cgi?id=982516
  sh "rpm -Va" fails because apparently /dev/shm is not created/bind-mounted correctly

@@ -191,9 +197,6 @@ Bugs in NEW or ASSIGNED state are open and waiting for someone to fix.
 1027526 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1027526
  RFE: Labels for logical partitions lost in Windows 2003 after virt-resize for primary partition

-1028676 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1028676
-  Add virt-builder to RHEL 7.1
-
 1029134 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1029134
  Broken links in virt-builder web man page

@@ -203,18 +206,30 @@ Bugs in NEW or ASSIGNED state are open and waiting for someone to fix.
 1040912 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1040912
  [ARM] mount-local / FUSE support does not seem to work at all

-1041552 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1041552
-  virt-sysprep should remove Pegasus certificates
-
-1042780 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1042780
-  Support the virt-sysprep --delete option
-
 1051694 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1051694
  libguestfs FTBFS on Ubuntu saucy

+1056045 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1056045
+  virt-v2v OVA import fails when no (optional) manifest file is included
+
 1056047 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1056047
  virt-df generates no output for Solaris 11 x86_64 guest.

+1056126 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1056126
+  virt-v2v OVA/OVF import fails with 'MegaBytes' as memory allocation units
+
+1056534 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1056534
+  virt-v2v OVF/OVA import fails when disks aren't attached to either IDE or SCSI controllers
+
+1056640 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1056640
+  virt-v2v OVA/OVF import fails when no (optional) ovf:capacityAllocationUnits is specified
+
+1056983 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1056983
+  virt-v2v OVA/OVF import fails when no (optional) ovf:populatedSize is specified
+
+1057006 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1057006
+  virt-v2v OVA/OVF import fails when no (optional) Name under VirtualSystem is specified
+
 1057873 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1057873
  libguestfs df/ subdirectory tests fail occasionally

@@ -230,18 +245,9 @@ Bugs in NEW or ASSIGNED state are open and waiting for someone to fix.
 1064041 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1064041
  virt-sparsify fails if a btrfs filesystem contains readonly snapshots

-1074005 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1074005
-  java bindings inspect_list_applications2 throws java.lang.ArrayIndexOutOfBoundsException:
-
-1075164 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1075164
-  RFE: allow passing in a pre-opened libvirt connection from python
-
 1075594 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1075594
  RFE: python-libguestfs should be available on pypi

-1076478 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1076478
-  FTBFS: libguestfs-1.22.6-15.el7
-
 1079625 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1079625
  virt-sparsify fails if a btrfs filesystem contains readonly snapshots

@@ -254,21 +260,12 @@ Bugs in NEW or ASSIGNED state are open and waiting for someone to fix.
 1089100 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1089100
  NetworkManager avc unlink denied for resolv.conf after using --selinux-relabel

-1091856 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1091856
-  scrub-file can't handle link file
-
-1091859 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1091859
-  scrub-file can't handle link file
-
 1092583 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1092583
  guestfish removes query string from URI

 1097272 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1097272
  Ruby bindings should use RB_GC_GUARD (instead of volatile) for enhanced safety

-1099284 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1099284
-  typo errors in man pages
-
 1099292 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1099292
  sfdisk failed by "Device or resource busy" when using one command line

@@ -276,7 +273,7 @@ Bugs in NEW or ASSIGNED state are open and waiting for someone to fix.
  sfdisk: BLKRRPART: Device or resource busy

 1099976 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1099976
-  virt-builder gives GPG warning message
+  virt-builder gives GPG warning message with gnupg2

 1100138 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1100138
  some operation cause "lvremove" can not find the object
@@ -284,15 +281,6 @@ Bugs in NEW or ASSIGNED state are open and waiting for someone to fix.
 1100140 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1100140
  some operation cause "lvremove" can not 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
-
-1100530 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1100530
-  These APIs also need to add to `guestfish -h` command list
-
-1100533 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1100533
-  Remove 'user-cancel' from guestfish(1)
-
 1102241 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1102241
  [RFE] libguestfs should detect OSTree (project-atomic) qcow2 disk image

@@ -302,6 +290,9 @@ Bugs in NEW or ASSIGNED state are open and waiting for someone to fix.
 1102620 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1102620
  lvm-clear-filter failed when has two same name but different uuid's VG

+1103444 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1103444
+  virt-v2v of RHEL AS release 3(Taroon) VMware VM fails because rpm binary segfaults
+
 1107317 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1107317
  Ubuntu package fails to depend on linux-image-extra (causes missing virtio-serial)

@@ -311,15 +302,9 @@ Bugs in NEW or ASSIGNED state are open and waiting for someone to fix.
 1109144 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1109144
  virt-builder --get-kernel doesn't fetch the dtb from images

-1111662 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1111662
-  Guestfs.Error("vgchange_uuid_all:   Volume group has active logical volumes")
-
 1111794 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1111794
  virt-sparsify leaves lots of data in TMPDIR

-1113020 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1113020
-  Support virt-sparsify option to allow specifying temporary file or block device
-
 1113153 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1113153
  RFE: Inspection should support systemd mount units

@@ -329,21 +314,210 @@ Bugs in NEW or ASSIGNED state are open and waiting for someone to fix.
 1118305 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1118305
  RFE: Ability to set iSCSI-Initiator-IQN for iSCSI connections

-1123221 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1123221
-  make xfs faield, "mkfs.xfs: No such file or directory"
-
-1123281 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1123281
-  lvm-set-filter stopped working in Rawhide
-
-1123797 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1123797
-  libguestfs 'direct' backend should close file descriptors before exec-ing qemu to avoid leaking !O_CLOEXEC fds
-
-1128942 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1128942
-  libguests tools failing on images containing a colon in the path
-
 1129110 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1129110
  Libguestfs NTFS not setting ACLs

+1130506 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1130506
+  RFE: virt-sparsify in copying mode should support qemu detect-zeroes
+
+1132652 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1132652
+  virt-sysprep firstboot doesn't work with RHEL 7 guest
+
+1134726 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1134726
+  [RFE] virt-builder should support args with the --run command
+
+1135064 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1135064
+  virt-sparsify fails at /sys/block/sdb/dev discovery
+
+1135585 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1135585
+  [RFE] virt-builder should support copying in a directory/list of files
+
+1136371 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1136371
+  add apt-rpm support to supermin
+
+1139785 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1139785
+  virt-sysprep should change UUID fields in /etc/sysconfig/network-scripts/ifcfg-* files
+
+1141451 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1141451
+  Failures in tests: /dev/sda1: No such file or directory
+
+1142184 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1142184
+  virt-sparsify --help print description of a option which is hard to get common understanding
+
+1144137 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1144137
+  virt-inspector fails on Minix 3 guest
+
+1144138 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1144138
+  virt-inspector fails on FreeBSD 9.3 guest
+
+1145583 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1145583
+  xen kernel should be removed from boot menu after conversion by virt-v2v
+
+1146007 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1146007
+  Input/output error during conversion of esx guest.
+
+1146339 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1146339
+  Improve the error showing when no enough space left on host while conversion
+
+1146477 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1146477
+  virt-v2v sometimes hangs with printing: Add. Sense: No additional sense information
+
+1146832 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1146832
+  virt-v2v fail to convert guest with disk type volume
+
+1150298 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1150298
+  ARM 32 bit on Ubuntu: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]
+
+1150816 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1150816
+  Can not find "RECURSIVE LONG LISTING" in 'man virt-diff'
+
+1150858 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1150858
+  virt-sparsify: unknown option `--check-tmpdir=ignore'
+
+1151902 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1151902
+  virt-v2v:Network interface disappear after conversion of guest with interface type direct
+
+1151903 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1151903
+  virt tools --csv output should have a meaningful output
+
+1151905 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1151905
+  virt tools --csv output should have a meaningful output
+
+1152369 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1152369
+  [RFE]virt-v2v failed to convert guest with UEFI firmware
+
+1152533 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1152533
+  virt-v2v fail to convert guest with virtio lun disk
+
+1152818 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1152818
+  llz give ? for the security context of a file, which is wrong
+
+1152819 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1152819
+  Can not end a running command in virt-rescue by press ^C or other keys, the only way is to exit virt-rescue
+
+1152821 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1152821
+  Can not end a running command in virt-rescue by press ^C or other keys, the only way is to exit virt-rescue
+
+1152825 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1152825
+  virt-rescue --selinux can not work well, when enable selinux in the command line the value of 'getenforce' is still Disabled in virt-rescue appliance
+
+1152832 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1152832
+  virt-rescue --selinux can not work well, when enable selinux in the command line the value of 'getenforce' is still Disabled in virt-rescue appliance
+
+1152833 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1152833
+  llz give ? for the security context of a file, which is wrong
+
+1153702 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1153702
+  Using "upload - XXX" doesn't work with remote
+
+1154408 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1154408
+  libguestfs does not allow registering a qemu+tcp backend
+
+1155229 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1155229
+  RFE: Allow uploading virt-v2v converted images directly to Cinder
+
+1159030 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1159030
+  libvirt backend does not set RBD password
+
+1161019 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1161019
+  Remove rhev related files(rhsrvany.exe and rhev-apt.exe) after conversion of windows guests to kvm
+
+1164708 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1164708
+  set-label can only set <=127 bytes for btrfs and <=126 bytes for ntfs filesystem which not meet the help message. Also for ntfs it should give a warning message when the length >128 bytes
+
+1164729 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1164729
+  set-label can only set <=63 bytes for btrfs and ntfs filesystem which not meet the help message. Also for btrfs and ntfs it should give a warning message when the length exceed the limited length
+
+1164765 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1164765
+  [RFE] Add a new API to scan devices for a btrfs filesystem
+
+1164766 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1164766
+  [RFE] Add a new API to scan devices for a btrfs filesystem
+
+1166057 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1166057
+  btrfs filesystem will not work well if you create the filesystem with multiple disks at the same time, such as: mkfs-btrfs "/dev/sda1 /dev/sdb1"
+
+1167623 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1167623
+  Remove "If reporting bugs, run virt-v2v with debugging enabled .." message when running virt-p2v
+
+1167916 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1167916
+  P2V error:unexpected end of file waiting for password prompt.
+
+1167921 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1167921
+  p2v: No Network Connection dialog
+
+1167922 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1167922
+  p2v: No virtual console
+
+1168144 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1168144
+  warning: fstrim: fstrim: /sysroot/: FITRIM ioctl failed: Operation not supported (ignored) when convert win2003 guest from xen server
+
+1168626 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1168626
+  Tracker: Build RHEL 7.1 - based virt-p2v ISO
+
+1168865 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1168865
+  warning: /files/boot/grub/device.map/hd0 references unknown device "vda" when convert a local guest with virtio disk to openstack server (-i disk))
+
+1170771 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1170771
+  virt-sparsify fails to sparsify CentOS 7 SWAP
+
+1171654 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1171654
+  Modify a file in virt-rescue with vi on some linux terminal such as yakuake, can lead to abnormal display in virt-rescue shell
+
+1172425 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1172425
+  [RFE]virt-v2v failed to convert VMware ESX VM with snapshot
+
+1172659 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1172659
+  virt-resize --expand fails on ubuntu-14.04.img image (regression)
+
+1172660 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1172660
+  virt-resize --expand fails on ubuntu-14.04.img image
+
+1173462 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1173462
+  virt-resize on RHEL 5.7 fails to resize the raw format disk image
+
+1173695 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1173695
+  Error occurred when install a rhel guest with disk pool
+
+1174073 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1174073
+  The listen address for vnc is changed after conversion by virt-v2v
+
+1174200 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1174200
+  New virt-v2v failure: CURL: Error opening file: NSS: client certificate not found (nickname not specified): Invalid argument
+
+1174551 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1174551
+  "lstatnslist" and "lstatlist" don't give an error if the API is used wrongly
+
+1176493 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1176493
+  virt-v2v ignores sound device when convert xen guest to local kvm
+
+1176526 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1176526
+  virt-resize cannot shrink ext filesystem by a small amount
+
+1176801 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1176801
+  File /etc/sysconfig/kernel isn't updated when convert XenPV guest with regular kernel installed
+
+1177460 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1177460
+  virt-customize does not work with fedora 21 atomic
+
+1177910 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1177910
+  Libguestfs fails to locate the qemu-kvm on POWER8(BE) host.
+
+1179576 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1179576
+  virt-v2v prints warning: /files/etc/fstab/8/spec references unknown device "hdb"
+
+1180170 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1180170
+  virt-builder gives GPG warning message with gnupg2
+
+1180769 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1180769
+  Security context on image file gets reset
+
+1183234 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1183234
+  part_get_mbr_id test fails: sfdisk --change-id: sfdisk: change-id is deprecated in favour of ---part-type
+
+1183493 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1183493
+  RFE: virt-rescue: add a flag to autorun the suggested mount commands and chroot, suggested with --suggest
+
 503134 ASSIGNED https://bugzilla.redhat.com/show_bug.cgi?id=503134
  guestfish's list splitting does not recognize internal quoting

@@ -353,6 +527,9 @@ Bugs in NEW or ASSIGNED state are open and waiting for someone to fix.
 541618 ASSIGNED https://bugzilla.redhat.com/show_bug.cgi?id=541618
  guestfish not able to mount freebsd ufs2 partitions automatically

+547488 ASSIGNED https://bugzilla.redhat.com/show_bug.cgi?id=547488
+  guestfish cannot tab complete filenames that contain spaces
+
 619334 ASSIGNED https://bugzilla.redhat.com/show_bug.cgi?id=619334
  RFE: Enable coredump capture in the appliance

@@ -362,7 +539,19 @@ Bugs in NEW or ASSIGNED state are open and waiting for someone to fix.
 1069966 ASSIGNED https://bugzilla.redhat.com/show_bug.cgi?id=1069966
  RFE: let virt-builder etc build ARM guests on x86 host

-(114 bugs)
+1143887 ASSIGNED https://bugzilla.redhat.com/show_bug.cgi?id=1143887
+  Warning shows when converting guests to rhev:chown: changing ownership of ?/tmp/v2v.u48xag/*.ovf?: Invalid argument
+
+1145908 ASSIGNED https://bugzilla.redhat.com/show_bug.cgi?id=1145908
+  No virtio drivers available warning shows when converting win8 guest
+
+1156298 ASSIGNED https://bugzilla.redhat.com/show_bug.cgi?id=1156298
+  Remove files in package libguestfs-bash-completion, these files are bash completion files, some of the virt tool completion are already implement in another file, so can remove its completion file
+
+1176591 ASSIGNED https://bugzilla.redhat.com/show_bug.cgi?id=1176591
+  virt-v2v -o vdsm doesn't work with multiple data domains
+
+(177 bugs)

 --------------------------------------------------
 Bugs in MODIFIED, POST or ON_QA state are fixed.
@@ -371,17 +560,17 @@ You can help by testing the fixes.
 1028650 POST https://bugzilla.redhat.com/show_bug.cgi?id=1028650
  virt-* argument parser doesn't accept --arg=value (you have to use --arg value)

-1073917 POST https://bugzilla.redhat.com/show_bug.cgi?id=1073917
-  java bindings inspect_list_applications2 throws java.lang.ArrayIndexOutOfBoundsException:
+1175196 POST https://bugzilla.redhat.com/show_bug.cgi?id=1175196
+  "parse-environment" and "parse-environment-list" fail to parse "LIBGUESTFS_TRACE = 0"

-1091803 POST https://bugzilla.redhat.com/show_bug.cgi?id=1091803
-  tar-in-opts execute failed that cause libguestfs appliance crashed
+1175676 POST https://bugzilla.redhat.com/show_bug.cgi?id=1175676
+  Typo error in 'help ping-daemon'

-1122557 POST https://bugzilla.redhat.com/show_bug.cgi?id=1122557
-  virt-sparsify overwrites block devices if used as output files
+1176598 POST https://bugzilla.redhat.com/show_bug.cgi?id=1176598
+  virt-v2v -o vdsm write ovf to specify domain

-805417 MODIFIED https://bugzilla.redhat.com/show_bug.cgi?id=805417
-  RFE: support inspection of installation ISOs of WinVista, Win7, Win2008 & Win2008r2
+1182463 POST https://bugzilla.redhat.com/show_bug.cgi?id=1182463
+  "mknod-b", "mknod-c", and "mkfifo" do not strip non-permissions bits from "mode"

 1053847 MODIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1053847
  Recommended default clock/timer settings
@@ -392,56 +581,344 @@ You can help by testing the fixes.
 1021149 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1021149
  Rebase libguestfs to 1.28 in RHEL 7.1

-1079182 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1079182
-  virt-df cannot report used disk space of windows guest when updated to 6.5
+1076213 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1076213
+  OpenStack as a v2v target.

-1097359 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1097359
-  virt-sparsify hangs with 'No space left on device' while filling LV
+1100530 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1100530
+  These APIs also need to add to `guestfish -h` command list

-1106548 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1106548
-  root gets an error accessing to a non-root dir on a snapshot guestmount VMDK img
+1100533 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1100533
+  Remove 'user-cancel' from guestfish(1)

-1117540 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1117540
-  Support virt-sparsify option to allow specifying temporary file or block device
+1122557 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1122557
+  virt-sparsify overwrites block devices if used as output files

-1123794 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1123794
-  libguestfs 'direct' backend should close file descriptors before exec-ing qemu to avoid leaking !O_CLOEXEC fds
+1128942 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1128942
+  libguests tools failing on images containing a colon in the path

-(13 bugs)
+1138630 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1138630
+  Remove user accounts from "/etc/shadow" when exeucte virt-sysprep with '--enable user-account' option
+
+1140946 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1140946
+  qemu-img shows error message for backing file twice
+
+1153846 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1153846
+  Redundancy whitespace at the end of directory name when use <TAB> to complete the directory name in guestfish with a xfs filesystem in guest
+
+1160203 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1160203
+  log of virt-sysprep contains only the output of the last script
+
+1165564 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1165564
+  Provide Reboot/Shutdown button after virt-p2v
+
+1165569 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1165569
+  Disable "cancel conversion" button after virt-p2v conversion finished
+
+1167601 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1167601
+  "Conversion was successful" pop out even virt-p2v fails
+
+1167774 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1167774
+  virt-p2v fails with error:"nbd.c:nbd_receive_negotiate():L501: read failed"
+
+(21 bugs)

 --------------------------------------------------
 These bugs are in the VERIFIED state.

-624335 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=624335
-  blockdev-setbsz succeeds, but does not affect blockdev-getbsz
+805417 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=805417
+  RFE: support inspection of installation ISOs of WinVista, Win7, Win2008 & Win2008r2

-965495 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=965495
-  New APIs required in libguestfs for virt-v2v in RHEL 6.5
+980790 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=980790
+  fstrim returns error "FITRIM ioctl failed: Inappropriate ioctl for device"

-982979 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=982979
-  Disable fstrim API/command in RHEL 6
+1028676 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1028676
+  Add virt-builder to RHEL 7.1

-1025269 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1025269
-  libguestfs tests hang in libguestfs-1.20.11/tests/guests/guest-aux/make-fedora-img.pl
+1041552 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1041552
+  virt-sysprep should remove Pegasus certificates

-1056558 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1056558
-  virt-sparsify overwrites block devices if used as output files
+1042780 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1042780
+  Support the virt-sysprep --delete option

-1057510 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1057510
-  mount-local should give a clearer error if root is not mounted
+1073917 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1073917
+  java bindings inspect_list_applications2 throws java.lang.ArrayIndexOutOfBoundsException:

-1072062 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1072062
-  Ruby bindings for libguestfs throws an error periodically
+1074005 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1074005
+  java bindings inspect_list_applications2 throws java.lang.ArrayIndexOutOfBoundsException:

-1091805 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1091805
+1091803 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1091803
  tar-in-opts execute failed that cause libguestfs appliance crashed

-1099105 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1099105
-  libguestfs Requires: /lib64/libldif-2.4.so.2 missing from openldap-2.4.39-6.el6.x86_64
+1091856 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1091856
+  scrub-file can't handle link file

-1099332 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1099332
+1091859 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1091859
+  scrub-file can't handle link file
+
+1099284 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1099284
  typo errors in man pages

-(10 bugs)
+1100528 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1100528
+  These APIs also need to add to `guestfish -h` command list
+
+1113020 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1113020
+  Support virt-sparsify option to allow specifying temporary file or block device
+
+1123797 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1123797
+  libguestfs 'direct' backend should close file descriptors before exec-ing qemu to avoid leaking !O_CLOEXEC fds
+
+1136739 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1136739
+  virt-v2v warning info should be printed to fill the whole line
+
+1138182 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1138182
+  xen guest will be kernel panic after converted by virt-v2v
+
+1138184 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1138184
+  virt-v2v will fail when converting guests with initramfs-*kdump.img under /boot
+
+1138504 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1138504
+  Support conversion of guests from remote kvm/xen/esx connections by virt-v2v
+
+1138586 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1138586
+  No error shows when converting running guest with virt-v2v
+
+1138634 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1138634
+  Remove user accounts from "/etc/shadow" when exeucte virt-sysprep with '--enable user-account' option
+
+1139543 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1139543
+  Improve the error info when converting guest with no space left
+
+1139973 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1139973
+  Improve the error info when converting xen guest with no passwordless SSH access configured
+
+1140050 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1140050
+  No error shows when multiple conflicting options used with virt-v2v
+
+1140547 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1140547
+  virt-builder option '--format' don't work well
+
+1140894 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1140894
+  No error messages output if append '--format qcow2' after '-a guest.img', guest.img is a raw format image file
+
+1141113 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1141113
+  virt-v2v fails to convert esx guests
+
+1141145 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1141145
+  virt-v2v fails to convert xen pv guests.
+
+1141157 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1141157
+  virt-sysprep option '--user-accounts' don't work well
+
+1141626 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1141626
+  virt-sysprep option '--password' don't work well, it will cause login problem and if execute with other options it will take no effect
+
+1141631 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1141631
+  [RFE] virt-v2 should support convert a guest to a dir-pool with using pool's uuid
+
+1141654 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1141654
+  virt-v2v: error: access: No such file or directory shows when converting xen/esx guests
+
+1141680 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1141680
+  [RFE] virt-v2 should support convert a domain with using domain's UUID instead of domain name
+
+1141723 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1141723
+  virt-v2v: error: disk sda has no defined format shows when converting xen hvm guest
+
+1142004 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1142004
+  virt-v2v prints warning:WARNING:/files/boot/grub/device.map references unknown device "xvda"
+
+1142008 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1142008
+  Conversion guest cannot been seen on rhevm server
+
+1142158 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1142158
+  Illegal command 'part-get-name /dev/sda1 1' cause libguestfs appliance crashed
+
+1142178 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1142178
+  virt-customize: No error messages output if append '--format qcow2' after '-a guest.img', guest.img is a raw format image file
+
+1142186 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1142186
+  virt-sysprep option '--mount-options' don't work well
+
+1142416 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1142416
+  part-get-name give 'libguestfs: error: part_get_name: parted does not support the machine output (-m)' error message when run 'part-get-name /dev/sda 1'
+
+1143866 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1143866
+  virt-v2v fails with error: cannot open Packages index using db5
+
+1143883 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1143883
+  warning shows when converting rhel7 guest:virt-v2v:could not update grub2 console: aug_get: no matching node (ignored)
+
+1143949 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1143949
+  virt-customize option '--password-crypto' do not work
+
+1144197 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1144197
+  Disable libguestfs UML backend mode in RHEL7
+
+1144201 VERIFIED 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
+
+1144766 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1144766
+  futimens() is a no-op via guestmount
+
+1144927 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1144927
+  Syntax error in lens definition: /usr/share/guestfs/guestfs_lvm_conf.aug:28.25-.40:Could not load module Quote for Quote.do_dquotee
+
+1145582 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1145582
+  Failed to import sparse qcow2 disk image after converting to rhevm
+
+1145916 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1145916
+  virt-v2v fails to convert win7 guest
+
+1145995 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1145995
+  Improve the error info when converting windows guest with unclean file system
+
+1146017 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1146017
+  virt-v2v -v -x during windows guest conversion will hang at hivex: hivex_open: used block id ??
+
+1146815 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1146815
+  virt-v2v prints warning: /files/etc/fstab/8/spec references unknown device "cdrom"
+
+1147065 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1147065
+  regression setting root password with virt-builder/virt-customize
+
+1147313 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1147313
+  virt-v2v cmd with option --qemu-boot doesn't work:  "qemu-system-x86_64: command not found"
+
+1149640 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1149640
+  hardcoded el7 disttag in BR makes build fail on ppc64le
+
+1150475 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1150475
+  Exporting 2+ disk guest to RHEV, only one disk shows after import
+
+1150701 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1150701
+  virt-v2v does not fstrim data disks and non-mounted filesystems
+
+1150815 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1150815
+  Can not find "RECURSIVE LONG LISTING" in 'man virt-diff'
+
+1150867 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1150867
+  'copy-file-to-file /src /dest' create file /dest even if command 'copy-file-to-file /src /dest' failed
+
+1150880 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1150880
+  virt-v2v: warning: display <graphics type='sdl'> was ignored when converting rhel5 guest with sdl graphics
+
+1151033 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1151033
+  virt-v2v conversions from VMware vCenter server run slowly
+
+1151725 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1151725
+  virt-v2v: warning: /files/boot/grub/device.map/hd0 references unknown device "sda" when convert a guest with ide bus
+
+1151738 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1151738
+  typo error in man page of virt-edit
+
+1151739 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1151739
+  typo error in man page of virt-edit
+
+1151766 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1151766
+  libguestfs-bash-completion package contains file /usr/share/bash-completion/completions/virt-log, but no _virt_log() function in that file
+
+1151900 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1151900
+  Should also add a field for directory files when run virt-ls with --csv option
+
+1151901 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1151901
+  Should also add a field for directory files when run virt-ls with --csv option
+
+1151910 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1151910
+  virt-ls should remove '/' in the output when specify the directory name as /etc/
+
+1151911 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1151911
+  virt-ls should remove '/' in the output when specify the directory name as /etc/
+
+1152998 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1152998
+  virt-v2v / qemu-img fails on ova image
+
+1153515 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1153515
+  empty (but set) LIBGUESTFS_BACKEND prints libguestfs: error: invalid backend:
+
+1153589 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1153589
+  virt-v2v will hang when converting esx guest before disk copy phase
+
+1153730 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1153730
+  Booting windows 2008 R2 if=virtio gets BSOD
+
+1153844 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1153844
+  Redundancy whitespace at the end of directory name when use <TAB> to complete the directory name in guestfish with a xfs filesystem in guest
+
+1153974 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1153974
+  guestfish prints 'n' in error message
+
+1155121 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1155121
+  Virt-v2v will fail when using relative path for -i ova
+
+1155610 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1155610
+  disable uninstallation of VMware drivers on Linux for RHEL 7.1
+
+1156301 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1156301
+  virt-inspector support adding a remote disk, but in its man page -a URI / --add URI is missing
+
+1157691 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1157691
+  virt-p2v-make-disk should add firmwares
+
+1158526 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1158526
+  Use password file instead of process interaction
+
+1159258 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1159258
+  esx win2008 32 bit guest fail to load after conversion because the firmware isn't ACPI compatible
+
+1159651 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1159651
+  virt-sysprep firstboot script is not deleted if it reboot a RHEL 7 guest
+
+1160043 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1160043
+  virt-sysprep firstboot script is not deleted if it reboot a RHEL 7 guest
+
+1160199 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1160199
+  log of virt-sysprep contains only the output of the last script
+
+1161575 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1161575
+  Failed to import guest with "rtl8139" nic  to openstack server after converted by v2v
+
+1162966 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1162966
+  xfs should also give a warning out to let customer know the limitation
+
+1164619 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1164619
+  Inspect-get-icon failed on RHEL7 guest
+
+1164697 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1164697
+  typo errors in man pages
+
+1164732 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1164732
+  The description of 'help append' is not accurately, it add the kernel options to libguestfs appliance not the guest kernel
+
+1164734 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1164734
+  The description of 'help append' is not accurately, it add the kernel options to libguestfs appliance not the guest kernel
+
+1164853 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1164853
+  Booting in qemu found no volume groups and failed checking the filesystems
+
+1165975 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1165975
+  File "/boot/grub2/device.map" showing is not right after converting a rhel7 guest from esx server
+
+1166618 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1166618
+  virt-resize should give out the detail warning info to let customers know what's going wrong
+
+1167302 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1167302
+  virt-v2v: warning: ova hard disk has no parent controller when convert from a ova file
+
+1168632 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1168632
+  Fix kickstart for virt-p2v
+
+1168751 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1168751
+  broken lvm-set-filter API with newer lvm2
+
+1170073 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1170073
+  virt-v2v picks debug kernels over non-debug kernels when versions are equal
+
+1171130 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1171130
+  virt-v2v conversion of RHEL 3 guest fails with: All of your loopback devices are in use
+
+1174123 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1174123
+  Graphics password disappear after conversion of virt-v2v
+
+(98 bugs)

 End of BUGS file.
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
 # libguestfs
-# Copyright (C) 2009-2014 Red Hat Inc.
+# Copyright (C) 2009-2015 Red Hat Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -82,7 +82,7 @@ SUBDIRS += fish
 # virt-tools in C.
 SUBDIRS += align cat diff df edit format inspector make-fs rescue
 if HAVE_P2V
-SUBDIRS += p2v p2v-iso
+SUBDIRS += p2v
 endif

 # bash-completion
@@ -276,9 +276,6 @@ endif
 if HAVE_PYTHON
 HTMLFILES += html/guestfs-python.3.html
 endif
-if HAVE_P2V
-HTMLFILES += html/guestfs-p2v-iso.1.html
-endif
 if HAVE_RUBY
 HTMLFILES += html/guestfs-ruby.3.html
 endif
@@ -287,6 +284,12 @@ HTMLFILES += \
 	html/guestmount.1.html \
 	html/guestunmount.1.html
 endif
+if HAVE_P2V
+HTMLFILES += \
+	html/virt-p2v.1.html \
+	html/virt-p2v-make-disk.1.html \
+	html/virt-p2v-make-kickstart.1.html
+endif

 HTMLSUPPORTFILES = \
 	html/draft.png \
@@ -424,9 +427,6 @@ check-release:
 	  check-valgrind \
 	  check-direct \
 	  check-valgrind-direct
-	$(MAKE) -j1 LIBGUESTFS_HV=$(HOME)/d/linux-um/vmlinux \
-	  check-uml \
-	  check-valgrind-uml
 	$(MAKE) -j1 \
 	  check-slow

--- a/18
+++ b/18
@@ -52,7 +52,8 @@ The full requirements are described below.
 +--------------+-------------+---+-----------------------------------------+
 | qemu         | 1.2.0       | R | 1.1 may work, but has broken virtio-scsi|
 +--------------+-------------+---+-----------------------------------------+
-| qemu-img     |             | R |                                         |
+| qemu-img     |             | R | >= 2.2.0 is required for virt-v2v but   |
+|              |             |   | optional elsewhere                      |
 +--------------+-------------+---+-----------------------------------------+
 | kernel       | 2.6.34      | R | Make sure the following are enabled     |
 |              |             |   | compiled in or as a module:             |
@@ -85,6 +86,10 @@ The full requirements are described below.
 |              |             |   | Optional if compiling from tarball.     |
 |              |             |   | To build generated files and OCaml bindings.
 +--------------+-------------+---+-----------------------------------------+
+| findlib      |             |R/O| Required if compiling from git.         |
+|              |             |   | Optional if compiling from tarball.     |
+|              |             |   | To build generated files and OCaml bindings.
+--------------+-------------+---+-----------------------------------------+
 | autotools    |             |R/O| Required if compiling from git.         |
 |              |             |   | Optional if compiling from tarball.     |
 |              |             |   | Autotools-based build system.           |
@@ -147,7 +152,7 @@ The full requirements are described below.
 +--------------+-------------+---+-----------------------------------------+
 | sd-journal   |             | O | systemd journal library                 |
 +--------------+-------------+---+-----------------------------------------+
-| yajl         | 2           | O | JSON parser for parsing output of       |
+| yajl         | 2.0.4       | O | JSON parser for parsing output of       |
 |              |             |   | ldmtool and qemu-img info commands.     |
 +--------------+-------------+---+-----------------------------------------+
 | gdisk        |             | O | GPT disk support.                       |
@@ -178,11 +183,11 @@ The full requirements are described below.
 +--------------+-------------+---+-----------------------------------------+
 | gtk2         |             | O | Used by virt-p2v user interface.        |
 +--------------+-------------+---+-----------------------------------------+
+| zip, unzip   |             | O | Used by virt-v2v for OVA files.         |
+--------------+-------------+---+-----------------------------------------+
 | python-evtx  |             | O | Used by virt-log to parse Windows       |
 |              |             |   | Event Log files.                        |
 +--------------+-------------+---+-----------------------------------------+
-| findlib      |             | O | For the OCaml bindings.                 |
-+--------------+-------------+---+-----------------------------------------+
 | ocaml-gettext|             | O | For localizing OCaml virt-* tools.      |
 +--------------+-------------+---+-----------------------------------------+
 | Python       | 2.2         | O | For the Python bindings.                |
@@ -220,6 +225,9 @@ The full requirements are described below.
 +--------------+-------------+---+-----------------------------------------+
 | Sys::Virt    |             | O | Perl bindings for libvirt.              |
 +--------------+-------------+---+-----------------------------------------+
+| libvirt-python             | O | For testing Python libvirt/libguestfs   |
+|              |             |   | interactions.                           |
+--------------+-------------+---+-----------------------------------------+
 | Win::Hivex   |             | O | Perl bindings for hivex.                |
 +--------------+-------------+---+-----------------------------------------+
 | Pod::Usage   |             | O | Perl module used by tests.              |
@@ -395,7 +403,7 @@ Don't enable GCC warnings (ie. *don't* use
 Copyright and license information
 ----------------------------------------------------------------------

-Copyright (C) 2009-2014 Red Hat Inc.
+Copyright (C) 2009-2015 Red Hat Inc.

 The library is distributed under the LGPLv2+.  The programs are
 distributed under the GPLv2+.  Please see the files COPYING and
--- a/6
+++ b/6
@@ -598,3 +598,9 @@ Improvements in virt-log

 - Support Windows guests, see
  http://rwmj.wordpress.com/2011/04/17/decoding-the-windows-event-log-using-guestfish/
+
+Subsecond handling in virt-diff, virt-ls
+----------------------------------------
+
+Handle nanoseconds properly.  You should be able to specify them on
+the command line and display them.
--- a/align/Makefile.am
+++ b/align/Makefile.am
@@ -68,6 +68,7 @@ virt_alignment_scan_LDADD = \
 	$(top_builddir)/src/libguestfs.la \
 	$(LIBXML2_LIBS) \
 	$(LIBVIRT_LIBS) \
+	$(LTLIBINTL) \
 	../gnulib/lib/libgnu.la \
 	-lm

--- a/align/scan.c
+++ b/align/scan.c
@@ -115,6 +115,7 @@ main (int argc, char *argv[])
    { "help", 0, 0, HELP_OPTION },
    { "long-options", 0, 0, 0 },
    { "quiet", 0, 0, 'q' },
+    { "short-options", 0, 0, 0 },
    { "uuid", 0, 0, 0, },
    { "verbose", 0, 0, 'v' },
    { "version", 0, 0, 'V' },
@@ -122,6 +123,7 @@ main (int argc, char *argv[])
  };
  struct drv *drvs = NULL;
  const char *format = NULL;
+  bool format_consumed = true;
  int c;
  int option_index;
  int exit_code;
@@ -142,11 +144,10 @@ main (int argc, char *argv[])
    case 0:			/* options which are long only */
      if (STREQ (long_options[option_index].name, "long-options"))
        display_long_options (long_options);
+      else if (STREQ (long_options[option_index].name, "short-options"))
+        display_short_options (options);
      else if (STREQ (long_options[option_index].name, "format")) {
-        if (!optarg || STREQ (optarg, ""))
-          format = NULL;
-        else
-          format = optarg;
+        OPTION_format;
      } else if (STREQ (long_options[option_index].name, "uuid")) {
        uuid = 1;
      } else {
@@ -211,6 +212,8 @@ main (int argc, char *argv[])
  if (optind != argc)
    usage (EXIT_FAILURE);

+  CHECK_OPTION_format_consumed;
+
  /* virt-alignment-scan has two modes.  If the user didn't specify
   * any drives, then we do the scan on every libvirt guest.  That's
   * the if-clause below.  If the user specified domains/drives, then
@@ -350,15 +353,15 @@ scan (guestfs_h *g, const char *prefix, FILE *fp)
 static int
 scan_work (guestfs_h *g, size_t i, FILE *fp)
 {
-  struct guestfs___add_libvirt_dom_argv optargs;
+  struct guestfs_add_libvirt_dom_argv optargs;

  optargs.bitmask =
-    GUESTFS___ADD_LIBVIRT_DOM_READONLY_BITMASK |
-    GUESTFS___ADD_LIBVIRT_DOM_READONLYDISK_BITMASK;
+    GUESTFS_ADD_LIBVIRT_DOM_READONLY_BITMASK |
+    GUESTFS_ADD_LIBVIRT_DOM_READONLYDISK_BITMASK;
  optargs.readonly = 1;
  optargs.readonlydisk = "read";

-  if (guestfs___add_libvirt_dom (g, domains[i].dom, &optargs) == -1)
+  if (guestfs_add_libvirt_dom_argv (g, domains[i].dom, &optargs) == -1)
    return -1;

  if (guestfs_launch (g) == -1)
--- a/align/test-virt-alignment-scan-guests.sh
+++ b/align/test-virt-alignment-scan-guests.sh
@@ -26,7 +26,7 @@ fi
 guestsdir="$(cd ../tests/guests && pwd)"
 libvirt_uri="test://$guestsdir/guests-all-good.xml"

-$VG ./virt-alignment-scan -c "$libvirt_uri"
+$VG virt-alignment-scan -c "$libvirt_uri"
 r=$?

 # 0, 2 and 3 are reasonable non-error exit codes.  Others are errors.
--- a/align/test-virt-alignment-scan.sh
+++ b/align/test-virt-alignment-scan.sh
@@ -18,7 +18,7 @@

 export LANG=C

-$VG ./virt-alignment-scan -a ../tests/guests/fedora.img
+$VG virt-alignment-scan -a ../tests/guests/fedora.img
 r=$?

 # 0, 2 and 3 are reasonable non-error exit codes.  Others are errors.
--- a/align/virt-alignment-scan.pod
+++ b/align/virt-alignment-scan.pod
@@ -250,13 +250,13 @@ Partitions which are not aligned correctly to the underlying
 storage cause extra I/O.  For example:

                       sect#63
-                       +--------------------------+------
-                       |         guest            |
-                       |    filesystem block      |
- ---+------------------+------+-------------------+-----+---
-    |  host block             |  host block             |
-    |                         |                         |
- ---+-------------------------+-------------------------+---
+                       ┌──────────────────────────┬ ─ ─ ─ ─
+                       │         guest            │
+                       │    filesystem block      │
+  ─ ┬──────────────────┴──────┬───────────────────┴─────┬ ─ ─
+    │  host block             │  host block             │
+    │                         │                         │
+  ─ ┴─────────────────────────┴─────────────────────────┴ ─ ─

 In this example, each time a 4K guest block is read, two blocks on the
 host must be accessed (so twice as much I/O is done).  When a 4K guest
--- a/appliance/Makefile.am
+++ b/appliance/Makefile.am
@@ -1,5 +1,5 @@
 # libguestfs
-# Copyright (C) 2009-2014 Red Hat Inc.
+# Copyright (C) 2009-2015 Red Hat Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -21,6 +21,8 @@ EXTRA_DIST = \
 	99-guestfs-serial.rules \
 	excludefiles.in \
 	guestfsd.suppressions \
+	guestfs_lvm_conf.aug \
+	guestfs_shadow.aug \
 	hostfiles.in \
 	init \
 	libguestfs-make-fixed-appliance.in \
@@ -74,12 +76,14 @@ packagelist: packagelist.in Makefile
 	cmp -s $@ $@-t || mv $@-t $@
 	rm -f $@-t

-supermin.d/daemon.tar.gz: ../daemon/guestfsd guestfsd.suppressions
+supermin.d/daemon.tar.gz: ../daemon/guestfsd guestfsd.suppressions guestfs_lvm_conf.aug guestfs_shadow.aug
 	rm -f $@ $@-t
 	rm -rf tmp-d
-	mkdir -p tmp-d$(DAEMON_SUPERMIN_DIR) tmp-d/etc
+	mkdir -p tmp-d$(DAEMON_SUPERMIN_DIR) tmp-d/etc tmp-d/usr/share/guestfs
 	ln ../daemon/guestfsd tmp-d$(DAEMON_SUPERMIN_DIR)/guestfsd
 	ln $(srcdir)/guestfsd.suppressions tmp-d/etc/guestfsd.suppressions
+	ln $(srcdir)/guestfs_lvm_conf.aug tmp-d/usr/share/guestfs/guestfs_lvm_conf.aug
+	ln $(srcdir)/guestfs_shadow.aug tmp-d/usr/share/guestfs/guestfs_shadow.aug
 	( cd tmp-d && tar zcf - * ) > $@-t
 	rm -r tmp-d
 	mv $@-t $@
--- a/appliance/excludefiles.in
+++ b/appliance/excludefiles.in
@@ -11,6 +11,9 @@ dnl   REDHAT=1     For Fedora, RHEL, EPEL and workalikes.
 dnl   DEBIAN=1     For Debian.
 dnl   UBUNTU=1     For Ubuntu.
 dnl   ARCHLINUX=1  For Archlinux.
+dnl   SUSE=1       For OpenSUSE.
+dnl   FRUGALWARE=1 For Frugalware.
+dnl   MAGEIA=1     For Mageia.
 dnl
 dnl Note that any matching file will be dropped from the appliance.
 dnl Of course, this may break the appliance, so be careful.
@@ -42,3 +45,10 @@ dnl For Debian:
 -/usr/share/doc-base/*
 -/usr/share/bug/*
 -/etc/initramfs-tools/*
+
+dnl For Ubuntu:
+ifelse(UBUNTU,1,
+dnl This lvm2 rule automatically re-enables vgs when they are added
+dnl or changed
+-/lib/udev/rules.d/85-lvm2.rules
+)
--- a/appliance/guestfs_lvm_conf.aug
+++ b/appliance/guestfs_lvm_conf.aug
@@ -0,0 +1,74 @@
+(*
+Module: LVM
+  Parses LVM metadata.
+
+Author: Gabriel de Perthuis	      <g2p.code+augeas@gmail.com>
+
+About: License
+  This file is licensed under the LGPL v2+.
+
+About: Configuration files
+  This lens applies to files in /etc/lvm/backup and /etc/lvm/archive.
+
+About: Examples
+  The <Test_LVM> file contains various examples and tests.
+*)
+
+module Guestfs_LVM_conf =
+	autoload xfm
+
+	(* See lvm2/libdm/libdm-config.c for tokenisation;
+	 * libdm uses a blacklist but I prefer the safer whitelist approach. *)
+	(* View: identifier
+	 * The left hand side of a definition *)
+	let identifier = /[a-zA-Z0-9_-]+/
+
+	(* strings can contain backslash-escaped dquotes, but I don't know
+	 * how to get the message across to augeas *)
+	let str = [label "str". Quote.do_dquote (store /([^\"]|\\\\.)*/)]
+	let int = [label "int". store Rx.relinteger]
+	(* View: flat_literal
+	 * A literal without structure *)
+	let flat_literal = int|str
+
+	(* allow multiline and mixed int/str, used for raids and stripes *)
+	(* View: list
+	 * A list containing flat literals *)
+	let list = [
+		  label "list" . counter "list"
+		. del /\[[ \t\n]*/ "["
+		.([seq "list". flat_literal . del /,[ \t\n]*/ ", "]*
+				. [seq "list". flat_literal . del /[ \t\n]*/ ""])?
+		. Util.del_str "]"]
+
+	(* View: val
+	 * Any value that appears on the right hand side of an assignment *)
+	let val = flat_literal | list
+
+	(* View: nondef
+	 * A line that doesn't contain a statement *)
+	let nondef =
+		  Util.empty
+		| Util.comment
+
+	(* Build.block couldn't be reused, because of recursion and
+	 * a different philosophy of whitespace handling. *)
+	(* View: def
+	 * An assignment, or a block containing definitions *)
+	let rec def = [
+		  Util.indent . key identifier . (
+			   del /[ \t]*\{\n/ " {\n"
+			  .[label "dict".(nondef | def)*]
+			  . Util.indent . Util.del_str "}\n"
+			  |Sep.space_equal . val . Util.comment_or_eol)]
+
+	(* View: lns
+	 * The main lens *)
+	let lns = (nondef | def)*
+
+	let filter =
+		  incl "/etc/lvm/archive/*.vg"
+		. incl "/etc/lvm/backup/*"
+		. Util.stdexcl
+
+	let xfm = transform lns filter
--- a/appliance/guestfs_shadow.aug
+++ b/appliance/guestfs_shadow.aug
@@ -0,0 +1,72 @@
+(*
+ Module: Shadow
+ Parses /etc/shadow
+
+ Author: Lorenzo M. Catucci <catucci@ccd.uniroma2.it>
+
+ Original Author: Free Ekanayaka <free@64studio.com>
+
+ About: Reference
+
+   - man 5 shadow
+   - man 3 getspnam
+
+ About: License
+   This file is licensed under the LGPL v2+, like the rest of Augeas.
+
+ About:
+
+ Each line in the shadow files represents the additional shadow-defined attributes
+ for the corresponding user, as defined in the passwd file.
+
+*)
+
+module Guestfs_Shadow =
+
+   autoload xfm
+
+(************************************************************************
+ *                           USEFUL PRIMITIVES
+ *************************************************************************)
+
+let eol        = Util.eol
+let comment    = Util.comment
+let empty      = Util.empty
+let dels       = Util.del_str
+
+let colon      = Sep.colon
+
+let word       = Rx.word
+let integer    = Rx.integer
+
+let sto_to_col = Passwd.sto_to_col
+let sto_to_eol = Passwd.sto_to_eol
+
+(************************************************************************
+ * Group:                        ENTRIES
+ *************************************************************************)
+
+(* View: entry *)
+let entry   = [ key word
+                . colon
+                . [ label "password"          . sto_to_col?    . colon ]
+                . [ label "lastchange_date"   . store integer? . colon ]
+                . [ label "minage_days"       . store integer? . colon ]
+                . [ label "maxage_days"       . store integer? . colon ]
+                . [ label "warn_days"         . store integer? . colon ]
+                . [ label "inactive_days"     . store integer? . colon ]
+                . [ label "expire_date"       . store integer? . colon ]
+                . [ label "flag"              . store integer? ]
+                . eol ]
+
+(************************************************************************
+ *                                LENS
+ *************************************************************************)
+
+let lns        = (comment|empty|entry) *
+
+let filter
+               = incl "/shadow"
+               . Util.stdexcl
+
+let xfm        = transform lns filter
--- a/appliance/hostfiles.in
+++ b/appliance/hostfiles.in
@@ -9,6 +9,9 @@ dnl   REDHAT=1     For Fedora, RHEL, EPEL and workalikes.
 dnl   DEBIAN=1     For Debian.
 dnl   UBUNTU=1     For Ubuntu.
 dnl   ARCHLINUX=1  For Archlinux.
+dnl   SUSE=1       For OpenSUSE.
+dnl   FRUGALWARE=1 For Frugalware.
+dnl   MAGEIA=1     For Mageia.

 /lib/lsb/*
 /usr/share/augeas/lenses/*.aug
--- a/appliance/init
+++ b/appliance/init
@@ -41,6 +41,15 @@ ln -s ../run/lock /var/lock
 # devtmpfs is required since udev 176
 mount -t devtmpfs /dev /dev

+# Static nodes must happen before udev is started.
+
+# Set up kmod static-nodes (RHBZ#1011907).
+mkdir -p /run/tmpfiles.d
+kmod static-nodes --format=tmpfiles --output=/run/tmpfiles.d/kmod.conf
+
+# Set up tmpfiles (must run after kmod.conf is created above).
+systemd-tmpfiles --prefix=/dev --create --boot
+
 # Find udevd and run it directly.
 for f in /sbin/udevd /lib/udev/udevd \
    /lib/systemd/systemd-udevd /usr/lib/systemd/systemd-udevd \
@@ -51,7 +60,7 @@ if [ -z "$UDEVD" ]; then
  echo "udev not found!  Things will probably not work ..."
 fi

-$UDEVD --daemon
+$UDEVD --daemon #--debug
 udevadm trigger
 udevadm settle --timeout=600

@@ -59,13 +68,6 @@ if grep -sq selinux=1 /proc/cmdline; then
  mount -t selinuxfs none /sys/fs/selinux
 fi

-# Set up kmod static-nodes (RHBZ#1011907).
-mkdir -p /run/tmpfiles.d
-kmod static-nodes --format=tmpfiles --output=/run/tmpfiles.d/kmod.conf
-
-# Set up tmpfiles (must run after kmod.conf is created above).
-systemd-tmpfiles --prefix=/dev --create
-
 # Disk optimizations.
 # Increase the SCSI timeout so we can read remote images.
 for f in /sys/block/sd*/device/timeout; do echo 300 > $f; done
@@ -79,12 +81,13 @@ hwclock -u -s
 ip addr add 127.0.0.1/8 brd + dev lo scope host
 ip link set dev lo up

-ip addr add 169.254.2.10/16 brd + dev eth0 scope global
-ip link set dev eth0 up
-
-ip route add default via 169.254.2.2
-
-echo nameserver 169.254.2.3 > /etc/resolv.conf
+if grep -sq guestfs_network=1 /proc/cmdline; then
+    if dhclient --version >/dev/null 2>&1; then
+        dhclient
+    else
+        dhcpcd
+    fi
+fi

 # Scan for MDs.
 mdadm -As --auto=yes --run
@@ -113,8 +116,7 @@ if grep -sq guestfs_verbose=1 /proc/cmdline; then
    date
    echo -n "clocksource: "
    cat /sys/devices/system/clocksource/clocksource0/current_clocksource
-    #ping -n -v -c 5 10.0.2.2
-    #ping -n -v -c 5 10.0.2.4
+    #ping -n -v -c 5 8.8.8.8

    echo -n "uptime: "; cat /proc/uptime
 fi
--- a/appliance/libguestfs-make-fixed-appliance.pod
+++ b/appliance/libguestfs-make-fixed-appliance.pod
@@ -175,4 +175,4 @@ Richard W.M. Jones (C<rjones at redhat dot com>)

 =head1 COPYRIGHT

-Copyright (C) 2009-2014 Red Hat Inc.
+Copyright (C) 2009-2015 Red Hat Inc.
--- a/appliance/make.sh.in
+++ b/appliance/make.sh.in
@@ -1,6 +1,6 @@
 #!/bin/bash -
 # @configure_input@
-# Copyright (C) 2009-2014 Red Hat Inc.
+# Copyright (C) 2009-2015 Red Hat Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
--- a/appliance/packagelist.in
+++ b/appliance/packagelist.in
@@ -7,8 +7,10 @@ dnl
 dnl   REDHAT=1     For Fedora, RHEL, EPEL and workalikes.
 dnl   DEBIAN=1     For Debian.
 dnl   UBUNTU=1     For Ubuntu.
-dnl   MAGEIA=1     For Mageia
 dnl   ARCHLINUX=1  For Archlinux.
+dnl   SUSE=1       For OpenSUSE.
+dnl   FRUGALWARE=1 For Frugalware.
+dnl   MAGEIA=1     For Mageia.
 dnl
 dnl There is also a list of packages which are excluded if they appear
 dnl as dependencies of the packages below.  See: excludelist.in
@@ -25,7 +27,7 @@ ifelse(REDHAT,1,
  btrfs-progs
  cryptsetup
  cryptsetup-luks      dnl old name used before Fedora 17
-  e2fsprogs
+  dhclient
  dnl e4fsprogs only exists on RHEL 5, will be ignored everywhere else.
  e4fsprogs
  genisoimage
@@ -58,7 +60,6 @@ ifelse(DEBIAN,1,
  bsdmainutils
  btrfs-tools
  cryptsetup
-  e2fsprogs
  extlinux
  genisoimage
 dnl gfs-tools, gfs2-tools have been renamed to gfs2-utils
@@ -73,10 +74,13 @@ dnl iproute has been renamed to iproute2
  iputils-ping
  iputils-arping
  iputils-tracepath
+  isc-dhcp-client
  libaugeas0
+  libc-bin
  libcap2
  libhivex0
  libpcre3
+  libsystemd0
  libsystemd-id128-0
  libsystemd-journal0
  libyajl2
@@ -88,6 +92,7 @@ dnl iproute has been renamed to iproute2
  openssh-client
  reiserfsprogs
  sysvinit                  dnl for /sbin/reboot
+  systemd                   dnl alternative for /sbin/reboot
  ufsutils
  vim-tiny
  xz-utils
@@ -99,7 +104,8 @@ ifelse(ARCHLINUX,1,
  btrfs-progs
  cdrkit
  cryptsetup
-  e2fsprogs
+  dhcpcd
+  gptfdisk
  grub
  hivex
  iproute2
@@ -107,6 +113,9 @@ ifelse(ARCHLINUX,1,
  libcap
  linux
  lrzip
+  dnl syslinux has mtools as optional dependency, but in reality it's
+  dnl a hard one:
+  mtools
  nilfs-utils
  ntfsprogs
  ntfs-3g
@@ -119,12 +128,35 @@ ifelse(ARCHLINUX,1,
  zfs-fuse
 )

+ifelse(SUSE,1,
+  augeas
+  dnl It seems no other augeas package depends on it.
+  augeas-lenses
+  btrfsprogs
+  cryptsetup
+  dhcpcd
+  genisoimage
+  glibc-locale
+  gptfdisk
+  hivex
+  iproute2
+  iputils
+  libcap2
+  libselinux1
+  libyajl2
+  mkisofs
+  reiserfs
+  systemd
+  vim
+  xz
+)
+
 ifelse(FRUGALWARE,1,
  augeas
  btrfs-progs
  cryptsetup-luks
-  e2fsprogs
  cdrkit
+  dhclient
  grub2
  hfsplus
  iproute2
@@ -136,45 +168,13 @@ ifelse(FRUGALWARE,1,
  openssh
  pcre
  reiserfsprogs
-  syslinux
  systemd
  vim
  xz
  yajl
  xfsprogs-acl
  xfsprogs-attr
-  bash
-  binutils
-  bzip2
-  coreutils
-  cpio
-  diffutils
-  dosfstools
-  file
-  findutils
-  gawk
  gptfdisk
-  grep
-  gzip
-  jfsutils
-  kmod
-  less
-  libxml2
-  lsof
-  lsscsi
-  lvm2
-  mdadm
-  module-init-tools
-  parted
-  procps
-  psmisc
-  rsync
-  sed
-  strace
-  syslinux
-  tar
-  util-linux
-  xfsprogs
 )

 ifelse(MAGEIA,1,
@@ -182,8 +182,9 @@ ifelse(MAGEIA,1,
  btrfs-progs
  cryptsetup
  chkconfig /* for /etc/init.d */
-  e2fsprogs
  cdrkit-genisoimage
+  cdrkit-isotools
+  dhcp-client
  extlinux
  gfs2-utils
  grub
@@ -192,6 +193,8 @@ ifelse(MAGEIA,1,
  iproute2
  iputils
  libcap
+  dnl syslinux uses mtools without depending on it
+  mtools
  nilfs-utils
  ntfsprogs
  ntfs-3g
@@ -203,10 +206,6 @@ ifelse(MAGEIA,1,
  vim-minimal
  xz
  yajl
-  module-init-tools
-  procps-ng
-  udev
-  util-linux-ng
 )

 acl
@@ -218,6 +217,7 @@ coreutils
 cpio
 diffutils
 dosfstools
+e2fsprogs
 file
 findutils
 gawk
--- a/bash/Makefile.am
+++ b/bash/Makefile.am
@@ -21,6 +21,11 @@ scripts = \
 	guestfish \
 	guestmount \
 	virt-alignment-scan \
+	virt-rescue \
+	virt-resize \
+	virt-v2v
+
+symlinks = \
 	virt-builder \
 	virt-cat \
 	virt-df \
@@ -30,45 +35,42 @@ scripts = \
 	virt-inspector \
 	virt-log \
 	virt-ls \
-	virt-rescue \
-	virt-resize \
 	virt-sparsify \
 	virt-sysprep

+# Note: Don't distribute the symbolic links, only the real files.
 EXTRA_DIST = \
 	README \
 	$(scripts)

-# Some of the scripts are simply symbolic links.
-virt-cat:
-	ln -sf virt-alignment-scan $@
-virt-df:
-	ln -sf virt-alignment-scan $@
-virt-edit:
-	ln -sf virt-alignment-scan $@
-virt-filesystems:
-	ln -sf virt-alignment-scan $@
-virt-format:
-	ln -sf virt-alignment-scan $@
-virt-inspector:
-	ln -sf virt-alignment-scan $@
-virt-log:
-	ln -sf virt-alignment-scan $@
-virt-ls:
-	ln -sf virt-alignment-scan $@
-virt-sysprep:
-	ln -sf virt-alignment-scan $@
+CLEANFILES = \
+	$(symlinks)

-virt-builder:
-	ln -sf virt-resize $@
-virt-sparsify:
-	ln -sf virt-resize $@
+# Some of the scripts are simply symbolic links.
+virt-cat virt-df virt-edit virt-filesystems virt-format virt-inspector \
+virt-log virt-ls virt-sysprep:
+	rm -f $@
+	$(LN_S) virt-alignment-scan $@
+
+virt-builder virt-sparsify:
+	rm -f $@
+	$(LN_S) virt-resize $@

 if HAVE_BASH_COMPLETION

 # Bash completion script.

 bashcompletiondir = $(BASH_COMPLETIONS_DIR)
-bashcompletion_DATA = $(scripts)
+#bashcompletion_DATA = $(scripts)
+
+all-local: $(scripts) $(symlinks)
+	-test $(srcdir) != $(builddir) && cd $(srcdir) && cp $(scripts) $(abs_builddir)/
+
+install-data-local:
+	$(mkdir_p) $(DESTDIR)$(bashcompletiondir)
+	cp -d $(scripts) $(symlinks) $(DESTDIR)$(bashcompletiondir)
+
+clean-local:
+	-test $(srcdir) != $(builddir) && rm -f $(scripts)

 endif
--- a/bash/guestfish
+++ b/bash/guestfish
@@ -1,5 +1,5 @@
 # guestfish bash completion script -*- shell-script -*-
-# Copyright (C) 2010-2014 Red Hat Inc.
+# Copyright (C) 2010-2015 Red Hat Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -31,12 +31,10 @@ _guestfs_virsh_list ()
 _guestfish ()
 {
    local cur prev words cword split
-    local longopts flag_ro=0 c=1 word cmds doms
+    local shortopts longopts flag_ro=0 c=1 word cmds doms

    _init_completion -s || return

-    longopts="$(guestfish --long-options)"
-
    # See if user has specified certain options anywhere on the
    # command line before the current word.
    while [ $c -lt $COMP_CWORD ]; do
@@ -60,8 +58,15 @@ _guestfish ()
    case "$cur" in
        --*)
            # --options
+            longopts="$(guestfish --long-options)"
            COMPREPLY=( $(compgen -W "$longopts" -- "$cur") )
            return ;;
+        -*)
+            # -o and --options
+            shortopts="$(guestfish --short-options)"
+            longopts="$(guestfish --long-options)"
+            COMPREPLY=( $(compgen -W "$shortopts $longopts" -- "$cur") )
+            return ;;
        *)
            # Might be a guestfish command.
            cmds=$(guestfish -h| head -n -1 | tail -n +2 | awk '{print $1}')
--- a/bash/guestmount
+++ b/bash/guestmount
@@ -1,5 +1,5 @@
 # guestmount bash completion script -*- shell-script -*-
-# Copyright (C) 2010-2014 Red Hat Inc.
+# Copyright (C) 2010-2015 Red Hat Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -31,12 +31,10 @@ _guestfs_virsh_list ()
 _guestmount ()
 {
    local cur prev words cword split
-    local longopts flag_ro=0 c=1 word doms
+    local shortopts longopts flag_ro=0 c=1 word doms

    _init_completion -s || return

-    longopts="$(guestmount --long-options)"
-
    # See if user has specified certain options anywhere on the
    # command line before the current word.
    while [ $c -lt $COMP_CWORD ]; do
@@ -57,8 +55,15 @@ _guestmount ()
    case "$cur" in
        --*)
            # --options
+            longopts="$(guestmount --long-options)"
            COMPREPLY=( $(compgen -W "$longopts" -- "$cur") )
            return ;;
+        -*)
+            # -o and --options
+            shortopts="$(guestmount --short-options)"
+            longopts="$(guestmount --long-options)"
+            COMPREPLY=( $(compgen -W "$shortopts $longopts" -- "$cur") )
+            return ;;
        *)
            COMPREPLY=( $(compgen "$cur") )
            return ;;
--- a/bash/virt-alignment-scan
+++ b/bash/virt-alignment-scan
@@ -1,5 +1,5 @@
 # virt-tools bash completion script -*- shell-script -*-
-# Copyright (C) 2010-2014 Red Hat Inc.
+# Copyright (C) 2010-2015 Red Hat Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -31,7 +31,7 @@ _guestfs_virsh_list ()
 _guestfs_virttools ()
 {
    local cur prev words cword split
-    local longopts="$1" flag_ro="$2" doms
+    local shortopts longopts tool="$1" flag_ro="$2" doms

    _init_completion -s || return

@@ -45,8 +45,15 @@ _guestfs_virttools ()
    case "$cur" in
        --*)
            # --options
+            longopts="$($tool --long-options)"
            COMPREPLY=( $(compgen -W "$longopts" -- "$cur") )
            return ;;
+        -*)
+            # -o and --options
+            shortopts="$($tool --short-options)"
+            longopts="$($tool --long-options)"
+            COMPREPLY=( $(compgen -W "$shortopts $longopts" -- "$cur") )
+            return ;;
        *)
            COMPREPLY=( $(compgen "$cur") )
            return ;;
@@ -55,54 +62,60 @@ _guestfs_virttools ()

 _virt_alignment_scan ()
 {
-    _guestfs_virttools "$(virt-alignment-scan --long-options)" 1
+    _guestfs_virttools "virt-alignment-scan" 1
 } &&
 complete -o default -F _virt_alignment_scan virt-alignment-scan

 _virt_cat ()
 {
-    _guestfs_virttools "$(virt-cat --long-options)" 1
+    _guestfs_virttools "virt-cat" 1
 } &&
 complete -o default -F _virt_cat virt-cat

 _virt_df ()
 {
-    _guestfs_virttools "$(virt-df --long-options)" 1
+    _guestfs_virttools "virt-df" 1
 } &&
 complete -o default -F _virt_df virt-df

 _virt_edit ()
 {
-    _guestfs_virttools "$(virt-edit --long-options)" 0
+    _guestfs_virttools "virt-edit" 0
 } &&
 complete -o default -F _virt_edit virt-edit

 _virt_filesystems ()
 {
-    _guestfs_virttools "$(virt-filesystems --long-options)" 1
+    _guestfs_virttools "virt-filesystems" 1
 } &&
 complete -o default -F _virt_filesystems virt-filesystems

 _virt_format ()
 {
-    _guestfs_virttools "$(virt-format --long-options)" 0
+    _guestfs_virttools "virt-format" 0
 } &&
 complete -o default -F _virt_format virt-format

 _virt_inspector ()
 {
-    _guestfs_virttools "$(virt-inspector --long-options)" 1
+    _guestfs_virttools "virt-inspector" 1
 } &&
 complete -o default -F _virt_inspector virt-inspector

 _virt_ls ()
 {
-    _guestfs_virttools "$(virt-ls --long-options)" 1
+    _guestfs_virttools "virt-ls" 1
 } &&
 complete -o default -F _virt_ls virt-ls

 _virt_sysprep ()
 {
-    _guestfs_virttools "$(virt-sysprep --long-options)" 0
+    _guestfs_virttools "virt-sysprep" 0
 } &&
 complete -o default -F _virt_sysprep virt-sysprep
+
+_virt_log ()
+{
+    _guestfs_virttools "virt-log" 1
+} &&
+complete -o default -F _virt_log virt-log
--- a/bash/virt-rescue
+++ b/bash/virt-rescue
@@ -1,5 +1,5 @@
 # virt-rescue bash completion script -*- shell-script -*-
-# Copyright (C) 2010-2014 Red Hat Inc.
+# Copyright (C) 2010-2015 Red Hat Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -31,12 +31,10 @@ _guestfs_virsh_list ()
 _virt_rescue ()
 {
    local cur prev words cword split
-    local longopts flag_ro=0 c=1 word doms
+    local shortopts longopts flag_ro=0 c=1 word doms

    _init_completion -s || return

-    longopts="$(virt-rescue --long-options)"
-
    # See if user has specified certain options anywhere on the
    # command line before the current word.
    while [ $c -lt $COMP_CWORD ]; do
@@ -57,8 +55,15 @@ _virt_rescue ()
    case "$cur" in
        --*)
            # --options
+            longopts="$(virt-rescue --long-options)"
            COMPREPLY=( $(compgen -W "$longopts" -- "$cur") )
            return ;;
+        -*)
+            # -o and --options
+            shortopts="$(virt-rescue --short-options)"
+            longopts="$(virt-rescue --long-options)"
+            COMPREPLY=( $(compgen -W "$shortopts $longopts" -- "$cur") )
+            return ;;
        *)
            COMPREPLY=( $(compgen "$cur") )
            return ;;
--- a/bash/virt-resize
+++ b/bash/virt-resize
@@ -1,6 +1,6 @@
 # virt-resize, virt-builder, virt-sparsify bash completion script
 # -*- shell-script -*-
-# Copyright (C) 2010-2014 Red Hat Inc.
+# Copyright (C) 2010-2015 Red Hat Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -19,15 +19,37 @@
 _guestfs_options_only ()
 {
    local cur prev words cword split
-    local longopts="$1"
+    local shortopts longopts tool="$1"

    _init_completion -s || return

+    case "$prev" in
+        --align-first)
+            COMPREPLY=( $( compgen -W "never always auto" -- "$cur") )
+            return ;;
+        --check-tmpdir)
+            COMPREPLY=( $( compgen -W "ignore i continue cont c warn warning w fail f error" -- "$cur") )
+            return ;;
+        --list-format)
+            COMPREPLY=( $( compgen -W "short long json" -- "$cur") )
+            return ;;
+        --password-crypto)
+            COMPREPLY=( $( compgen -W "md5 sha256 sha512" -- "$cur") )
+            return ;;
+    esac
+
    case "$cur" in
        --*)
            # --options
+            longopts="$($tool --long-options)"
            COMPREPLY=( $(compgen -W "$longopts" -- "$cur") )
            return ;;
+        -*)
+            # -o and --options
+            shortopts="$($tool --short-options)"
+            longopts="$($tool --long-options)"
+            COMPREPLY=( $(compgen -W "$shortopts $longopts" -- "$cur") )
+            return ;;
        *)
            COMPREPLY=( $(compgen "$cur") )
            return ;;
@@ -36,18 +58,18 @@ _guestfs_options_only ()

 _virt_builder ()
 {
-    _guestfs_options_only "$(virt-builder --long-options)"
+    _guestfs_options_only "virt-builder"
 } &&
 complete -o default -F _virt_builder virt-builder

 _virt_resize ()
 {
-    _guestfs_options_only "$(virt-resize --long-options)"
+    _guestfs_options_only "virt-resize"
 } &&
 complete -o default -F _virt_resize virt-resize

 _virt_sparsify ()
 {
-    _guestfs_options_only "$(virt-sparsify --long-options)"
+    _guestfs_options_only "virt-sparsify"
 } &&
 complete -o default -F _virt_sparsify virt-sparsify
--- a/bash/virt-v2v
+++ b/bash/virt-v2v
@@ -0,0 +1,59 @@
+# virt-v2v bash completion script -*- shell-script -*-
+# Copyright (C) 2014 Red Hat Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+_virt_v2v ()
+{
+    local cur prev words cword split
+    local shortopts longopts items
+
+    _init_completion -s || return
+
+    case "$prev" in
+        -i)
+            items="$(virt-v2v --machine-readable | awk -F':' '/input:/ {print $2;}')"
+            COMPREPLY=( $( compgen -W "$items" -- "$cur") )
+            return ;;
+        -o)
+            items="$(virt-v2v --machine-readable | awk -F':' '/output:/ {print $2;}')"
+            COMPREPLY=( $( compgen -W "$items" -- "$cur") )
+            return ;;
+        -oa)
+            COMPREPLY=( $( compgen -W "sparse preallocated" -- "$cur") )
+            return ;;
+        --vmtype)
+            COMPREPLY=( $( compgen -W "server desktop" -- "$cur") )
+            return ;;
+    esac
+
+    case "$cur" in
+        --*)
+            # --options
+            longopts="$(virt-v2v --long-options)"
+            COMPREPLY=( $(compgen -W "$longopts" -- "$cur") )
+            return ;;
+        -*)
+            # -o and --options
+            shortopts="$(virt-v2v --short-options)"
+            longopts="$(virt-v2v --long-options)"
+            COMPREPLY=( $(compgen -W "$shortopts $longopts" -- "$cur") )
+            return ;;
+        *)
+            COMPREPLY=( $(compgen "$cur") )
+            return ;;
+    esac
+} &&
+complete -o default -F _virt_v2v virt-v2v
--- a/6
+++ b/6
@@ -34,13 +34,12 @@ libtoolize --copy --install
 gnulib_tool=$GNULIB_SRCDIR/gnulib-tool
 <$gnulib_tool || exit

-(cd daemon && mkdir -p tests lib && ../$gnulib_tool --dir=.. --update)
-
 modules='
 accept4
 areadlink
 areadlinkat
 arpa_inet
+base64
 byteswap
 c-ctype
 cloexec
@@ -64,6 +63,7 @@ gnumakefile
 hash
 hash-pjw
 human
+iconv
 ignore-value
 lock
 maintainer-makefile
@@ -77,6 +77,7 @@ openat
 perror
 pipe2
 pread
+ptsname_r
 read-file
 readlink
 select
@@ -95,6 +96,7 @@ vc-list-files
 warnings
 xalloc
 xalloc-die
+xgetcwd
 xstrtol
 xstrtoll
 xvasprintf
--- a/bugs-in-changelog.sh
+++ b/bugs-in-changelog.sh
@@ -1,6 +1,6 @@
 #!/bin/bash -
 # bugs-in-changelog.sh
-# Copyright (C) 2009-2014 Red Hat Inc.
+# Copyright (C) 2009-2015 Red Hat Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
--- a/builder/Makefile.am
+++ b/builder/Makefile.am
@@ -1,5 +1,5 @@
 # libguestfs virt-builder tool
-# Copyright (C) 2013 Red Hat Inc.
+# Copyright (C) 2013-2015 Red Hat Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -18,16 +18,9 @@
 include $(top_srcdir)/subdir-rules.mk

 AM_YFLAGS = -d
-AM_CFLAGS = \
-	-I$(shell $(OCAMLC) -where) \
-	-I$(top_srcdir)/gnulib/lib \
-	-I$(top_srcdir)/src \
-	-I$(top_srcdir)/fish \
-	-pthread \
-	$(LIBLZMA_CFLAGS)

 EXTRA_DIST = \
-	$(SOURCES) \
+	$(SOURCES_MLI) $(SOURCES_ML) $(SOURCES_C) \
 	libguestfs.gpg \
 	test-index \
 	test-virt-builder.sh \
@@ -40,105 +33,107 @@ EXTRA_DIST = \
 	virt-builder.pod \
 	virt-index-validate.pod

-CLEANFILES = *~ *.cmi *.cmo *.cmx *.cmxa *.o virt-builder
+CLEANFILES = *~ *.annot *.cmi *.cmo *.cmx *.cmxa *.o virt-builder

-# Alphabetical order.
-SOURCES = \
-	architecture.ml \
-	builder.ml \
+SOURCES_MLI = \
 	cache.mli \
-	cache.ml \
-	cmdline.ml \
 	downloader.mli \
-	downloader.ml \
 	get_kernel.mli \
-	get_kernel.ml \
 	index_parser.mli \
-	index_parser.ml \
-	index-parser-c.c \
 	ini_reader.mli \
-	ini_reader.ml \
 	languages.mli \
-	languages.ml \
 	list_entries.mli \
-	list_entries.ml \
-	paths.ml \
-	pxzcat.ml \
 	pxzcat.mli \
-	pxzcat-c.c \
-	setlocale.ml \
 	setlocale.mli \
-	setlocale-c.c \
 	sigchecker.mli \
-	sigchecker.ml \
 	sources.mli \
-	sources.ml \
+	uname.mli
+
+SOURCES_ML = \
+	utils.ml \
+	pxzcat.ml \
+	setlocale.ml \
 	uname.ml \
-	uname.mli \
+	architecture.ml \
+	ini_reader.ml \
+	paths.ml \
+	languages.ml \
+	get_kernel.ml \
+	cache.ml \
+	sources.ml \
+	downloader.ml \
+	sigchecker.ml \
+	index_parser.ml \
+	list_entries.ml \
+	cmdline.ml \
+	builder.ml
+
+SOURCES_C = \
+	$(top_srcdir)/mllib/fsync-c.c \
+	$(top_srcdir)/mllib/uri-c.c \
+	$(top_srcdir)/mllib/mkdtemp-c.c \
+	$(top_srcdir)/customize/perl_edit-c.c \
+	$(top_srcdir)/customize/crypt-c.c \
+	$(top_srcdir)/fish/uri.c \
+	$(top_srcdir)/fish/file-edit.c \
+	index-scan.c \
+	index-struct.c \
+	index-parse.c \
+	index-parser-c.c \
+	pxzcat-c.c \
+	setlocale-c.c \
 	uname-c.c

 man_MANS =
 noinst_DATA =
+bin_PROGRAMS =

 if HAVE_OCAML

-# Note this list must be in dependency order.
-deps = \
-	$(top_builddir)/mllib/libdir.cmx \
-	$(top_builddir)/mllib/config.cmx \
-	$(top_builddir)/mllib/common_gettext.cmx \
-	$(top_builddir)/mllib/common_utils.cmx \
-	$(top_builddir)/mllib/fsync-c.o \
-	$(top_builddir)/mllib/fsync.cmx \
-	$(top_builddir)/mllib/planner.cmx \
-	$(top_builddir)/mllib/regedit.cmx \
-	$(top_builddir)/mllib/uri-c.o \
-	$(top_builddir)/mllib/uRI.cmx \
-	$(top_builddir)/mllib/mkdtemp-c.o \
-	$(top_builddir)/mllib/mkdtemp.cmx \
-	$(top_builddir)/customize/urandom.cmx \
-	$(top_builddir)/customize/random_seed.cmx \
-	$(top_builddir)/customize/hostname.cmx \
-	$(top_builddir)/customize/timezone.cmx \
-	$(top_builddir)/customize/firstboot.cmx \
-	$(top_builddir)/customize/perl_edit.cmx \
-	$(top_builddir)/customize/crypt-c.o \
-	$(top_builddir)/customize/crypt.cmx \
-	$(top_builddir)/customize/password.cmx \
-	$(top_builddir)/customize/customize_cmdline.cmx \
-	$(top_builddir)/customize/customize_run.cmx \
-	$(top_builddir)/fish/guestfish-uri.o \
-	index-scan.o \
-	index-struct.o \
-	index-parse.o \
-	index-parser-c.o \
-	pxzcat-c.o \
-	pxzcat.cmx \
-	setlocale-c.o \
-	setlocale.cmx \
-	uname-c.o \
-	uname.cmx \
-	architecture.cmx \
-	ini_reader.cmx \
-	paths.cmx \
-	languages.cmx \
-	get_kernel.cmx \
-	cache.cmx \
-	downloader.cmx \
-	sigchecker.cmx \
-	index_parser.cmx \
-	list_entries.cmx \
-	sources.cmx \
-	cmdline.cmx \
-	builder.cmx
+bin_PROGRAMS += virt-builder

-if HAVE_OCAMLOPT
-OBJECTS = $(deps)
-else
-OBJECTS = $(patsubst %.cmx,%.cmo,$(deps))
-endif
+virt_builder_SOURCES = $(SOURCES_C)
+virt_builder_CPPFLAGS = \
+	-I. \
+	-I$(top_builddir) \
+	-I$(top_srcdir)/gnulib/lib -I$(top_builddir)/gnulib/lib \
+	-I$(shell $(OCAMLC) -where) \
+	-I$(top_srcdir)/gnulib/lib \
+	-I$(top_srcdir)/src \
+	-I$(top_srcdir)/fish
+virt_builder_CFLAGS = \
+	-pthread \
+	$(WARN_CFLAGS) $(WERROR_CFLAGS) \
+	-Wno-unused-macros \
+	$(LIBLZMA_CFLAGS) \
+	$(LIBTINFO_CFLAGS) \
+	$(LIBXML2_CFLAGS)

-bin_SCRIPTS = virt-builder
+BOBJECTS = \
+	$(top_builddir)/mllib/libdir.cmo \
+	$(top_builddir)/mllib/config.cmo \
+	$(top_builddir)/mllib/common_gettext.cmo \
+	$(top_builddir)/mllib/common_utils.cmo \
+	$(top_builddir)/mllib/fsync.cmo \
+	$(top_builddir)/mllib/planner.cmo \
+	$(top_builddir)/mllib/regedit.cmo \
+	$(top_builddir)/mllib/JSON.cmo \
+	$(top_builddir)/mllib/uRI.cmo \
+	$(top_builddir)/mllib/mkdtemp.cmo \
+	$(top_builddir)/customize/customize_utils.cmo \
+	$(top_builddir)/customize/urandom.cmo \
+	$(top_builddir)/customize/random_seed.cmo \
+	$(top_builddir)/customize/hostname.cmo \
+	$(top_builddir)/customize/timezone.cmo \
+	$(top_builddir)/customize/firstboot.cmo \
+	$(top_builddir)/customize/perl_edit.cmo \
+	$(top_builddir)/customize/crypt.cmo \
+	$(top_builddir)/customize/password.cmo \
+	$(top_builddir)/customize/ssh_key.cmo \
+	$(top_builddir)/customize/customize_cmdline.cmo \
+	$(top_builddir)/customize/customize_run.cmo \
+	$(SOURCES_ML:.ml=.cmo)
+XOBJECTS = $(BOBJECTS:.cmo=.cmx)

 # -I $(top_builddir)/src/.libs is a hack which forces corresponding -L
 # option to be passed to gcc, so we don't try linking against an
@@ -146,6 +141,7 @@ bin_SCRIPTS = virt-builder
 OCAMLPACKAGES = \
 	-package str,unix \
 	-I $(top_builddir)/src/.libs \
+	-I $(top_builddir)/gnulib/lib/.libs \
 	-I $(top_builddir)/ocaml \
 	-I $(top_builddir)/mllib \
 	-I $(top_builddir)/customize
@@ -153,38 +149,32 @@ if HAVE_OCAML_PKG_GETTEXT
 OCAMLPACKAGES += -package gettext-stub
 endif

-OCAMLCFLAGS = -g -warn-error CDEFLMPSUVYZX-3 $(OCAMLPACKAGES)
-OCAMLOPTFLAGS = $(OCAMLCFLAGS)
+OCAMLFLAGS = $(OCAML_FLAGS) $(OCAML_WARN_ERROR)

-OCAMLCLIBS  = \
-	$(LIBLZMA_LIBS) \
-	$(LIBXML2_LIBS) \
-	-L../src/.libs -lutils \
-	-L../gnulib/lib/.libs -lgnu \
-	-pthread -lpthread \
-	-lncurses -lcrypt
-
-if HAVE_OCAMLOPT
-virt-builder: $(OBJECTS)
-	$(OCAMLFIND) ocamlopt $(OCAMLOPTFLAGS) \
-	  mlguestfs.cmxa -linkpkg $^ \
-	  -cclib '$(OCAMLCLIBS)' \
-	  -o $@
+if !HAVE_OCAMLOPT
+OBJECTS = $(BOBJECTS)
+BEST    = c
+OCAMLLINKFLAGS = mlguestfs.cma -custom
 else
-virt-builder: $(OBJECTS)
-	$(OCAMLFIND) ocamlc $(OCAMLCFLAGS) \
-	  mlguestfs.cma -linkpkg $^ \
-	  -cclib '$(OCAMLCLIBS)' \
-	  -custom \
-	  -o $@
+OBJECTS = $(XOBJECTS)
+BEST    = opt
+OCAMLLINKFLAGS = mlguestfs.cmxa
 endif

+virt_builder_DEPENDENCIES = $(OBJECTS)
+virt_builder_LINK = \
+	./link.sh \
+	  $(OCAMLFIND) $(BEST) $(OCAMLFLAGS) $(OCAMLPACKAGES) $(OCAMLLINKFLAGS) \
+	  $(OBJECTS) -o $@
+
 .mli.cmi:
-	$(OCAMLFIND) ocamlc $(OCAMLCFLAGS) -c $< -o $@
+	$(OCAMLFIND) ocamlc $(OCAMLFLAGS) $(OCAMLPACKAGES) -c $< -o $@
 .ml.cmo:
-	$(OCAMLFIND) ocamlc $(OCAMLCFLAGS) -c $< -o $@
+	$(OCAMLFIND) ocamlc $(OCAMLFLAGS) $(OCAMLPACKAGES) -c $< -o $@
+if HAVE_OCAMLOPT
 .ml.cmx:
-	$(OCAMLFIND) ocamlopt $(OCAMLOPTFLAGS) -c $< -o $@
+	$(OCAMLFIND) ocamlopt $(OCAMLFLAGS) $(OCAMLPACKAGES) -c $< -o $@
+endif

 # Manual pages and HTML files for the website.

@@ -224,12 +214,12 @@ fedora.qcow2: ../tests/guests/fedora.img

 fedora.qcow2.xz: fedora.qcow2
 	rm -f $@ $@-t
-	xz --best --block-size=16777216 -c $< > $@-t
+	xz --best -c $< > $@-t
 	mv $@-t $@

 %.xz: ../tests/guests/%.img
 	rm -f $@ $@-t
-	xz --best --block-size=16777216 -c $< > $@-t
+	xz --best -c $< > $@-t
 	mv $@-t $@

 TESTS = \
@@ -275,7 +265,7 @@ install-exec-hook:
 	$(LN_S) xdg/virt-builder $(DESTDIR)$(sysconfdir)/virt-builder

 # Build a small C index validator program.
-bin_PROGRAMS = virt-index-validate
+bin_PROGRAMS += virt-index-validate

 virt_index_validate_SOURCES = \
 	index-parse.y \
@@ -285,9 +275,16 @@ virt_index_validate_SOURCES = \
 	index-validate.c

 virt_index_validate_CPPFLAGS = \
-	-DLOCALEBASEDIR=\""$(datadir)/locale"\"
-
+	-DLOCALEBASEDIR=\""$(datadir)/locale"\" \
+	-I. \
+	-I$(top_builddir) \
+	-I$(top_srcdir)/gnulib/lib -I$(top_builddir)/gnulib/lib \
+	-I$(top_srcdir)/src
+virt_index_validate_CFLAGS = \
+	$(WARN_CFLAGS) $(WERROR_CFLAGS) \
+	-Wno-unused-macros
 virt_index_validate_LDADD = \
+	$(LTLIBINTL) \
 	../gnulib/lib/libgnu.la

 man_MANS += virt-index-validate.1
@@ -310,12 +307,13 @@ CLEANFILES += \
 	stamp-virt-index-validate.pod

 if HAVE_OCAML
-# Automake-generated makefile has a rule ".l.c:" but lacks a rule ".l.h:".
+# Automake-generated makefile has a rule ".y.c" but lacks a rule ".y.h".
+index-parse.h: index-parse.y
+	touch $(srcdir)/index-parse.y
+	$(MAKE) index-parse.c
 # Also it doesn't generate dependencies for the C files that include
 # index-parse.h.
 index-parser-c.c index-scan.c index-validate.c: index-parse.h
-index-parse.h: index-parse.y
-	$(MAKE) index-parse.h
 endif

 # Apparently there's no clean way with Automake to not have them
--- a/builder/builder.ml
+++ b/builder/builder.ml
@@ -23,6 +23,7 @@ module G = Guestfs
 open Common_utils
 open Password
 open Planner
+open Utils

 open Cmdline
 open Customize_cmdline
@@ -30,8 +31,6 @@ open Customize_cmdline
 open Unix
 open Printf

-let quote = Filename.quote
-
 let prog = Filename.basename Sys.executable_name

 let () = Random.self_init ()
@@ -85,12 +84,12 @@ let main () =

  (* If debugging, echo the command line arguments and the sources. *)
  if verbose then (
-    eprintf "command line:";
-    List.iter (eprintf " %s") (Array.to_list Sys.argv);
-    prerr_newline ();
+    printf "command line:";
+    List.iter (printf " %s") (Array.to_list Sys.argv);
+    print_newline ();
    iteri (
      fun i (source, fingerprint) ->
-        eprintf "source[%d] = (%S, %S)\n" i source fingerprint
+        printf "source[%d] = (%S, %S)\n" i source fingerprint
    ) sources
  );

@@ -108,9 +107,7 @@ let main () =
        Cache.clean_cachedir cachedir;
        exit 0
      | None ->
-        eprintf (f_"%s: error: could not find cache directory. Is $HOME set?\n")
-          prog;
-        exit 1
+        error (f_"could not find cache directory. Is $HOME set?")
      )

    | (`Install|`List|`Notes|`Print_cache|`Cache_all) as mode -> mode in
@@ -122,27 +119,21 @@ let main () =
   *)
  let cmd = sprintf "%s --help >/dev/null 2>&1" gpg in
  if Sys.command cmd <> 0 then (
-    if check_signature then (
-      eprintf (f_"%s: gpg is not installed (or does not work)\nYou should install gpg, or use --gpg option, or use --no-check-signature.\n") prog;
-      exit 1
-    )
+    if check_signature then
+      error (f_"gpg is not installed (or does not work)\nYou should install gpg, or use --gpg option, or use --no-check-signature.")
    else if verbose then
-      warning ~prog (f_"gpg program is not available")
+      warning (f_"gpg program is not available")
  );

  (* Check that curl works. *)
  let cmd = sprintf "%s --help >/dev/null 2>&1" curl in
-  if Sys.command cmd <> 0 then (
-    eprintf (f_"%s: curl is not installed (or does not work)\n") prog;
-    exit 1
-  );
+  if Sys.command cmd <> 0 then
+    error (f_"curl is not installed (or does not work)");

  (* Check that virt-resize works. *)
  let cmd = "virt-resize --help >/dev/null 2>&1" in
-  if Sys.command cmd <> 0 then (
-    eprintf (f_"%s: virt-resize is not installed (or does not work)\n") prog;
-    exit 1
-  );
+  if Sys.command cmd <> 0 then
+    error (f_"virt-resize is not installed (or does not work)");

  (* Create the cache. *)
  let cache =
@@ -151,34 +142,31 @@ let main () =
    | Some dir ->
      try Some (Cache.create ~verbose ~directory:dir)
      with exn ->
-        warning ~prog (f_"cache %s: %s") dir (Printexc.to_string exn);
-        warning ~prog (f_"disabling the cache");
+        warning (f_"cache %s: %s") dir (Printexc.to_string exn);
+        warning (f_"disabling the cache");
        None
  in

  (* Download the sources. *)
  let downloader = Downloader.create ~verbose ~curl ~cache in
  let repos = Sources.read_sources ~prog ~verbose in
-  let repos = List.map (
-    fun { Sources.uri = uri; Sources.gpgkey = gpgkey; Sources.proxy = proxy } ->
-      let gpgkey =
-        match gpgkey with
-        | None -> Sigchecker.No_Key
-        | Some key -> Sigchecker.KeyFile key in
-      uri, gpgkey, proxy
-  ) repos in
  let sources = List.map (
    fun (source, fingerprint) ->
-      source, Sigchecker.Fingerprint fingerprint, Downloader.SystemProxy
+      {
+        Sources.name = source; uri = source;
+        gpgkey = Utils.Fingerprint fingerprint;
+        proxy = Downloader.SystemProxy;
+      }
  ) sources in
  let sources = List.append repos sources in
  let index : Index_parser.index =
    List.concat (
      List.map (
-        fun (source, key, proxy) ->
+        fun source ->
          let sigchecker =
-            Sigchecker.create ~verbose ~gpg ~check_signature ~gpgkey:key in
-          Index_parser.get_index ~prog ~verbose ~downloader ~sigchecker ~proxy source
+            Sigchecker.create ~verbose ~gpg ~check_signature
+              ~gpgkey:source.Sources.gpgkey in
+          Index_parser.get_index ~prog ~verbose ~downloader ~sigchecker source
      ) sources
    ) in
  let index = remove_duplicates index in
@@ -209,8 +197,7 @@ let main () =
    | `Cache_all ->                     (* --cache-all-templates *)
      (match cache with
      | None ->
-        eprintf (f_"%s: error: no cache directory\n") prog;
-        exit 1
+        error (f_"no cache directory")
      | Some _ ->
        List.iter (
          fun (name,
@@ -246,9 +233,8 @@ let main () =
        name = arg && arch = Architecture.filter_arch a
    ) index
    with Not_found ->
-      eprintf (f_"%s: cannot find os-version '%s' with architecture '%s'.\nUse --list to list available guest types.\n")
-        prog arg arch;
-      exit 1 in
+      error (f_"cannot find os-version '%s' with architecture '%s'.\nUse --list to list available guest types.")
+        arg arch in
  let entry = snd item in
  let sigchecker = entry.Index_parser.sigchecker in

@@ -315,8 +301,10 @@ let main () =
      | None -> []
      | Some format -> [`Format, format] in
    let compression_tag =
-      match detect_compression template with
+      match detect_file_type template with
      | `XZ -> [ `XZ, "" ]
+      | `GZip | `Tar | `Zip ->
+        error (f_"input file (%s) has an unsupported type") template
      | `Unknown -> [] in
    [ `Template, ""; `Filename, template; `Size, Int64.to_string size ] @
      format_tag @ compression_tag in
@@ -330,10 +318,8 @@ let main () =
    | Some output, None -> output, "raw"
    | Some output, Some format -> output, format in

-  if is_char_device output_filename then (
-    eprintf (f_"%s: cannot output to a character device or /dev/null\n") prog;
-    exit 1
-  );
+  if is_char_device output_filename then
+    error (f_"cannot output to a character device or /dev/null");

  let blockdev_getsize64 dev =
    let cmd = sprintf "blockdev --getsize64 %s" (quote dev) in
@@ -357,16 +343,12 @@ let main () =
      (* --size parameter missing, block device: use block device size *)
      | None -> blockdev_size in

-    if size < original_image_size then (
-      eprintf (f_"%s: images cannot be shrunk, the output size is too small for this image.  Requested size = %s, minimum size = %s\n")
-        prog (human_size size) (human_size original_image_size);
-      exit 1
-    )
-    else if output_is_block_dev && output_format = "raw" && size > blockdev_size then (
-      eprintf (f_"%s: output size is too large for this block device.  Requested size = %s, output block device = %s, output block device size = %s\n")
-        prog (human_size size) output_filename (human_size blockdev_size);
-      exit 1
-    );
+    if size < original_image_size then
+      error (f_"images cannot be shrunk, the output size is too small for this image.  Requested size = %s, minimum size = %s")
+        (human_size size) (human_size original_image_size)
+    else if output_is_block_dev && output_format = "raw" && size > blockdev_size then
+      error (f_"output size is too large for this block device.  Requested size = %s, output block device = %s, output block device size = %s")
+        (human_size size) output_filename (human_size blockdev_size);
    size in

  let goal =
@@ -483,45 +465,44 @@ let main () =
    try plan ~max_depth:5 transitions itags goal
    with
      Failure "plan" ->
-        eprintf (f_"%s: no plan could be found for making a disk image with\nthe required size, format etc. This is a bug in libguestfs!\nPlease file a bug, giving the command line arguments you used.\n") prog;
-        exit 1
+        error (f_"no plan could be found for making a disk image with\nthe required size, format etc. This is a bug in libguestfs!\nPlease file a bug, giving the command line arguments you used.");
  in

  (* Print out the plan. *)
  if verbose then (
    let print_tags tags =
      (try
-         let v = List.assoc `Filename tags in eprintf " +filename=%s" v
+         let v = List.assoc `Filename tags in printf " +filename=%s" v
       with Not_found -> ());
      (try
-         let v = List.assoc `Size tags in eprintf " +size=%s" v
+         let v = List.assoc `Size tags in printf " +size=%s" v
       with Not_found -> ());
      (try
-         let v = List.assoc `Format tags in eprintf " +format=%s" v
+         let v = List.assoc `Format tags in printf " +format=%s" v
       with Not_found -> ());
-      if List.mem_assoc `Template tags then eprintf " +template";
-      if List.mem_assoc `XZ tags then eprintf " +xz"
+      if List.mem_assoc `Template tags then printf " +template";
+      if List.mem_assoc `XZ tags then printf " +xz"
    in
    let print_task = function
-      | `Copy -> eprintf "cp"
-      | `Rename -> eprintf "mv"
-      | `Pxzcat -> eprintf "pxzcat"
-      | `Virt_resize -> eprintf "virt-resize"
-      | `Disk_resize -> eprintf "qemu-img resize"
-      | `Convert -> eprintf "qemu-img convert"
+      | `Copy -> printf "cp"
+      | `Rename -> printf "mv"
+      | `Pxzcat -> printf "pxzcat"
+      | `Virt_resize -> printf "virt-resize"
+      | `Disk_resize -> printf "qemu-img resize"
+      | `Convert -> printf "qemu-img convert"
    in

    iteri (
      fun i (itags, task, otags) ->
-        eprintf "%d: itags:" i;
+        printf "%d: itags:" i;
        print_tags itags;
-        eprintf "\n";
-        eprintf "%d: task : " i;
+        printf "\n";
+        printf "%d: task : " i;
        print_task task;
-        eprintf "\n";
-        eprintf "%d: otags:" i;
+        printf "\n";
+        printf "%d: otags:" i;
        print_tags otags;
-        eprintf "\n\n%!"
+        printf "\n\n%!"
    ) plan
  );

@@ -544,14 +525,14 @@ let main () =
      let ofile = List.assoc `Filename otags in
      msg (f_"Copying");
      let cmd = sprintf "cp %s %s" (quote ifile) (quote ofile) in
-      if verbose then eprintf "%s\n%!" cmd;
+      if verbose then printf "%s\n%!" cmd;
      if Sys.command cmd <> 0 then exit 1

    | itags, `Rename, otags ->
      let ifile = List.assoc `Filename itags in
      let ofile = List.assoc `Filename otags in
      let cmd = sprintf "mv %s %s" (quote ifile) (quote ofile) in
-      if verbose then eprintf "%s\n%!" cmd;
+      if verbose then printf "%s\n%!" cmd;
      if Sys.command cmd <> 0 then exit 1

    | itags, `Pxzcat, otags ->
@@ -591,7 +572,7 @@ let main () =
          | None -> ""
          | Some lvexpand -> sprintf " --lv-expand %s" (quote lvexpand))
          (quote ifile) (quote ofile) in
-      if verbose then eprintf "%s\n%!" cmd;
+      if verbose then printf "%s\n%!" cmd;
      if Sys.command cmd <> 0 then exit 1

    | itags, `Disk_resize, otags ->
@@ -602,7 +583,7 @@ let main () =
        (human_size osize);
      let cmd = sprintf "qemu-img resize %s %Ld%s"
        (quote ofile) osize (if verbose then "" else " >/dev/null") in
-      if verbose then eprintf "%s\n%!" cmd;
+      if verbose then printf "%s\n%!" cmd;
      if Sys.command cmd <> 0 then exit 1

    | itags, `Convert, otags ->
@@ -619,7 +600,7 @@ let main () =
        | Some iformat -> sprintf " -f %s" (quote iformat))
        (quote ifile) (quote oformat) (quote ofile)
        (if verbose then "" else " >/dev/null 2>&1") in
-      if verbose then eprintf "%s\n%!" cmd;
+      if verbose then printf "%s\n%!" cmd;
      if Sys.command cmd <> 0 then exit 1
  ) plan;

@@ -633,7 +614,11 @@ let main () =
    (match smp with None -> () | Some smp -> g#set_smp smp);
    g#set_network network;

-    g#set_selinux ops.flags.selinux_relabel;
+    (* Make sure to turn SELinux off to avoid awkward interactions
+     * between the appliance kernel and applications/libraries interacting
+     * with SELinux xattrs.
+     *)
+    g#set_selinux false;

    (* The output disk is being created, so use cache=unsafe here. *)
    g#add_drive_opts ~format:output_format ~cachemode:"unsafe" output_filename;
@@ -659,14 +644,14 @@ let main () =
      List.iter (
        fun (mp, dev) ->
          try g#mount dev mp
-          with G.Error msg -> eprintf (f_"%s: %s (ignored)\n") prog msg
+          with G.Error msg -> warning (f_"%s (ignored)") msg
      ) mps;
      root
    | _ ->
-      eprintf (f_"%s: no guest operating systems or multiboot OS found in this disk image\nThis is a failure of the source repository.  Use -v for more information.\n") prog;
-      exit 1 in
+      error (f_"no guest operating systems or multiboot OS found in this disk image\nThis is a failure of the source repository.  Use -v for more information.")
+  in

-  Customize_run.run ~prog ~verbose ~quiet g root ops;
+  Customize_run.run ~verbose ~quiet g root ops;

  (* Collect some stats about the final output file.
   * Notes:
@@ -736,30 +721,4 @@ let main () =
  | None -> ()
  | Some stats -> print_string stats

-let () =
-  try main ()
-  with
-  | Unix_error (code, fname, "") ->     (* from a syscall *)
-    eprintf (f_"%s: error: %s: %s\n") prog fname (error_message code);
-    exit 1
-  | Unix_error (code, fname, param) ->  (* from a syscall *)
-    eprintf (f_"%s: error: %s: %s: %s\n") prog fname (error_message code) param;
-    exit 1
-  | G.Error msg ->                      (* from libguestfs *)
-    eprintf (f_"%s: libguestfs error: %s\n") prog msg;
-    exit 1
-  | Failure msg ->                      (* from failwith/failwithf *)
-    eprintf (f_"%s: failure: %s\n") prog msg;
-    exit 1
-  | Invalid_argument msg ->             (* probably should never happen *)
-    eprintf (f_"%s: internal error: invalid argument: %s\n") prog msg;
-    exit 1
-  | Assert_failure (file, line, char) -> (* should never happen *)
-    eprintf (f_"%s: internal error: assertion failed at %s, line %d, char %d\n") prog file line char;
-    exit 1
-  | Not_found ->                        (* should never happen *)
-    eprintf (f_"%s: internal error: Not_found exception was thrown\n") prog;
-    exit 1
-  | exn ->                              (* something not matched above *)
-    eprintf (f_"%s: exception: %s\n") prog (Printexc.to_string exn);
-    exit 1
+let () = run_main_and_handle_errors ~prog main
--- a/builder/cache.ml
+++ b/builder/cache.ml
@@ -1,5 +1,5 @@
 (* virt-builder
- * Copyright (C) 2013-2014 Red Hat Inc.
+ * Copyright (C) 2013-2015 Red Hat Inc.
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -19,11 +19,11 @@
 open Common_gettext.Gettext
 open Common_utils

+open Utils
+
 open Unix
 open Printf

-let quote = Filename.quote
-
 let clean_cachedir dir =
  let cmd = sprintf "rm -rf %s" (quote dir) in
  ignore (Sys.command cmd);
--- a/builder/cache.mli
+++ b/builder/cache.mli
@@ -1,5 +1,5 @@
 (* virt-builder
- * Copyright (C) 2013-2014 Red Hat Inc.
+ * Copyright (C) 2013-2015 Red Hat Inc.
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
--- a/builder/cmdline.ml
+++ b/builder/cmdline.ml
@@ -23,13 +23,13 @@ open Common_utils

 open Customize_cmdline

+open Utils
+
 module G = Guestfs

 open Unix
 open Printf

-let prog = Filename.basename Sys.executable_name
-
 let parse_cmdline () =
  let display_version () =
    printf "virt-builder %s\n" Config.package_version;
@@ -77,8 +77,7 @@ let parse_cmdline () =
    | "long" -> `Long
    | "json" -> `Json
    | fmt ->
-      eprintf (f_"%s: invalid --list-format type '%s', see the man page.\n") prog fmt;
-      exit 1 in
+      error (f_"invalid --list-format type '%s', see the man page") fmt in

  let machine_readable = ref false in

@@ -136,6 +135,7 @@ let parse_cmdline () =
    "--long",    Arg.Unit list_set_long,    " " ^ s_"Shortcut for --list-format short";
    "--list-format", Arg.String list_set_format,
                                            "short|long|json" ^ " " ^ s_"Set the format for --list (default: short)";
+    "--short-options", Arg.Unit display_short_options, " " ^ s_"List short options";
    "--long-options", Arg.Unit display_long_options, " " ^ s_"List long options";
    "--machine-readable", Arg.Set machine_readable, " " ^ s_"Make output machine readable";
    "-m",        Arg.Int set_memsize,       "mb" ^ " " ^ s_"Set memory size";
@@ -158,8 +158,7 @@ let parse_cmdline () =
    "--version", Arg.Unit display_version,  " " ^ s_"Display version and exit";
    "-x",        Arg.Set trace,             " " ^ s_"Enable tracing of libguestfs calls";
  ] in
-  let customize_argspec, get_customize_ops =
-    Customize_cmdline.argspec ~prog () in
+  let customize_argspec, get_customize_ops = Customize_cmdline.argspec () in
  let customize_argspec =
    List.map (fun (spec, _, _) -> spec) customize_argspec in
  let argspec = argspec @ customize_argspec in
@@ -236,28 +235,25 @@ read the man page virt-builder(1).
      (match args with
      | [arg] -> arg
      | [] ->
-        eprintf (f_"%s: virt-builder os-version\nMissing 'os-version'. Use '--list' to list available template names.\n") prog;
-        exit 1
+        error (f_"virt-builder os-version\nMissing 'os-version'. Use '--list' to list available template names.")
      | _ ->
-        eprintf (f_"%s: virt-builder: too many parameters, expecting 'os-version'\n") prog;
-        exit 1
+        error (f_"too many parameters, expecting 'os-version'")
      )
    | `List ->
+      if format <> None then
+        error (f_"virt-builder --list: use '--list-format', not '--format'");
      (match args with
      | [] -> ""
      | _ ->
-        eprintf (f_"%s: virt-builder --list does not need any extra arguments.\n") prog;
-        exit 1
+        error (f_"virt-builder --list does not need any extra arguments")
      )
    | `Notes ->
      (match args with
      | [arg] -> arg
      | [] ->
-        eprintf (f_"%s: virt-builder --notes os-version\nMissing 'os-version'. Use '--list' to list available template names.\n") prog;
-        exit 1
+        error (f_"virt-builder --notes os-version\nMissing 'os-version'. Use '--list' to list available template names.")
      | _ ->
-        eprintf (f_"%s: virt-builder: too many parameters, expecting 'os-version'\n") prog;
-        exit 1
+        error (f_"virt-builder: too many parameters, expecting 'os-version'");
      )
    | `Cache_all
    | `Print_cache
@@ -265,18 +261,15 @@ read the man page virt-builder(1).
      (match args with
      | [] -> ""
      | _ ->
-        eprintf (f_"%s: virt-builder --cache-all-templates/--print-cache/--delete-cache does not need any extra arguments.\n") prog;
-        exit 1
+        error (f_"virt-builder --cache-all-templates/--print-cache/--delete-cache does not need any extra arguments")
      )
    | `Get_kernel ->
      (match args with
      | [arg] -> arg
      | [] ->
-        eprintf (f_"%s: virt-builder --get-kernel image\nMissing 'image' (disk image file) argument.\n") prog;
-        exit 1
+        error (f_"virt-builder --get-kernel image\nMissing 'image' (disk image file) argument")
      | _ ->
-        eprintf (f_"%s: virt-builder --get-kernel: too many parameters\n") prog;
-        exit 1
+        error (f_"virt-builder --get-kernel: too many parameters")
      ) in

  (* Check source(s) and fingerprint(s). *)
@@ -296,11 +289,8 @@ read the man page virt-builder(1).
        repeat fingerprint nr_sources
      | xs -> xs in

-    if List.length fingerprints <> nr_sources then (
-      eprintf (f_"%s: source and fingerprint lists are not the same length\n")
-        prog;
-      exit 1
-    );
+    if List.length fingerprints <> nr_sources then
+      error (f_"source and fingerprint lists are not the same length");

    (* Combine the sources and fingerprints into a single list of pairs. *)
    List.combine sources fingerprints in
@@ -317,14 +307,11 @@ read the man page virt-builder(1).
          | `Command _ | `InstallPackages _ | `Script _ | `Update -> true
          | `Delete _ | `Edit _ | `FirstbootCommand _ | `FirstbootPackages _
          | `FirstbootScript _ | `Hostname _ | `Link _ | `Mkdir _
-          | `Password _ | `RootPassword _ | `Scrub _ | `Timezone _ | `Upload _
-          | `Write _ | `Chmod _ -> false
+          | `Password _ | `RootPassword _ | `Scrub _ | `SSHInject _
+          | `Timezone _ | `Upload _ | `Write _ | `Chmod _ -> false
        ) ops.ops in
-        if requires_execute_on_guest then (
-          eprintf (f_"%s: sorry, cannot run commands on a guest with a different architecture\n")
-            prog;
-          exit 1
-        );
+        if requires_execute_on_guest then
+          error (f_"sorry, cannot run commands on a guest with a different architecture");
      );
      target_arch in

@@ -337,7 +324,7 @@ read the man page virt-builder(1).
    ) ops.ops in
    if has_set_root_password then ops
    else (
-      let pw = Password.parse_selector ~prog "random" in
+      let pw = Password.parse_selector "random" in
      { ops with ops = ops.ops @ [ `RootPassword pw ] }
    ) in

--- a/builder/downloader.ml
+++ b/builder/downloader.ml
@@ -19,11 +19,11 @@
 open Common_gettext.Gettext
 open Common_utils

+open Utils
+
 open Unix
 open Printf

-let quote = Filename.quote
-
 type uri = string
 type filename = string

@@ -73,8 +73,8 @@ and download_to ~prog t ?(progress_bar = false) ~proxy uri filename =
  let parseduri =
    try URI.parse_uri uri
    with Invalid_argument "URI.parse_uri" ->
-      eprintf (f_"Error parsing URI '%s'. Look for error messages printed above.\n") uri;
-      exit 1 in
+      error (f_"error parsing URI '%s'. Look for error messages printed above.")
+        uri in

  (* Note because there may be parallel virt-builder instances running
   * and also to avoid partial downloads in the cache if the network
@@ -91,11 +91,8 @@ and download_to ~prog t ?(progress_bar = false) ~proxy uri filename =
      (if t.verbose then " -v" else "")
      (quote path) (quote filename_new) in
    let r = Sys.command cmd in
-    if r <> 0 then (
-      eprintf (f_"%s: cp (download) command failed copying '%s'\n")
-        prog path;
-      exit 1
-    )
+    if r <> 0 then
+      error (f_"cp (download) command failed copying '%s'") path;
  | _ as protocol -> (* Any other protocol. *)
    let outenv = proxy_envvar protocol proxy in
    (* Get the status code first to ensure the file exists. *)
@@ -104,13 +101,10 @@ and download_to ~prog t ?(progress_bar = false) ~proxy uri filename =
      t.curl
      (if t.verbose then "" else " -s -S")
      (quote uri) in
-    if t.verbose then eprintf "%s\n%!" cmd;
+    if t.verbose then printf "%s\n%!" cmd;
    let lines = external_command ~prog cmd in
-    if List.length lines < 1 then (
-      eprintf (f_"%s: unexpected output from curl command, enable debug and look at previous messages\n")
-        prog;
-      exit 1
-    );
+    if List.length lines < 1 then
+      error (f_"unexpected output from curl command, enable debug and look at previous messages");
    let status_code = List.hd lines in
    let bad_status_code = function
      | "" -> true
@@ -118,11 +112,8 @@ and download_to ~prog t ?(progress_bar = false) ~proxy uri filename =
      | s when s.[0] = '5' -> true (* 5xx *)
      | _ -> false
    in
-    if bad_status_code status_code then (
-      eprintf (f_"%s: failed to download %s: HTTP status code %s\n")
-        prog uri status_code;
-      exit 1
-    );
+    if bad_status_code status_code then
+      error (f_"failed to download %s: HTTP status code %s") uri status_code;

    (* Now download the file. *)
    let cmd = sprintf "%s%s%s -g -o %s %s"
@@ -130,13 +121,10 @@ and download_to ~prog t ?(progress_bar = false) ~proxy uri filename =
      t.curl
      (if t.verbose then "" else if progress_bar then " -#" else " -s -S")
      (quote filename_new) (quote uri) in
-    if t.verbose then eprintf "%s\n%!" cmd;
+    if t.verbose then printf "%s\n%!" cmd;
    let r = Sys.command cmd in
-    if r <> 0 then (
-      eprintf (f_"%s: curl (download) command failed downloading '%s'\n")
-        prog uri;
-      exit 1
-    )
+    if r <> 0 then
+      error (f_"curl (download) command failed downloading '%s'") uri;
  );

  (* Rename the file if the download was successful. *)
@@ -154,7 +142,7 @@ and proxy_envvar protocol = function
    (* No changes required. *)
    ""
  | ForcedProxy proxy ->
-    let proxy = Filename.quote proxy in
+    let proxy = quote proxy in
    (match protocol with
    | "http" -> sprintf "env http_proxy=%s no_proxy= " proxy
    | "https" -> sprintf "env https_proxy=%s no_proxy= " proxy
--- a/builder/get_kernel.ml
+++ b/builder/get_kernel.ml
@@ -19,6 +19,8 @@
 open Common_gettext.Gettext
 open Common_utils

+open Utils
+
 module G = Guestfs

 open Printf
@@ -34,14 +36,10 @@ let rec get_kernel ~trace ~verbose ?format ?output disk =
  g#launch ();

  let roots = g#inspect_os () in
-  if Array.length roots = 0 then (
-    eprintf (f_"virt-builder: get-kernel: no operating system found\n");
-    exit 1
-  );
-  if Array.length roots > 1 then (
-    eprintf (f_"virt-builder: get-kernel: dual/multi-boot images are not supported by this tool\n");
-    exit 1
-  );
+  if Array.length roots = 0 then
+    error (f_"get-kernel: no operating system found");
+  if Array.length roots > 1 then
+    error (f_"get-kernel: dual/multi-boot images are not supported by this tool");
  let root = roots.(0) in

  (* Mount up the disks. *)
@@ -51,7 +49,7 @@ let rec get_kernel ~trace ~verbose ?format ?output disk =
  List.iter (
    fun (mp, dev) ->
      try g#mount_ro dev mp
-      with Guestfs.Error msg -> eprintf "%s (ignored)\n" msg
+      with Guestfs.Error msg -> warning (f_"%s (ignored)") msg
  ) mps;

  (* Get all kernels and initramfses. *)
@@ -69,10 +67,8 @@ let rec get_kernel ~trace ~verbose ?format ?output disk =
  let kernels = List.rev (List.sort compare_version kernels) in
  let initrds = List.rev (List.sort compare_version initrds) in

-  if kernels = [] then (
-    eprintf (f_"virt-builder: no kernel found\n");
-    exit 1
-  );
+  if kernels = [] then
+    error (f_"no kernel found");

  (* Download the latest. *)
  let outputdir =
--- a/builder/index-parse.y
+++ b/builder/index-parse.y
@@ -30,6 +30,8 @@

 extern void yyerror (YYLTYPE * yylloc, yyscan_t scanner, struct parse_context *context, const char *msg);
 extern int yylex (YYSTYPE * yylval, YYLTYPE * yylloc, yyscan_t scanner);
+
+extern int do_parse (struct parse_context *context, FILE *in);
 extern void scanner_init (yyscan_t *scanner, struct parse_context *context, FILE *in);
 extern void scanner_destroy (yyscan_t scanner);

@@ -90,9 +92,7 @@ typedef void *yyscan_t;
 %parse-param { yyscan_t scanner }
 %parse-param { struct parse_context *context }

-%destructor { section_free ($$); } <sections>
 %destructor { section_free ($$); } <section>
-%destructor { field_free ($$); } <fields>
 %destructor { field_free ($$); } <field>

 %%
@@ -153,8 +153,8 @@ yyerror (YYLTYPE * yylloc, yyscan_t scanner, struct parse_context *context, cons
  int has_suffix = context->error_suffix != NULL && context->error_suffix[0] != 0;

  fprintf (stderr, "%s%s%s%ssyntax error at line %d: %s%s%s\n",
-           context->program_name ? context->program_name : "",
-           context->program_name ? ": " : "",
+           context->progname ? context->progname : "",
+           context->progname ? ": " : "",
           context->input_file ? context->input_file : "",
           context->input_file ? ": " : "",
           yylloc->first_line, msg,
--- a/builder/index-parser-c.c
+++ b/builder/index-parser-c.c
@@ -45,6 +45,8 @@ extern void unix_error (int errcode, char * cmdname, value arg) Noreturn;

 extern int do_parse (struct parse_context *context, FILE *in);

+extern value virt_builder_parse_index (value progv, value error_suffixv, value filenamev);
+
 value
 virt_builder_parse_index (value progv, value error_suffixv, value filenamev)
 {
@@ -56,7 +58,7 @@ virt_builder_parse_index (value progv, value error_suffixv, value filenamev)
  FILE *in;

  parse_context_init (&context);
-  context.program_name = String_val (progv);
+  context.progname = String_val (progv);
  context.input_file = String_val (filenamev);
  context.error_suffix = String_val (error_suffixv);

--- a/builder/index-scan.l
+++ b/builder/index-scan.l
@@ -16,19 +16,33 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */

-%{
+%top{
 #include <config.h>
+}

+%{
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

+/* Silence gcc warnings from the generated code. */
+#if defined(__GNUC__)
+#pragma GCC diagnostic push
+/* flex creates macros that it doesn't use */
+#pragma GCC diagnostic ignored "-Wunused-macros"
+/* on aarch64, flex doesn't know that char is unsigned */
+#pragma GCC diagnostic ignored "-Wsign-compare"
+#endif
+
 #include "index-struct.h"
 #include "index-parse.h"

 #define YY_EXTRA_TYPE struct parse_context *
 #define YY_USER_ACTION yylloc->first_line = yylloc->last_line = yylineno;

+extern void scanner_init (yyscan_t *scanner, struct parse_context *context, FILE *in);
+extern void scanner_destroy (yyscan_t scanner);
+
 %}

 %option nounput
--- a/builder/index-struct.h
+++ b/builder/index-struct.h
@@ -44,7 +44,7 @@ struct parse_context {
   */
  int seen_comments;
  const char *input_file;
-  const char *program_name;
+  const char *progname;
  const char *error_suffix;
 };

--- a/builder/index_parser.ml
+++ b/builder/index_parser.ml
@@ -19,6 +19,8 @@
 open Common_gettext.Gettext
 open Common_utils

+open Utils
+
 open Printf
 open Unix

@@ -109,16 +111,15 @@ let print_entry chan (name, { printable_name = printable_name;
  );
  if hidden then fp "hidden=true\n"

-let get_index ~prog ~verbose ~downloader ~sigchecker ~proxy source =
+let get_index ~prog ~verbose ~downloader ~sigchecker
+  { Sources.uri = uri; proxy = proxy } =
  let corrupt_file () =
-    eprintf (f_"\nThe index file downloaded from '%s' is corrupt.\nYou need to ask the supplier of this file to fix it and upload a fixed version.\n")
-      source;
-    exit 1
+    error (f_"The index file downloaded from '%s' is corrupt.\nYou need to ask the supplier of this file to fix it and upload a fixed version.") uri
  in

  let rec get_index () =
    (* Get the index page. *)
-    let tmpfile, delete_tmpfile = Downloader.download ~prog downloader ~proxy source in
+    let tmpfile, delete_tmpfile = Downloader.download ~prog downloader ~proxy uri in

    (* Check index file signature (also verifies it was fully
     * downloaded and not corrupted in transit).
@@ -145,7 +146,7 @@ let get_index ~prog ~verbose ~downloader ~sigchecker ~proxy source =
      fun (n, arch) ->
        let id = n, arch in
        if Hashtbl.mem nseen id then (
-          eprintf (f_"virt-builder: index is corrupt: os-version '%s' with architecture '%s' appears two or more times\n") n arch;
+          eprintf (f_"%s: index is corrupt: os-version '%s' with architecture '%s' appears two or more times\n") prog n arch;
          corrupt_file ()
        );
        Hashtbl.add nseen id true
@@ -161,9 +162,9 @@ let get_index ~prog ~verbose ~downloader ~sigchecker ~proxy source =
            if Hashtbl.mem fseen hashkey then (
              (match subkey with
              | Some value ->
-                eprintf (f_"virt-builder: index is corrupt: %s: field '%s[%s]' appears two or more times\n") n field value
+                eprintf (f_"%s: index is corrupt: %s: field '%s[%s]' appears two or more times\n") prog n field value
              | None ->
-                eprintf (f_"virt-builder: index is corrupt: %s: field '%s' appears two or more times\n") n field);
+                eprintf (f_"%s: index is corrupt: %s: field '%s' appears two or more times\n") prog n field);
              corrupt_file ()
            );
            Hashtbl.add fseen hashkey true
@@ -182,12 +183,12 @@ let get_index ~prog ~verbose ~downloader ~sigchecker ~proxy source =
          let file_uri =
            try make_absolute_uri (List.assoc ("file", None) fields)
            with Not_found ->
-              eprintf (f_"virt-builder: no 'file' (URI) entry for '%s'\n") n;
+              eprintf (f_"%s: no 'file' (URI) entry for '%s'\n") prog n;
            corrupt_file () in
          let arch =
            try List.assoc ("arch", None) fields
            with Not_found ->
-              eprintf (f_"virt-builder: no 'arch' entry for '%s'\n") n;
+              eprintf (f_"%s: no 'arch' entry for '%s'\n") prog n;
            corrupt_file () in
          let signature_uri =
            try Some (make_absolute_uri (List.assoc ("sig", None) fields))
@@ -202,8 +203,7 @@ let get_index ~prog ~verbose ~downloader ~sigchecker ~proxy source =
            with
            | Not_found -> 1
            | Failure "int_of_string" ->
-              eprintf (f_"virt-builder: cannot parse 'revision' field for '%s'\n")
-                n;
+              eprintf (f_"%s: cannot parse 'revision' field for '%s'\n") prog n;
              corrupt_file () in
          let format =
            try Some (List.assoc ("format", None) fields) with Not_found -> None in
@@ -211,11 +211,10 @@ let get_index ~prog ~verbose ~downloader ~sigchecker ~proxy source =
            try Int64.of_string (List.assoc ("size", None) fields)
            with
            | Not_found ->
-              eprintf (f_"virt-builder: no 'size' field for '%s'\n") n;
+              eprintf (f_"%s: no 'size' field for '%s'\n") prog n;
              corrupt_file ()
            | Failure "int_of_string" ->
-              eprintf (f_"virt-builder: cannot parse 'size' field for '%s'\n")
-                n;
+              eprintf (f_"%s: cannot parse 'size' field for '%s'\n") prog n;
              corrupt_file () in
          let compressed_size =
            try Some (Int64.of_string (List.assoc ("compressed_size", None) fields))
@@ -223,8 +222,8 @@ let get_index ~prog ~verbose ~downloader ~sigchecker ~proxy source =
            | Not_found ->
              None
            | Failure "int_of_string" ->
-              eprintf (f_"virt-builder: cannot parse 'compressed_size' field for '%s'\n")
-                n;
+              eprintf (f_"%s: cannot parse 'compressed_size' field for '%s'\n")
+                prog n;
              corrupt_file () in
          let expand =
            try Some (List.assoc ("expand", None) fields) with Not_found -> None in
@@ -248,8 +247,8 @@ let get_index ~prog ~verbose ~downloader ~sigchecker ~proxy source =
            with
            | Not_found -> false
            | Failure "bool_of_string" ->
-              eprintf (f_"virt-builder: cannot parse 'hidden' field for '%s'\n")
-                n;
+              eprintf (f_"%s: cannot parse 'hidden' field for '%s'\n")
+                prog n;
              corrupt_file () in
          let aliases =
            let l =
@@ -280,8 +279,8 @@ let get_index ~prog ~verbose ~downloader ~sigchecker ~proxy source =
      ) sections in

    if verbose then (
-      eprintf "index file (%s) after parsing (C parser):\n" source;
-      List.iter (print_entry Pervasives.stderr) entries
+      printf "index file (%s) after parsing (C parser):\n" uri;
+      List.iter (print_entry Pervasives.stdout) entries
    );

    entries
@@ -289,25 +288,24 @@ let get_index ~prog ~verbose ~downloader ~sigchecker ~proxy source =
  (* Verify same-origin policy for the file= and sig= fields. *)
  and make_absolute_uri path =
    if String.length path = 0 then (
-      eprintf (f_"virt-builder: zero length path in the index file\n");
+      eprintf (f_"%s: zero length path in the index file\n") prog;
      corrupt_file ()
    )
    else if string_find path "://" >= 0 then (
-      eprintf (f_"virt-builder: cannot use a URI ('%s') in the index file\n")
-        path;
+      eprintf (f_"%s: cannot use a URI ('%s') in the index file\n") prog path;
      corrupt_file ()
    )
    else if path.[0] = '/' then (
-      eprintf (f_"virt-builder: you must use relative paths (not '%s') in the index file\n") path;
+      eprintf (f_"%s: you must use relative paths (not '%s') in the index file\n") prog path;
      corrupt_file ()
    )
    else (
      (* Construct the URI. *)
      try
-        let i = String.rindex source '/' in
-        String.sub source 0 (i+1) ^ path
+        let i = String.rindex uri '/' in
+        String.sub uri 0 (i+1) ^ path
      with
-        Not_found -> source // path
+        Not_found -> uri // path
    )
  in

--- a/builder/index_parser.mli
+++ b/builder/index_parser.mli
@@ -38,4 +38,4 @@ and entry = {
  proxy : Downloader.proxy_mode;
 }

-val get_index : prog:string -> verbose:bool -> downloader:Downloader.t -> sigchecker:Sigchecker.t -> proxy:Downloader.proxy_mode -> string -> index
+val get_index : prog:string -> verbose:bool -> downloader:Downloader.t -> sigchecker:Sigchecker.t -> Sources.source -> index
--- a/builder/ini_reader.ml
+++ b/builder/ini_reader.ml
@@ -1,5 +1,5 @@
 (* virt-builder
- * Copyright (C) 2013-2014 Red Hat Inc.
+ * Copyright (C) 2013-2015 Red Hat Inc.
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
--- a/builder/ini_reader.mli
+++ b/builder/ini_reader.mli
@@ -1,5 +1,5 @@
 (* virt-builder
- * Copyright (C) 2013-2014 Red Hat Inc.
+ * Copyright (C) 2013-2015 Red Hat Inc.
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
--- a/builder/languages.ml
+++ b/builder/languages.ml
@@ -1,5 +1,5 @@
 (* virt-builder
- * Copyright (C) 2013-2014 Red Hat Inc.
+ * Copyright (C) 2013-2015 Red Hat Inc.
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
--- a/builder/link.sh.in
+++ b/builder/link.sh.in
@@ -0,0 +1,22 @@
+# libguestfs Makefile.am
+# @configure_input@
+# (C) Copyright 2014 Red Hat Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+# Hack automake to link binary properly.  There is no other way to add
+# the -cclib parameter to the end of the command line.
+
+exec "$@" -linkpkg -cclib '-pthread -lpthread -lutils @LIBTINFO_LIBS@ -lcrypt @LIBLZMA_LIBS@ @LIBXML2_LIBS@ @LIBINTL@ -lgnu'
--- a/builder/list_entries.ml
+++ b/builder/list_entries.ml
@@ -47,13 +47,13 @@ and list_entries_long ~sources index =
  let langs = Languages.languages () in

  List.iter (
-    fun (source, key, proxy) ->
-      printf (f_"Source URI: %s\n") source;
-      (match key with
-      | Sigchecker.No_Key -> ()
-      | Sigchecker.Fingerprint fp ->
+    fun { Sources.uri = uri; gpgkey = gpgkey } ->
+      printf (f_"Source URI: %s\n") uri;
+      (match gpgkey with
+      | Utils.No_Key -> ()
+      | Utils.Fingerprint fp ->
        printf (f_"Fingerprint: %s\n") fp;
-      | Sigchecker.KeyFile kf ->
+      | Utils.KeyFile kf ->
        printf (f_"Key: %s\n") kf;
      );
      printf "\n"
@@ -97,92 +97,69 @@ and list_entries_long ~sources index =
  ) index

 and list_entries_json ~sources index =
-  let trailing_comma index size =
-    if index = size - 1 then "" else "," in
-  let json_string_of_bool b =
-    if b then "true" else "false" in
-  let json_string_escape str =
-    let res = ref "" in
-    for i = 0 to String.length str - 1 do
-      res := !res ^ (match str.[i] with
-        | '"' -> "\\\""
-        | '\\' -> "\\\\"
-        | '\b' -> "\\b"
-        | '\n' -> "\\n"
-        | '\r' -> "\\r"
-        | '\t' -> "\\t"
-        | c -> String.make 1 c)
-    done;
-    !res in
-  let json_optional_printf_string key = function
-    | None -> ()
-    | Some str ->
-      printf "    \"%s\": \"%s\",\n" key (json_string_escape str) in
-  let json_optional_printf_int64 key = function
-    | None -> ()
-    | Some n ->
-      printf "    \"%s\": \"%Ld\",\n" key n in
-  let json_optional_printf_stringlist key = function
-    | None -> ()
-    | Some l ->
-      printf "    \"%s\": [" key;
-      iteri (
-        fun i alias ->
-          printf " \"%s\"%s" alias (trailing_comma i (List.length l))
-      ) l;
-      printf " ],\n" in
-  let print_notes = function
-    | [] -> ()
-    | notes ->
-      printf "    \"notes\": {\n";
-      iteri (
-        fun i (lang, langnotes) ->
-          let lang =
-            match lang with
-            | "" -> "C"
-            | x -> x in
-          printf "      \"%s\": \"%s\"%s\n"
-            (json_string_escape lang) (json_string_escape langnotes)
-            (trailing_comma i (List.length notes))
-      ) notes;
-      printf "    },\n" in
-
-  printf "{\n";
-  printf "  \"version\": %d,\n" 1;
-  printf "  \"sources\": [\n";
-  iteri (
-    fun i (source, key, proxy) ->
-      printf "  {\n";
-      (match key with
-      | Sigchecker.No_Key -> ()
-      | Sigchecker.Fingerprint fp ->
-        printf "    \"fingerprint\": \"%s\",\n" fp;
-      | Sigchecker.KeyFile kf ->
-        printf "    \"key\": \"%s\",\n" kf;
-      );
-      printf "    \"uri\": \"%s\"\n" source;
-      printf "  }%s\n" (trailing_comma i (List.length sources))
-  ) sources;
-  printf "  ],\n";
-  printf "  \"templates\": [\n";
-  iteri (
-    fun i (name, { Index_parser.printable_name = printable_name;
+  let json_sources =
+    List.map (
+      fun { Sources.uri = uri; gpgkey = gpgkey } ->
+        let item = [ "uri", JSON.String uri ] in
+        let item =
+          match gpgkey with
+          | Utils.No_Key -> item
+          | Utils.Fingerprint fp ->
+            ("fingerprint", JSON.String fp) :: item
+          | Utils.KeyFile kf ->
+            ("key", JSON.String kf) :: item in
+        JSON.Dict item
+    ) sources in
+  let json_templates =
+    List.map (
+      fun (name, { Index_parser.printable_name = printable_name;
                   arch = arch;
                   size = size;
                   compressed_size = compressed_size;
                   notes = notes;
                   aliases = aliases;
+                   osinfo = osinfo;
                   hidden = hidden }) ->
-      printf "  {\n";
-      printf "    \"os-version\": \"%s\",\n" name;
-      json_optional_printf_string "full-name" printable_name;
-      printf "    \"arch\": \"%s\",\n" arch;
-      printf "    \"size\": %Ld,\n" size;
-      json_optional_printf_int64 "compressed-size" compressed_size;
-      print_notes notes;
-      json_optional_printf_stringlist "aliases" aliases;
-      printf "    \"hidden\": %s\n" (json_string_of_bool hidden);
-      printf "  }%s\n" (trailing_comma i (List.length index))
-  ) index;
-  printf "  ]\n";
- printf "}\n"
+        let item = [ "os-version", JSON.String name ] in
+        let item =
+          match printable_name with
+          | None -> item
+          | Some str -> ("full-name", JSON.String str) :: item in
+        let item = ("arch", JSON.String arch) :: item in
+        let item = ("size", JSON.Int64 size) :: item in
+        let item =
+          match compressed_size with
+          | None -> item
+          | Some n -> ("compressed-size", JSON.String (Int64.to_string n)) :: item in
+        let item =
+          let json_notes =
+            List.fold_right (
+              fun (lang, langnotes) acc ->
+                let lang =
+                  match lang with
+                  | "" -> "C"
+                  | x -> x in
+                (lang, JSON.String langnotes) :: acc
+            ) notes [] in
+          if List.length json_notes = 0 then item
+          else ("notes", JSON.Dict json_notes) :: item in
+        let item =
+          match aliases with
+          | None -> item
+          | Some l ->
+            let l = List.map (fun x -> JSON.String x) l in
+            ("aliases", JSON.List l) :: item in
+        let item =
+          match osinfo with
+          | None -> item
+          | Some str -> ("osinfo", JSON.String str) :: item in
+        let item = ("hidden", JSON.Bool hidden) :: item in
+        JSON.Dict (List.rev item)
+    ) index in
+  let doc = [
+    "version", JSON.Int 1;
+    "sources", JSON.List json_sources;
+    "templates", JSON.List json_templates;
+  ] in
+  print_string (JSON.string_of_doc ~fmt:JSON.Indented doc);
+  print_newline ()
--- a/builder/list_entries.mli
+++ b/builder/list_entries.mli
@@ -16,4 +16,4 @@
 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 *)

-val list_entries : list_format:([ `Short | `Long | `Json ]) -> sources:(string * Sigchecker.gpgkey_type * Downloader.proxy_mode) list -> Index_parser.index -> unit
+val list_entries : list_format:([ `Short | `Long | `Json ]) -> sources:Sources.source list -> Index_parser.index -> unit
--- a/builder/pxzcat-c.c
+++ b/builder/pxzcat-c.c
@@ -20,6 +20,7 @@

 #include <stdio.h>
 #include <stdlib.h>
+#include <stdint.h>
 #include <string.h>
 #include <unistd.h>
 #include <fcntl.h>
@@ -34,6 +35,9 @@
 #include <caml/memory.h>
 #include <caml/mlvalues.h>

+#include "guestfs.h"
+#include "guestfs-internal-frontend.h"
+
 #include "ignore-value.h"

 #if HAVE_LIBLZMA
@@ -55,6 +59,8 @@ extern void unix_error (int errcode, char * cmdname, value arg) Noreturn;
 #define PARALLEL_XZCAT 0
 #endif

+extern value virt_builder_using_parallel_xzcat (value unitv);
+
 value
 virt_builder_using_parallel_xzcat (value unitv)
 {
@@ -65,6 +71,8 @@ virt_builder_using_parallel_xzcat (value unitv)
 static void pxzcat (value filenamev, value outputfilev, unsigned nr_threads);
 #endif /* PARALLEL_XZCAT */

+extern value virt_builder_pxzcat (value inputfilev, value outputfilev);
+
 value
 virt_builder_pxzcat (value inputfilev, value outputfilev)
 {
@@ -98,13 +106,13 @@ virt_builder_pxzcat (value inputfilev, value outputfilev)

  fd = open (String_val (outputfilev), O_WRONLY|O_CREAT|O_TRUNC|O_NOCTTY, 0666);
  if (fd == -1)
-    unix_error (errno, "open", outputfilev);
+    unix_error (errno, (char *) "open", outputfilev);

  pid = fork ();
  if (pid == -1) {
    int err = errno;
    close (fd);
-    unix_error (err, "fork", Nothing);
+    unix_error (err, (char *) "fork", Nothing);
  }

  if (pid == 0) {               /* child - run xzcat */
@@ -117,7 +125,7 @@ virt_builder_pxzcat (value inputfilev, value outputfilev)
  close (fd);

  if (waitpid (pid, &status, 0) == -1)
-    unix_error (errno, "waitpid", Nothing);
+    unix_error (errno, (char *) "waitpid", Nothing);
  if (!WIFEXITED (status) || WEXITSTATUS (status) != 0)
    caml_failwith (XZCAT " program failed, see earlier error messages");

@@ -141,8 +149,6 @@ virt_builder_pxzcat (value inputfilev, value outputfilev)

 #define XZ_HEADER_MAGIC     "\xfd" "7zXZ\0"
 #define XZ_HEADER_MAGIC_LEN 6
-#define XZ_FOOTER_MAGIC     "YZ"
-#define XZ_FOOTER_MAGIC_LEN 2

 static int check_header_magic (int fd);
 static lzma_index *parse_indexes (value filenamev, int fd);
@@ -158,7 +164,7 @@ pxzcat (value filenamev, value outputfilev, unsigned nr_threads)
  /* Open the file. */
  fd = open (String_val (filenamev), O_RDONLY);
  if (fd == -1)
-    unix_error (errno, "open", filenamev);
+    unix_error (errno, (char *) "open", filenamev);

  /* Check file magic. */
  if (!check_header_magic (fd)) {
@@ -181,31 +187,31 @@ pxzcat (value filenamev, value outputfilev, unsigned nr_threads)
  if (ofd == -1) {
    int err = errno;
    close (fd);
-    unix_error (err, "open", outputfilev);
+    unix_error (err, (char *) "open", outputfilev);
  }

  if (ftruncate (ofd, 1) == -1) {
    int err = errno;
    close (fd);
-    unix_error (err, "ftruncate", outputfilev);
+    unix_error (err, (char *) "ftruncate", outputfilev);
  }

  if (lseek (ofd, 0, SEEK_SET) == -1) {
    int err = errno;
    close (fd);
-    unix_error (err, "lseek", outputfilev);
+    unix_error (err, (char *) "lseek", outputfilev);
  }

  if (write (ofd, "\0", 1) == -1) {
    int err = errno;
    close (fd);
-    unix_error (err, "write", outputfilev);
+    unix_error (err, (char *) "write", outputfilev);
  }

  if (ftruncate (ofd, size) == -1) {
    int err = errno;
    close (fd);
-    unix_error (err, "ftruncate", outputfilev);
+    unix_error (err, (char *) "ftruncate", outputfilev);
  }

  /* Tell the kernel we won't read the output file. */
@@ -217,7 +223,7 @@ pxzcat (value filenamev, value outputfilev, unsigned nr_threads)
  lzma_index_end (idx, NULL);

  if (close (fd) == -1)
-    unix_error (errno, "close", filenamev);
+    unix_error (errno, (char *) "close", filenamev);
 }

 static int
@@ -256,7 +262,7 @@ parse_indexes (value filenamev, int fd)
  /* Check file size is a multiple of 4 bytes. */
  pos = lseek (fd, 0, SEEK_END);
  if (pos == (off_t) -1)
-    unix_error (errno, "lseek", filenamev);
+    unix_error (errno, (char *) "lseek", filenamev);

  if ((pos & 3) != 0)
    caml_invalid_argument ("input not an xz file: size is not a multiple of 4 bytes");
@@ -269,10 +275,10 @@ parse_indexes (value filenamev, int fd)
      caml_invalid_argument ("corrupted xz file");

    if (lseek (fd, -LZMA_STREAM_HEADER_SIZE, SEEK_CUR) == -1)
-      unix_error (errno, "lseek", filenamev);
+      unix_error (errno, (char *) "lseek", filenamev);

    if (read (fd, footer, LZMA_STREAM_HEADER_SIZE) != LZMA_STREAM_HEADER_SIZE)
-      unix_error (errno, "read", filenamev);
+      unix_error (errno, (char *) "read", filenamev);

    /* Skip stream padding. */
    if (footer[8] == 0 && footer[9] == 0 &&
@@ -304,7 +310,7 @@ parse_indexes (value filenamev, int fd)

    /* Seek backwards to the index of this stream. */
    if (lseek (fd, pos, SEEK_SET) == -1)
-      unix_error (errno, "lseek", filenamev);
+      unix_error (errno, (char *) "lseek", filenamev);

    /* Decode the index. */
    r = lzma_index_decoder (&strm, &this_index, UINT64_MAX);
@@ -322,7 +328,7 @@ parse_indexes (value filenamev, int fd)

      n = read (fd, &buf, strm.avail_in);
      if (n == -1)
-        unix_error (errno, "read", filenamev);
+        unix_error (errno, (char *) "read", filenamev);

      index_size -= strm.avail_in;

@@ -341,10 +347,10 @@ parse_indexes (value filenamev, int fd)

    /* Read and decode the stream header. */
    if (lseek (fd, pos, SEEK_SET) == -1)
-      unix_error (errno, "lseek", filenamev);
+      unix_error (errno, (char *) "lseek", filenamev);

    if (read (fd, header, LZMA_STREAM_HEADER_SIZE) != LZMA_STREAM_HEADER_SIZE)
-      unix_error (errno, "read stream header", filenamev);
+      unix_error (errno, (char *) "read stream header", filenamev);

    r = lzma_stream_header_decode (&header_flags, header);
    if (r != LZMA_OK) {
@@ -456,7 +462,7 @@ iter_blocks (lzma_index *idx, unsigned nr_threads,
  global.iter_finished = 0;
  err = pthread_mutex_init (&global.iter_mutex, NULL);
  if (err != 0)
-    unix_error (err, "pthread_mutex_init", Nothing);
+    unix_error (err, (char *) "pthread_mutex_init", Nothing);

  global.filename = String_val (filenamev);
  global.fd = fd;
@@ -472,7 +478,7 @@ iter_blocks (lzma_index *idx, unsigned nr_threads,
  for (u = 0; u < nr_threads; ++u) {
    err = pthread_create (&thread[u], NULL, worker_thread, &per_thread[u]);
    if (err != 0)
-      unix_error (err, "pthread_create", Nothing);
+      unix_error (err, (char *) "pthread_create", Nothing);
  }

  /* Wait for the threads to exit. */
@@ -491,6 +497,24 @@ iter_blocks (lzma_index *idx, unsigned nr_threads,
    caml_invalid_argument ("some threads failed, see earlier errors");
 }

+static int
+xpwrite (int fd, const void *bufvp, size_t count, off_t offset)
+{
+  const char *buf = bufvp;
+  ssize_t r;
+
+  while (count > 0) {
+    r = pwrite (fd, buf, count, offset);
+    if (r == -1)
+      return -1;
+    count -= r;
+    offset += r;
+    buf += r;
+  }
+
+  return 0;
+}
+
 /* Iterate over the blocks and uncompress. */
 static void *
 worker_thread (void *vp)
@@ -500,19 +524,29 @@ worker_thread (void *vp)
  lzma_index_iter iter;
  int err;
  off_t position, oposition;
-  uint8_t header[LZMA_BLOCK_HEADER_SIZE_MAX];
+  CLEANUP_FREE uint8_t *header = NULL;
  ssize_t n;
  lzma_block block;
-  lzma_filter filters[LZMA_FILTERS_MAX + 1];
+  CLEANUP_FREE lzma_filter *filters = NULL;
  lzma_ret r;
  lzma_stream strm = LZMA_STREAM_INIT;
-  uint8_t buf[BUFFER_SIZE];
-  unsigned char outbuf[BUFFER_SIZE];
+  CLEANUP_FREE uint8_t *buf = NULL;
+  CLEANUP_FREE uint8_t *outbuf = NULL;
  size_t i;
  lzma_bool iter_finished;

  state->status = -1;

+  header = malloc (sizeof (uint8_t) * LZMA_BLOCK_HEADER_SIZE_MAX);
+  filters = malloc (sizeof (lzma_filter) * (LZMA_FILTERS_MAX + 1));
+  buf = malloc (sizeof (uint8_t) * BUFFER_SIZE);
+  outbuf = malloc (sizeof (uint8_t) * BUFFER_SIZE);
+
+  if (header == NULL || filters == NULL || buf == NULL || outbuf == NULL) {
+    perror ("malloc");
+    return &state->status;
+  }
+
  for (;;) {
    /* Get the next block. */
    err = pthread_mutex_lock (&global->iter_mutex);
@@ -633,8 +667,7 @@ worker_thread (void *vp)
         * sparseness.  However we have to update oposition.
         */
        if (!is_zero (outbuf, wsz)) {
-          if (pwrite (global->ofd, outbuf, wsz, oposition) != wsz) {
-            /* XXX Handle short writes. */
+          if (xpwrite (global->ofd, outbuf, wsz, oposition) == -1) {
            perror (global->filename);
            return &state->status;
          }
--- a/builder/setlocale-c.c
+++ b/builder/setlocale-c.c
@@ -37,6 +37,8 @@ static const int lc_string_table[7] = {

 #define Val_none (Val_int (0))

+extern value virt_builder_setlocale (value val_category, value val_name);
+
 value
 virt_builder_setlocale (value val_category, value val_name)
 {
--- a/builder/sigchecker.ml
+++ b/builder/sigchecker.ml
@@ -19,16 +19,11 @@
 open Common_gettext.Gettext
 open Common_utils

+open Utils
+
 open Printf
 open Unix

-let quote = Filename.quote
-
-type gpgkey_type =
-  | No_Key
-  | Fingerprint of string
-  | KeyFile of string
-
 type t = {
  verbose : bool;
  gpg : string;
@@ -44,12 +39,10 @@ let import_keyfile ~gpg ~gpghome ~verbose keyfile =
  let cmd = sprintf "%s --homedir %s --status-file %s --import %s%s"
    gpg gpghome (quote status_file) (quote keyfile)
    (if verbose then "" else " >/dev/null 2>&1") in
-  if verbose then eprintf "%s\n%!" cmd;
+  if verbose then printf "%s\n%!" cmd;
  let r = Sys.command cmd in
-  if r <> 0 then (
-    eprintf (f_"virt-builder: error: could not import public key\nUse the '-v' option and look for earlier error messages.\n");
-    exit 1
-  );
+  if r <> 0 then
+    error (f_"could not import public key\nUse the '-v' option and look for earlier error messages.");
  status_file

 let rec create ~verbose ~gpg ~gpgkey ~check_signature =
@@ -68,12 +61,10 @@ let rec create ~verbose ~gpg ~gpgkey ~check_signature =
       *)
      let cmd = sprintf "%s --homedir %s --list-keys%s"
        gpg tmpdir (if verbose then "" else " >/dev/null 2>&1") in
-      if verbose then eprintf "%s\n%!" cmd;
+      if verbose then printf "%s\n%!" cmd;
      let r = Sys.command cmd in
-      if r <> 0 then (
-        eprintf (f_"virt-builder: error: GPG failure: could not run GPG the first time\nUse the '-v' option and look for earlier error messages.\n");
-        exit 1
-      );
+      if r <> 0 then
+        error (f_"GPG failure: could not run GPG the first time\nUse the '-v' option and look for earlier error messages.");
      match gpgkey with
      | No_Key ->
        assert false
@@ -96,12 +87,10 @@ let rec create ~verbose ~gpg ~gpgkey ~check_signature =
        let cmd = sprintf "%s --yes --armor --output %s --export %s%s"
          gpg (quote filename) (quote fp)
          (if verbose then "" else " >/dev/null 2>&1") in
-        if verbose then eprintf "%s\n%!" cmd;
+        if verbose then printf "%s\n%!" cmd;
        let r = Sys.command cmd in
-        if r <> 0 then (
-          eprintf (f_"virt-builder: error: could not export public key\nUse the '-v' option and look for earlier error messages.\n");
-          exit 1
-        );
+        if r <> 0 then
+          error (f_"could not export public key\nUse the '-v' option and look for earlier error messages.");
        ignore (import_keyfile gpg tmpdir verbose filename);
        fp
    ) else
@@ -148,8 +137,7 @@ and verify_detached t filename sigfile =
  if t.check_signature then (
    match sigfile with
    | None ->
-      eprintf (f_"virt-builder: error: there is no detached signature file\nThis probably means the index file is missing a sig=... line.\nYou can use --no-check-signature to ignore this error, but that means\nyou are susceptible to man-in-the-middle attacks.\n");
-      exit 1
+      error (f_"there is no detached signature file\nThis probably means the index file is missing a sig=... line.\nYou can use --no-check-signature to ignore this error, but that means\nyou are susceptible to man-in-the-middle attacks.\n")
    | Some sigfile ->
      let args = sprintf "%s %s" (quote sigfile) (quote filename) in
      do_verify t args
@@ -163,12 +151,10 @@ and do_verify t args =
        t.gpg t.gpghome
        (if t.verbose then "" else " -q --logger-file /dev/null")
        (quote status_file) args in
-  if t.verbose then eprintf "%s\n%!" cmd;
+  if t.verbose then printf "%s\n%!" cmd;
  let r = Sys.command cmd in
-  if r <> 0 then (
-    eprintf (f_"virt-builder: error: GPG failure: could not verify digital signature of file\nTry:\n - Use the '-v' option and look for earlier error messages.\n - Delete the cache: virt-builder --delete-cache\n - Check no one has tampered with the website or your network!\n");
-    exit 1
-  );
+  if r <> 0 then
+    error (f_"GPG failure: could not verify digital signature of file\nTry:\n - Use the '-v' option and look for earlier error messages.\n - Delete the cache: virt-builder --delete-cache\n - Check no one has tampered with the website or your network!");

  (* Check the fingerprint is who it should be. *)
  let status = read_whole_file status_file in
@@ -183,11 +169,9 @@ and do_verify t args =
      | _ -> ()
  ) status;

-  if not (equal_fingerprints !fingerprint t.fingerprint) then (
-    eprintf (f_"virt-builder: error: fingerprint of signature does not match the expected fingerprint!\n  found fingerprint: %s\n  expected fingerprint: %s\n")
-      !fingerprint t.fingerprint;
-    exit 1
-  )
+  if not (equal_fingerprints !fingerprint t.fingerprint) then
+    error (f_"fingerprint of signature does not match the expected fingerprint!\n  found fingerprint: %s\n  expected fingerprint: %s")
+      !fingerprint t.fingerprint

 type csum_t = SHA512 of string

@@ -196,12 +180,10 @@ let verify_checksum t (SHA512 csum) filename =
  unlink_on_exit csum_file;
  let cmd = sprintf "sha512sum %s | awk '{print $1}' > %s"
    (quote filename) (quote csum_file) in
-  if t.verbose then eprintf "%s\n%!" cmd;
+  if t.verbose then printf "%s\n%!" cmd;
  let r = Sys.command cmd in
-  if r <> 0 then (
-    eprintf (f_"virt-builder: error: could not run sha512sum command to verify checksum\n");
-    exit 1
-  );
+  if r <> 0 then
+    error (f_"could not run sha512sum command to verify checksum");

  let csum_actual = read_whole_file csum_file in

@@ -212,8 +194,6 @@ let verify_checksum t (SHA512 csum) filename =
    else
      csum_actual in

-  if csum <> csum_actual then (
-    eprintf (f_"virt-builder: error: checksum of template did not match the expected checksum!\n  found checksum: %s\n  expected checksum: %s\nTry:\n - Use the '-v' option and look for earlier error messages.\n - Delete the cache: virt-builder --delete-cache\n - Check no one has tampered with the website or your network!\n")
-      csum_actual csum;
-    exit 1
-  )
+  if csum <> csum_actual then
+    error (f_"checksum of template did not match the expected checksum!\n  found checksum: %s\n  expected checksum: %s\nTry:\n - Use the '-v' option and look for earlier error messages.\n - Delete the cache: virt-builder --delete-cache\n - Check no one has tampered with the website or your network!")
+      csum_actual csum
--- a/builder/sigchecker.mli
+++ b/builder/sigchecker.mli
@@ -18,12 +18,7 @@

 type t

-type gpgkey_type =
-  | No_Key
-  | Fingerprint of string
-  | KeyFile of string
-
-val create : verbose:bool -> gpg:string -> gpgkey:gpgkey_type -> check_signature:bool -> t
+val create : verbose:bool -> gpg:string -> gpgkey:Utils.gpgkey_type -> check_signature:bool -> t

 val verify : t -> string -> unit
 (** Verify the file is signed (if check_signature is true). *)
--- a/builder/sources.ml
+++ b/builder/sources.ml
@@ -25,7 +25,7 @@ open Unix
 type source = {
  name : string;
  uri : string;
-  gpgkey : string option;
+  gpgkey : Utils.gpgkey_type;
  proxy : Downloader.proxy_mode;
 }

@@ -33,7 +33,7 @@ module StringSet = Set.Make (String)

 let parse_conf ~prog ~verbose file =
  if verbose then (
-    eprintf (f_"%s: trying to read %s\n") prog file;
+    printf (f_"%s: trying to read %s\n") prog file;
  );
  let sections = Ini_reader.read_ini ~prog ~error_suffix:"[ignored]" file in

@@ -52,19 +52,19 @@ let parse_conf ~prog ~verbose file =
            | Not_found -> None
            | Invalid_argument "URI.parse_uri" as ex ->
              if verbose then (
-                eprintf (f_"%s: '%s' has invalid gpgkey URI\n") prog n;
+                printf (f_"%s: '%s' has invalid gpgkey URI\n") prog n;
              );
              raise ex in
          match k with
-          | None -> None
+          | None -> Utils.No_Key
          | Some uri ->
            (match uri.URI.protocol with
-            | "file" -> Some uri.URI.path
+            | "file" -> Utils.KeyFile uri.URI.path
            | _ ->
              if verbose then (
-                eprintf (f_"%s: '%s' has non-local gpgkey URI\n") prog n;
+                printf (f_"%s: '%s' has non-local gpgkey URI\n") prog n;
              );
-              None
+              Utils.No_Key
            ) in
        let proxy =
          try
@@ -84,7 +84,7 @@ let parse_conf ~prog ~verbose file =
  ) sections [] in

  if verbose then (
-    eprintf (f_"%s: ... read %d sources\n") prog (List.length sources);
+    printf (f_"%s: ... read %d sources\n") prog (List.length sources);
  );

  sources
@@ -127,12 +127,12 @@ let read_sources ~prog ~verbose =
          ) with
          | Unix_error (code, fname, _) ->
            if verbose then (
-              eprintf (f_"%s: file error: %s: %s\n") prog fname (error_message code)
+              printf (f_"%s: file error: %s: %s\n") prog fname (error_message code)
            );
            acc
          | Invalid_argument msg ->
            if verbose then (
-              eprintf (f_"%s: internal error: invalid argument: %s\n") prog msg
+              printf (f_"%s: internal error: invalid argument: %s\n") prog msg
            );
            acc
      ) acc files
--- a/builder/sources.mli
+++ b/builder/sources.mli
@@ -19,7 +19,7 @@
 type source = {
  name : string;
  uri : string;
-  gpgkey : string option;
+  gpgkey : Utils.gpgkey_type;
  proxy : Downloader.proxy_mode;
 }

--- a/builder/test-virt-builder-list.sh
+++ b/builder/test-virt-builder-list.sh
@@ -26,7 +26,7 @@ abs_builddir=$(pwd)
 export XDG_CONFIG_HOME=
 export XDG_CONFIG_DIRS="$abs_builddir/test-config"

-short_list=$($VG ./virt-builder --no-check-signature --no-cache --list)
+short_list=$($VG virt-builder --no-check-signature --no-cache --list)

 if [ "$short_list" != "phony-debian             x86_64     Phony Debian
 phony-fedora             x86_64     Phony Fedora
@@ -40,7 +40,7 @@ phony-windows            x86_64     Phony Windows" ]; then
    exit 1
 fi

-long_list=$(./virt-builder --no-check-signature --no-cache --list --long)
+long_list=$(virt-builder --no-check-signature --no-cache --list --long)

 if [ "$long_list" != "Source URI: file://$abs_builddir/test-index

@@ -111,86 +111,86 @@ Phony Windows look-alike used for testing." ]; then
    exit 1
 fi

-json_list=$(./virt-builder --no-check-signature --no-cache --list --list-format json)
+json_list=$(virt-builder --no-check-signature --no-cache --list --list-format json)

 if [ "$json_list" != "{
  \"version\": 1,
  \"sources\": [
-  {
-    \"uri\": \"file://$abs_builddir/test-index\"
-  }
+    {
+      \"uri\": \"file://$abs_builddir/test-index\"
+    }
  ],
  \"templates\": [
-  {
-    \"os-version\": \"phony-debian\",
-    \"full-name\": \"Phony Debian\",
-    \"arch\": \"x86_64\",
-    \"size\": 536870912,
-    \"notes\": {
-      \"C\": \"Phony Debian look-alike used for testing.\"
+    {
+      \"os-version\": \"phony-debian\",
+      \"full-name\": \"Phony Debian\",
+      \"arch\": \"x86_64\",
+      \"size\": 536870912,
+      \"notes\": {
+        \"C\": \"Phony Debian look-alike used for testing.\"
+      },
+      \"hidden\": false
    },
-    \"hidden\": false
-  },
-  {
-    \"os-version\": \"phony-fedora\",
-    \"full-name\": \"Phony Fedora\",
-    \"arch\": \"x86_64\",
-    \"size\": 1073741824,
-    \"notes\": {
-      \"C\": \"Phony Fedora look-alike used for testing.\"
+    {
+      \"os-version\": \"phony-fedora\",
+      \"full-name\": \"Phony Fedora\",
+      \"arch\": \"x86_64\",
+      \"size\": 1073741824,
+      \"notes\": {
+        \"C\": \"Phony Fedora look-alike used for testing.\"
+      },
+      \"hidden\": false
    },
-    \"hidden\": false
-  },
-  {
-    \"os-version\": \"phony-fedora-qcow2\",
-    \"full-name\": \"Phony Fedora qcow2\",
-    \"arch\": \"x86_64\",
-    \"size\": 1073741824,
-    \"notes\": {
-      \"C\": \"Phony Fedora look-alike used for testing.\"
+    {
+      \"os-version\": \"phony-fedora-qcow2\",
+      \"full-name\": \"Phony Fedora qcow2\",
+      \"arch\": \"x86_64\",
+      \"size\": 1073741824,
+      \"notes\": {
+        \"C\": \"Phony Fedora look-alike used for testing.\"
+      },
+      \"hidden\": false
    },
-    \"hidden\": false
-  },
-  {
-    \"os-version\": \"phony-fedora-qcow2-uncompressed\",
-    \"full-name\": \"Phony Fedora qcow2 uncompressed\",
-    \"arch\": \"x86_64\",
-    \"size\": 1073741824,
-    \"notes\": {
-      \"C\": \"Phony Fedora look-alike used for testing.\"
+    {
+      \"os-version\": \"phony-fedora-qcow2-uncompressed\",
+      \"full-name\": \"Phony Fedora qcow2 uncompressed\",
+      \"arch\": \"x86_64\",
+      \"size\": 1073741824,
+      \"notes\": {
+        \"C\": \"Phony Fedora look-alike used for testing.\"
+      },
+      \"hidden\": false
    },
-    \"hidden\": false
-  },
-  {
-    \"os-version\": \"phony-fedora-no-format\",
-    \"full-name\": \"Phony Fedora\",
-    \"arch\": \"x86_64\",
-    \"size\": 1073741824,
-    \"notes\": {
-      \"C\": \"Phony Fedora look-alike used for testing.\"
+    {
+      \"os-version\": \"phony-fedora-no-format\",
+      \"full-name\": \"Phony Fedora\",
+      \"arch\": \"x86_64\",
+      \"size\": 1073741824,
+      \"notes\": {
+        \"C\": \"Phony Fedora look-alike used for testing.\"
+      },
+      \"hidden\": false
    },
-    \"hidden\": false
-  },
-  {
-    \"os-version\": \"phony-ubuntu\",
-    \"full-name\": \"Phony Ubuntu\",
-    \"arch\": \"x86_64\",
-    \"size\": 536870912,
-    \"notes\": {
-      \"C\": \"Phony Ubuntu look-alike used for testing.\"
+    {
+      \"os-version\": \"phony-ubuntu\",
+      \"full-name\": \"Phony Ubuntu\",
+      \"arch\": \"x86_64\",
+      \"size\": 536870912,
+      \"notes\": {
+        \"C\": \"Phony Ubuntu look-alike used for testing.\"
+      },
+      \"hidden\": false
    },
-    \"hidden\": false
-  },
-  {
-    \"os-version\": \"phony-windows\",
-    \"full-name\": \"Phony Windows\",
-    \"arch\": \"x86_64\",
-    \"size\": 536870912,
-    \"notes\": {
-      \"C\": \"Phony Windows look-alike used for testing.\"
-    },
-    \"hidden\": false
-  }
+    {
+      \"os-version\": \"phony-windows\",
+      \"full-name\": \"Phony Windows\",
+      \"arch\": \"x86_64\",
+      \"size\": 536870912,
+      \"notes\": {
+        \"C\": \"Phony Windows look-alike used for testing.\"
+      },
+      \"hidden\": false
+    }
  ]
 }" ]; then
    echo "$0: unexpected --list --format json output:"
--- a/builder/test-virt-builder-planner.sh
+++ b/builder/test-virt-builder-planner.sh
@@ -29,7 +29,7 @@ if [ ! -f fedora.xz -o ! -f fedora.qcow2 -o ! -f fedora.qcow2.xz ]; then
    exit 77
 fi

-if [ "$(../fish/guestfish get-backend)" = "uml" ]; then
+if [ "$(guestfish get-backend)" = "uml" ]; then
    echo "$0: test skipped because backend is UML"
    exit 77
 fi
@@ -43,8 +43,8 @@ for input in phony-fedora phony-fedora-qcow2 phony-fedora-qcow2-uncompressed pho
            if [ "$size" != "none" ]; then args="$args --size $size"; fi
            if [ "$format" != "none" ]; then args="$args --format $format"; fi

-            echo $VG ./virt-builder $input $args
-            $VG ./virt-builder $input $args
+            echo $VG virt-builder $input $args
+            $VG virt-builder $input $args
        done
    done
 done
--- a/builder/test-virt-builder.sh
+++ b/builder/test-virt-builder.sh
@@ -37,7 +37,7 @@ fi
 output=phony-fedora.img

 format=qcow2
-if [ "$(../fish/guestfish get-backend)" = "uml" ]; then
+if [ "$(guestfish get-backend)" = "uml" ]; then
    format=raw

    # XXX We specifically want virt-builder to work with the UML
@@ -55,7 +55,7 @@ rm -f $output
 # Note we cannot test --install, --run since the phony Fedora doesn't
 # have a real OS inside just some configuration files.  Just about
 # every other option is fair game.
-$VG ./virt-builder phony-fedora \
+$VG virt-builder phony-fedora \
    -v --no-cache --no-check-signature $no_network \
    -o $output --size 2G --format $format \
    --arch x86_64 \
@@ -65,6 +65,7 @@ $VG ./virt-builder phony-fedora \
    --mkdir /etc/foo/bar/baz \
    --write '/etc/foo/bar/baz/foo:Hello World' \
    --upload Makefile:/Makefile \
+    --edit '/Makefile: s{^#.*}{}' \
    --upload Makefile:/etc/foo/bar/baz \
    --delete /Makefile \
    --link /etc/foo/bar/baz/foo:/foo \
@@ -73,7 +74,7 @@ $VG ./virt-builder phony-fedora \
    --firstboot-install "minicom,inkscape"

 # Check that some modifications were made.
-$VG ../fish/guestfish --ro -i -a $output > test.out <<EOF
+$VG guestfish --ro -i -a $output > test.out <<EOF
 # Uploaded files
 is-file /etc/foo/bar/baz/Makefile
 cat /etc/foo/bar/baz/foo
--- a/builder/test-virt-index-validate.sh
+++ b/builder/test-virt-index-validate.sh
@@ -19,6 +19,6 @@
 export LANG=C
 set -e

-! $VG ./virt-index-validate test-virt-index-validate-bad-1
-$VG ./virt-index-validate test-virt-index-validate-good-1
-$VG ./virt-index-validate test-virt-index-validate-good-2
+! $VG virt-index-validate test-virt-index-validate-bad-1
+$VG virt-index-validate test-virt-index-validate-good-1
+$VG virt-index-validate test-virt-index-validate-good-2
--- a/builder/uname-c.c
+++ b/builder/uname-c.c
@@ -33,6 +33,8 @@
 extern void unix_error (int errcode, char * cmdname, value arg) Noreturn;
 #endif

+extern value virt_builder_uname (value unit);
+
 value
 virt_builder_uname (value unit)
 {
--- a/builder/utils.ml
+++ b/builder/utils.ml
@@ -0,0 +1,35 @@
+(* virt-builder
+ * Copyright (C) 2013-2015 Red Hat Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *)
+
+(* Utilities/common functions used in virt-builder only. *)
+
+open Printf
+
+open Common_utils
+
+type gpgkey_type =
+  | No_Key
+  | Fingerprint of string
+  | KeyFile of string
+
+let prog = Filename.basename Sys.executable_name
+let error ?exit_code fs = error ~prog ?exit_code fs
+let warning fs = warning ~prog fs
+let info fs = info ~prog fs
+
+let quote = Filename.quote
--- a/builder/virt-builder.pod
+++ b/builder/virt-builder.pod
@@ -164,7 +164,9 @@ the guest boots.

 Or:

- virt-builder fedora-20 --edit '/etc/yum.conf: s/gpgcheck=1/gpgcheck=0/'
+ virt-builder fedora-20 \
+   --edit '/etc/yum.conf:
+             s/gpgcheck=1/gpgcheck=0/'

 which edits C</etc/yum.conf> inside the disk image (during disk image
 creation, long before boot).
@@ -307,13 +309,13 @@ alternate home directory:

 =item B<--list>

-=item B<--list --format> format
+=item B<--list --list-format> format

 =item B<--list --long>

 List available templates.

-It is possible to choose with I<--format> the output format for the list
+It is possible to choose with I<--list-format> the output format for the list
 templates:

 =over 4
@@ -772,6 +774,37 @@ If C</tmp> or C<C:\Temp> is missing.
 If you don't want the log file to appear in the final image, then
 use the I<--no-logfile> command line option.

+=head2 SSH KEYS
+
+The I<--ssh-inject> option is used to inject ssh keys for users in
+the guest, so they can login without supplying a password.
+
+The C<SELECTOR> part of the option value is optional; in this case,
+I<--ssh-inject> C<USER> means that we look in the I<current>
+user's C<~/.ssh> directory to find the default public ID file.  That
+key is uploaded.  "default public ID" is the I<default_ID_file> file
+described in L<ssh-copy-id(1)>.
+
+If specified, the C<SELECTOR> can be in one of the following formats:
+
+=over 4
+
+=item B<--ssh-inject> USER:file:FILENAME
+
+Read the ssh key from C<FILENAME>.  C<FILENAME> is usually a I<.pub>
+file.
+
+=item B<--ssh-inject> USER:string:KEY_STRING
+
+Use the specified C<KEY_STRING>.  C<KEY_STRING> is usually a public
+string like I<ssh-rsa AAAA.... user@localhost>.
+
+=back
+
+In any case, the C<~USER/.ssh> directory and the
+C<~USER/.ssh/authorized_keys> file will be created if not existing
+already.
+
 =head2 INSTALLATION PROCESS

 When you invoke virt-builder, installation proceeds as follows:
@@ -843,7 +876,9 @@ I<--os-variant> is highly recommended, because it will present optimum
 devices to enable the guest to run most efficiently.  To get a list
 of all variants, do:

- virt-install --os-variant list
+ osinfo-query os
+
+The above tool is provided by libosinfo package.

 =item 3.

@@ -1601,6 +1636,11 @@ which is normal and harmless.

 =back

+Please note that if your guest uses SELinux, and you are doing operations
+on it which might create new files or change existing ones, you are
+recommended to use I<--selinux-relabel>.  This will help in making sure
+that files have the right SELinux labels.
+
 =head1 MACHINE READABLE OUTPUT

 The I<--machine-readable> option can be used to make the output more
--- a/builder/website/centos.sh
+++ b/builder/website/centos.sh
@@ -1,6 +1,6 @@
 #!/bin/bash -
 # virt-builder
-# Copyright (C) 2013-2014 Red Hat Inc.
+# Copyright (C) 2013-2015 Red Hat Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
--- a/builder/website/fedora.sh
+++ b/builder/website/fedora.sh
@@ -30,7 +30,11 @@ if [ $# -ne 1 ]; then
 fi

 version=$1
-tree=http://mirror.bytemark.co.uk/fedora/linux/releases/$version/Fedora/x86_64/os/
+if [ $version -lt 21 ]; then
+    tree=http://mirror.bytemark.co.uk/fedora/linux/releases/$version/Fedora/x86_64/os/
+else
+    tree=http://mirror.bytemark.co.uk/fedora/linux/releases/$version/Server/x86_64/os/
+fi
 output=fedora-$version
 tmpname=tmp-$(tr -cd 'a-f0-9' < /dev/urandom | head -c 8)

--- a/builder/website/index
+++ b/builder/website/index
@@ -1,15 +1,15 @@
 [centos-6]
-name=CentOS 6.5
-osinfo=centos6.5
+name=CentOS 6.6
+osinfo=centos6.6
 arch=x86_64
 file=centos-6.xz
-revision=5
-checksum=8f08505ec708b04a25bbd21816cdda8a5eff8bbf85fec3caff6d7a9a7bfba07dafa707e60772f5676c437a6d3381cd26b4e48bc82a232bc940ca9dcddcff7a85
+revision=6
+checksum=fc403ea3555a5608a25ad30ce2514b67288311a7197ddf9fb664475820f26db2bd95a86be9cd6e3f772187b384a02e0965430456dd518d343a80457057bc5441
 format=raw
 size=6442450944
-compressed_size=197139324
+compressed_size=199265736
 expand=/dev/sda3
-notes=CentOS 6.5
+notes=CentOS 6.6
 
 This CentOS image contains only unmodified @Core group packages.
 
@@ -191,26 +191,28 @@ notes=Fedora 20.
 Fedora and the Infinity design logo are trademarks of Red Hat, Inc.
 Source and further information is available from http://fedoraproject.org/

-[rhel-7rc]
-name=Red Hat Enterprise Linux® 7 Release Candidate
+[fedora-21]
+name=Fedora® 21 Server
+osinfo=fedora21
 arch=x86_64
-file=rhel-7rc.xz
-checksum=c4252cfdf7482d4289de24f78e7fd1b9c9b6ff702d717a1c2a54a341b0565c03a5c8e95d32e1f23f7afe5ed2cf5b8e0f0ee3e16c1179e01348a54f82cb552c0f
+file=fedora-21.xz
+revision=1
+checksum=4dc92cbf540d3a0745ffe1fa01ffae15f17e7a8aa45c70ad975a1dda82b7f1ebe42f912be74d91a5866a91ee2ca3be3c2be274b5da29db930fe1ec8c2286575b
 format=raw
-size=6442450944
-compressed_size=210202084
+size=4294967296
+compressed_size=209059864
 expand=/dev/sda3
-notes=Red Hat Enterprise Linux® 7 Release Candidate
+notes=Fedora 21 Server.
 
- This image contains only unmodified @Core group packages.
+ 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/rhel.sh
+ builder/website/fedora.sh
 
- Red Hat Enterprise Linux is a trademark of Red Hat, Inc.
- Source and further information is available from ftp://ftp.redhat.com
+ Fedora and the Infinity design logo are trademarks of Red Hat, Inc.
+ Source and further information is available from http://fedoraproject.org/

 [scientificlinux-6]
 name=Scientific Linux 6.5
--- a/builder/website/index.asc
+++ b/builder/website/index.asc
@@ -2,17 +2,17 @@
 Hash: SHA1

 [centos-6]
-name=CentOS 6.5
-osinfo=centos6.5
+name=CentOS 6.6
+osinfo=centos6.6
 arch=x86_64
 file=centos-6.xz
-revision=5
-checksum=8f08505ec708b04a25bbd21816cdda8a5eff8bbf85fec3caff6d7a9a7bfba07dafa707e60772f5676c437a6d3381cd26b4e48bc82a232bc940ca9dcddcff7a85
+revision=6
+checksum=fc403ea3555a5608a25ad30ce2514b67288311a7197ddf9fb664475820f26db2bd95a86be9cd6e3f772187b384a02e0965430456dd518d343a80457057bc5441
 format=raw
 size=6442450944
-compressed_size=197139324
+compressed_size=199265736
 expand=/dev/sda3
-notes=CentOS 6.5
+notes=CentOS 6.6
 
 This CentOS image contains only unmodified @Core group packages.
 
@@ -194,26 +194,28 @@ notes=Fedora 20.
 Fedora and the Infinity design logo are trademarks of Red Hat, Inc.
 Source and further information is available from http://fedoraproject.org/

-[rhel-7rc]
-name=Red Hat Enterprise Linux® 7 Release Candidate
+[fedora-21]
+name=Fedora® 21 Server
+osinfo=fedora21
 arch=x86_64
-file=rhel-7rc.xz
-checksum=c4252cfdf7482d4289de24f78e7fd1b9c9b6ff702d717a1c2a54a341b0565c03a5c8e95d32e1f23f7afe5ed2cf5b8e0f0ee3e16c1179e01348a54f82cb552c0f
+file=fedora-21.xz
+revision=1
+checksum=4dc92cbf540d3a0745ffe1fa01ffae15f17e7a8aa45c70ad975a1dda82b7f1ebe42f912be74d91a5866a91ee2ca3be3c2be274b5da29db930fe1ec8c2286575b
 format=raw
-size=6442450944
-compressed_size=210202084
+size=4294967296
+compressed_size=209059864
 expand=/dev/sda3
-notes=Red Hat Enterprise Linux® 7 Release Candidate
+notes=Fedora 21 Server.
 
- This image contains only unmodified @Core group packages.
+ 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/rhel.sh
+ builder/website/fedora.sh
 
- Red Hat Enterprise Linux is a trademark of Red Hat, Inc.
- Source and further information is available from ftp://ftp.redhat.com
+ Fedora and the Infinity design logo are trademarks of Red Hat, Inc.
+ Source and further information is available from http://fedoraproject.org/

 [scientificlinux-6]
 name=Scientific Linux 6.5
@@ -321,17 +323,17 @@ notes=Ubuntu 14.04 (Trusty).
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1

-iQIcBAEBAgAGBQJTu7WkAAoJEJFzj3Pht2igRNYQAKlLcgtJ9uMMmP70d93fT9dP
-o1Ui29qpXYGEyD5hm+39Dy86FrUYGRbXIMZZX1mS4mkPYfD4zcD6sx0anhEkfSBq
-wBGAQgMHDO1voFHJHpydmqDd3F60DRBycIZnGr9kDcpdwo/AgFcCGZWYSdBR5uSs
-X1oIwZtWRy03rKBDBoCS/XQ68JP3rw9wjQHvOewMijmpVSYcTUQybBhSNsd9Yrdd
-sulALoaJTjjWhQv8XDXI6iQSO9Q7+MWz08fLRqFv8tNkAeWSfIPchVtUHF0WvUVR
-VnVVJEc/hb+MJoYEFAU84wRsryy9frii8C5d2y89oAJB7nX+axS1smkTDxBcZPEQ
-mdAxkoZC1wFlryhgnNIQXDZBwxmIuMHUldExR8FZA8nmSh0SPWGrq9ofpZh0u8N1
-oxSoauDrzWHJuhU15gR+1K3uoidVGTXHM+A4us/flJ0qNJ8+kZuxtSgvcXzha39K
-uSmgk/APGnumKwr8VB9DaM6eC5VqKFnHKk3PttRS+G2bkdUHakcu5TWd0Fr2ISmW
-RJRwQYodd2SLH/bJ3mdR99Uv5ObkzBzq9IIqCD3squPm9Qh6cQUOaJ1bgwMCuvQN
-rx0y9K0CYBg6pPfNgEiRmtItqrJUgvgQEQBfQOQmbcXYTX089HNuTBTXLPWBLiRH
-HE/+U5EuzjFGZzUasFmn
-=bMpw
+iQIcBAEBAgAGBQJUh0qYAAoJEJFzj3Pht2igo4gP/jHI52b2SNlKDkIFMjM26ztL
+UxtxHlU+70y8pOq/78beVHuiGYFGpkgmbU6lzPpVDivZP4riX1VWUWDWppmu2eEr
+SatDQEaUI1dlETFULXA2kpebH0Q4HsuALZeTt8y9j2U8l/JbKmqBM95f4YOxZiaf
+/UCfF+Er23Lp0whbPVlKDlWQvEVuGANllhoP0lGzLjaz5AHdjLewC+VcJrax74TO
+Lo/aelcZ6M0IYHyXJKUFHl1MrudoWcPvwvTevS7T9zTWJv4Pr+cfCquRxuZ2WZez
+hlwDcMYAO8XF7GsIjGl5ay2Y2H0Anm9iIFwR/bfGMr2EnLLxYZ0qYmeZeO9ZCQFK
+or57RjBebb4qvl5LQQ6JcagRUBPpQ7V5H0sbKTZgLbTDyuUWy+3xJ1MOIZPlnVvB
+gqVgbim9oPatIAgDUS60v4Gu5IFWoi8rgKoPUbY2eSmCfLd8wf1TeC2wQ4vKYJjj
+pMnnmR74gOUL5uUSFV+kM9PqdO65T5YJEG0Be09WCWqkvXbDsOpWDnBz4d5rfxbA
+78lAILtBcDZJvYk+dEekK2TKcWEBfqOPJ5ecWSoogn8pCdnvx3mMzGDaFzDiiiC+
+75nhFNimJs/akwOFh2DLkML0dfIMoaRwTrSoyAfAY+k9rCXBxNVsR0PtThEXaNYo
+RnA1DWswrHxjgIEj4pao
+=TEYf
 -----END PGP SIGNATURE-----
--- a/builder/website/rhel.sh
+++ b/builder/website/rhel.sh
@@ -35,6 +35,26 @@ tmpname=tmp-$(tr -cd 'a-f0-9' < /dev/urandom | head -c 8)
 guestroot=/dev/sda3

 case $version in
+    3.*)
+        major=3
+        minor=`echo $version | awk -F. '{print $2}'`
+        topurl=http://download.devel.redhat.com/released/RHEL-$major/U$minor/AS
+        tree=$topurl/x86_64/tree
+        srpms=$topurl/x86_64/tree/SRPMS
+        bootfs=ext2
+        rootfs=ext3
+        guestroot=/dev/sda2
+        ;;
+    4.*)
+        major=4
+        minor=`echo $version | awk -F. '{print $2}'`
+        topurl=http://download.devel.redhat.com/released/RHEL-$major/U$minor/AS
+        tree=$topurl/x86_64/tree
+        srpms=$topurl/x86_64/tree/SRPMS
+        bootfs=ext2
+        rootfs=ext3
+        guestroot=/dev/sda2
+        ;;
    5.*)
        major=5
        minor=`echo $version | awk -F. '{print $2}'`
@@ -82,10 +102,22 @@ keyboard us
 network --bootproto dhcp
 rootpw builder
 firewall --enabled --ssh
-selinux --enforcing
 timezone --utc America/New_York
 EOF

+if [ $major -le 4 ]; then
+cat >> $ks <<EOF
+langsupport en_US
+mouse generic
+EOF
+fi
+
+if [ $major -ge 4 ]; then
+cat >> $ks <<EOF
+selinux --enforcing
+EOF
+fi
+
 if [ $major -eq 5 ]; then
 cat >> $ks <<EOF
 key --skip
@@ -100,9 +132,17 @@ part /boot --fstype=$bootfs --size=512         --asprimary
 part swap                   --size=1024        --asprimary
 part /     --fstype=$rootfs --size=1024 --grow --asprimary

+EOF
+
+if [ $major -ge 4 ]; then
+cat >> $ks <<EOF
 # Halt the system once configuration has finished.
 poweroff

+EOF
+fi
+
+cat >> $ks <<EOF
 %packages
@core
 EOF
@@ -173,9 +213,11 @@ virt-install \
    --nographics \
    --noreboot

+if [ $major -ge 5 ]; then
 # We have to replace yum config so it doesn't try to use RHN (it
 # won't be registered).
 guestfish --rw -a $output -m $guestroot \
  upload $yum /etc/yum.repos.d/download.devel.redhat.com.repo
+fi

 source $(dirname "$0")/compress.sh $output
--- a/builder/website/test-guest.sh
+++ b/builder/website/test-guest.sh
@@ -27,14 +27,14 @@
 export LANG=C
 set -e

-if [ ! -x builder/virt-builder ]; then
+if ! virt-builder --help >/dev/null 2>&1 || [ ! -f builder/virt-builder.pod ]; then
    echo "$0: running the test from the wrong directory, or libguestfs has not been built"
    exit 1
 fi

 if [ $# -lt 1 ]; then
    echo "$0: missing os-version"
-    echo "try: ./run builder/virt-builder -l"
+    echo "try: ./run virt-builder -l"
    exit 1
 fi

@@ -42,7 +42,7 @@ osversion="$1"
 shift
 output="$osversion.img"

-builder/virt-builder "$osversion" \
+virt-builder "$osversion" \
    --no-cache -v \
    --size 10G \
    --root-password password:123456 \
--- a/builder/website/validate.sh
+++ b/builder/website/validate.sh
@@ -24,8 +24,8 @@ fn=test-filename-for-index-validate
 rm -f $fn
 touch $fn

-$VG ../virt-index-validate $srcdir/index
-$VG ../virt-index-validate $srcdir/index.asc
-$VG ../virt-index-validate $fn
+$VG virt-index-validate $srcdir/index
+$VG virt-index-validate $srcdir/index.asc
+$VG virt-index-validate $fn

 rm $fn
--- a/cat/Makefile.am
+++ b/cat/Makefile.am
@@ -1,5 +1,5 @@
 # libguestfs virt-cat, virt-filesystems, virt-log and virt-ls.
-# Copyright (C) 2010-2014 Red Hat Inc.
+# Copyright (C) 2010-2015 Red Hat Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -42,7 +42,9 @@ SHARED_SOURCE_FILES = \
 	../fish/options.h \
 	../fish/options.c \
 	../fish/uri.h \
-	../fish/uri.c
+	../fish/uri.c \
+	../fish/windows.h \
+	../fish/windows.c

 virt_cat_SOURCES = \
 	$(SHARED_SOURCE_FILES) \
@@ -64,6 +66,7 @@ virt_cat_LDADD = \
 	$(top_builddir)/src/libguestfs.la \
 	$(LIBXML2_LIBS) \
 	$(LIBVIRT_LIBS) \
+	$(LTLIBINTL) \
 	../gnulib/lib/libgnu.la

 virt_filesystems_SOURCES = \
@@ -86,6 +89,7 @@ virt_filesystems_LDADD = \
 	$(top_builddir)/src/libguestfs.la \
 	$(LIBXML2_LIBS) \
 	$(LIBVIRT_LIBS) \
+	$(LTLIBINTL) \
 	../gnulib/lib/libgnu.la

 virt_log_SOURCES = \
@@ -108,6 +112,7 @@ virt_log_LDADD = \
 	$(top_builddir)/src/libguestfs.la \
 	$(LIBXML2_LIBS) \
 	$(LIBVIRT_LIBS) \
+	$(LTLIBINTL) \
 	../gnulib/lib/libgnu.la

 virt_ls_SOURCES = \
@@ -132,6 +137,7 @@ virt_ls_LDADD = \
 	$(top_builddir)/src/libguestfs.la \
 	$(LIBXML2_LIBS) \
 	$(LIBVIRT_LIBS) \
+	$(LTLIBINTL) \
 	../gnulib/lib/libgnu.la

 # Manual pages and HTML files for the website.
--- a/cat/cat.c
+++ b/cat/cat.c
@@ -29,10 +29,9 @@
 #include <assert.h>
 #include <libintl.h>

-#include "c-ctype.h"
-
 #include "guestfs.h"
 #include "options.h"
+#include "windows.h"

 /* Currently open libguestfs handle. */
 guestfs_h *g;
@@ -46,8 +45,6 @@ const char *libvirt_uri = NULL;
 int inspector = 1;

 static int do_cat (int argc, char *argv[]);
-static int is_windows (guestfs_h *g, const char *root);
-static char *windows_path (guestfs_h *g, const char *root, const char *filename);

 static void __attribute__((noreturn))
 usage (int status)
@@ -102,6 +99,7 @@ main (int argc, char *argv[])
    { "keys-from-stdin", 0, 0, 0 },
    { "long-options", 0, 0, 0 },
    { "mount", 1, 0, 'm' },
+    { "short-options", 0, 0, 0 },
    { "verbose", 0, 0, 'v' },
    { "version", 0, 0, 'V' },
    { 0, 0, 0, 0 }
@@ -112,6 +110,7 @@ main (int argc, char *argv[])
  struct mp *mp;
  char *p;
  const char *format = NULL;
+  bool format_consumed = true;
  int c;
  int r;
  int option_index;
@@ -130,15 +129,14 @@ main (int argc, char *argv[])
    case 0:			/* options which are long only */
      if (STREQ (long_options[option_index].name, "long-options"))
        display_long_options (long_options);
+      else if (STREQ (long_options[option_index].name, "short-options"))
+        display_short_options (options);
      else if (STREQ (long_options[option_index].name, "keys-from-stdin")) {
        keys_from_stdin = 1;
      } else if (STREQ (long_options[option_index].name, "echo-keys")) {
        echo_keys = 1;
      } else if (STREQ (long_options[option_index].name, "format")) {
-        if (!optarg || STREQ (optarg, ""))
-          format = NULL;
-        else
-          format = optarg;
+        OPTION_format;
      } else {
        fprintf (stderr, _("%s: unknown long option: %s (%d)\n"),
                 program_name, long_options[option_index].name, option_index);
@@ -232,6 +230,8 @@ main (int argc, char *argv[])
  if (optind >= argc || argc - optind < 1)
    usage (EXIT_FAILURE);

+  CHECK_OPTION_format_consumed;
+
  /* User must have specified some drives. */
  if (drvs == NULL)
    usage (EXIT_FAILURE);
@@ -285,7 +285,8 @@ do_cat (int argc, char *argv[])
    const char *filename = argv[i];

    if (windows) {
-      filename = filename_to_free = windows_path (g, root, filename);
+      filename = filename_to_free = windows_path (g, root, filename,
+                                                  1 /* readonly */);
      if (filename == NULL) {
        errors++;
        continue;
@@ -298,109 +299,3 @@ do_cat (int argc, char *argv[])

  return errors == 0 ? 0 : -1;
 }
-
-static int
-is_windows (guestfs_h *g, const char *root)
-{
-  char *type;
-  int w;
-
-  type = guestfs_inspect_get_type (g, root);
-  if (!type)
-    return 0;
-
-  w = STREQ (type, "windows");
-  free (type);
-  return w;
-}
-
-static void mount_drive_letter_ro (char drive_letter, const char *root);
-
-static char *
-windows_path (guestfs_h *g, const char *root, const char *path)
-{
-  char *ret;
-  size_t i;
-
-  /* If there is a drive letter, rewrite the path. */
-  if (c_isalpha (path[0]) && path[1] == ':') {
-    char drive_letter = c_tolower (path[0]);
-    /* This returns the newly allocated string. */
-    mount_drive_letter_ro (drive_letter, root);
-    ret = strdup (path + 2);
-    if (ret == NULL) {
-      perror ("strdup");
-      exit (EXIT_FAILURE);
-    }
-  }
-  else if (!*path) {
-    ret = strdup ("/");
-    if (ret == NULL) {
-      perror ("strdup");
-      exit (EXIT_FAILURE);
-    }
-  }
-  else {
-    ret = strdup (path);
-    if (ret == NULL) {
-      perror ("strdup");
-      exit (EXIT_FAILURE);
-    }
-  }
-
-  /* Blindly convert any backslashes into forward slashes.  Is this good? */
-  for (i = 0; i < strlen (ret); ++i)
-    if (ret[i] == '\\')
-      ret[i] = '/';
-
-  /* If this fails, we want to return NULL. */
-  char *t = guestfs_case_sensitive_path (g, ret);
-  free (ret);
-  ret = t;
-
-  return ret;
-}
-
-static void
-mount_drive_letter_ro (char drive_letter, const char *root)
-{
-  char **drives;
-  char *device;
-  size_t i;
-
-  /* Resolve the drive letter using the drive mappings table. */
-  drives = guestfs_inspect_get_drive_mappings (g, root);
-  if (drives == NULL || drives[0] == NULL) {
-    fprintf (stderr, _("%s: to use Windows drive letters, this must be a Windows guest\n"),
-             program_name);
-    exit (EXIT_FAILURE);
-  }
-
-  device = NULL;
-  for (i = 0; drives[i] != NULL; i += 2) {
-    if (c_tolower (drives[i][0]) == drive_letter && drives[i][1] == '\0') {
-      device = drives[i+1];
-      break;
-    }
-  }
-
-  if (device == NULL) {
-    fprintf (stderr, _("%s: drive '%c:' not found.\n"),
-             program_name, drive_letter);
-    exit (EXIT_FAILURE);
-  }
-
-  /* Unmount current disk and remount device. */
-  if (guestfs_umount_all (g) == -1)
-    exit (EXIT_FAILURE);
-
-  if (guestfs_mount_ro (g, device, "/") == -1)
-    exit (EXIT_FAILURE);
-
-  for (i = 0; drives[i] != NULL; ++i)
-    free (drives[i]);
-  free (drives);
-  /* Don't need to free (device) because that string was in the
-   * drives array.
-   */
-}
--- a/cat/filesystems.c
+++ b/cat/filesystems.c
@@ -164,6 +164,7 @@ main (int argc, char *argv[])
    { "physical-volumes", 0, 0, 0 },
    { "physvols", 0, 0, 0 },
    { "pvs", 0, 0, 0 },
+    { "short-options", 0, 0, 0 },
    { "uuid", 0, 0, 0 },
    { "uuids", 0, 0, 0 },
    { "verbose", 0, 0, 'v' },
@@ -175,6 +176,7 @@ main (int argc, char *argv[])
  };
  struct drv *drvs = NULL;
  const char *format = NULL;
+  bool format_consumed = true;
  int c;
  int option_index;
  int no_title = 0;             /* --no-title */
@@ -196,15 +198,14 @@ main (int argc, char *argv[])
    case 0:			/* options which are long only */
      if (STREQ (long_options[option_index].name, "long-options"))
        display_long_options (long_options);
+      else if (STREQ (long_options[option_index].name, "short-options"))
+        display_short_options (options);
      else if (STREQ (long_options[option_index].name, "keys-from-stdin")) {
        keys_from_stdin = 1;
      } else if (STREQ (long_options[option_index].name, "echo-keys")) {
        echo_keys = 1;
      } else if (STREQ (long_options[option_index].name, "format")) {
-        if (!optarg || STREQ (optarg, ""))
-          format = NULL;
-        else
-          format = optarg;
+        OPTION_format;
      } else if (STREQ (long_options[option_index].name, "all")) {
        output = OUTPUT_ALL;
      } else if (STREQ (long_options[option_index].name, "blkdevs") ||
@@ -296,6 +297,8 @@ main (int argc, char *argv[])
  if (optind != argc)
    usage (EXIT_FAILURE);

+  CHECK_OPTION_format_consumed;
+
  /* -h and --csv doesn't make sense.  Spreadsheets will corrupt these
   * fields.  (RHBZ#600977).
   */
--- a/cat/log.c
+++ b/cat/log.c
@@ -1,5 +1,5 @@
 /* virt-log
- * Copyright (C) 2010-2014 Red Hat Inc.
+ * Copyright (C) 2010-2015 Red Hat Inc.
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -34,8 +34,6 @@
 #include <sys/types.h>
 #include <sys/wait.h>

-#include "c-ctype.h"
-
 #include "guestfs.h"
 #include "options.h"

@@ -66,7 +64,7 @@ usage (int status)
  else {
    fprintf (stdout,
           _("%s: display log files in a virtual machine\n"
-             "Copyright (C) 2010-2014 Red Hat Inc.\n"
+             "Copyright (C) 2010-2015 Red Hat Inc.\n"
             "Usage:\n"
             "  %s [--options] -d domname\n"
             "  %s [--options] -a disk.img [-a disk.img ...]\n"
@@ -107,12 +105,14 @@ main (int argc, char *argv[])
    { "help", 0, 0, HELP_OPTION },
    { "keys-from-stdin", 0, 0, 0 },
    { "long-options", 0, 0, 0 },
+    { "short-options", 0, 0, 0 },
    { "verbose", 0, 0, 'v' },
    { "version", 0, 0, 'V' },
    { 0, 0, 0, 0 }
  };
  struct drv *drvs = NULL;
  const char *format = NULL;
+  bool format_consumed = true;
  int c;
  int r;
  int option_index;
@@ -131,15 +131,14 @@ main (int argc, char *argv[])
    case 0:			/* options which are long only */
      if (STREQ (long_options[option_index].name, "long-options"))
        display_long_options (long_options);
+      else if (STREQ (long_options[option_index].name, "short-options"))
+        display_short_options (options);
      else if (STREQ (long_options[option_index].name, "keys-from-stdin")) {
        keys_from_stdin = 1;
      } else if (STREQ (long_options[option_index].name, "echo-keys")) {
        echo_keys = 1;
      } else if (STREQ (long_options[option_index].name, "format")) {
-        if (!optarg || STREQ (optarg, ""))
-          format = NULL;
-        else
-          format = optarg;
+        OPTION_format;
      } else {
        fprintf (stderr, _("%s: unknown long option: %s (%d)\n"),
                 program_name, long_options[option_index].name, option_index);
@@ -191,6 +190,8 @@ main (int argc, char *argv[])
  if (optind != argc)
    usage (EXIT_FAILURE);

+  CHECK_OPTION_format_consumed;
+
  /* User must have specified some drives. */
  if (drvs == NULL)
    usage (EXIT_FAILURE);
--- a/cat/ls.c
+++ b/cat/ls.c
@@ -71,7 +71,7 @@ static void output_int64 (int64_t);
 static void output_int64_dev (int64_t);
 static void output_int64_perms (int64_t);
 static void output_int64_size (int64_t);
-static void output_int64_time (int64_t);
+static void output_int64_time (int64_t secs, int64_t nsecs);
 static void output_int64_uid (int64_t);
 static void output_string (const char *);
 static void output_string_link (const char *);
@@ -151,6 +151,7 @@ main (int argc, char *argv[])
    { "long-options", 0, 0, 0 },
    { "mount", 1, 0, 'm' },
    { "recursive", 0, 0, 'R' },
+    { "short-options", 0, 0, 0 },
    { "time", 0, 0, 0 },
    { "times", 0, 0, 0 },
    { "time-days", 0, 0, 0 },
@@ -168,6 +169,7 @@ main (int argc, char *argv[])
  struct mp *mp;
  char *p;
  const char *format = NULL;
+  bool format_consumed = true;
  int c;
  int option_index;
 #define MODE_LS_L  1
@@ -189,15 +191,14 @@ main (int argc, char *argv[])
    case 0:			/* options which are long only */
      if (STREQ (long_options[option_index].name, "long-options"))
        display_long_options (long_options);
+      else if (STREQ (long_options[option_index].name, "short-options"))
+        display_short_options (options);
      else if (STREQ (long_options[option_index].name, "keys-from-stdin")) {
        keys_from_stdin = 1;
      } else if (STREQ (long_options[option_index].name, "echo-keys")) {
        echo_keys = 1;
      } else if (STREQ (long_options[option_index].name, "format")) {
-        if (!optarg || STREQ (optarg, ""))
-          format = NULL;
-        else
-          format = optarg;
+        OPTION_format;
      } else if (STREQ (long_options[option_index].name, "checksum") ||
                 STREQ (long_options[option_index].name, "checksums")) {
        if (!optarg || STREQ (optarg, ""))
@@ -327,6 +328,8 @@ main (int argc, char *argv[])
  assert (inspector == 1 || mps != NULL);
  assert (live == 0);

+  CHECK_OPTION_format_consumed;
+
  /* Many flags only apply to -lR mode. */
  if (mode != MODE_LS_LR &&
      (csv || human || enable_uids || enable_times || enable_extra_stats ||
@@ -449,7 +452,7 @@ do_ls_R (const char *dir)
  return 0;
 }

-static int show_file (const char *dir, const char *name, const struct guestfs_stat *stat, const struct guestfs_xattr_list *xattrs, void *unused);
+static int show_file (const char *dir, const char *name, const struct guestfs_statns *stat, const struct guestfs_xattr_list *xattrs, void *unused);

 static int
 do_ls_lR (const char *dir)
@@ -466,7 +469,7 @@ do_ls_lR (const char *dir)
 */
 static int
 show_file (const char *dir, const char *name,
-           const struct guestfs_stat *stat,
+           const struct guestfs_statns *stat,
           const struct guestfs_xattr_list *xattrs,
           void *unused)
 {
@@ -476,45 +479,45 @@ show_file (const char *dir, const char *name,
  /* Display the basic fields. */
  output_start_line ();

-  if (is_reg (stat->mode))
+  if (is_reg (stat->st_mode))
    filetype = "-";
-  else if (is_dir (stat->mode))
+  else if (is_dir (stat->st_mode))
    filetype = "d";
-  else if (is_chr (stat->mode))
+  else if (is_chr (stat->st_mode))
    filetype = "c";
-  else if (is_blk (stat->mode))
+  else if (is_blk (stat->st_mode))
    filetype = "b";
-  else if (is_fifo (stat->mode))
+  else if (is_fifo (stat->st_mode))
    filetype = "p";
-  else if (is_lnk (stat->mode))
+  else if (is_lnk (stat->st_mode))
    filetype = "l";
-  else if (is_sock (stat->mode))
+  else if (is_sock (stat->st_mode))
    filetype = "s";
  else
    filetype = "u";
  output_string (filetype);
-  output_int64_perms (stat->mode & 07777);
+  output_int64_perms (stat->st_mode & 07777);

-  output_int64_size (stat->size);
+  output_int64_size (stat->st_size);

  /* Display extra fields when enabled. */
  if (enable_uids) {
-    output_int64_uid (stat->uid);
-    output_int64_uid (stat->gid);
+    output_int64_uid (stat->st_uid);
+    output_int64_uid (stat->st_gid);
  }

  if (enable_times) {
-    output_int64_time (stat->atime);
-    output_int64_time (stat->mtime);
-    output_int64_time (stat->ctime);
+    output_int64_time (stat->st_atime_sec, stat->st_atime_nsec);
+    output_int64_time (stat->st_mtime_sec, stat->st_mtime_nsec);
+    output_int64_time (stat->st_ctime_sec, stat->st_ctime_nsec);
  }

  if (enable_extra_stats) {
-    output_int64_dev (stat->dev);
-    output_int64 (stat->ino);
-    output_int64 (stat->nlink);
-    output_int64_dev (stat->rdev);
-    output_int64 (stat->blocks);
+    output_int64_dev (stat->st_dev);
+    output_int64 (stat->st_ino);
+    output_int64 (stat->st_nlink);
+    output_int64_dev (stat->st_rdev);
+    output_int64 (stat->st_blocks);
  }

  /* Disabled for now -- user would definitely want these to be interpreted.
@@ -524,17 +527,20 @@ show_file (const char *dir, const char *name,

  path = full_path (dir, name);

-  if (checksum && is_reg (stat->mode)) {
-    csum = guestfs_checksum (g, checksum, path);
-    if (!csum)
-      exit (EXIT_FAILURE);
+  if (checksum) {
+    if (is_reg (stat->st_mode)) {
+      csum = guestfs_checksum (g, checksum, path);
+      if (!csum)
+        exit (EXIT_FAILURE);

-    output_string (csum);
+      output_string (csum);
+    } else if (csv)
+      output_string ("");
  }

  output_string (path);

-  if (is_lnk (stat->mode))
+  if (is_lnk (stat->st_mode))
    /* XXX Fix this for NTFS. */
    link = guestfs_readlink (g, path);
  if (link)
@@ -703,7 +709,7 @@ output_int64_perms (int64_t i)
 }

 static void
-output_int64_time (int64_t i)
+output_int64_time (int64_t secs, int64_t nsecs)
 {
  int r;

@@ -713,19 +719,19 @@ output_int64_time (int64_t i)
  if (time_t_output) {
    switch (time_relative) {
    case 0:                     /* --time-t */
-      r = printf ("%10" PRIi64, i);
+      r = printf ("%10" PRIi64, secs);
      break;
    case 1:                     /* --time-relative */
-      r = printf ("%8" PRIi64, now - i);
+      r = printf ("%8" PRIi64, now - secs);
      break;
    case 2:                     /* --time-days */
    default:
-      r = printf ("%3" PRIi64, (now - i) / 86400);
+      r = printf ("%3" PRIi64, (now - secs) / 86400);
      break;
    }
  }
  else {
-    time_t t = (time_t) i;
+    time_t t = (time_t) secs;
    char buf[64];
    struct tm *tm;

--- a/cat/test-virt-cat.sh
+++ b/cat/test-virt-cat.sh
@@ -1,6 +1,6 @@
 #!/bin/bash -
 # libguestfs
-# Copyright (C) 2009-2014 Red Hat Inc.
+# Copyright (C) 2009-2015 Red Hat Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -20,11 +20,11 @@ export LANG=C
 set -e

 # Read out the test files from the image using virt-cat.
-if [ "$($VG ./virt-cat ../tests/guests/fedora.img /etc/test1)" != "abcdefg" ]; then
+if [ "$($VG virt-cat ../tests/guests/fedora.img /etc/test1)" != "abcdefg" ]; then
    echo "$0: error: mismatch in file test1"
    exit 1
 fi
-if [ "$($VG ./virt-cat ../tests/guests/fedora.img /etc/test2)" != "" ]; then
+if [ "$($VG virt-cat ../tests/guests/fedora.img /etc/test2)" != "" ]; then
    echo "$0: error: mismatch in file test2"
    exit 1
 fi
--- a/cat/test-virt-filesystems.sh
+++ b/cat/test-virt-filesystems.sh
@@ -1,6 +1,6 @@
 #!/bin/bash -
 # libguestfs
-# Copyright (C) 2009-2014 Red Hat Inc.
+# Copyright (C) 2009-2015 Red Hat Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -19,7 +19,7 @@
 export LANG=C
 set -e

-output="$($VG ./virt-filesystems -a ../tests/guests/fedora.img | sort)"
+output="$($VG virt-filesystems -a ../tests/guests/fedora.img | sort)"
 expected="/dev/VG/LV1
 /dev/VG/LV2
 /dev/VG/LV3
@@ -32,7 +32,7 @@ if [ "$output" != "$expected" ]; then
    exit 1
 fi

-output="$($VG ./virt-filesystems -a ../tests/guests/fedora.img --all --long --uuid -h --no-title | awk '{print $1}' | sort -u)"
+output="$($VG virt-filesystems -a ../tests/guests/fedora.img --all --long --uuid -h --no-title | awk '{print $1}' | sort -u)"
 expected="/dev/VG
 /dev/VG/LV1
 /dev/VG/LV2
--- a/cat/test-virt-log.sh
+++ b/cat/test-virt-log.sh
@@ -1,6 +1,6 @@
 #!/bin/bash -
 # libguestfs
-# Copyright (C) 2009-2014 Red Hat Inc.
+# Copyright (C) 2009-2015 Red Hat Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -19,7 +19,37 @@
 export LANG=C
 set -e

+can_handle ()
+{
+    fn=$(basename $1)
+    case "$fn" in
+    fedora.img)
+        guestfish -a /dev/null run : available journal
+        ;;
+    *)
+        return 0
+        ;;
+    esac
+}
+
+tmpfile=`mktemp`
+
 # Read out the log files from the image using virt-log.
 for f in ../tests/guests/{fedora,debian,ubuntu}.img; do
-    if [ -s "$f" ]; then $VG ./virt-log -a "$f"; fi
+    echo "Trying $f ..."
+    if [ ! -s "$f" ]; then
+        echo "SKIP: empty file"
+        echo
+        continue
+    fi
+    if ! can_handle "$f"; then
+        echo "SKIP: cannot handle $f"
+        echo
+        continue
+    fi
+    $VG virt-log -a "$f" &> $tmpfile
+    cat $tmpfile
+    echo
 done
+
+rm -f $tmpfile
--- a/cat/test-virt-ls.sh
+++ b/cat/test-virt-ls.sh
@@ -20,7 +20,7 @@ export LANG=C
 set -e

 # Read out the test directory using virt-ls.
-if [ "$($VG ./virt-ls ../tests/guests/fedora.img /bin)" != "ls
+if [ "$($VG virt-ls ../tests/guests/fedora.img /bin)" != "ls
 test1
 test2
 test3
@@ -33,7 +33,7 @@ test7" ]; then
 fi

 # Try the -lR option.
-output="$($VG ./virt-ls -lR ../tests/guests/fedora.img /boot | awk '{print $1 $2 $4}')"
+output="$($VG virt-ls -lR ../tests/guests/fedora.img /boot | awk '{print $1 $2 $4}')"
 expected="d0755/boot
 d0755/boot/grub
 -0644/boot/grub/grub.conf
@@ -49,5 +49,5 @@ if [ "$output" != "$expected" ]; then
 fi

 # Try the -l and -R options.   XXX Should check the output.
-$VG ./virt-ls -l ../tests/guests/fedora.img /
-$VG ./virt-ls -R ../tests/guests/fedora.img /
+$VG virt-ls -l ../tests/guests/fedora.img /
+$VG virt-ls -R ../tests/guests/fedora.img /
--- a/cat/virt-log.pod
+++ b/cat/virt-log.pod
@@ -148,4 +148,4 @@ Richard W.M. Jones L<http://people.redhat.com/~rjones/>

 =head1 COPYRIGHT

-Copyright (C) 2010-2014 Red Hat Inc.
+Copyright (C) 2010-2015 Red Hat Inc.
--- a/cat/virt-ls.pod
+++ b/cat/virt-ls.pod
@@ -531,4 +531,4 @@ Richard W.M. Jones L<http://people.redhat.com/~rjones/>

 =head1 COPYRIGHT

-Copyright (C) 2009-2014 Red Hat Inc.
+Copyright (C) 2009-2015 Red Hat Inc.
--- a/cat/visit.c
+++ b/cat/visit.c
@@ -1,5 +1,5 @@
 /* virt-ls visitor function
- * Copyright (C) 2010-2014 Red Hat Inc.
+ * Copyright (C) 2010-2015 Red Hat Inc.
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -51,11 +51,11 @@ _visit (guestfs_h *g, int depth, const char *dir,
   * case.
   */
  if (depth == 0) {
-    CLEANUP_FREE_STAT struct guestfs_stat *stat = NULL;
+    CLEANUP_FREE_STATNS struct guestfs_statns *stat = NULL;
    CLEANUP_FREE_XATTR_LIST struct guestfs_xattr_list *xattrs = NULL;
    int r;

-    stat = guestfs_lstat (g, dir);
+    stat = guestfs_lstatns (g, dir);
    if (stat == NULL)
      return -1;

@@ -71,14 +71,14 @@ _visit (guestfs_h *g, int depth, const char *dir,

  size_t i, xattrp;
  CLEANUP_FREE_STRING_LIST char **names = NULL;
-  CLEANUP_FREE_STAT_LIST struct guestfs_stat_list *stats = NULL;
+  CLEANUP_FREE_STAT_LIST struct guestfs_statns_list *stats = NULL;
  CLEANUP_FREE_XATTR_LIST struct guestfs_xattr_list *xattrs = NULL;

  names = guestfs_ls (g, dir);
  if (names == NULL)
    return -1;

-  stats = guestfs_lstatlist (g, dir, names);
+  stats = guestfs_lstatnslist (g, dir, names);
  if (stats == NULL)
    return -1;

@@ -123,7 +123,7 @@ _visit (guestfs_h *g, int depth, const char *dir,
      return -1;

    /* Recursively call visit, but only on directories. */
-    if (is_dir (stats->val[i].mode)) {
+    if (is_dir (stats->val[i].st_mode)) {
      path = full_path (dir, names[i]);
      if (_visit (g, depth + 1, path, f, opaque) == -1)
        return -1;
@@ -138,13 +138,18 @@ full_path (const char *dir, const char *name)
 {
  int r;
  char *path;
+  int len;
+
+  len = strlen (dir);
+  if (len > 0 && dir[len - 1] == '/')
+    --len;

  if (STREQ (dir, "/"))
    r = asprintf (&path, "/%s", name ? name : "");
  else if (name)
-    r = asprintf (&path, "%s/%s", dir, name);
+    r = asprintf (&path, "%.*s/%s", len, dir, name);
  else
-    r = asprintf (&path, "%s", dir);
+    r = asprintf (&path, "%.*s", len, dir);

  if (r == -1) {
    perror ("asprintf");
--- a/cat/visit.h
+++ b/cat/visit.h
@@ -1,5 +1,5 @@
 /* virt-ls visitor function
- * Copyright (C) 2010-2014 Red Hat Inc.
+ * Copyright (C) 2010-2015 Red Hat Inc.
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -19,7 +19,7 @@
 #ifndef VISIT_H
 #define VISIT_H

-typedef int (*visitor_function) (const char *dir, const char *name, const struct guestfs_stat *stat, const struct guestfs_xattr_list *xattrs, void *opaque);
+typedef int (*visitor_function) (const char *dir, const char *name, const struct guestfs_statns *stat, const struct guestfs_xattr_list *xattrs, void *opaque);

 extern int visit (guestfs_h *g, const char *dir, visitor_function f, void *opaque);

--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 # libguestfs
-# Copyright (C) 2009-2014 Red Hat Inc.
+# Copyright (C) 2009-2015 Red Hat Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -25,8 +25,8 @@
 # add extra information using --with-extra="..." which may be any
 # freeform string.
 m4_define([libguestfs_major],   [1])
-m4_define([libguestfs_minor],   [27])
-m4_define([libguestfs_release], [26])
+m4_define([libguestfs_minor],   [29])
+m4_define([libguestfs_release], [21])

 AC_INIT([libguestfs],libguestfs_major.libguestfs_minor.libguestfs_release)
 AC_CONFIG_AUX_DIR([build-aux])
@@ -203,6 +203,14 @@ test "x$U" != "x" && AC_MSG_ERROR([Compiler not ANSI compliant])

 AM_PROG_CC_C_O

+# Provide a global place to set CFLAGS.  (Note that setting AM_CFLAGS
+# is no use because it doesn't override target_CFLAGS).
+#---
+# Kill -fstrict-overflow which is a license for the C compiler to make
+# dubious and often unsafe optimizations, in a time-wasting attempt to
+# deal with CPU architectures that do not exist.
+CFLAGS="$CFLAGS -fno-strict-overflow -Wno-strict-overflow"
+
 dnl Work out how to specify the linker script to the linker.
 VERSION_SCRIPT_FLAGS=-Wl,--version-script=
 `/usr/bin/ld --help 2>&1 | grep -- --version-script >/dev/null` || \
@@ -270,6 +278,12 @@ dnl Check if stat has the required fields.
 AC_STRUCT_ST_BLOCKS
 AC_CHECK_MEMBER([struct stat.st_blksize],[
    AC_DEFINE([HAVE_STRUCT_STAT_ST_BLKSIZE],[1],[Define to 1 if 'st_blksize' is a member of 'struct stat'.])])
+AC_CHECK_MEMBER([struct stat.st_atim.tv_nsec],[
+    AC_DEFINE([HAVE_STRUCT_STAT_ST_ATIM_TV_NSEC],[1],[Define to 1 if 'st_mtim.tv_nsec' is a member of 'struct stat'.])])
+AC_CHECK_MEMBER([struct stat.st_mtim.tv_nsec],[
+    AC_DEFINE([HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC],[1],[Define to 1 if 'st_mtim.tv_nsec' is a member of 'struct stat'.])])
+AC_CHECK_MEMBER([struct stat.st_ctim.tv_nsec],[
+    AC_DEFINE([HAVE_STRUCT_STAT_ST_CTIM_TV_NSEC],[1],[Define to 1 if 'st_mtim.tv_nsec' is a member of 'struct stat'.])])

 dnl Define a C symbol for the host CPU architecture.
 AC_DEFINE_UNQUOTED([host_cpu],["$host_cpu"],[Host architecture.])
@@ -282,6 +296,7 @@ AC_CHECK_HEADERS([\
    attr/xattr.h \
    byteswap.h \
    endian.h \
+    sys/endian.h \
    errno.h \
    linux/fs.h \
    linux/raid/md_u.h \
@@ -321,19 +336,37 @@ AC_CHECK_FUNCS([\
    statvfs \
    sync])

-dnl tgetent, tputs and UP [sic] are all required.  They come from libtinfo
-dnl which is pulled in as a dependency of libncurses.
-old_LIBS="$LIBS"
-AC_CHECK_LIB([ncurses], [tgetent], [], [
-    AC_MSG_ERROR(['ncurses' library not found, or it doesn't contain 'tgetent'])
+dnl Check for UNIX_PATH_MAX, creating a custom one if not available.
+AC_MSG_CHECKING([for UNIX_PATH_MAX])
+AC_COMPILE_IFELSE([
+  AC_LANG_PROGRAM([[
+#include <sys/un.h>
+  ]], [[
+#ifndef UNIX_PATH_MAX
+#error UNIX_PATH_MAX not defined
+#endif
+  ]])], [
+    AC_MSG_RESULT([yes])
+  ], [
+    AC_MSG_RESULT([no])
+    AC_MSG_CHECKING([for size of sockaddr_un.sun_path])
+    AC_COMPUTE_INT(unix_path_max, [sizeof (myaddr.sun_path)], [
+#include <sys/un.h>
+struct sockaddr_un myaddr;
+      ], [
+        AC_MSG_ERROR([cannot get it])
+      ])
+    AC_MSG_RESULT([$unix_path_max])
+    AC_DEFINE_UNQUOTED([UNIX_PATH_MAX], $unix_path_max, [Custom value for UNIX_PATH_MAX])
+  ])
+
+dnl tgetent, tputs and UP [sic] are all required.  They come from the lower
+dnl tinfo library, but might be part of ncurses directly.
+PKG_CHECK_MODULES([LIBTINFO], [tinfo], [], [
+    PKG_CHECK_MODULES([LIBTINFO], [ncurses])
 ])
-AC_CHECK_LIB([ncurses], [tputs], [], [
-    AC_MSG_ERROR(['ncurses' library not found, or it doesn't contain 'tputs'])
-])
-AC_CHECK_LIB([ncurses], [UP], [], [
-    AC_MSG_ERROR(['ncurses' library not found, or it doesn't contain 'UP'])
-])
-LIBS="$old_LIBS"
+AC_SUBST([LIBTINFO_CFLAGS])
+AC_SUBST([LIBTINFO_LIBS])

 dnl GNU gettext tools (optional).
 AC_CHECK_PROG([XGETTEXT],[xgettext],[xgettext],[no])
@@ -352,6 +385,9 @@ AC_MSG_RESULT([$msgfmt_is_gnu])
 AM_CONDITIONAL([HAVE_GNU_GETTEXT],
    [test "x$XGETTEXT" != "xno" && test "x$MSGCAT" != "xno" && test "x$MSGFMT" != "xno" && test "x$MSGMERGE" != "xno" && test "x$msgfmt_is_gnu" != "xno"])

+dnl Check for gettext.
+AM_GNU_GETTEXT([external])
+
 dnl Default backend.
 AC_MSG_CHECKING([if the user specified a default backend])
 AC_ARG_WITH([default-backend],
@@ -553,6 +589,13 @@ AC_ARG_WITH([extra-packages],
    [EXTRA_PACKAGES=])
 AC_SUBST([EXTRA_PACKAGES])

+dnl Check for libdl/dlopen (optional - only used to test if the library
+dnl can be used with libdl).
+AC_CHECK_LIB([dl],[dlopen],[have_libdl=yes],[have_libdl=no])
+AC_CHECK_HEADERS([dlfcn.h],[have_dlfcn=yes],[have_dlfcn=no])
+AM_CONDITIONAL([HAVE_LIBDL],
+               [test "x$have_libdl" = "xyes" && test "x$have_dlfcn" = "xyes"])
+
 dnl Check for rpcgen and XDR library.  rpcgen is optional.
 AC_CHECK_PROG([RPCGEN],[rpcgen],[rpcgen],[no])
 AM_CONDITIONAL([HAVE_RPCGEN],[test "x$RPCGEN" != "xno"])
@@ -648,10 +691,8 @@ AC_CHECK_PROG([PO4A],[po4a],[po4a],[no])
 AM_CONDITIONAL([HAVE_PO4A], [test "x$PO4A" != "xno"])

 dnl Check for db_dump, db_load (optional).
-AC_PATH_PROGS([DB_DUMP],
-              [db_dump db5.1_dump db4_dump db4.8_dump db4.7_dump db4.6_dump],[no])
-AC_PATH_PROGS([DB_LOAD],
-              [db_load db5.1_load db4_load db4.8_load db4.7_load db4.6_load],[no])
+GUESTFS_FIND_DB_TOOL([DB_DUMP], [dump])
+GUESTFS_FIND_DB_TOOL([DB_LOAD], [load])
 if test "x$DB_DUMP" != "xno"; then
    AC_DEFINE_UNQUOTED([DB_DUMP],["$DB_DUMP"],[Name of db_dump program.])
 fi
@@ -714,14 +755,22 @@ if test "x$YACC" = "xyacc"; then
    AC_MSG_FAILURE([GNU 'bison' is required (yacc won't work).])
 fi

+dnl zip/unzip, used by virt-v2v
+AC_PATH_PROGS([ZIP],[zip],[no])
+AC_DEFINE_UNQUOTED([ZIP],["$ZIP"],[Name of zip program.])
+AM_CONDITIONAL([HAVE_ZIP],[test "x$ZIP" != "xno"])
+AC_PATH_PROGS([UNZIP],[unzip],[no])
+AC_DEFINE_UNQUOTED([UNZIP],["$UNZIP"],[Name of unzip program.])
+
 dnl Check for QEMU for running binaries on this $host_cpu, fall
 dnl back to basic 'qemu'.  Allow the user to override it.
-qemu_system="$(
-    echo qemu-system-$host_cpu |
-    $SED -e 's/-i@<:@456@:>@86/-i386/g' \
-         -e 's/-arm.*/-arm/g'
-    )"
-default_qemu="qemu-kvm kvm $qemu_system qemu"
+AS_CASE([$host_cpu],
+        [i@<:@456@:>@86],[qemu_cpu=i386],
+        [arm*],[qemu_cpu=arm],
+        [amd64],[qemu_cpu=x86_64],
+        [powerpc64 | ppc64le | powerpc64le],[qemu_cpu=ppc64],
+        [qemu_cpu=$host_cpu])
+default_qemu="qemu-kvm kvm qemu-system-$qemu_cpu qemu"
 AC_ARG_WITH([qemu],
    [AS_HELP_STRING([--with-qemu="bin1 bin2 ..."],
        [set default QEMU binary @<:@default="[qemu-kvm] qemu-system-<host> qemu"@:>@])],
@@ -966,12 +1015,19 @@ PKG_CHECK_MODULES([HIVEX], [hivex],[
 AM_CONDITIONAL([HAVE_HIVEX],[test "x$HIVEX_LIBS" != "x"])

 dnl systemd journal library (optional)
-PKG_CHECK_MODULES([SD_JOURNAL], [libsystemd-journal >= 196],[
+PKG_CHECK_MODULES([SD_JOURNAL], [libsystemd],[
    AC_SUBST([SD_JOURNAL_CFLAGS])
    AC_SUBST([SD_JOURNAL_LIBS])
    AC_DEFINE([HAVE_SD_JOURNAL],[1],[systemd journal library found at compile time.])
-],
-    [AC_MSG_WARN([systemd journal library not found, some features will be disabled])])
+],[
+    PKG_CHECK_MODULES([SD_JOURNAL], [libsystemd-journal >= 196],[
+        AC_SUBST([SD_JOURNAL_CFLAGS])
+        AC_SUBST([SD_JOURNAL_LIBS])
+        AC_DEFINE([HAVE_SD_JOURNAL],[1],[systemd journal library found at compile time.])
+    ],[
+        AC_MSG_WARN([systemd journal library not found, some features will be disabled])
+    ])
+])

 dnl FUSE is optional to build the FUSE module.
 AC_ARG_ENABLE([fuse],
@@ -995,7 +1051,7 @@ AS_IF([test "x$enable_fuse" != "xno"],[
 AM_CONDITIONAL([HAVE_FUSE],[test "x$enable_fuse" != "xno"])

 dnl Check for yajl JSON library (optional).
-PKG_CHECK_MODULES([YAJL], [yajl >= 2], [
+PKG_CHECK_MODULES([YAJL], [yajl >= 2.0.4], [
    AC_SUBST([YAJL_CFLAGS])
    AC_SUBST([YAJL_LIBS])
    AC_DEFINE([HAVE_YAJL],[1],[Define to 1 if you have yajl.])
@@ -1080,6 +1136,12 @@ AC_CHECK_PROG([OCAML_GETTEXT],[ocaml-gettext],[ocaml-gettext],[no])
 AM_CONDITIONAL([HAVE_OCAML_GETTEXT],
    [test "x$OCAMLC" != "xno" && test "x$OCAMLFIND" != "xno" && test "x$OCAML_PKG_gettext" != "xno" && test "x$OCAML_GETTEXT" != "xno"])

+dnl Flags we want to pass to every OCaml compiler call.
+OCAML_WARN_ERROR="-warn-error CDEFLMPSUVYZX-3"
+AC_SUBST([OCAML_WARN_ERROR])
+OCAML_FLAGS="-g -annot"
+AC_SUBST([OCAML_FLAGS])
+
 dnl Check for Perl (optional, for Perl bindings and Perl tools).
 AC_ARG_ENABLE([perl],
    AS_HELP_STRING([--disable-perl], [disable Perl language bindings]),
@@ -1211,9 +1273,15 @@ AS_IF([test "x$enable_ruby" != "xno"],[
        libruby="$(cat conftest)"
        rm conftest
        AS_IF([test -n "$libruby"],[
+            ruby_cmd='puts RbConfig::CONFIG@<:@"libdir"@:>@'
+            echo running: $RUBY -rrbconfig -e \'$ruby_cmd\' >&AS_MESSAGE_LOG_FD
+            $RUBY -rrbconfig -e "$ruby_cmd" >conftest 2>&AS_MESSAGE_LOG_FD
+            libruby_libdir="$(cat conftest)"
+            rm conftest
+            test -n "$libruby_libdir" && libruby_libdir="-L$libruby_libdir"
            AC_MSG_RESULT([-l$libruby])
            AC_CHECK_LIB([$libruby],[ruby_init],
-                         [have_libruby=1],[have_libruby=])
+                         [have_libruby=1],[have_libruby=],[$libruby_libdir])
        ],[
            AC_MSG_RESULT([not found])
        ])
@@ -1251,6 +1319,9 @@ if test "x$with_java" != "xno"; then
        for d in \
            /usr/lib/jvm/java \
            /usr/lib/jvm/default-java \
+            /usr/lib/jvm/default \
+            /usr/lib/jvm/java-8-openjdk \
+            /usr/lib/jvm/java-7-openjdk \
            /usr/lib/jvm/java-6-openjdk
        do
            if test -d $d && test -f $d/bin/java; then
@@ -1609,22 +1680,32 @@ mkdir -p \
 dnl http://www.mail-archive.com/automake@gnu.org/msg10204.html
 AC_CONFIG_FILES([appliance/libguestfs-make-fixed-appliance],
                [chmod +x,-w appliance/libguestfs-make-fixed-appliance])
+AC_CONFIG_FILES([builder/link.sh],
+                [chmod +x,-w builder/link.sh])
+AC_CONFIG_FILES([customize/link.sh],
+                [chmod +x,-w customize/link.sh])
 AC_CONFIG_FILES([inspector/test-xmllint.sh],
                [chmod +x,-w inspector/test-xmllint.sh])
-AC_CONFIG_FILES([p2v-iso/kickstart-target.sh],
-                [chmod +x,-w p2v-iso/kickstart-target.sh])
-AC_CONFIG_FILES([p2v-iso/virt-builder-target.sh],
-                [chmod +x,-w p2v-iso/virt-builder-target.sh])
+AC_CONFIG_FILES([mllib/link.sh],
+                [chmod +x,-w mllib/link.sh])
+AC_CONFIG_FILES([p2v/virt-p2v-make-disk],
+                [chmod +x,-w p2v/virt-p2v-make-disk])
+AC_CONFIG_FILES([p2v/virt-p2v-make-kickstart],
+                [chmod +x,-w p2v/virt-p2v-make-kickstart])
 AC_CONFIG_FILES([php/extension/php-for-tests.sh],
                [chmod +x,-w php/extension/php-for-tests.sh])
 AC_CONFIG_FILES([pick-guests.pl],
                [chmod +x,-w pick-guests.pl])
 AC_CONFIG_FILES([podwrapper.pl],
                [chmod +x,-w podwrapper.pl])
+AC_CONFIG_FILES([resize/link.sh],
+                [chmod +x,-w resize/link.sh])
 AC_CONFIG_FILES([run],
                [chmod +x,-w run])
 AC_CONFIG_FILES([sparsify/link.sh],
                [chmod +x,-w sparsify/link.sh])
+AC_CONFIG_FILES([sysprep/link.sh],
+                [chmod +x,-w sysprep/link.sh])
 AC_CONFIG_FILES([v2v/link.sh],
                [chmod +x,-w v2v/link.sh])

@@ -1672,7 +1753,6 @@ AC_CONFIG_FILES([Makefile
                 ocaml/Makefile
                 ocaml/examples/Makefile
                 p2v/Makefile
-                 p2v-iso/Makefile
                 perl/Makefile
                 perl/Makefile.PL
                 perl/examples/Makefile
@@ -1733,7 +1813,8 @@ AC_CONFIG_FILES([Makefile
                 tests/xfs/Makefile
                 tests/xml/Makefile
                 tools/Makefile
-                 v2v/Makefile])
+                 v2v/Makefile
+                 v2v/test-v2v-networks-and-bridges.xml])
 AC_OUTPUT

 dnl Produce summary.
--- a/contrib/autobuild/autobuild.sh
+++ b/contrib/autobuild/autobuild.sh
@@ -1,6 +1,6 @@
 #!/bin/bash -
 # libguestfs autobuild script
-# Copyright (C) 2009-2014 Red Hat Inc.
+# Copyright (C) 2009-2015 Red Hat Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
--- a/contrib/make-check-on-installed.pl
+++ b/contrib/make-check-on-installed.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 # libguestfs
-# Copyright (C) 2009-2014 Red Hat Inc.
+# Copyright (C) 2009-2015 Red Hat Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
--- a/contrib/visualize-alignment/tracetops.ml
+++ b/contrib/visualize-alignment/tracetops.ml
@@ -1,7 +1,7 @@
 #!/usr/bin/ocamlrun /usr/bin/ocaml

 (* Convert *.qtr (qemu block device trace) to Postscript.
- * Copyright (C) 2009-2014 Red Hat Inc.
+ * Copyright (C) 2009-2015 Red Hat Inc.
 * By Richard W.M. Jones <rjones@redhat.com>.
 *
 * This program is free software; you can redistribute it and/or modify
--- a/customize/Makefile.am
+++ b/customize/Makefile.am
@@ -18,12 +18,12 @@
 include $(top_srcdir)/subdir-rules.mk

 EXTRA_DIST = \
-	$(SOURCES) \
+	$(SOURCES_MLI) $(SOURCES_ML) $(SOURCES_C) \
 	test-virt-customize.sh \
 	virt-customize.pod

 CLEANFILES = \
-	*~ *.cmi *.cmo *.cmx *.cmxa *.o \
+	*~ *.annot *.cmi *.cmo *.cmx *.cmxa *.o \
 	stamp-virt-customize.pod \
 	virt-customize virt-customize.1

@@ -33,70 +33,68 @@ generator_built = \
 	customize-options.pod \
 	customize-synopsis.pod

-# Alphabetical order.
-SOURCES = \
-	crypt.ml \
+SOURCES_MLI = \
 	crypt.mli \
-	crypt-c.c \
-	customize_cmdline.ml \
 	customize_cmdline.mli \
-	customize_run.ml \
 	customize_run.mli \
-	firstboot.ml \
 	firstboot.mli \
-	hostname.ml \
 	hostname.mli \
-	customize_main.ml \
-	password.ml \
 	password.mli \
-	perl_edit.ml \
 	perl_edit.mli \
-	random_seed.ml \
 	random_seed.mli \
-	timezone.ml \
+	ssh_key.mli \
 	timezone.mli \
-	urandom.ml \
 	urandom.mli

+# This list must be in dependency order.
+SOURCES_ML = \
+	customize_utils.ml \
+	crypt.ml \
+	firstboot.ml \
+	hostname.ml \
+	urandom.ml \
+	password.ml \
+	perl_edit.ml \
+	random_seed.ml \
+	ssh_key.ml \
+	timezone.ml \
+	customize_cmdline.ml \
+	customize_run.ml \
+	customize_main.ml
+
+SOURCES_C = \
+	$(top_srcdir)/fish/uri.c \
+	$(top_srcdir)/fish/file-edit.c \
+	$(top_srcdir)/fish/file-edit.h \
+	$(top_srcdir)/mllib/uri-c.c \
+	crypt-c.c \
+	perl_edit-c.c
+
 if HAVE_OCAML

-deps = \
-	$(top_builddir)/fish/guestfish-uri.o \
-	$(top_builddir)/mllib/common_gettext.cmx \
-	$(top_builddir)/mllib/common_utils.cmx \
-	$(top_builddir)/mllib/config.cmx \
-	$(top_builddir)/mllib/regedit.cmx \
-	$(top_builddir)/mllib/uri-c.o \
-	$(top_builddir)/mllib/uRI.cmx \
-	crypt-c.o
+bin_PROGRAMS = virt-customize

-if HAVE_OCAMLOPT
-OBJECTS = $(deps)
-else
-OBJECTS = $(patsubst %.cmx,%.cmo,$(deps))
-endif
+virt_customize_SOURCES = $(SOURCES_C)
+virt_customize_CPPFLAGS = \
+	-I. \
+	-I$(top_builddir) \
+	-I$(top_srcdir)/gnulib/lib -I$(top_builddir)/gnulib/lib \
+	-I$(shell $(OCAMLC) -where) \
+	-I$(top_srcdir)/src \
+	-I$(top_srcdir)/fish
+virt_customize_CFLAGS = \
+	$(WARN_CFLAGS) $(WERROR_CFLAGS) \
+	$(LIBVIRT_CFLAGS) \
+	$(LIBXML2_CFLAGS)

-# This list must be in dependency order.
-ocaml_modules = \
-	crypt \
-	firstboot \
-	hostname \
-	urandom \
-	password \
-	perl_edit \
-	random_seed \
-	timezone \
-	customize_cmdline \
-	customize_run \
-	customize_main
-
-if HAVE_OCAMLOPT
-OBJECTS += $(patsubst %,%.cmx,$(ocaml_modules))
-else
-OBJECTS += $(patsubst %,%.cmo,$(ocaml_modules))
-endif
-
-bin_SCRIPTS = virt-customize
+BOBJECTS = \
+	$(top_builddir)/mllib/common_gettext.cmo \
+	$(top_builddir)/mllib/common_utils.cmo \
+	$(top_builddir)/mllib/config.cmo \
+	$(top_builddir)/mllib/regedit.cmo \
+	$(top_builddir)/mllib/uRI.cmo \
+	$(SOURCES_ML:.ml=.cmo)
+XOBJECTS = $(BOBJECTS:.cmo=.cmx)

 # -I $(top_builddir)/src/.libs is a hack which forces corresponding -L
 # option to be passed to gcc, so we don't try linking against an
@@ -104,53 +102,39 @@ bin_SCRIPTS = virt-customize
 OCAMLPACKAGES = \
 	-package str,unix \
 	-I $(top_builddir)/src/.libs \
+	-I $(top_builddir)/gnulib/lib/.libs \
 	-I $(top_builddir)/ocaml \
 	-I $(top_builddir)/mllib
 if HAVE_OCAML_PKG_GETTEXT
 OCAMLPACKAGES += -package gettext-stub
 endif

-OCAMLCFLAGS = -g -warn-error CDEFLMPSUVYZX-3 $(OCAMLPACKAGES)
-OCAMLOPTFLAGS = $(OCAMLCFLAGS)
+OCAMLFLAGS = $(OCAML_FLAGS) $(OCAML_WARN_ERROR)

-OCAMLCLIBS  = \
-	$(LIBXML2_LIBS) -lncurses -lcrypt \
-	-L../src/.libs -lutils \
-	-L../gnulib/lib/.libs -lgnu
-
-virt-customize: $(OBJECTS)
-if HAVE_OCAMLOPT
-	$(OCAMLFIND) ocamlopt $(OCAMLOPTFLAGS) \
-	  mlguestfs.cmxa -linkpkg $^ \
-	  -cclib '$(OCAMLCLIBS)' \
-	  -o $@
+if !HAVE_OCAMLOPT
+OBJECTS = $(BOBJECTS)
+BEST    = c
+OCAMLLINKFLAGS = mlguestfs.cma -custom
 else
-	$(OCAMLFIND) ocamlc $(OCAMLCFLAGS) \
-	  mlguestfs.cma -linkpkg $^ \
-	  -cclib '$(OCAMLCLIBS)' \
-	  -custom \
-	  -o $@
+OBJECTS = $(XOBJECTS)
+BEST    = opt
+OCAMLLINKFLAGS = mlguestfs.cmxa
 endif

+virt_customize_DEPENDENCIES = $(OBJECTS)
+virt_customize_LINK = \
+	./link.sh \
+	  $(OCAMLFIND) $(BEST) $(OCAMLFLAGS) $(OCAMLPACKAGES) $(OCAMLLINKFLAGS) \
+	  $(OBJECTS) -o $@
+
 .mli.cmi:
-	$(OCAMLFIND) ocamlc $(OCAMLCFLAGS) -c $< -o $@
+	$(OCAMLFIND) ocamlc $(OCAMLFLAGS) $(OCAMLPACKAGES) -c $< -o $@
 .ml.cmo:
-	$(OCAMLFIND) ocamlc $(OCAMLCFLAGS) -c $< -o $@
+	$(OCAMLFIND) ocamlc $(OCAMLFLAGS) $(OCAMLPACKAGES) -c $< -o $@
+if HAVE_OCAMLOPT
 .ml.cmx:
-	$(OCAMLFIND) ocamlopt $(OCAMLOPTFLAGS) -c $< -o $@
-
-# automake will decide we don't need C support in this file.  Really
-# we do, so we have to provide it ourselves.
-
-DEFAULT_INCLUDES = \
-	-I. \
-	-I$(top_builddir) \
-	-I$(shell $(OCAMLC) -where) \
-	-I$(top_srcdir)/src \
-	-I$(top_srcdir)/fish
-
-.c.o:
-	$(CC) $(CFLAGS) $(PROF_CFLAGS) $(DEFAULT_INCLUDES) -c $< -o $@
+	$(OCAMLFIND) ocamlopt $(OCAMLFLAGS) $(OCAMLPACKAGES) -c $< -o $@
+endif

 # Manual pages and HTML files for the website.
 man_MANS = virt-customize.1
--- a/customize/crypt-c.c
+++ b/customize/crypt-c.c
@@ -26,6 +26,8 @@
 #include <caml/memory.h>
 #include <caml/mlvalues.h>

+#pragma GCC diagnostic ignored "-Wmissing-prototypes"
+
 value
 virt_sysprep_crypt (value keyv, value saltv)
 {
--- a/customize/customize_main.ml
+++ b/customize/customize_main.ml
@@ -19,6 +19,7 @@
 open Common_gettext.Gettext
 open Common_utils

+open Customize_utils
 open Customize_cmdline

 open Printf
@@ -27,12 +28,13 @@ module G = Guestfs

 let () = Random.self_init ()

-let prog = Filename.basename Sys.executable_name
-
 let main () =
  let attach = ref [] in
  let attach_format = ref None in
-  let set_attach_format = function
+  let attach_format_consumed = ref true in
+  let set_attach_format s =
+    attach_format_consumed := false;
+    match s with
    | "auto" -> attach_format := None
    | s -> attach_format := Some s
  in
@@ -42,6 +44,11 @@ let main () =
  let dryrun = ref false in
  let files = ref [] in
  let format = ref "auto" in
+  let format_consumed = ref true in
+  let set_format s =
+    format := s;
+    format_consumed := false
+  in
  let libvirturi = ref "" in
  let memsize = ref None in
  let set_memsize arg = memsize := Some arg in
@@ -59,15 +66,14 @@ let main () =
    let uri =
      try URI.parse_uri arg
      with Invalid_argument "URI.parse_uri" ->
-        eprintf "Error parsing URI '%s'. Look for error messages printed above.\n" arg;
-        exit 1 in
+        error (f_"error parsing URI '%s'. Look for error messages printed above.")
+          arg in
    let format = match !format with "auto" -> None | fmt -> Some fmt in
-    files := (uri, format) :: !files
+    files := (uri, format) :: !files;
+    format_consumed := true
  and set_domain dom =
-    if !domain <> None then (
-      eprintf (f_"%s: --domain option can only be given once\n") prog;
-      exit 1
-    );
+    if !domain <> None then
+      error (f_"--domain option can only be given once");
    domain := Some dom
  in

@@ -85,8 +91,9 @@ let main () =
    "-n",        Arg.Set dryrun,            " " ^ s_"Perform a dry run";
    "--dryrun",  Arg.Set dryrun,            " " ^ s_"Perform a dry run";
    "--dry-run", Arg.Set dryrun,            " " ^ s_"Perform a dry run";
-    "--format",  Arg.Set_string format,     s_"format" ^ " " ^ s_"Set format (default: auto)";
+    "--format",  Arg.String set_format,     s_"format" ^ " " ^ s_"Set format (default: auto)";
    "--long-options", Arg.Unit display_long_options, " " ^ s_"List long options";
+    "--short-options", Arg.Unit display_short_options, " " ^ s_"List short options";
    "-m",        Arg.Int set_memsize,       "mb" ^ " " ^ s_"Set memory size";
    "--memsize", Arg.Int set_memsize,       "mb" ^ " " ^ s_"Set memory size";
    "--network", Arg.Set network,           " " ^ s_"Enable appliance network (default)";
@@ -101,7 +108,7 @@ let main () =
    "-x",        Arg.Set trace,             " " ^ s_"Enable tracing of libguestfs calls";
  ] in
  let customize_argspec, get_customize_ops =
-    Customize_cmdline.argspec ~prog () in
+    Customize_cmdline.argspec () in
  let customize_argspec =
    List.map (fun (spec, _, _) -> spec) customize_argspec in
  let argspec = argspec @ customize_argspec in
@@ -129,6 +136,12 @@ read the man page virt-customize(1).
      prog in
  Arg.parse argspec anon_fun usage_msg;

+  if not !format_consumed then
+    error (f_"--format parameter must appear before -a parameter");
+
+  if not !attach_format_consumed then
+    error (f_"--attach-format parameter must appear before --attach parameter");
+
  (* Check -a and -d options. *)
  let files = !files in
  let domain = !domain in
@@ -136,9 +149,7 @@ read the man page virt-customize(1).
  let add =
    match files, domain with
    | [], None ->
-      eprintf (f_"%s: you must give either -a or -d options\n") prog;
-      eprintf (f_"Read virt-customize(1) man page for further information.\n");
-      exit 1
+      error (f_"you must give either -a or -d options. Read virt-customize(1) man page for further information.")
    | [], Some dom ->
      fun (g : Guestfs.guestfs) readonly ->
        let allowuuid = true in
@@ -149,9 +160,7 @@ read the man page virt-customize(1).
                  ?libvirturi ~allowuuid ~readonlydisk
                  dom)
    | _, Some _ ->
-      eprintf (f_"%s: you cannot give -a and -d options together\n") prog;
-      eprintf (f_"Read virt-customize(1) man page for further information.\n");
-      exit 1
+      error (f_"you cannot give -a and -d options together. Read virt-customize(1) man page for further information.")
    | files, None ->
      fun g readonly ->
        List.iter (
@@ -193,7 +202,11 @@ read the man page virt-customize(1).
    (match memsize with None -> () | Some memsize -> g#set_memsize memsize);
    (match smp with None -> () | Some smp -> g#set_smp smp);
    g#set_network network;
-    g#set_selinux ops.flags.selinux_relabel;
+    (* Make sure to turn SELinux off to avoid awkward interactions
+     * between the appliance kernel and applications/libraries interacting
+     * with SELinux xattrs.
+     *)
+    g#set_selinux false;

    (* Add disks. *)
    add g dryrun;
@@ -210,8 +223,7 @@ read the man page virt-customize(1).
  (* Inspection. *)
  (match Array.to_list (g#inspect_os ()) with
  | [] ->
-    eprintf (f_"%s: no operating systems were found in the guest image\n") prog;
-    exit 1
+    error (f_"no operating systems were found in the guest image")
  | roots ->
    List.iter (
      fun root ->
@@ -224,11 +236,11 @@ read the man page virt-customize(1).
        List.iter (
          fun (mp, dev) ->
            try g#mount dev mp;
-            with Guestfs.Error msg -> eprintf (f_"%s (ignored)\n") msg
+            with Guestfs.Error msg -> warning (f_"%s (ignored)") msg
        ) mps;

        (* Do the customization. *)
-        Customize_run.run ~prog ~verbose ~quiet g root ops;
+        Customize_run.run ~verbose ~quiet g root ops;

        g#umount_all ();
    ) roots;
@@ -242,25 +254,4 @@ read the man page virt-customize(1).
    Gc.compact ()

 (* Finished. *)
-let () =
-  (try main ()
-   with
-   | Failure msg ->                     (* from failwith/failwithf *)
-     eprintf (f_"%s: %s\n") prog msg;
-     exit 1
-   | Invalid_argument msg ->            (* probably should never happen *)
-     eprintf (f_"%s: internal error: invalid argument: %s\n") prog msg;
-     exit 1
-   | Assert_failure (file, line, char) -> (* should never happen *)
-     eprintf (f_"%s: internal error: assertion failed at %s, line %d, char %d\n")
-       prog file line char;
-     exit 1
-   | Not_found ->                       (* should never happen *)
-     eprintf (f_"%s: internal error: Not_found exception was thrown\n") prog;
-     exit 1
-   | exn ->
-     eprintf (f_"%s: exception: %s\n") prog (Printexc.to_string exn);
-     exit 1
-  );
-
-  exit 0
+let () = run_main_and_handle_errors ~prog main
--- a/customize/customize_run.ml
+++ b/customize/customize_run.ml
@@ -22,12 +22,11 @@ open Printf
 open Common_gettext.Gettext
 open Common_utils

+open Customize_utils
 open Customize_cmdline
 open Password

-let quote = Filename.quote
-
-let run ~prog ~verbose ~quiet (g : Guestfs.guestfs) root (ops : ops) =
+let run ~verbose ~quiet (g : Guestfs.guestfs) root (ops : ops) =
  (* Timestamped messages in ordinary, non-debug non-quiet mode. *)
  let msg fs = make_message_function ~quiet fs in

@@ -50,8 +49,7 @@ let run ~prog ~verbose ~quiet (g : Guestfs.guestfs) root (ops : ops) =
       *)
      g#download logfile "/dev/stderr"
    with exn ->
-      eprintf (f_"%s: log file %s: %s (ignored)\n")
-        prog logfile (Printexc.to_string exn) in
+      warning (f_"log file %s: %s (ignored)") logfile (Printexc.to_string exn) in

  (* Useful wrapper for scripts. *)
  let do_run ~display cmd =
@@ -75,13 +73,12 @@ exec >>%s 2>&1
 %s
 " (quote logfile) env_vars cmd in

-    if verbose then eprintf "running command:\n%s\n%!" cmd;
+    if verbose then printf "running command:\n%s\n%!" cmd;
    try ignore (g#sh cmd)
    with
      Guestfs.Error msg ->
        debug_logfile ();
-        eprintf (f_"%s: %s: command exited with an error\n") prog display;
-        exit 1
+        error (f_"%s: command exited with an error") display
  in

  (* http://distrowatch.com/dwres.php?resource=package-management *)
@@ -96,6 +93,8 @@ exec >>%s 2>&1
        apt-get $apt_opts update
        apt-get $apt_opts install %s
      " quoted_args
+    | "dnf" ->
+      sprintf "dnf -y install %s" quoted_args
    | "pisi" ->
      sprintf "pisi it %s" quoted_args
    | "pacman" ->
@@ -108,13 +107,9 @@ exec >>%s 2>&1
      (* XXX Should we use -n option? *)
      sprintf "zypper in %s" quoted_args
    | "unknown" ->
-      eprintf (f_"%s: --install is not supported for this guest operating system\n")
-        prog;
-      exit 1
+      error (f_"--install is not supported for this guest operating system")
    | pm ->
-      eprintf (f_"%s: sorry, don't know how to use --install with the '%s' package manager\n")
-        prog pm;
-      exit 1
+      error (f_"sorry, don't know how to use --install with the '%s' package manager") pm

  and guest_update_command () =
    match g#inspect_get_package_management root with
@@ -126,6 +121,8 @@ exec >>%s 2>&1
        apt-get $apt_opts update
        apt-get $apt_opts upgrade
      "
+    | "dnf" ->
+      sprintf "dnf -y update"
    | "pisi" ->
      sprintf "pisi upgrade"
    | "pacman" ->
@@ -137,19 +134,15 @@ exec >>%s 2>&1
    | "zypper" ->
      sprintf "zypper update"
    | "unknown" ->
-      eprintf (f_"%s: --update is not supported for this guest operating system\n")
-        prog;
-      exit 1
+      error (f_"--update is not supported for this guest operating system")
    | pm ->
-      eprintf (f_"%s: sorry, don't know how to use --update with the '%s' package manager\n")
-        prog pm;
-      exit 1
+      error (f_"sorry, don't know how to use --update with the '%s' package manager") pm
  in

  (* Set the random seed. *)
  msg (f_"Setting a random seed");
  if not (Random_seed.set_random_seed g root) then
-    warning ~prog (f_"random seed could not be set for this type of guest");
+    warning (f_"random seed could not be set for this type of guest");

  (* Used for numbering firstboot commands. *)
  let i = ref 0 in
@@ -157,11 +150,8 @@ exec >>%s 2>&1
  (* Store the passwords and set them all at the end. *)
  let passwords = Hashtbl.create 13 in
  let set_password user pw =
-    if Hashtbl.mem passwords user then (
-      eprintf (f_"%s: error: multiple --root-password/--password options set the password for user '%s' twice.\n")
-        prog user;
-      exit 1
-    );
+    if Hashtbl.mem passwords user then
+      error (f_"multiple --root-password/--password options set the password for user '%s' twice") user;
    Hashtbl.replace passwords user pw
  in

@@ -187,36 +177,33 @@ exec >>%s 2>&1
    | `Edit (path, expr) ->
      msg (f_"Editing: %s") path;

-      if not (g#is_file path) then (
-        eprintf (f_"%s: error: %s is not a regular file in the guest\n")
-          prog path;
-        exit 1
-      );
+      if not (g#is_file path) then
+        error (f_"%s is not a regular file in the guest") path;

-      Perl_edit.edit_file ~verbose g path expr
+      Perl_edit.edit_file ~verbose g#ocaml_handle path expr

    | `FirstbootCommand cmd ->
      incr i;
      msg (f_"Installing firstboot command: [%d] %s") !i cmd;
-      Firstboot.add_firstboot_script ~prog g root !i cmd
+      Firstboot.add_firstboot_script g root !i cmd

    | `FirstbootPackages pkgs ->
      incr i;
      msg (f_"Installing firstboot packages: [%d] %s") !i
        (String.concat " " pkgs);
      let cmd = guest_install_command pkgs in
-      Firstboot.add_firstboot_script ~prog g root !i cmd
+      Firstboot.add_firstboot_script g root !i cmd

    | `FirstbootScript script ->
      incr i;
      msg (f_"Installing firstboot script: [%d] %s") !i script;
      let cmd = read_whole_file script in
-      Firstboot.add_firstboot_script ~prog g root !i cmd
+      Firstboot.add_firstboot_script g root !i cmd

    | `Hostname hostname ->
      msg (f_"Setting the hostname: %s") hostname;
      if not (Hostname.set_hostname g root hostname) then
-        warning ~prog (f_"hostname could not be set for this type of guest")
+        warning (f_"hostname could not be set for this type of guest")

    | `InstallPackages pkgs ->
      msg (f_"Installing packages: %s") (String.concat " " pkgs);
@@ -249,10 +236,18 @@ exec >>%s 2>&1
      msg (f_"Scrubbing: %s") path;
      g#scrub_file path

+    | `SSHInject (user, selector) ->
+      (match g#inspect_get_type root with
+      | "linux" | "freebsd" | "netbsd" | "openbsd" | "hurd" ->
+        msg (f_"SSH key inject: %s") user;
+        Ssh_key.do_ssh_inject_unix g user selector
+      | _ ->
+        warning (f_"SSH key could be injected for this type of guest"))
+
    | `Timezone tz ->
      msg (f_"Setting the timezone: %s") tz;
-      if not (Timezone.set_timezone ~prog g root tz) then
-        warning ~prog (f_"timezone could not be set for this type of guest")
+      if not (Timezone.set_timezone g root tz) then
+        warning (f_"timezone could not be set for this type of guest")

    | `Update ->
      msg (f_"Updating core packages");
@@ -289,10 +284,10 @@ exec >>%s 2>&1
    | "linux" ->
      msg (f_"Setting passwords");
      let password_crypto = ops.flags.password_crypto in
-      set_linux_passwords ~prog ?password_crypto g root passwords
+      set_linux_passwords ?password_crypto g root passwords

    | _ ->
-      warning ~prog (f_"passwords could not be set for this type of guest")
+      warning (f_"passwords could not be set for this type of guest")
  );

  if ops.flags.selinux_relabel then (
@@ -331,6 +326,6 @@ exec >>%s 2>&1
  (try ignore (g#debug "sh" [| "fuser"; "-k"; "/sysroot" |])
   with exn ->
     if verbose then
-       eprintf (f_"%s: %s (ignored)\n") prog (Printexc.to_string exn)
+       printf (f_"%s: %s (ignored)\n") prog (Printexc.to_string exn)
  );
  g#ping_daemon () (* tiny delay after kill *)
--- a/customize/customize_run.mli
+++ b/customize/customize_run.mli
@@ -23,4 +23,4 @@
 * filesystems must be mounted up.
 *)

-val run : prog:string -> verbose:bool -> quiet:bool -> Guestfs.guestfs -> string -> Customize_cmdline.ops -> unit
+val run : verbose:bool -> quiet:bool -> Guestfs.guestfs -> string -> Customize_cmdline.ops -> unit
--- a/customize/customize_utils.ml
+++ b/customize/customize_utils.ml
@@ -0,0 +1,30 @@
+(* virt-customize
+ * Copyright (C) 2013-2015 Red Hat Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *)
+
+(* Utilities/common functions used in virt-customize only. *)
+
+open Printf
+
+open Common_utils
+
+let prog = Filename.basename Sys.executable_name
+let error ?exit_code fs = error ~prog ?exit_code fs
+let warning fs = warning ~prog fs
+let info fs = info ~prog fs
+
+let quote = Filename.quote
--- a/customize/firstboot.ml
+++ b/customize/firstboot.ml
@@ -1,5 +1,5 @@
 (* virt-customize
- * Copyright (C) 2012-2014 Red Hat Inc.
+ * Copyright (C) 2012-2015 Red Hat Inc.
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -21,6 +21,7 @@ open Printf
 open Common_utils
 open Common_gettext.Gettext

+open Customize_utils
 open Regedit

 (* For Linux guests. *)
@@ -46,23 +47,28 @@ module Linux = struct
 ### END INIT INFO

 d=%s/scripts
+d_done=%s/scripts-done
 logfile=~root/virt-sysprep-firstboot.log

-echo \"$0\" \"$@\" 2>&1 | tee $logfile
-echo \"Scripts dir: $d\" 2>&1 | tee $logfile
+echo \"$0\" \"$@\" 2>&1 | tee -a $logfile
+echo \"Scripts dir: $d\" 2>&1 | tee -a $logfile

 if test \"$1\" = \"start\"
 then
+  mkdir -p $d_done
  for f in $d/* ; do
    if test -x \"$f\"
    then
-      echo '=== Running' $f '===' 2>&1 | tee $logfile
-      $f 2>&1 | tee $logfile
-      rm -f $f
+      # move the script to the 'scripts-done' directory, so it is not
+      # executed again at the next boot
+      mv $f $d_done
+      echo '=== Running' $f '===' 2>&1 | tee -a $logfile
+      $d_done/$(basename $f) 2>&1 | tee -a $logfile
    fi
  done
+  rm -f $d_done/*
 fi
-" firstboot_dir
+" firstboot_dir firstboot_dir

  let firstboot_service = sprintf "\
 [Unit]
@@ -81,7 +87,7 @@ StandardError=inherit
 WantedBy=default.target
 " firstboot_dir

-  let rec install_service ~prog (g : Guestfs.guestfs) distro =
+  let rec install_service (g : Guestfs.guestfs) distro =
    g#mkdir_p firstboot_dir;
    g#mkdir_p (sprintf "%s/scripts" firstboot_dir);
    g#write (sprintf "%s/firstboot.sh" firstboot_dir) firstboot_sh;
@@ -97,7 +103,7 @@ WantedBy=default.target
    if g#is_dir "/etc/systemd/system" then
      install_systemd_service g;
    if g#is_dir "/etc/rc.d" || g#is_dir "/etc/init.d" then
-      install_sysvinit_service ~prog g distro
+      install_sysvinit_service g distro

  (* Install the systemd firstboot service, if not installed already. *)
  and install_systemd_service g =
@@ -106,7 +112,7 @@ WantedBy=default.target
    g#ln_sf (sprintf "%s/firstboot.service" firstboot_dir)
      "/etc/systemd/system/default.target.wants"

-  and install_sysvinit_service ~prog g = function
+  and install_sysvinit_service g = function
    | "fedora"|"rhel"|"centos"|"scientificlinux"|"redhat-based" ->
      install_sysvinit_redhat g
    | "opensuse"|"sles"|"suse-based" ->
@@ -114,7 +120,7 @@ WantedBy=default.target
    | "debian"|"ubuntu" ->
      install_sysvinit_debian g
    | distro ->
-      error ~prog (f_"guest type %s is not supported") distro
+      error (f_"guest type %s is not supported") distro

  and install_sysvinit_redhat g =
    g#mkdir_p "/etc/rc.d/rc2.d";
@@ -158,7 +164,7 @@ end

 module Windows = struct

-  let rec install_service ~prog (g : Guestfs.guestfs) root =
+  let rec install_service (g : Guestfs.guestfs) root =
    (* Get the data directory. *)
    let virt_tools_data_dir =
      try Sys.getenv "VIRT_TOOLS_DATA_DIR"
@@ -174,7 +180,7 @@ module Windows = struct
       close_in chan
     with
       Sys_error msg ->
-         error ~prog (f_"'%s' is missing.  This file is required in order to install Windows firstboot scripts.  You can get it by building rhsrvany (https://github.com/rwmjones/rhsrvany).  Original error: %s")
+         error (f_"'%s' is missing.  This file is required in order to install Windows firstboot scripts.  You can get it by building rhsrvany (https://github.com/rwmjones/rhsrvany).  Original error: %s")
           rhsrvany_exe msg
    );

@@ -261,12 +267,12 @@ module Windows = struct

 end

-let add_firstboot_script ~prog (g : Guestfs.guestfs) root i content =
+let add_firstboot_script (g : Guestfs.guestfs) root i content =
  let typ = g#inspect_get_type root in
  let distro = g#inspect_get_distro root in
  match typ, distro with
  | "linux", _ ->
-    Linux.install_service ~prog g distro;
+    Linux.install_service g distro;
    let t = Int64.of_float (Unix.time ()) in
    let r = string_random8 () in
    let filename = sprintf "%s/scripts/%04d-%Ld-%s" Linux.firstboot_dir i t r in
@@ -274,11 +280,11 @@ let add_firstboot_script ~prog (g : Guestfs.guestfs) root i content =
    g#chmod 0o755 filename

  | "windows", _ ->
-    let firstboot_dir = Windows.install_service ~prog g root in
+    let firstboot_dir = Windows.install_service g root in
    let t = Int64.of_float (Unix.time ()) in
    let r = string_random8 () in
    let filename = sprintf "%s/scripts/%04d-%Ld-%s.bat" firstboot_dir i t r in
    g#write filename content

  | _ ->
-    error ~prog (f_"guest type %s/%s is not supported") typ distro
+    error (f_"guest type %s/%s is not supported") typ distro
--- a/customize/firstboot.mli
+++ b/customize/firstboot.mli
@@ -1,5 +1,5 @@
 (* virt-customize
- * Copyright (C) 2012-2014 Red Hat Inc.
+ * Copyright (C) 2012-2015 Red Hat Inc.
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -16,8 +16,8 @@
 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 *)

-val add_firstboot_script : prog:string -> Guestfs.guestfs -> string -> int -> string -> unit
-  (** [add_firstboot_script ~prog g root idx content] adds a firstboot
+val add_firstboot_script : Guestfs.guestfs -> string -> int -> string -> unit
+  (** [add_firstboot_script g root idx content] adds a firstboot
      script called [shortname] containing [content].

      NB. [content] is the contents of the script, {b not} a filename.
--- a/customize/hostname.ml
+++ b/customize/hostname.ml
@@ -1,5 +1,5 @@
 (* virt-sysprep
- * Copyright (C) 2012-2014 Red Hat Inc.
+ * Copyright (C) 2012-2015 Red Hat Inc.
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
--- a/customize/hostname.mli
+++ b/customize/hostname.mli
@@ -1,5 +1,5 @@
 (* virt-sysprep
- * Copyright (C) 2012-2014 Red Hat Inc.
+ * Copyright (C) 2012-2015 Red Hat Inc.
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
--- a/customize/link.sh.in
+++ b/customize/link.sh.in
@@ -0,0 +1,22 @@
+# libguestfs Makefile.am
+# @configure_input@
+# (C) Copyright 2014 Red Hat Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+# Hack automake to link binary properly.  There is no other way to add
+# the -cclib parameter to the end of the command line.
+
+exec "$@" -linkpkg -cclib '-lutils @LIBTINFO_LIBS@ -lcrypt @LIBVIRT_LIBS@ @LIBXML2_LIBS@ @LIBINTL@ -lgnu'
--- a/customize/password.ml
+++ b/customize/password.ml
@@ -1,5 +1,5 @@
 (* virt-sysprep
- * Copyright (C) 2012-2014 Red Hat Inc.
+ * Copyright (C) 2012-2015 Red Hat Inc.
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -18,6 +18,9 @@

 open Common_gettext.Gettext
 open Common_utils
+
+open Customize_utils
+
 open Printf

 type password_crypto = [`MD5 | `SHA256 | `SHA512 ]
@@ -40,23 +43,21 @@ let make_random_password =
  let chars = "ABCDEFGHIJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz0123456789" in
  fun () -> Urandom.urandom_uniform 16 chars

-let password_crypto_of_string ~prog = function
+let password_crypto_of_string = function
  | "md5" -> `MD5
  | "sha256" -> `SHA256
  | "sha512" -> `SHA512
  | arg ->
-    eprintf (f_"%s: password-crypto: unknown algorithm %s, use \"md5\", \"sha256\" or \"sha512\".\n")
-      prog arg;
-    exit 1
+    error (f_"password-crypto: unknown algorithm %s, use \"md5\", \"sha256\" or \"sha512\"") arg

-let rec parse_selector ~prog arg =
-  parse_selector_list ~prog arg (string_nsplit ":" arg)
+let rec parse_selector arg =
+  parse_selector_list arg (string_nsplit ":" arg)

-and parse_selector_list ~prog orig_arg = function
+and parse_selector_list orig_arg = function
  | [ "lock"|"locked" ] ->
    { pw_locked = true; pw_password = Disabled_password }
  | ("lock"|"locked") :: rest ->
-    let pw = parse_selector_list ~prog orig_arg rest in
+    let pw = parse_selector_list orig_arg rest in
    { pw with pw_locked = true }
  | [ "file"; filename ] ->
    { pw_password = Password (read_password_from_file filename);
@@ -68,9 +69,7 @@ and parse_selector_list ~prog orig_arg = function
  | [ "disable"|"disabled" ] ->
    { pw_password = Disabled_password; pw_locked = false }
  | _ ->
-    eprintf (f_"%s: invalid password selector '%s'; see the man page.\n")
-      prog orig_arg;
-    exit 1
+    error (f_"invalid password selector '%s'; see the man page") orig_arg

 and read_password_from_file filename =
  let chan = open_in filename in
@@ -81,50 +80,52 @@ and read_password_from_file filename =
 (* Permissible characters in a salt. *)
 let chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789./"

-let rec set_linux_passwords ~prog ?password_crypto g root passwords =
+let rec set_linux_passwords ?password_crypto (g : Guestfs.guestfs) root passwords =
  let crypto =
    match password_crypto with
-    | None -> default_crypto ~prog g root
+    | None -> default_crypto g root
    | Some c -> c in

-  (* XXX Would like to use Augeas here, but Augeas doesn't support
-   * /etc/shadow (as of 1.1.0).
+  (* Create a (almost) empty temporary file with the attributes of
+   * /etc/shadow, so we can restore them later.
   *)
+  let tempfile = g#mktemp "/etc/shadow.guestfsXXXXXX" in
+  g#write tempfile "*";
+  g#copy_attributes ~all:true "/etc/shadow" tempfile;

-  let shadow = Array.to_list (g#read_lines "/etc/shadow") in
-  let shadow =
-    List.map (
-      fun line ->
-        try
-          (* Each line is: "user:[!!]password:..."
-           * !! at the front of the password field means the account is locked.
-           * 'i' points to the first colon, 'j' to the second colon.
-           *)
-          let i = String.index line ':' in
-          let user = String.sub line 0 i in
-          let selector = Hashtbl.find passwords user in
-          let j = String.index_from line (i+1) ':' in
-          let rest = String.sub line j (String.length line - j) in
-          let pwfield =
-            match selector with
-            | { pw_locked = locked;
-                pw_password = Password password } ->
-              if locked then "!!" else "" ^ encrypt password crypto
-            | { pw_locked = locked;
-                pw_password = Random_password } ->
-              let password = make_random_password () in
-              printf (f_"Setting random password of %s to %s\n%!")
-                user password;
-              if locked then "!!" else "" ^ encrypt password crypto
-            | { pw_locked = true; pw_password = Disabled_password } -> "!!*"
-            | { pw_locked = false; pw_password = Disabled_password } -> "*" in
-          user ^ ":" ^ pwfield ^ rest
-        with Not_found -> line
-    ) shadow in
+  g#aug_init "/" 0;
+  let users = Array.to_list (g#aug_ls "/files/etc/shadow") in
+  List.iter (
+    fun userpath ->
+      let user =
+        let i = String.rindex userpath '/' in
+        String.sub userpath (i+1) (String.length userpath -i-1) in
+      try
+        (* Each line is: "user:[!!]password:..."
+         * !! at the front of the password field means the account is locked.
+         *)
+        let selector = Hashtbl.find passwords user in
+        let pwfield =
+          match selector with
+          | { pw_locked = locked;
+              pw_password = Password password } ->
+            (if locked then "!!" else "") ^ encrypt password crypto
+          | { pw_locked = locked;
+              pw_password = Random_password } ->
+            let password = make_random_password () in
+            info (f_"Setting random password of %s to %s") user password;
+            (if locked then "!!" else "") ^ encrypt password crypto
+          | { pw_locked = true; pw_password = Disabled_password } -> "!!*"
+          | { pw_locked = false; pw_password = Disabled_password } -> "*" in
+        g#aug_set (userpath ^ "/password") pwfield
+      with Not_found -> ()
+  ) users;
+  g#aug_save ();
+  g#aug_close ();

-  g#write "/etc/shadow" (String.concat "\n" shadow ^ "\n");
-  (* In virt-sysprep /.autorelabel will label it correctly. *)
-  g#chmod 0 "/etc/shadow"
+  (* Restore all the attributes from the temporary file, and remove it. *)
+  g#copy_attributes ~all:true tempfile "/etc/shadow";
+  g#rm tempfile

 (* Encrypt each password.  Use glibc (on the host).  See:
 * https://rwmj.wordpress.com/2013/07/09/setting-the-root-or-other-passwords-in-a-linux-guest/
@@ -145,7 +146,7 @@ and encrypt password crypto =
 * precede this date only support md5, whereas all guests after this
 * date can support sha512.
 *)
-and default_crypto ~prog g root =
+and default_crypto g root =
  let distro = g#inspect_get_distro root in
  let major = g#inspect_get_major_version root in
  match distro, major with
@@ -167,6 +168,6 @@ and default_crypto ~prog g root =
  | "ubuntu", _ -> `MD5

  | _, _ ->
-    warning ~prog (f_"password: using insecure md5 password encryption for
+    warning (f_"password: using insecure md5 password encryption for
 guest of type %s version %d.\nIf this is incorrect, use --password-crypto option and file a bug.") distro major;
    `MD5
--- a/customize/password.mli
+++ b/customize/password.mli
@@ -1,5 +1,5 @@
 (* virt-sysprep
- * Copyright (C) 2012-2014 Red Hat Inc.
+ * Copyright (C) 2012-2015 Red Hat Inc.
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -18,7 +18,7 @@

 type password_crypto = [ `MD5 | `SHA256 | `SHA512 ]

-val password_crypto_of_string : prog:string -> string -> password_crypto
+val password_crypto_of_string : string -> password_crypto
 (** Parse --password-crypto parameter on command line. *)

 type password_selector = {
@@ -30,13 +30,13 @@ and password =
 | Random_password                    (** Choose a random password. *)
 | Disabled_password                  (** [*] in the password field. *)

-val parse_selector : prog:string -> string -> password_selector
+val parse_selector : string -> password_selector
 (** Parse the selector field in --password/--root-password.  Note this
    doesn't parse the username part.  Exits if the format is not valid. *)

 type password_map = (string, password_selector) Hashtbl.t
 (** A map of username -> selector. *)

-val set_linux_passwords : prog:string -> ?password_crypto:password_crypto -> Guestfs.guestfs -> string -> password_map -> unit
+val set_linux_passwords : ?password_crypto:password_crypto -> Guestfs.guestfs -> string -> password_map -> unit
 (** Adjust the passwords of a Linux guest according to the
    password map. *)
--- a/customize/perl_edit-c.c
+++ b/customize/perl_edit-c.c
@@ -1,5 +1,5 @@
-/* virt-resize - interface to isatty
- * Copyright (C) 2013 Red Hat Inc.
+/* virt-customize - interface to edit_file_perl
+ * Copyright (C) 2014 Red Hat Inc.
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -22,17 +22,33 @@
 #include <stdlib.h>
 #include <unistd.h>

+#include <caml/alloc.h>
 #include <caml/memory.h>
 #include <caml/mlvalues.h>

-/* RHEL 5-era ocaml didn't have Unix.isatty.
- *
- * Note this function is marked as "noalloc" so it must not call any
- * OCaml allocation functions:
- * http://camltastic.blogspot.co.uk/2008/08/tip-calling-c-functions-directly-with.html
+#include "file-edit.h"
+
+/**
+ * We try to reuse the internals of the OCaml binding (for extracting
+ * the guestfs handle, and raising errors); hopefully this should be safe,
+ * as long as it's kept internal within the libguestfs sources.
 */
+#include "../ocaml/guestfs-c.h"
+
+#pragma GCC diagnostic ignored "-Wmissing-prototypes"
+
 value
-virt_resize_isatty_stdout (value unitv)
+virt_customize_edit_file_perl (value verbosev, value gv, value filev,
+                               value exprv)
 {
-  return isatty (1) ? Val_true : Val_false;
+  CAMLparam4 (verbosev, gv, filev, exprv);
+  int r;
+  guestfs_h *g = Guestfs_val (gv);
+
+  r = edit_file_perl (g, String_val (filev), String_val (exprv), NULL,
+                      Bool_val (verbosev));
+  if (r == -1)
+    ocaml_guestfs_raise_error (g, "edit_file_perl");
+
+  CAMLreturn (Val_unit);
 }
--- a/Show More
+++ b/Show More