[Pkg-libvirt-commits] [libguestfs] 44/87: Version 1.24.5.

Hilko Bengen bengen at moszumanska.debian.org
Wed Feb 19 21:10:09 UTC 2014


This is an automated email from the git hooks/post-receive script.

bengen pushed a commit to branch debian
in repository libguestfs.

commit 3e5d8262cdeeaa12881699e2cdce5083d2588f31
Author: Richard W.M. Jones <rjones at redhat.com>
Date:   Mon Jan 20 12:42:57 2014 +0000

    Version 1.24.5.
---
 BUGS                        |  61 ++--
 configure.ac                |   2 +-
 po-docs/ja.po               | 673 +++++++++++++++++++++++++-------------------
 po-docs/libguestfs-docs.pot | 650 ++++++++++++++++++++++++------------------
 po-docs/uk.po               | 673 +++++++++++++++++++++++++-------------------
 po/en_GB.po                 | 102 ++++---
 po/es.po                    | 102 ++++---
 po/gu.po                    | 102 ++++---
 po/hi.po                    | 102 ++++---
 po/kn.po                    | 102 ++++---
 po/libguestfs.pot           |  96 +++----
 po/ml.po                    | 102 ++++---
 po/mr.po                    | 102 ++++---
 po/nl.po                    | 102 ++++---
 po/or.po                    | 102 ++++---
 po/pa.po                    | 102 ++++---
 po/pl.po                    | 102 ++++---
 po/ta.po                    | 102 ++++---
 po/te.po                    | 102 ++++---
 po/uk.po                    | 102 ++++---
 20 files changed, 1911 insertions(+), 1672 deletions(-)

diff --git a/BUGS b/BUGS
index f9f60e9..f5ce93b 100644
--- a/BUGS
+++ b/BUGS
@@ -1,5 +1,5 @@
 NOTE: This file is automatically generated from "update-bugs.sh".
-Last updated: 2014-01-02
+Last updated: 2014-01-20
 
 This contains a local list of the bugs that are open against
 libguestfs.  Bugs are tracked in the Red Hat Bugzilla database
@@ -245,8 +245,14 @@ Bugs in NEW or ASSIGNED state are open and waiting for someone to fix.
 1042780 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1042780
   Support the virt-sysprep --delete option
 
-1046905 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1046905
-  RFE: add argument to virt-sysprep to disable individual default operations
+1049656 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1049656
+  hostnamectl set-hostname fails
+
+1051694 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1051694
+  libguestfs FTBFS on Ubuntu saucy
+
+1054761 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1054761
+  guestfs_pvs prints "unknown device" if a physical volume is missing
 
 503134 ASSIGNED https://bugzilla.redhat.com/show_bug.cgi?id=503134
   guestfish's list splitting does not recognize internal quoting
@@ -269,7 +275,7 @@ Bugs in NEW or ASSIGNED state are open and waiting for someone to fix.
 965495 ASSIGNED https://bugzilla.redhat.com/show_bug.cgi?id=965495
   New APIs required in libguestfs for virt-v2v in RHEL 6.5
 
-(83 bugs)
+(85 bugs)
 
 --------------------------------------------------
 Bugs in MODIFIED, POST or ON_QA state are fixed.
@@ -278,34 +284,19 @@ 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)
 
+1045033 POST https://bugzilla.redhat.com/show_bug.cgi?id=1045033
+  LIBVIRT_DEFAULT_URI=qemu:///system breaks libguestfs
+
 998109 MODIFIED https://bugzilla.redhat.com/show_bug.cgi?id=998109
   Let's enable kvmclock in RHEL 7
 
-1046509 MODIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1046509
-  ruby-libguestfs throws "expecting 0 or 1 arguments" on Guestfs::Guestfs.new
-
-869179 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=869179
-  libguestfs fail to startup  on latest rhel7 tree
-
-880806 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=880806
-  virt-df with two -a options displays incorrect disk image name
-
-892271 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=892271
-  virt-format fail to format  the same disk more than twice with lvm enable
-
-985856 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=985856
-  Can't set acl value for a specified user with 'acl-set-file'
-
-1011922 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1011922
-  Use host-passthrough instead of host-model
+1053847 MODIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1053847
+  Recommended default clock/timer settings
 
 1020950 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1020950
   CVE-2013-4419 libguestfs: insecure temporary directory handling for guestfish's network socket [epel-5]
 
-1037795 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1037795
-  libguestfs rebuild needed due to broken ABI compatibility (caused by procps-ng update to 3.3.9)
-
-(10 bugs)
+(5 bugs)
 
 --------------------------------------------------
 These bugs are in the VERIFIED state.
@@ -313,6 +304,12 @@ These bugs are in the VERIFIED state.
 672485 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=672485
   [RFE] virt-edit/tar-in/tar-out/inspector do not support encrypted system
 
+869179 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=869179
+  libguestfs fail to startup  on latest rhel7 tree
+
+880806 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=880806
+  virt-df with two -a options displays incorrect disk image name
+
 889536 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=889536
   [RFE]It's better to emphasize "libguestfs-winsupport" in V2V manpage or error output
 
@@ -322,6 +319,9 @@ These bugs are in the VERIFIED state.
 889538 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=889538
   libguestfs can not be installed with recent iptables
 
+892271 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=892271
+  virt-format fail to format  the same disk more than twice with lvm enable
+
 892275 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=892275
   checksums-out fail to compute the checksums of all regular files in directory
 
@@ -376,6 +376,9 @@ These bugs are in the VERIFIED state.
 983691 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=983691
   libguestfs double free when kernel link fails during launch
 
+985856 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=985856
+  Can't set acl value for a specified user with 'acl-set-file'
+
 988862 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=988862
   virt-sysprep --firstboot option writes incorrect "99" (instead of "S99") sysv-init-style start up script
 
@@ -412,6 +415,9 @@ These bugs are in the VERIFIED state.
 1003291 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1003291
   Backport cachemode patch to RHEL 7
 
+1011922 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1011922
+  Use host-passthrough instead of host-model
+
 1016465 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1016465
   blockdev-setbsz succeeds, but does not affect blockdev-getbsz
 
@@ -421,6 +427,9 @@ These bugs are in the VERIFIED state.
 1020021 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1020021
   Drop php-libguestfs subpackage
 
-(37 bugs)
+1037795 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1037795
+  libguestfs rebuild needed due to broken ABI compatibility (caused by procps-ng update to 3.3.9)
+
+(43 bugs)
 
 End of BUGS file.
diff --git a/configure.ac b/configure.ac
index ba390fe..0b3980f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,7 +26,7 @@
 # freeform string.
 m4_define([libguestfs_major],   [1])
 m4_define([libguestfs_minor],   [24])
-m4_define([libguestfs_release], [4])
+m4_define([libguestfs_release], [5])
 
 AC_INIT([libguestfs],libguestfs_major.libguestfs_minor.libguestfs_release)
 AC_CONFIG_AUX_DIR([build-aux])
diff --git a/po-docs/ja.po b/po-docs/ja.po
index bd75b8e..b5834d6 100644
--- a/po-docs/ja.po
+++ b/po-docs/ja.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libguestfs\n"
 "Report-Msgid-Bugs-To: libguestfs at redhat.com\n"
-"POT-Creation-Date: 2014-01-02 20:24+0000\n"
+"POT-Creation-Date: 2014-01-20 12:50+0000\n"
 "PO-Revision-Date: 2013-10-17 14:46+0000\n"
 "Last-Translator: rjones <rjones at redhat.com>\n"
 "Language-Team: Japanese (http://www.transifex.com/projects/p/fedora/language/"
@@ -727,7 +727,7 @@ msgstr ""
 "定されていないとき)、 このオプションのみが適用されます。"
 
 #. type: =item
-#: ../align/virt-alignment-scan.pod:195 ../builder/virt-builder.pod:546
+#: ../align/virt-alignment-scan.pod:195 ../builder/virt-builder.pod:549
 #: ../cat/virt-cat.pod:140 ../cat/virt-filesystems.pod:267
 #: ../cat/virt-ls.pod:437 ../daemon/guestfsd.pod:62 ../df/virt-df.pod:185
 #: ../edit/virt-edit.pod:169 ../fish/guestfish.pod:421
@@ -739,7 +739,7 @@ msgid "B<-v>"
 msgstr "B<-v>"
 
 #. type: =item
-#: ../align/virt-alignment-scan.pod:197 ../builder/virt-builder.pod:548
+#: ../align/virt-alignment-scan.pod:197 ../builder/virt-builder.pod:551
 #: ../cat/virt-cat.pod:142 ../cat/virt-filesystems.pod:269
 #: ../cat/virt-ls.pod:439 ../daemon/guestfsd.pod:64 ../df/virt-df.pod:187
 #: ../edit/virt-edit.pod:171 ../fish/guestfish.pod:423
@@ -763,7 +763,7 @@ msgstr "デバッグ用の冗長なメッセージを有効にします。"
 #. type: =item
 #: ../align/virt-alignment-scan.pod:201
 #: ../appliance/libguestfs-make-fixed-appliance.pod:107
-#: ../builder/virt-builder.pod:555 ../cat/virt-cat.pod:146
+#: ../builder/virt-builder.pod:558 ../cat/virt-cat.pod:146
 #: ../cat/virt-filesystems.pod:273 ../cat/virt-ls.pod:443
 #: ../df/virt-df.pod:191 ../edit/virt-edit.pod:175 ../fish/guestfish.pod:428
 #: ../format/virt-format.pod:161 ../fuse/guestmount.pod:360
@@ -777,7 +777,7 @@ msgstr "B<-V>"
 #. type: =item
 #: ../align/virt-alignment-scan.pod:203
 #: ../appliance/libguestfs-make-fixed-appliance.pod:109
-#: ../builder/virt-builder.pod:557 ../cat/virt-cat.pod:148
+#: ../builder/virt-builder.pod:560 ../cat/virt-cat.pod:148
 #: ../cat/virt-filesystems.pod:275 ../cat/virt-ls.pod:445
 #: ../df/virt-df.pod:193 ../edit/virt-edit.pod:177 ../fish/guestfish.pod:430
 #: ../format/virt-format.pod:163 ../fuse/guestmount.pod:362
@@ -791,7 +791,7 @@ msgid "B<--version>"
 msgstr "B<--version>"
 
 #. type: textblock
-#: ../align/virt-alignment-scan.pod:205 ../builder/virt-builder.pod:559
+#: ../align/virt-alignment-scan.pod:205 ../builder/virt-builder.pod:562
 #: ../cat/virt-cat.pod:150 ../cat/virt-filesystems.pod:277
 #: ../cat/virt-ls.pod:447 ../df/virt-df.pod:195 ../edit/virt-edit.pod:179
 #: ../format/virt-format.pod:165 ../inspector/virt-inspector.pod:128
@@ -1201,7 +1201,7 @@ msgstr ""
 #. type: =head1
 #: ../align/virt-alignment-scan.pod:359
 #: ../appliance/libguestfs-make-fixed-appliance.pod:156
-#: ../builder/virt-builder.pod:1295 ../cat/virt-cat.pod:244
+#: ../builder/virt-builder.pod:1331 ../cat/virt-cat.pod:244
 #: ../cat/virt-filesystems.pod:390 ../cat/virt-ls.pod:502
 #: ../daemon/guestfsd.pod:73 ../df/virt-df.pod:260 ../edit/virt-edit.pod:357
 #: ../fish/guestfish.pod:1356 ../format/virt-format.pod:183
@@ -1226,14 +1226,14 @@ msgstr "このプログラムは以下を返します:"
 #: ../appliance/libguestfs-make-fixed-appliance.pod:54
 #: ../appliance/libguestfs-make-fixed-appliance.pod:75
 #: ../builder/virt-builder.pod:495 ../builder/virt-builder.pod:499
-#: ../builder/virt-builder.pod:700 ../builder/virt-builder.pod:707
-#: ../builder/virt-builder.pod:711 ../builder/virt-builder.pod:715
-#: ../builder/virt-builder.pod:720 ../builder/virt-builder.pod:724
-#: ../builder/virt-builder.pod:728 ../builder/virt-builder.pod:732
-#: ../builder/virt-builder.pod:736 ../builder/virt-builder.pod:740
-#: ../builder/virt-builder.pod:744 ../builder/virt-builder.pod:748
-#: ../builder/virt-builder.pod:752 ../builder/virt-builder.pod:761
-#: ../builder/virt-builder.pod:1116 ../builder/virt-builder.pod:1120
+#: ../builder/virt-builder.pod:707 ../builder/virt-builder.pod:714
+#: ../builder/virt-builder.pod:718 ../builder/virt-builder.pod:722
+#: ../builder/virt-builder.pod:727 ../builder/virt-builder.pod:731
+#: ../builder/virt-builder.pod:735 ../builder/virt-builder.pod:739
+#: ../builder/virt-builder.pod:743 ../builder/virt-builder.pod:747
+#: ../builder/virt-builder.pod:751 ../builder/virt-builder.pod:755
+#: ../builder/virt-builder.pod:759 ../builder/virt-builder.pod:768
+#: ../builder/virt-builder.pod:1140 ../builder/virt-builder.pod:1144
 #: ../cat/virt-cat.pod:183 ../cat/virt-cat.pod:188 ../cat/virt-cat.pod:193
 #: ../cat/virt-cat.pod:204 ../cat/virt-cat.pod:208 ../edit/virt-edit.pod:274
 #: ../edit/virt-edit.pod:279 ../edit/virt-edit.pod:284
@@ -1407,7 +1407,7 @@ msgstr ""
 #. type: =head1
 #: ../align/virt-alignment-scan.pod:393
 #: ../appliance/libguestfs-make-fixed-appliance.pod:166
-#: ../builder/virt-builder.pod:1300 ../cat/virt-cat.pod:249
+#: ../builder/virt-builder.pod:1336 ../cat/virt-cat.pod:249
 #: ../cat/virt-filesystems.pod:395 ../cat/virt-ls.pod:507
 #: ../daemon/guestfsd.pod:117 ../df/virt-df.pod:265 ../edit/virt-edit.pod:362
 #: ../erlang/examples/guestfs-erlang.pod:97
@@ -1441,7 +1441,7 @@ msgstr ""
 "L<virt-resize(1)>, L<http://libguestfs.org/>."
 
 #. type: =head1
-#: ../align/virt-alignment-scan.pod:402 ../builder/virt-builder.pod:1315
+#: ../align/virt-alignment-scan.pod:402 ../builder/virt-builder.pod:1353
 #: ../cat/virt-cat.pod:258 ../cat/virt-filesystems.pod:406
 #: ../cat/virt-ls.pod:516 ../daemon/guestfsd.pod:122 ../df/virt-df.pod:273
 #: ../edit/virt-edit.pod:373 ../format/virt-format.pod:197
@@ -1453,7 +1453,7 @@ msgid "AUTHOR"
 msgstr "著者"
 
 #. type: textblock
-#: ../align/virt-alignment-scan.pod:404 ../builder/virt-builder.pod:1317
+#: ../align/virt-alignment-scan.pod:404 ../builder/virt-builder.pod:1355
 #: ../cat/virt-cat.pod:260 ../cat/virt-filesystems.pod:408
 #: ../cat/virt-ls.pod:518 ../daemon/guestfsd.pod:124 ../df/virt-df.pod:275
 #: ../edit/virt-edit.pod:375 ../format/virt-format.pod:199
@@ -1468,7 +1468,7 @@ msgstr "Richard W.M. Jones L<http://people.redhat.com/~rjones/>"
 #. type: =head1
 #: ../align/virt-alignment-scan.pod:406
 #: ../appliance/libguestfs-make-fixed-appliance.pod:179
-#: ../builder/virt-builder.pod:1319 ../cat/virt-cat.pod:262
+#: ../builder/virt-builder.pod:1357 ../cat/virt-cat.pod:262
 #: ../cat/virt-filesystems.pod:410 ../cat/virt-ls.pod:520
 #: ../daemon/guestfsd.pod:126 ../df/virt-df.pod:277 ../edit/virt-edit.pod:377
 #: ../erlang/examples/guestfs-erlang.pod:116
@@ -1812,7 +1812,7 @@ msgstr ""
 
 #. type: =head1
 #: ../appliance/libguestfs-make-fixed-appliance.pod:161
-#: ../builder/virt-builder.pod:1253 ../edit/virt-edit.pod:337
+#: ../builder/virt-builder.pod:1289 ../edit/virt-edit.pod:337
 #: ../fish/guestfish.pod:1361 ../fuse/guestunmount.pod:115
 #: ../rescue/virt-rescue.pod:390 ../sparsify/virt-sparsify.pod:312
 #: ../src/guestfs.pod:4578 ../test-tool/libguestfs-test-tool.pod:178
@@ -1913,7 +1913,8 @@ msgstr ""
 #: ../builder/virt-builder.pod:16
 #, no-wrap
 msgid ""
-" virt-builder [-o|--output DISKIMAGE] [--size SIZE] [--format raw|qcow2]\n"
+" virt-builder os-version\n"
+"    [-o|--output DISKIMAGE] [--size SIZE] [--format raw|qcow2]\n"
 "    [--attach ISOFILE]\n"
 "    [--root-password SELECTOR]\n"
 "    [--hostname HOSTNAME]\n"
@@ -1924,7 +1925,6 @@ msgid ""
 "    [--run SCRIPT] [--run-command 'CMD ARGS ...']\n"
 "    [--firstboot SCRIPT] [--firstboot-command 'CMD ARGS ...']\n"
 "    [--firstboot-install PKG,[PKG...]]\n"
-"    os-version\n"
 "\n"
 msgstr ""
 
@@ -1945,7 +1945,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:33 ../builder/virt-builder.pod:1153
+#: ../builder/virt-builder.pod:33 ../builder/virt-builder.pod:1177
 #, no-wrap
 msgid ""
 " virt-builder --print-cache\n"
@@ -1953,7 +1953,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:35 ../builder/virt-builder.pod:1161
+#: ../builder/virt-builder.pod:35 ../builder/virt-builder.pod:1185
 #, no-wrap
 msgid ""
 " virt-builder --cache-all-templates\n"
@@ -1961,7 +1961,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:37 ../builder/virt-builder.pod:1157
+#: ../builder/virt-builder.pod:37 ../builder/virt-builder.pod:1181
 #, no-wrap
 msgid ""
 " virt-builder --delete-cache\n"
@@ -2337,7 +2337,7 @@ msgstr ""
 #: ../builder/virt-builder.pod:192
 msgid ""
 "See also: I<--run>, L</Installing packages at build time from a side "
-"repository>, L<virt-make-fs(1)>."
+"repository>, L<genisoimage(1)>, L<virt-make-fs(1)>."
 msgstr ""
 
 #. type: =item
@@ -2795,7 +2795,7 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:390 ../builder/virt-builder.pod:783
+#: ../builder/virt-builder.pod:390 ../builder/virt-builder.pod:790
 #: ../examples/guestfs-faq.pod:512 ../examples/guestfs-performance.pod:161
 #: ../examples/guestfs-performance.pod:211 ../examples/guestfs-recipes.pod:411
 #: ../rescue/virt-rescue.pod:328 ../resize/virt-resize.pod:31
@@ -2813,7 +2813,7 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:395 ../builder/virt-builder.pod:788
+#: ../builder/virt-builder.pod:395 ../builder/virt-builder.pod:795
 #: ../examples/guestfs-faq.pod:522 ../examples/guestfs-performance.pod:167
 #: ../examples/guestfs-performance.pod:218 ../examples/guestfs-recipes.pod:417
 #: ../rescue/virt-rescue.pod:336 ../resize/virt-resize.pod:44
@@ -3063,30 +3063,37 @@ msgid ""
 "device, partition, etc then the size of that device is used."
 msgstr ""
 
-#. type: =item
+#. type: textblock
 #: ../builder/virt-builder.pod:518
+msgid ""
+"To specify size in bytes, the number must be followed by the lowercase "
+"letter I<b>, eg: S<C<--size 10737418240b>>."
+msgstr ""
+
+#. type: =item
+#: ../builder/virt-builder.pod:521
 msgid "B<--source> URL"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:520
+#: ../builder/virt-builder.pod:523
 msgid ""
 "Set the source URL to look for templates.  If not specified it defaults to "
 "L<http://libguestfs.org/download/builder/index.asc>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:523
+#: ../builder/virt-builder.pod:526
 msgid "See also L</CREATING YOUR OWN TEMPLATES> below."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:525
+#: ../builder/virt-builder.pod:528
 msgid "You can also set the C<VIRT_BUILDER_SOURCE> environment variable."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:527
+#: ../builder/virt-builder.pod:530
 msgid ""
 "Note that you should not point I<--source> to sources that you don't trust "
 "(unless the source is signed by someone you do trust).  See also the I<--no-"
@@ -3094,12 +3101,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:531
+#: ../builder/virt-builder.pod:534
 msgid "B<--upload> FILE:DEST"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:533
+#: ../builder/virt-builder.pod:536
 msgid ""
 "Upload local file C<FILE> to destination C<DEST> in the disk image.  File "
 "owner and permissions from the original are preserved, so you should set "
@@ -3107,14 +3114,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:537
+#: ../builder/virt-builder.pod:540
 msgid ""
 "C<DEST> could be the final filename.  This can be used to rename the file on "
 "upload."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:540
+#: ../builder/virt-builder.pod:543
 msgid ""
 "If C<DEST> is a directory name (which must already exist in the guest)  then "
 "the file is uploaded into that directory, and it keeps the same name as on "
@@ -3122,46 +3129,46 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:544
+#: ../builder/virt-builder.pod:547
 msgid "See also: I<--mkdir>, I<--delete>, I<--scrub>."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:550
+#: ../builder/virt-builder.pod:553
 msgid "Enable debug messages and/or produce verbose output."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:552
+#: ../builder/virt-builder.pod:555
 msgid ""
 "When reporting bugs, use this option and attach the complete output to your "
 "bug report."
 msgstr ""
 
 #. type: =head1
-#: ../builder/virt-builder.pod:563
+#: ../builder/virt-builder.pod:566
 msgid "REFERENCE"
 msgstr ""
 
 #. type: =head2
-#: ../builder/virt-builder.pod:565
+#: ../builder/virt-builder.pod:568
 msgid "INSTALLING PACKAGES"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:567
+#: ../builder/virt-builder.pod:570
 msgid ""
 "There are several approaches to installing packages or applications in the "
 "guest which have different trade-offs."
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:570
+#: ../builder/virt-builder.pod:573
 msgid "Installing packages at build time"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:572
+#: ../builder/virt-builder.pod:575
 msgid ""
 "If the guest OS you are installing is similar to the host OS (eg.  both are "
 "Linux), and if libguestfs supports network connections, then you can use I<--"
@@ -3169,7 +3176,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:576
+#: ../builder/virt-builder.pod:579
 #, no-wrap
 msgid ""
 " virt-builder fedora-20 --install inkscape\n"
@@ -3177,23 +3184,23 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:578
+#: ../builder/virt-builder.pod:581
 msgid ""
 "This uses the guest's package manager and the host's network connection."
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:581
+#: ../builder/virt-builder.pod:584
 msgid "Installing packages at first boot"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:583
+#: ../builder/virt-builder.pod:586
 msgid "Another option is to install the packages when the guest first boots:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:585
+#: ../builder/virt-builder.pod:588
 #, no-wrap
 msgid ""
 " virt-builder fedora-20 --firstboot-install inkscape\n"
@@ -3201,13 +3208,13 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:587
+#: ../builder/virt-builder.pod:590
 msgid ""
 "This uses the guest's package manager and the guest's network connection."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:590
+#: ../builder/virt-builder.pod:593
 msgid ""
 "The downsides are that it will take the guest a lot longer to boot first "
 "time, and there's nothing much you can do if package installation fails (eg. "
@@ -3215,12 +3222,12 @@ msgid ""
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:595
+#: ../builder/virt-builder.pod:598
 msgid "Installing packages at build time from a side repository"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:597
+#: ../builder/virt-builder.pod:600
 msgid ""
 "If the software you want to install is not available in the main package "
 "repository of the guest, then you can add a side repository.  Usually this "
@@ -3228,31 +3235,38 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:602
+#: ../builder/virt-builder.pod:605
 msgid ""
-"Create a script that mounts the ISO and sets up the repository.  For yum, "
-"create /tmp/install.sh containing:"
+"You can create the disk image using either L<genisoimage(1)> or L<virt-make-"
+"fs(1)>.  For genisoimage, use a command like this:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:605 ../builder/virt-builder.pod:621
+#: ../builder/virt-builder.pod:608
 #, no-wrap
 msgid ""
-" mkdir /tmp/mount\n"
-" \n"
+" genisoimage -o extra-packages.iso -R -J -V EXTRA cdcontents/\n"
+"\n"
+msgstr ""
+
+#. type: textblock
+#: ../builder/virt-builder.pod:610
+msgid ""
+"Create a script that mounts the ISO and sets up the repository.  For yum, "
+"create /tmp/install.sh containing:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:607 ../builder/virt-builder.pod:623
+#: ../builder/virt-builder.pod:613 ../builder/virt-builder.pod:627
 #, no-wrap
 msgid ""
-" # Assume the volume label of the CD is 'EXTRA':\n"
+" mkdir /tmp/mount\n"
 " mount LABEL=EXTRA /tmp/mount\n"
 " \n"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:610
+#: ../builder/virt-builder.pod:616
 #, no-wrap
 msgid ""
 " cat <<'EOF' > /etc/yum.repos.d/extra.repo\n"
@@ -3265,7 +3279,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:617
+#: ../builder/virt-builder.pod:623
 #, no-wrap
 msgid ""
 " yum -y install famousdatabase\n"
@@ -3273,12 +3287,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:619
+#: ../builder/virt-builder.pod:625
 msgid "For apt, create /tmp/install.sh containing:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:626
+#: ../builder/virt-builder.pod:630
 #, no-wrap
 msgid ""
 " apt-cdrom -d=/tmp/mount add\n"
@@ -3287,25 +3301,29 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:629
-msgid "Use the I<--attach> option to attach the CD:"
+#: ../builder/virt-builder.pod:633
+msgid ""
+"Use the I<--attach> option to attach the CD / disk image and the I<--run> "
+"option to run the script:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:631
+#: ../builder/virt-builder.pod:636
 #, no-wrap
 msgid ""
-" virt-builder fedora 20 --attach extra.iso --run /tmp/install.sh\n"
+" virt-builder fedora-20 \\\n"
+"   --attach extra-packages.iso \\\n"
+"   --run /tmp/install.sh\n"
 "\n"
 msgstr ""
 
 #. type: =head2
-#: ../builder/virt-builder.pod:633
+#: ../builder/virt-builder.pod:640
 msgid "USERS AND PASSWORDS"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:635
+#: ../builder/virt-builder.pod:642
 msgid ""
 "The I<--root-password> option is used to change the root password (otherwise "
 "a random password is used).  This option takes a password C<SELECTOR> in one "
@@ -3313,12 +3331,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:641
+#: ../builder/virt-builder.pod:648
 msgid "B<--root-password> file:FILENAME"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:643
+#: ../builder/virt-builder.pod:650
 msgid ""
 "Read the root password from C<FILENAME>.  The whole first line of this file "
 "is the replacement password.  Any other lines are ignored.  You should "
@@ -3326,36 +3344,36 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:648
+#: ../builder/virt-builder.pod:655
 msgid "B<--root-password> password:PASSWORD"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:650
+#: ../builder/virt-builder.pod:657
 msgid "Set the root password to the literal string C<PASSWORD>."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:652 ../sysprep/sysprep-extra-options.pod:39
+#: ../builder/virt-builder.pod:659 ../sysprep/sysprep-extra-options.pod:39
 msgid ""
 "B<Note: this is not secure> since any user on the same machine can see the "
 "cleartext password using L<ps(1)>."
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:657
+#: ../builder/virt-builder.pod:664
 msgid "Creating user accounts"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:659
+#: ../builder/virt-builder.pod:666
 msgid ""
 "To create user accounts, use the L<useradd(8)> command with L<--firstboot-"
 "command> like this:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:662
+#: ../builder/virt-builder.pod:669
 #, no-wrap
 msgid ""
 " virt-builder --firstboot-command \\\n"
@@ -3364,7 +3382,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:665
+#: ../builder/virt-builder.pod:672
 msgid ""
 "The above command will create an C<rjones> account with no password, and "
 "force the user to set a password when they first log in.  There are other "
@@ -3372,12 +3390,12 @@ msgid ""
 msgstr ""
 
 #. type: =head2
-#: ../builder/virt-builder.pod:669
+#: ../builder/virt-builder.pod:676
 msgid "LOG FILE"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:671
+#: ../builder/virt-builder.pod:678
 msgid ""
 "Scripts and package installation that runs at build time (I<--run>, I<--run-"
 "command>, I<--install>, but I<not> firstboot) is logged in one of the "
@@ -3385,131 +3403,131 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:677
+#: ../builder/virt-builder.pod:684
 msgid "C</tmp/builder.log>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:679
+#: ../builder/virt-builder.pod:686
 msgid "On Linux, BSD and other guests."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:681
+#: ../builder/virt-builder.pod:688
 msgid "C<C:\\Temp\\builder.log>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:683
+#: ../builder/virt-builder.pod:690
 msgid "On Windows, DOS guests."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:685
+#: ../builder/virt-builder.pod:692
 msgid "C</builder.log>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:687
+#: ../builder/virt-builder.pod:694
 msgid "If C</tmp> or C<C:\\Temp> is missing."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:691
+#: ../builder/virt-builder.pod:698
 msgid ""
 "If you don't want the log file to appear in the final image, then use the "
 "I<--no-logfile> command line option."
 msgstr ""
 
 #. type: =head2
-#: ../builder/virt-builder.pod:694
+#: ../builder/virt-builder.pod:701
 msgid "INSTALLATION PROCESS"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:696
+#: ../builder/virt-builder.pod:703
 msgid "When you invoke virt-builder, installation proceeds as follows:"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:702
+#: ../builder/virt-builder.pod:709
 msgid "The template image is downloaded."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:704
+#: ../builder/virt-builder.pod:711
 msgid ""
 "If the template image is present in the cache, the cached version is used "
 "instead.  (See L</CACHING>)."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:709
+#: ../builder/virt-builder.pod:716
 msgid "The template signature is checked."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:713
+#: ../builder/virt-builder.pod:720
 #, fuzzy
 #| msgid "The file is compressed on-disk."
 msgid "The template is uncompressed to a tmp file."
 msgstr "ファイルはディスクにおいて圧縮されます。"
 
 #. type: textblock
-#: ../builder/virt-builder.pod:717
+#: ../builder/virt-builder.pod:724
 msgid ""
 "The template image is resized into the destination, using L<virt-resize(1)>."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:722
+#: ../builder/virt-builder.pod:729
 msgid "Extra disks are attached (I<--attach>)."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:726
+#: ../builder/virt-builder.pod:733
 msgid "A new random seed is generated for the guest."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:730
+#: ../builder/virt-builder.pod:737
 msgid "The hostname is set (I<--hostname>)."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:734
+#: ../builder/virt-builder.pod:741
 msgid "The root password is changed (I<--root-password>)."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:738
+#: ../builder/virt-builder.pod:745
 msgid "Packages are installed (I<--install>)."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:742
+#: ../builder/virt-builder.pod:749
 msgid "Files are uploaded (I<--upload>)."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:746
+#: ../builder/virt-builder.pod:753
 msgid "Files are edited (I<--edit>)."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:750
+#: ../builder/virt-builder.pod:757
 msgid "Files are deleted (I<--delete>, I<--scrub>)."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:754
+#: ../builder/virt-builder.pod:761
 msgid ""
 "Firstboot scripts are installed (I<--firstboot>, I<--firstboot-command>, I<--"
 "firstboot-install>)."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:757
+#: ../builder/virt-builder.pod:764
 msgid ""
 "Note that although firstboot scripts are installed at this step, they do not "
 "run until the guest is booted first time.  Firstboot scripts will run in the "
@@ -3517,34 +3535,34 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:763
+#: ../builder/virt-builder.pod:770
 msgid "Scripts are run (I<--run>, I<--run-command>)."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:765
+#: ../builder/virt-builder.pod:772
 msgid "Scripts run in the order they appear on the command line."
 msgstr ""
 
 #. type: =head2
-#: ../builder/virt-builder.pod:769
+#: ../builder/virt-builder.pod:776
 msgid "IMPORTING THE DISK IMAGE"
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:771
+#: ../builder/virt-builder.pod:778
 msgid "Importing into libvirt"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:773
+#: ../builder/virt-builder.pod:780
 msgid ""
 "Import the disk image into libvirt using L<virt-install(1)> I<--import> "
 "option."
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:776
+#: ../builder/virt-builder.pod:783
 #, no-wrap
 msgid ""
 " virt-install --import \\\n"
@@ -3553,7 +3571,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:779 ../examples/guestfs-recipes.pod:264
+#: ../builder/virt-builder.pod:786 ../examples/guestfs-recipes.pod:264
 #: ../fish/guestfish-actions.pod:2058 ../fish/guestfish-actions.pod:2600
 #: ../fish/guestfish-actions.pod:3196 ../src/guestfs-actions.pod:3252
 #: ../src/guestfs-actions.pod:4114 ../src/guestfs-actions.pod:4999
@@ -3562,14 +3580,14 @@ msgid "Notes:"
 msgstr "注:"
 
 #. type: textblock
-#: ../builder/virt-builder.pod:785
+#: ../builder/virt-builder.pod:792
 msgid ""
 "You I<must> specify the correct format.  The format is C<raw> unless you "
 "used virt-builder's I<--format> option."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:790
+#: ../builder/virt-builder.pod:797
 msgid ""
 "You can run virt-install as root or non-root.  Each works slightly "
 "differently because libvirt manages a different set of virtual machines for "
@@ -3578,57 +3596,95 @@ msgid ""
 "differently as well."
 msgstr ""
 
-#. type: =end
-#: ../builder/virt-builder.pod:798 ../builder/virt-builder.pod:804
-#: ../examples/guestfs-recipes.pod:3 ../examples/guestfs-recipes.pod:8
-#: ../guestfs-release-notes.pod:7 ../guestfs-release-notes.pod:14
-#: ../guestfs-release-notes.pod:200 ../guestfs-release-notes.pod:204
-#: ../guestfs-release-notes.pod:549 ../guestfs-release-notes.pod:553
-#: ../guestfs-release-notes.pod:1105 ../guestfs-release-notes.pod:1109
-msgid "comment"
-msgstr "コメント"
-
 #. type: =head3
-#: ../builder/virt-builder.pod:800
+#: ../builder/virt-builder.pod:805
 msgid "Importing into OpenStack"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:802
-msgid "XXX"
+#: ../builder/virt-builder.pod:807
+msgid "Import the image into Glance (the OpenStack image store) by doing:"
+msgstr ""
+
+#. type: verbatim
+#: ../builder/virt-builder.pod:809
+#, no-wrap
+msgid ""
+" glance image-create --name fedora-20-image --file fedora-20.img \\\n"
+"   --disk-format raw --container-format bare \\\n"
+"   --is-public True\n"
+"\n"
+msgstr ""
+
+#. type: textblock
+#: ../builder/virt-builder.pod:813
+msgid ""
+"The I<--file> parameter is the virt-builder-generated disk image.  It should "
+"match virt-builder's I<--output> option.  The I<--disk-format> parameter "
+"should match virt-builder's I<--format> option (or C<raw> if you didn't use "
+"that option).  The I<--container-format> should always be C<bare> since virt-"
+"builder doesn't put images into containers."
+msgstr ""
+
+#. type: textblock
+#: ../builder/virt-builder.pod:819
+msgid ""
+"You can use the S<C<glance image-show I<fedora-20-image>>> command to "
+"display the properties of the image."
+msgstr ""
+
+#. type: textblock
+#: ../builder/virt-builder.pod:822
+msgid "To boot up an instance of your image on a Nova compute node, do:"
+msgstr ""
+
+#. type: verbatim
+#: ../builder/virt-builder.pod:824
+#, no-wrap
+msgid ""
+" nova boot fedora-20-server --image fedora-20-image \\\n"
+"   --flavor m1.medium\n"
+"\n"
+msgstr ""
+
+#. type: textblock
+#: ../builder/virt-builder.pod:827
+msgid ""
+"Use S<C<nova flavor-list>> to list possible machine flavors.  Use S<C<nova "
+"list>> to list running instances."
 msgstr ""
 
 #. type: =head2
-#: ../builder/virt-builder.pod:806
+#: ../builder/virt-builder.pod:830
 msgid "DEBUGGING BUILDS"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:808
+#: ../builder/virt-builder.pod:832
 msgid ""
 "If virt-builder fails with an error, then enable debugging (I<-v>) and "
 "report a bug (see L</BUGS> below)."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:811
+#: ../builder/virt-builder.pod:835
 msgid ""
 "If virt-builder is successful but the image doesn't work, here are some "
 "things to try:"
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:816
+#: ../builder/virt-builder.pod:840
 msgid "Use virt-rescue"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:818
+#: ../builder/virt-builder.pod:842
 msgid "Run L<virt-rescue(1)> on the disk image:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:820
+#: ../builder/virt-builder.pod:844
 #, no-wrap
 msgid ""
 " virt-rescue -a disk.img\n"
@@ -3636,7 +3692,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:822
+#: ../builder/virt-builder.pod:846
 msgid ""
 "This gives you a rescue shell.  You can mount the filesystems from the disk "
 "image on C</sysroot> and examine them using ordinary Linux commands.  You "
@@ -3645,17 +3701,17 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:828
+#: ../builder/virt-builder.pod:852
 msgid "Use guestfish"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:830
+#: ../builder/virt-builder.pod:854
 msgid "Run L<guestfish(1)> on the disk image:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:832
+#: ../builder/virt-builder.pod:856
 #, no-wrap
 msgid ""
 " guestfish -a disk.img -i\n"
@@ -3663,25 +3719,25 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:834
+#: ../builder/virt-builder.pod:858
 msgid ""
 "Use guestfish commands like C<ll /directory> and C<cat /file> to examine "
 "directories and files."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:837
+#: ../builder/virt-builder.pod:861
 msgid "Use guestmount"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:839
+#: ../builder/virt-builder.pod:863
 msgid ""
 "Mount the disk image safely on the host using FUSE and L<guestmount(1)>:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:841
+#: ../builder/virt-builder.pod:865
 #, no-wrap
 msgid ""
 " mkdir /tmp/mp\n"
@@ -3691,12 +3747,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:845
+#: ../builder/virt-builder.pod:869
 msgid "To unmount the disk image do:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:847
+#: ../builder/virt-builder.pod:871
 #, no-wrap
 msgid ""
 " fusermount -u /tmp/mp\n"
@@ -3704,12 +3760,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:849
+#: ../builder/virt-builder.pod:873
 msgid "Add a serial console"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:851
+#: ../builder/virt-builder.pod:875
 msgid ""
 "If the guest hangs during boot, it can be helpful to add a serial console to "
 "the guest, and direct kernel messages to the serial console.  Adding the "
@@ -3719,7 +3775,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:857
+#: ../builder/virt-builder.pod:881
 #, no-wrap
 msgid ""
 " console=tty0 console=ttyS0,115200\n"
@@ -3727,26 +3783,26 @@ msgid ""
 msgstr ""
 
 #. type: =head2
-#: ../builder/virt-builder.pod:861
+#: ../builder/virt-builder.pod:885
 msgid "CREATING YOUR OWN TEMPLATES"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:863
+#: ../builder/virt-builder.pod:887
 msgid ""
 "For serious virt-builder use, you may want to create your own repository of "
 "templates."
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:866
+#: ../builder/virt-builder.pod:890
 #, fuzzy
 #| msgid "guestfs_grepi"
 msgid "Libguestfs.org repository"
 msgstr "guestfs_grepi"
 
 #. type: textblock
-#: ../builder/virt-builder.pod:868
+#: ../builder/virt-builder.pod:892
 msgid ""
 "Out of the box, virt-builder downloads the file L<http://libguestfs.org/"
 "download/builder/index.asc> which is an index of available templates plus "
@@ -3755,7 +3811,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:874
+#: ../builder/virt-builder.pod:898
 msgid ""
 "The templates hosted on libguestfs.org were created using shell scripts, "
 "kickstart files and preseed files which can be found in the libguestfs "
@@ -3763,19 +3819,19 @@ msgid ""
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:878
+#: ../builder/virt-builder.pod:902
 msgid "Setting up the repository"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:880
+#: ../builder/virt-builder.pod:904
 msgid ""
 "You can set up your own site containing an index file and some templates, "
 "and then point virt-builder at the site by using the I<--source> option:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:884
+#: ../builder/virt-builder.pod:908
 #, no-wrap
 msgid ""
 " virt-builder --source https://example.com/builder/index.asc \\\n"
@@ -3785,25 +3841,25 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:888
+#: ../builder/virt-builder.pod:912
 msgid ""
 "(Note setting the environment variables C<VIRT_BUILDER_SOURCE> and "
 "C<VIRT_BUILDER_FINGERPRINT> may be easier to type!)"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:891
+#: ../builder/virt-builder.pod:915
 msgid ""
 "You can host this on any web or FTP server, or a local or network filesystem."
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:894
+#: ../builder/virt-builder.pod:918
 msgid "Setting up a GPG key"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:896
+#: ../builder/virt-builder.pod:920
 msgid ""
 "If you don't have a GnuPG key, you will need to set one up.  (Strictly "
 "speaking this is optional, but if your index and template files are not "
@@ -3812,21 +3868,21 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:901
+#: ../builder/virt-builder.pod:925
 msgid ""
 "To create a key, see the GPG manual L<http://www.gnupg.org/gph/en/manual."
 "html>."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:904
+#: ../builder/virt-builder.pod:928
 msgid ""
 "Export your GPG public key and add it to the keyring of all virt-builder "
 "users:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:907
+#: ../builder/virt-builder.pod:931
 #, no-wrap
 msgid ""
 " gpg --export -a \"you at example.com\" > pubkey\n"
@@ -3834,7 +3890,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:909
+#: ../builder/virt-builder.pod:933
 #, no-wrap
 msgid ""
 " # For each virt-builder user:\n"
@@ -3843,12 +3899,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:912
+#: ../builder/virt-builder.pod:936
 msgid "Also find the fingerprint of your key:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:914
+#: ../builder/virt-builder.pod:938
 #, no-wrap
 msgid ""
 " gpg --list-keys --fingerprint\n"
@@ -3856,12 +3912,12 @@ msgid ""
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:916
+#: ../builder/virt-builder.pod:940
 msgid "Create the templates"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:918
+#: ../builder/virt-builder.pod:942
 msgid ""
 "There are many ways to create the templates.  For example you could clone "
 "existing guests (see L<virt-sysprep(1)>), or you could install a guest by "
@@ -3870,14 +3926,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:923
+#: ../builder/virt-builder.pod:947
 msgid ""
 "For best results when compressing the templates, use the following xz "
 "options (see L<nbdkit-xz-plugin(1)> for further explanation):"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:926
+#: ../builder/virt-builder.pod:950
 #, no-wrap
 msgid ""
 " xz --best --block-size=16777216 disk\n"
@@ -3885,19 +3941,19 @@ msgid ""
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:928
+#: ../builder/virt-builder.pod:952
 msgid "Creating and signing the index file"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:930
+#: ../builder/virt-builder.pod:954
 msgid ""
 "The index file has a simple text format (shown here without the digital "
 "signature):"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:933
+#: ../builder/virt-builder.pod:957
 #, no-wrap
 msgid ""
 " [fedora-18]\n"
@@ -3913,7 +3969,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:943
+#: ../builder/virt-builder.pod:967
 #, no-wrap
 msgid ""
 " [fedora-19]\n"
@@ -3930,21 +3986,21 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:954
+#: ../builder/virt-builder.pod:978
 msgid ""
 "The part in square brackets is the C<os-version>, which is the same string "
 "that is used on the virt-builder command line to build that OS."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:957
+#: ../builder/virt-builder.pod:981
 msgid ""
 "After preparing the C<index> file in the correct format, clearsign it using "
 "the following command:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:960
+#: ../builder/virt-builder.pod:984
 #, no-wrap
 msgid ""
 " gpg --clearsign --armor index\n"
@@ -3952,7 +4008,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:962
+#: ../builder/virt-builder.pod:986
 msgid ""
 "This will create the final file called C<index.asc> which can be uploaded to "
 "the server (and is the I<--source> URL).  As noted above, signing the index "
@@ -3960,46 +4016,46 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:966
+#: ../builder/virt-builder.pod:990
 msgid "The following fields can appear:"
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:970
+#: ../builder/virt-builder.pod:994
 msgid "C<name=NAME>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:972
+#: ../builder/virt-builder.pod:996
 msgid ""
 "The user-friendly name of this template.  This is displayed in the I<--list> "
 "output but is otherwise not significant."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:975
+#: ../builder/virt-builder.pod:999
 msgid "C<osinfo=ID>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:977
+#: ../builder/virt-builder.pod:1001
 msgid ""
 "This optional field maps the operating system to the associated libosinfo "
 "ID.  Virt-builder does not use it (yet)."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:980
+#: ../builder/virt-builder.pod:1004
 msgid "C<file=PATH>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:982
+#: ../builder/virt-builder.pod:1006
 msgid "The path (relative to the index) of the xz-compressed template."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:984 ../builder/virt-builder.pod:995
+#: ../builder/virt-builder.pod:1008 ../builder/virt-builder.pod:1019
 msgid ""
 "Note that absolute paths or URIs are B<not> permitted here.  This is because "
 "virt-builder has a \"same origin\" policy for templates so they cannot come "
@@ -4007,12 +4063,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:988
+#: ../builder/virt-builder.pod:1012
 msgid "C<sig=PATH>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:990
+#: ../builder/virt-builder.pod:1014
 #, fuzzy
 #| msgid ""
 #| "I<This function is deprecated.> In new code, use the L</e2fsck> call "
@@ -4023,19 +4079,19 @@ msgstr ""
 "てください。"
 
 #. type: textblock
-#: ../builder/virt-builder.pod:992
+#: ../builder/virt-builder.pod:1016
 msgid ""
 "The path (relative to the index) of the GPG detached signature of the xz "
 "file."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:999
+#: ../builder/virt-builder.pod:1023
 msgid "The file can be created as follows:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1001
+#: ../builder/virt-builder.pod:1025
 #, no-wrap
 msgid ""
 " gpg --detach-sign --armor -o disk.xz.sig disk.xz\n"
@@ -4043,19 +4099,19 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1003
+#: ../builder/virt-builder.pod:1027
 msgid "C<checksum[sha512]=7b882fe9b82eb0fef...>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1005
+#: ../builder/virt-builder.pod:1029
 msgid ""
 "The SHA-512 checksum of the B<compressed> file is checked after it is "
 "downloaded.  To work out the signature, do:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1008
+#: ../builder/virt-builder.pod:1032
 #, no-wrap
 msgid ""
 " sha512sum disk.xz\n"
@@ -4063,24 +4119,24 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1010
+#: ../builder/virt-builder.pod:1034
 msgid ""
 "Note if you use this, you don't need to sign the file, ie. don't use "
 "C<sig>.  This option overrides C<sig>."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1013
+#: ../builder/virt-builder.pod:1037
 msgid "C<checksum=7b882fe9b82eb0fef...>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1015
+#: ../builder/virt-builder.pod:1039
 msgid "C<checksum> is an alias for C<checksum[sha512]>."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1017
+#: ../builder/virt-builder.pod:1041
 msgid ""
 "If you need to interoperate with virt-builder = 1.24.0 then you have to use "
 "C<checksum> because that version would give a parse error with square "
@@ -4089,12 +4145,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1022
+#: ../builder/virt-builder.pod:1046
 msgid "C<revision=N>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1024
+#: ../builder/virt-builder.pod:1048
 msgid ""
 "The revision is an integer which is used to control the template cache.  "
 "Increasing the revision number causes clients to download the template again "
@@ -4102,22 +4158,22 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1028
+#: ../builder/virt-builder.pod:1052
 msgid "The revision number is optional.  If omitted it defaults to C<1>."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1030
+#: ../builder/virt-builder.pod:1054
 msgid "C<format=raw>"
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1032
+#: ../builder/virt-builder.pod:1056
 msgid "C<format=qcow2>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1034
+#: ../builder/virt-builder.pod:1058
 msgid ""
 "Specify the format of the disk image (before it was compressed).  If not "
 "given, the format is autodetected, but generally it is better to be explicit "
@@ -4125,7 +4181,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1038
+#: ../builder/virt-builder.pod:1062
 msgid ""
 "Note this is the source format, which is different from the I<--format> "
 "option (requested output format).  Virt-builder does on-the-fly conversion "
@@ -4133,12 +4189,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1043
+#: ../builder/virt-builder.pod:1067
 msgid "C<size=NNN>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1045
+#: ../builder/virt-builder.pod:1069
 msgid ""
 "The virtual size of the image in bytes.  This is the size of the image when "
 "uncompressed.  If using a non-raw format such as qcow2 then it means the "
@@ -4146,36 +4202,36 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1049
+#: ../builder/virt-builder.pod:1073
 msgid "This field is required."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1051
+#: ../builder/virt-builder.pod:1075
 msgid ""
 "Virt-builder also uses this as the minimum size that users can request via "
 "the I<--size> option, or as the default size if there is no I<--size> option."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1055
+#: ../builder/virt-builder.pod:1079
 msgid "C<compressed_size=NNN>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1057
+#: ../builder/virt-builder.pod:1081
 msgid ""
 "The compressed size of the disk image in bytes.  This is just used for "
 "information (when using I<--list --long>)."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1060
+#: ../builder/virt-builder.pod:1084
 msgid "C<expand=/dev/sdaX>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1062
+#: ../builder/virt-builder.pod:1086
 msgid ""
 "When expanding the image to its final size, instruct L<virt-resize(1)> to "
 "expand the named partition in the guest image to fill up all available "
@@ -4183,13 +4239,13 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1066
+#: ../builder/virt-builder.pod:1090
 msgid ""
 "You should usually put the device name of the guest's root filesystem here."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1068
+#: ../builder/virt-builder.pod:1092
 msgid ""
 "It's a good idea to use this, but not required.  If the field is omitted "
 "then virt-resize will create an extra partition at the end of the disk to "
@@ -4197,12 +4253,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1072
+#: ../builder/virt-builder.pod:1096
 msgid "C<lvexpand=/dev/VolGroup/LogVol>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1074
+#: ../builder/virt-builder.pod:1098
 msgid ""
 "When expanding the image to its final size, instruct L<virt-resize(1)> to "
 "expand the named logical volume in the guest image to fill up all available "
@@ -4210,7 +4266,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1078
+#: ../builder/virt-builder.pod:1102
 msgid ""
 "If the guest uses LVM2 you should usually put the LV of the guest's root "
 "filesystem here.  If the guest does not use LVM2 or its root filesystem is "
@@ -4218,90 +4274,90 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1082
+#: ../builder/virt-builder.pod:1106
 msgid "C<notes=NOTES>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1084
+#: ../builder/virt-builder.pod:1108
 msgid ""
 "Any notes that go with this image, especially notes describing what packages "
 "are in the image, how the image was prepared, and licensing information."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1088
+#: ../builder/virt-builder.pod:1112
 msgid ""
 "This information is shown in the I<--notes> and I<--list> I<--long> modes."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1090
+#: ../builder/virt-builder.pod:1114
 msgid ""
 "You can use multi-line notes here by indenting each new line with at least "
 "one character of whitespace (even on blank lines):"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1093
+#: ../builder/virt-builder.pod:1117
 #, no-wrap
 msgid ""
 " notes=This image was prepared using\n"
 "  the following kickstart script:\n"
 "                                <-- one space at beginning of line\n"
-"  timezone Europe/London\n"
 "  part /boot --fstype ext3\n"
+"  ...\n"
 "\n"
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1099
+#: ../builder/virt-builder.pod:1123
 msgid "C<hidden=true>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1101
+#: ../builder/virt-builder.pod:1125
 msgid ""
 "Using the hidden flag prevents the template from being listed by the I<--"
 "list> option (but it is still installable).  This is used for test images."
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:1107
+#: ../builder/virt-builder.pod:1131
 msgid "Running virt-builder against the alternate repository"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1109
+#: ../builder/virt-builder.pod:1133
 msgid ""
 "Ensure each virt-builder user has imported your public key into their gpg "
 "keyring (see above)."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1112
+#: ../builder/virt-builder.pod:1136
 msgid "Each virt-builder user should export these environment variables:"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1118
+#: ../builder/virt-builder.pod:1142
 msgid "C<VIRT_BUILDER_SOURCE> to point to the URL of the C<index.asc> file."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1122
+#: ../builder/virt-builder.pod:1146
 msgid ""
 "C<VIRT_BUILDER_FINGERPRINT> to contain the fingerprint (long hex string) of "
 "the user who signed the index file and the templates."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1127
+#: ../builder/virt-builder.pod:1151
 msgid "Now run virt-builder commands as normal, eg:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1129
+#: ../builder/virt-builder.pod:1153
 #, no-wrap
 msgid ""
 " virt-builder --list --long\n"
@@ -4309,7 +4365,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1131
+#: ../builder/virt-builder.pod:1155
 #, no-wrap
 msgid ""
 " virt-builder os-version\n"
@@ -4317,17 +4373,17 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1133
+#: ../builder/virt-builder.pod:1157
 msgid "To debug problems, add the C<-v> option to these commands."
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:1135
+#: ../builder/virt-builder.pod:1159
 msgid "Licensing of templates"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1137
+#: ../builder/virt-builder.pod:1161
 msgid ""
 "You should be aware of the licensing of images that you distribute.  For "
 "open source guests, provide a link to the source code in the C<notes> field "
@@ -4335,55 +4391,55 @@ msgid ""
 msgstr ""
 
 #. type: =head2
-#: ../builder/virt-builder.pod:1142
+#: ../builder/virt-builder.pod:1166
 msgid "CACHING"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1144
+#: ../builder/virt-builder.pod:1168
 msgid ""
 "Since the templates are usually very large, downloaded templates are cached "
 "in the user's home directory."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1147
+#: ../builder/virt-builder.pod:1171
 msgid ""
 "The location of the cache is C<$XDG_CACHE_HOME/virt-builder/> or C<$HOME/."
 "cache/virt-builder>."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1150
+#: ../builder/virt-builder.pod:1174
 msgid ""
 "You can print out information about the cache directory, including which "
 "guests are currently cached, by doing:"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1155
+#: ../builder/virt-builder.pod:1179
 msgid "The cache can be deleted if you want to save space by doing:"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1159
+#: ../builder/virt-builder.pod:1183
 msgid "You can download all (current) templates to the local cache by doing:"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1163
+#: ../builder/virt-builder.pod:1187
 msgid "To disable the template cache, use I<--no-cache>."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1165
+#: ../builder/virt-builder.pod:1189
 msgid ""
 "Only templates are cached.  The index and detached digital signatures are "
 "not cached."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1168
+#: ../builder/virt-builder.pod:1192
 msgid ""
 "Virt-builder uses L<curl(1)> to download files and it also uses the current "
 "C<http_proxy> (etc) settings when installing packages (I<--install>).  You "
@@ -4393,24 +4449,24 @@ msgid ""
 msgstr ""
 
 #. type: =head2
-#: ../builder/virt-builder.pod:1174
+#: ../builder/virt-builder.pod:1198
 msgid "DIGITAL SIGNATURES"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1176
+#: ../builder/virt-builder.pod:1200
 msgid ""
 "Virt-builder uses GNU Privacy Guard (GnuPG or gpg) to verify that the index "
 "and templates have not been tampered with."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1179
+#: ../builder/virt-builder.pod:1203
 msgid "The source points to an index file, which is optionally signed."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1181
+#: ../builder/virt-builder.pod:1205
 msgid ""
 "Virt-builder downloads the index and checks that the signature is valid and "
 "the signer's fingerprint matches the specified fingerprint (ie. I<--"
@@ -4419,7 +4475,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1186
+#: ../builder/virt-builder.pod:1210
 msgid ""
 "For checking against the built-in public key/fingerprint, this requires "
 "importing the public key into the user's local gpg keyring (that's just the "
@@ -4427,13 +4483,13 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1190
+#: ../builder/virt-builder.pod:1214
 msgid ""
 "When a template is downloaded, its signature is checked in the same way."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1193
+#: ../builder/virt-builder.pod:1217
 msgid ""
 "Although the signatures are optional, if you don't have them then virt-"
 "builder users will have to use I<--no-check-signature> on the command line.  "
@@ -4444,19 +4500,19 @@ msgid ""
 msgstr ""
 
 #. type: =head1
-#: ../builder/virt-builder.pod:1200 ../src/guestfs.pod:3343
+#: ../builder/virt-builder.pod:1224 ../src/guestfs.pod:3343
 msgid "ARCHITECTURE"
 msgstr "アーキテクチャー"
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1202
+#: ../builder/virt-builder.pod:1226
 msgid ""
 "Virt-builder can build a guest for any architecture no matter what the host "
 "architecture is.  For example an x86-64 guest on an ARM host."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1205
+#: ../builder/virt-builder.pod:1229
 msgid ""
 "However certain options may not work correctly, specifically options that "
 "require running commands in the guest during the build process: I<--"
@@ -4465,27 +4521,27 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1210
+#: ../builder/virt-builder.pod:1234
 msgid ""
 "An x86-64 host building 32 bit i686 guests should work without any special "
 "steps."
 msgstr ""
 
 #. type: =head1
-#: ../builder/virt-builder.pod:1213 ../src/guestfs.pod:1889
+#: ../builder/virt-builder.pod:1237 ../src/guestfs.pod:1889
 #: ../sysprep/virt-sysprep.pod:447
 msgid "SECURITY"
 msgstr "セキュリティ"
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1215
+#: ../builder/virt-builder.pod:1239
 msgid ""
 "Virt-builder does not need to run as root (in fact, should not be run as "
 "root), and doesn't use setuid, C<sudo> or any similar mechanism."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1218
+#: ../builder/virt-builder.pod:1242
 msgid ""
 "I<--install>, I<--run> and I<--run-command> are implemented using an "
 "appliance (a small virtual machine) so these commands do not run on the "
@@ -4495,7 +4551,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1224
+#: ../builder/virt-builder.pod:1248
 msgid ""
 "However these options will have access to the host's network and since the "
 "template may contain untrusted code, the code might try to access host "
@@ -4504,14 +4560,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1229
+#: ../builder/virt-builder.pod:1253
 msgid ""
 "Firstboot commands run in the context of the guest when it is booted, and so "
 "the security of your hypervisor / cloud should be considered."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1232
+#: ../builder/virt-builder.pod:1256
 msgid ""
 "Virt-builder injects a random seed into every guest which it builds.  This "
 "helps to ensure that TCP sequence numbers, UUIDs, ssh host keys etc are "
@@ -4519,17 +4575,17 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1236
+#: ../builder/virt-builder.pod:1260
 msgid "You should check digital signatures and not ignore any signing errors."
 msgstr ""
 
 #. type: =head2
-#: ../builder/virt-builder.pod:1238
+#: ../builder/virt-builder.pod:1262
 msgid "USER MODE LINUX"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1240
+#: ../builder/virt-builder.pod:1264
 msgid ""
 "You can use virt-builder with the User-Mode Linux (UML) backend.  This may "
 "be faster when running virt-builder inside a virtual machine (eg. in the "
@@ -4537,74 +4593,101 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1244
+#: ../builder/virt-builder.pod:1268
 msgid ""
 "To enable the UML backend, read the instructions in L<guestfs(3)/USER-MODE "
 "LINUX BACKEND>."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1247
+#: ../builder/virt-builder.pod:1271
 msgid ""
 "Currently you have to use the I<--no-network> option.  This should be fixed "
 "in a future version."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1250
+#: ../builder/virt-builder.pod:1274
 msgid ""
 "The qcow2 output format is not supported by UML.  You can only create raw-"
 "format guests."
 msgstr ""
 
+#. type: =head2
+#: ../builder/virt-builder.pod:1277 ../src/guestfs.pod:479
+msgid "SELINUX"
+msgstr "SELinux"
+
+#. type: textblock
+#: ../builder/virt-builder.pod:1279
+msgid ""
+"Guests which use SELinux (such as Fedora and Red Hat Enterprise Linux)  "
+"require that each file has a correct SELinux label."
+msgstr ""
+
+#. type: textblock
+#: ../builder/virt-builder.pod:1282
+msgid ""
+"Since virt-builder does not know how to give new files a correct label, it "
+"touches C</.autorelabel> in the guest and relies on the guest to relabel "
+"itself at first boot."
+msgstr ""
+
+#. type: textblock
+#: ../builder/virt-builder.pod:1286
+msgid ""
+"This usually means that these guests will reboot themselves once the first "
+"time you use them.  This is normal, and harmless."
+msgstr ""
+
 #. type: textblock
-#: ../builder/virt-builder.pod:1255
+#: ../builder/virt-builder.pod:1291
 msgid ""
 "For other environment variables which affect all libguestfs programs, see "
 "L<guestfs(3)/ENVIRONMENT VARIABLES>."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1260
+#: ../builder/virt-builder.pod:1296
 msgid "C<http_proxy>"
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1262
+#: ../builder/virt-builder.pod:1298
 msgid "C<https_proxy>"
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1264
+#: ../builder/virt-builder.pod:1300
 msgid "C<no_proxy>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1266
+#: ../builder/virt-builder.pod:1302
 msgid ""
 "Set the proxy for downloads.  These environment variables (and more)  are "
 "actually interpreted by L<curl(1)>, not virt-builder."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1269
+#: ../builder/virt-builder.pod:1305
 msgid "C<HOME>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1271 ../builder/virt-builder.pod:1291
+#: ../builder/virt-builder.pod:1307 ../builder/virt-builder.pod:1327
 msgid "Used to determine the location of the template cache.  See L</CACHING>."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1273
+#: ../builder/virt-builder.pod:1309
 #, fuzzy
 #| msgid "LIBGUESTFS_MEMSIZE"
 msgid "C<LIBGUESTFS_MEMSIZE>"
 msgstr "LIBGUESTFS_MEMSIZE"
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1275
+#: ../builder/virt-builder.pod:1311
 msgid ""
 "The size (in megabytes) of the appliance.  The default can be found using "
 "the command S<C<guestfish get-memsize>>.  Increase this if you find that I<--"
@@ -4612,36 +4695,36 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1279
+#: ../builder/virt-builder.pod:1315
 msgid "C<VIRT_BUILDER_FINGERPRINT>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1281
+#: ../builder/virt-builder.pod:1317
 msgid ""
 "Set the default value for the GPG signature fingerprint (see I<--"
 "fingerprint> option)."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1284
+#: ../builder/virt-builder.pod:1320
 msgid "C<VIRT_BUILDER_SOURCE>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1286
+#: ../builder/virt-builder.pod:1322
 msgid ""
 "Set the default value for the source URL for the template repository (see "
 "I<--source> option)."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1289
+#: ../builder/virt-builder.pod:1325
 msgid "C<XDG_CACHE_HOME>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1297 ../cat/virt-cat.pod:246
+#: ../builder/virt-builder.pod:1333 ../cat/virt-cat.pod:246
 #: ../cat/virt-filesystems.pod:392 ../cat/virt-ls.pod:504
 #: ../daemon/guestfsd.pod:75 ../df/virt-df.pod:262 ../edit/virt-edit.pod:359
 #: ../fuse/guestmount.pod:403 ../inspector/virt-inspector.pod:498
@@ -4651,7 +4734,7 @@ msgid ""
 msgstr "このプログラムは、成功すると 0 を、エラーがあると 0 以外を返します。"
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1302
+#: ../builder/virt-builder.pod:1338
 #, fuzzy
 #| msgid ""
 #| "L<guestfs(3)>, L<guestfish(1)>, L<virt-clone(1)>, L<virt-rescue(1)>, "
@@ -4661,15 +4744,15 @@ msgstr "このプログラムは、成功すると 0 を、エラーがあると
 msgid ""
 "L<guestfs(3)>, L<guestfish(1)>, L<guestmount(1)>, L<virt-copy-out(1)>, "
 "L<virt-install(1)>, L<virt-rescue(1)>, L<virt-resize(1)>, L<virt-"
-"sysprep(1)>, L<oz-install(1)>, L<gpg(1)>, L<curl(1)>, L<http://libguestfs."
-"org/>."
+"sysprep(1)>, L<oz-install(1)>, L<gpg(1)>, L<curl(1)>, L<virt-make-fs(1)>, "
+"L<genisoimage(1)>, L<http://libguestfs.org/>."
 msgstr ""
 "L<guestfs(3)>, L<guestfish(1)>, L<virt-clone(1)>, L<virt-rescue(1)>, L<virt-"
 "resize(1)>, L<virt-sparsify(1)>, L<virsh(1)>, L<lvcreate(8)>, L<qemu-"
 "img(1)>, L<scrub(1)>, L<http://libguestfs.org/>, L<http://libvirt.org/>."
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1321 ../fuse/guestunmount.pod:164
+#: ../builder/virt-builder.pod:1359 ../fuse/guestunmount.pod:164
 #: ../golang/examples/guestfs-golang.pod:99
 msgid "Copyright (C) 2013 Red Hat Inc."
 msgstr "Copyright (C) 2013 Red Hat Inc."
@@ -11812,6 +11895,15 @@ msgstr ""
 msgid "Copyright (C) 2012 Red Hat Inc."
 msgstr "Copyright (C) 2012 Red Hat Inc."
 
+#. type: =end
+#: ../examples/guestfs-recipes.pod:3 ../examples/guestfs-recipes.pod:8
+#: ../guestfs-release-notes.pod:7 ../guestfs-release-notes.pod:14
+#: ../guestfs-release-notes.pod:200 ../guestfs-release-notes.pod:204
+#: ../guestfs-release-notes.pod:549 ../guestfs-release-notes.pod:553
+#: ../guestfs-release-notes.pod:1105 ../guestfs-release-notes.pod:1109
+msgid "comment"
+msgstr "コメント"
+
 #. type: textblock
 #: ../examples/guestfs-recipes.pod:5
 msgid ""
@@ -69986,11 +70078,6 @@ msgid ""
 "L<sd_journal_open(3)>."
 msgstr ""
 
-#. type: =head2
-#: ../src/guestfs.pod:479
-msgid "SELINUX"
-msgstr "SELinux"
-
 #. type: textblock
 #: ../src/guestfs.pod:481
 msgid ""
diff --git a/po-docs/libguestfs-docs.pot b/po-docs/libguestfs-docs.pot
index 31c37d1..589c5ab 100644
--- a/po-docs/libguestfs-docs.pot
+++ b/po-docs/libguestfs-docs.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: libguestfs 1.24.4\n"
+"Project-Id-Version: libguestfs 1.24.5\n"
 "Report-Msgid-Bugs-To: libguestfs at redhat.com\n"
-"POT-Creation-Date: 2014-01-02 20:24+0000\n"
+"POT-Creation-Date: 2014-01-20 12:50+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -458,12 +458,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../align/virt-alignment-scan.pod:195 ../builder/virt-builder.pod:546 ../cat/virt-cat.pod:140 ../cat/virt-filesystems.pod:267 ../cat/virt-ls.pod:437 ../daemon/guestfsd.pod:62 ../df/virt-df.pod:185 ../edit/virt-edit.pod:169 ../fish/guestfish.pod:421 ../format/virt-format.pod:155 ../fuse/guestmount.pod:354 ../inspector/virt-inspector.pod:118 ../rescue/virt-rescue.pod:240 ../resize/virt-resize.pod:579 ../sparsify/virt-sparsify.pod:226 ../sysprep/virt-sysprep.pod:190
+#: ../align/virt-alignment-scan.pod:195 ../builder/virt-builder.pod:549 ../cat/virt-cat.pod:140 ../cat/virt-filesystems.pod:267 ../cat/virt-ls.pod:437 ../daemon/guestfsd.pod:62 ../df/virt-df.pod:185 ../edit/virt-edit.pod:169 ../fish/guestfish.pod:421 ../format/virt-format.pod:155 ../fuse/guestmount.pod:354 ../inspector/virt-inspector.pod:118 ../rescue/virt-rescue.pod:240 ../resize/virt-resize.pod:579 ../sparsify/virt-sparsify.pod:226 ../sysprep/virt-sysprep.pod:190
 msgid "B<-v>"
 msgstr ""
 
 #. type: =item
-#: ../align/virt-alignment-scan.pod:197 ../builder/virt-builder.pod:548 ../cat/virt-cat.pod:142 ../cat/virt-filesystems.pod:269 ../cat/virt-ls.pod:439 ../daemon/guestfsd.pod:64 ../df/virt-df.pod:187 ../edit/virt-edit.pod:171 ../fish/guestfish.pod:423 ../format/virt-format.pod:157 ../fuse/guestmount.pod:356 ../inspector/virt-inspector.pod:120 ../rescue/virt-rescue.pod:242 ../resize/virt-resize.pod:581 ../sparsify/virt-sparsify.pod:228 ../sysprep/virt-sysprep.pod:192
+#: ../align/virt-alignment-scan.pod:197 ../builder/virt-builder.pod:551 ../cat/virt-cat.pod:142 ../cat/virt-filesystems.pod:269 ../cat/virt-ls.pod:439 ../daemon/guestfsd.pod:64 ../df/virt-df.pod:187 ../edit/virt-edit.pod:171 ../fish/guestfish.pod:423 ../format/virt-format.pod:157 ../fuse/guestmount.pod:356 ../inspector/virt-inspector.pod:120 ../rescue/virt-rescue.pod:242 ../resize/virt-resize.pod:581 ../sparsify/virt-sparsify.pod:228 ../sysprep/virt-sysprep.pod:192
 msgid "B<--verbose>"
 msgstr ""
 
@@ -473,17 +473,17 @@ msgid "Enable verbose messages for debugging."
 msgstr ""
 
 #. type: =item
-#: ../align/virt-alignment-scan.pod:201 ../appliance/libguestfs-make-fixed-appliance.pod:107 ../builder/virt-builder.pod:555 ../cat/virt-cat.pod:146 ../cat/virt-filesystems.pod:273 ../cat/virt-ls.pod:443 ../df/virt-df.pod:191 ../edit/virt-edit.pod:175 ../fish/guestfish.pod:428 ../format/virt-format.pod:161 ../fuse/guestmount.pod:360 ../fuse/guestunmount.pod:107 ../inspector/virt-inspector.pod:124 ../rescue/virt-rescue.pod:246 ../resize/virt-resize.pod:585 ../sparsify/virt-sparsify.pod:23 [...]
+#: ../align/virt-alignment-scan.pod:201 ../appliance/libguestfs-make-fixed-appliance.pod:107 ../builder/virt-builder.pod:558 ../cat/virt-cat.pod:146 ../cat/virt-filesystems.pod:273 ../cat/virt-ls.pod:443 ../df/virt-df.pod:191 ../edit/virt-edit.pod:175 ../fish/guestfish.pod:428 ../format/virt-format.pod:161 ../fuse/guestmount.pod:360 ../fuse/guestunmount.pod:107 ../inspector/virt-inspector.pod:124 ../rescue/virt-rescue.pod:246 ../resize/virt-resize.pod:585 ../sparsify/virt-sparsify.pod:23 [...]
 msgid "B<-V>"
 msgstr ""
 
 #. type: =item
-#: ../align/virt-alignment-scan.pod:203 ../appliance/libguestfs-make-fixed-appliance.pod:109 ../builder/virt-builder.pod:557 ../cat/virt-cat.pod:148 ../cat/virt-filesystems.pod:275 ../cat/virt-ls.pod:445 ../df/virt-df.pod:193 ../edit/virt-edit.pod:177 ../fish/guestfish.pod:430 ../format/virt-format.pod:163 ../fuse/guestmount.pod:362 ../fuse/guestunmount.pod:109 ../inspector/virt-inspector.pod:126 ../rescue/virt-rescue.pod:248 ../resize/virt-resize.pod:587 ../sparsify/virt-sparsify.pod:23 [...]
+#: ../align/virt-alignment-scan.pod:203 ../appliance/libguestfs-make-fixed-appliance.pod:109 ../builder/virt-builder.pod:560 ../cat/virt-cat.pod:148 ../cat/virt-filesystems.pod:275 ../cat/virt-ls.pod:445 ../df/virt-df.pod:193 ../edit/virt-edit.pod:177 ../fish/guestfish.pod:430 ../format/virt-format.pod:163 ../fuse/guestmount.pod:362 ../fuse/guestunmount.pod:109 ../inspector/virt-inspector.pod:126 ../rescue/virt-rescue.pod:248 ../resize/virt-resize.pod:587 ../sparsify/virt-sparsify.pod:23 [...]
 msgid "B<--version>"
 msgstr ""
 
 #. type: textblock
-#: ../align/virt-alignment-scan.pod:205 ../builder/virt-builder.pod:559 ../cat/virt-cat.pod:150 ../cat/virt-filesystems.pod:277 ../cat/virt-ls.pod:447 ../df/virt-df.pod:195 ../edit/virt-edit.pod:179 ../format/virt-format.pod:165 ../inspector/virt-inspector.pod:128 ../rescue/virt-rescue.pod:250 ../resize/virt-resize.pod:589 ../sparsify/virt-sparsify.pod:236 ../sysprep/virt-sysprep.pod:200 ../tools/virt-list-filesystems:72 ../tools/virt-list-partitions:73 ../tools/virt-make-fs:169 ../tools [...]
+#: ../align/virt-alignment-scan.pod:205 ../builder/virt-builder.pod:562 ../cat/virt-cat.pod:150 ../cat/virt-filesystems.pod:277 ../cat/virt-ls.pod:447 ../df/virt-df.pod:195 ../edit/virt-edit.pod:179 ../format/virt-format.pod:165 ../inspector/virt-inspector.pod:128 ../rescue/virt-rescue.pod:250 ../resize/virt-resize.pod:589 ../sparsify/virt-sparsify.pod:236 ../sysprep/virt-sysprep.pod:200 ../tools/virt-list-filesystems:72 ../tools/virt-list-partitions:73 ../tools/virt-make-fs:169 ../tools [...]
 msgid "Display version number and exit."
 msgstr ""
 
@@ -778,7 +778,7 @@ msgid ""
 msgstr ""
 
 #. type: =head1
-#: ../align/virt-alignment-scan.pod:359 ../appliance/libguestfs-make-fixed-appliance.pod:156 ../builder/virt-builder.pod:1295 ../cat/virt-cat.pod:244 ../cat/virt-filesystems.pod:390 ../cat/virt-ls.pod:502 ../daemon/guestfsd.pod:73 ../df/virt-df.pod:260 ../edit/virt-edit.pod:357 ../fish/guestfish.pod:1356 ../format/virt-format.pod:183 ../fuse/guestmount.pod:401 ../fuse/guestunmount.pod:126 ../inspector/virt-inspector.pod:496 ../resize/virt-resize.pod:751 ../sparsify/virt-sparsify.pod:307  [...]
+#: ../align/virt-alignment-scan.pod:359 ../appliance/libguestfs-make-fixed-appliance.pod:156 ../builder/virt-builder.pod:1331 ../cat/virt-cat.pod:244 ../cat/virt-filesystems.pod:390 ../cat/virt-ls.pod:502 ../daemon/guestfsd.pod:73 ../df/virt-df.pod:260 ../edit/virt-edit.pod:357 ../fish/guestfish.pod:1356 ../format/virt-format.pod:183 ../fuse/guestmount.pod:401 ../fuse/guestunmount.pod:126 ../inspector/virt-inspector.pod:496 ../resize/virt-resize.pod:751 ../sparsify/virt-sparsify.pod:307  [...]
 msgid "EXIT STATUS"
 msgstr ""
 
@@ -788,7 +788,7 @@ msgid "This program returns:"
 msgstr ""
 
 #. type: =item
-#: ../align/virt-alignment-scan.pod:365 ../align/virt-alignment-scan.pod:371 ../align/virt-alignment-scan.pod:377 ../align/virt-alignment-scan.pod:384 ../appliance/libguestfs-make-fixed-appliance.pod:24 ../appliance/libguestfs-make-fixed-appliance.pod:30 ../appliance/libguestfs-make-fixed-appliance.pod:36 ../appliance/libguestfs-make-fixed-appliance.pod:54 ../appliance/libguestfs-make-fixed-appliance.pod:75 ../builder/virt-builder.pod:495 ../builder/virt-builder.pod:499 ../builder/virt-b [...]
+#: ../align/virt-alignment-scan.pod:365 ../align/virt-alignment-scan.pod:371 ../align/virt-alignment-scan.pod:377 ../align/virt-alignment-scan.pod:384 ../appliance/libguestfs-make-fixed-appliance.pod:24 ../appliance/libguestfs-make-fixed-appliance.pod:30 ../appliance/libguestfs-make-fixed-appliance.pod:36 ../appliance/libguestfs-make-fixed-appliance.pod:54 ../appliance/libguestfs-make-fixed-appliance.pod:75 ../builder/virt-builder.pod:495 ../builder/virt-builder.pod:499 ../builder/virt-b [...]
 msgid "*"
 msgstr ""
 
@@ -837,7 +837,7 @@ msgid ""
 msgstr ""
 
 #. type: =head1
-#: ../align/virt-alignment-scan.pod:393 ../appliance/libguestfs-make-fixed-appliance.pod:166 ../builder/virt-builder.pod:1300 ../cat/virt-cat.pod:249 ../cat/virt-filesystems.pod:395 ../cat/virt-ls.pod:507 ../daemon/guestfsd.pod:117 ../df/virt-df.pod:265 ../edit/virt-edit.pod:362 ../erlang/examples/guestfs-erlang.pod:97 ../examples/guestfs-examples.pod:57 ../examples/guestfs-faq.pod:1186 ../examples/guestfs-performance.pod:567 ../examples/guestfs-recipes.pod:654 ../examples/guestfs-testin [...]
+#: ../align/virt-alignment-scan.pod:393 ../appliance/libguestfs-make-fixed-appliance.pod:166 ../builder/virt-builder.pod:1336 ../cat/virt-cat.pod:249 ../cat/virt-filesystems.pod:395 ../cat/virt-ls.pod:507 ../daemon/guestfsd.pod:117 ../df/virt-df.pod:265 ../edit/virt-edit.pod:362 ../erlang/examples/guestfs-erlang.pod:97 ../examples/guestfs-examples.pod:57 ../examples/guestfs-faq.pod:1186 ../examples/guestfs-performance.pod:567 ../examples/guestfs-recipes.pod:654 ../examples/guestfs-testin [...]
 msgid "SEE ALSO"
 msgstr ""
 
@@ -849,17 +849,17 @@ msgid ""
 msgstr ""
 
 #. type: =head1
-#: ../align/virt-alignment-scan.pod:402 ../builder/virt-builder.pod:1315 ../cat/virt-cat.pod:258 ../cat/virt-filesystems.pod:406 ../cat/virt-ls.pod:516 ../daemon/guestfsd.pod:122 ../df/virt-df.pod:273 ../edit/virt-edit.pod:373 ../format/virt-format.pod:197 ../guestfs-release-notes.pod:2645 ../rescue/virt-rescue.pod:427 ../resize/virt-resize.pod:779 ../sparsify/virt-sparsify.pod:352 ../tools/virt-list-filesystems:202 ../tools/virt-list-partitions:283 ../tools/virt-make-fs:658 ../tools/vir [...]
+#: ../align/virt-alignment-scan.pod:402 ../builder/virt-builder.pod:1353 ../cat/virt-cat.pod:258 ../cat/virt-filesystems.pod:406 ../cat/virt-ls.pod:516 ../daemon/guestfsd.pod:122 ../df/virt-df.pod:273 ../edit/virt-edit.pod:373 ../format/virt-format.pod:197 ../guestfs-release-notes.pod:2645 ../rescue/virt-rescue.pod:427 ../resize/virt-resize.pod:779 ../sparsify/virt-sparsify.pod:352 ../tools/virt-list-filesystems:202 ../tools/virt-list-partitions:283 ../tools/virt-make-fs:658 ../tools/vir [...]
 msgid "AUTHOR"
 msgstr ""
 
 #. type: textblock
-#: ../align/virt-alignment-scan.pod:404 ../builder/virt-builder.pod:1317 ../cat/virt-cat.pod:260 ../cat/virt-filesystems.pod:408 ../cat/virt-ls.pod:518 ../daemon/guestfsd.pod:124 ../df/virt-df.pod:275 ../edit/virt-edit.pod:375 ../format/virt-format.pod:199 ../inspector/virt-inspector.pod:516 ../rescue/virt-rescue.pod:429 ../resize/virt-resize.pod:781 ../sparsify/virt-sparsify.pod:354 ../sysprep/virt-sysprep.pod:525 ../tools/virt-list-filesystems:204 ../tools/virt-list-partitions:285 ../t [...]
+#: ../align/virt-alignment-scan.pod:404 ../builder/virt-builder.pod:1355 ../cat/virt-cat.pod:260 ../cat/virt-filesystems.pod:408 ../cat/virt-ls.pod:518 ../daemon/guestfsd.pod:124 ../df/virt-df.pod:275 ../edit/virt-edit.pod:375 ../format/virt-format.pod:199 ../inspector/virt-inspector.pod:516 ../rescue/virt-rescue.pod:429 ../resize/virt-resize.pod:781 ../sparsify/virt-sparsify.pod:354 ../sysprep/virt-sysprep.pod:525 ../tools/virt-list-filesystems:204 ../tools/virt-list-partitions:285 ../t [...]
 msgid "Richard W.M. Jones L<http://people.redhat.com/~rjones/>"
 msgstr ""
 
 #. type: =head1
-#: ../align/virt-alignment-scan.pod:406 ../appliance/libguestfs-make-fixed-appliance.pod:179 ../builder/virt-builder.pod:1319 ../cat/virt-cat.pod:262 ../cat/virt-filesystems.pod:410 ../cat/virt-ls.pod:520 ../daemon/guestfsd.pod:126 ../df/virt-df.pod:277 ../edit/virt-edit.pod:377 ../erlang/examples/guestfs-erlang.pod:116 ../examples/guestfs-examples.pod:75 ../examples/guestfs-faq.pod:1196 ../examples/guestfs-performance.pod:584 ../examples/guestfs-recipes.pod:673 ../examples/guestfs-testi [...]
+#: ../align/virt-alignment-scan.pod:406 ../appliance/libguestfs-make-fixed-appliance.pod:179 ../builder/virt-builder.pod:1357 ../cat/virt-cat.pod:262 ../cat/virt-filesystems.pod:410 ../cat/virt-ls.pod:520 ../daemon/guestfsd.pod:126 ../df/virt-df.pod:277 ../edit/virt-edit.pod:377 ../erlang/examples/guestfs-erlang.pod:116 ../examples/guestfs-examples.pod:75 ../examples/guestfs-faq.pod:1196 ../examples/guestfs-performance.pod:584 ../examples/guestfs-recipes.pod:673 ../examples/guestfs-testi [...]
 msgid "COPYRIGHT"
 msgstr ""
 
@@ -1143,7 +1143,7 @@ msgid ""
 msgstr ""
 
 #. type: =head1
-#: ../appliance/libguestfs-make-fixed-appliance.pod:161 ../builder/virt-builder.pod:1253 ../edit/virt-edit.pod:337 ../fish/guestfish.pod:1361 ../fuse/guestunmount.pod:115 ../rescue/virt-rescue.pod:390 ../sparsify/virt-sparsify.pod:312 ../src/guestfs.pod:4578 ../test-tool/libguestfs-test-tool.pod:178
+#: ../appliance/libguestfs-make-fixed-appliance.pod:161 ../builder/virt-builder.pod:1289 ../edit/virt-edit.pod:337 ../fish/guestfish.pod:1361 ../fuse/guestunmount.pod:115 ../rescue/virt-rescue.pod:390 ../sparsify/virt-sparsify.pod:312 ../src/guestfs.pod:4578 ../test-tool/libguestfs-test-tool.pod:178
 msgid "ENVIRONMENT VARIABLES"
 msgstr ""
 
@@ -1199,7 +1199,8 @@ msgstr ""
 #: ../builder/virt-builder.pod:16
 #, no-wrap
 msgid ""
-" virt-builder [-o|--output DISKIMAGE] [--size SIZE] [--format raw|qcow2]\n"
+" virt-builder os-version\n"
+"    [-o|--output DISKIMAGE] [--size SIZE] [--format raw|qcow2]\n"
 "    [--attach ISOFILE]\n"
 "    [--root-password SELECTOR]\n"
 "    [--hostname HOSTNAME]\n"
@@ -1210,7 +1211,6 @@ msgid ""
 "    [--run SCRIPT] [--run-command 'CMD ARGS ...']\n"
 "    [--firstboot SCRIPT] [--firstboot-command 'CMD ARGS ...']\n"
 "    [--firstboot-install PKG,[PKG...]]\n"
-"    os-version\n"
 "\n"
 msgstr ""
 
@@ -1231,7 +1231,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:33 ../builder/virt-builder.pod:1153
+#: ../builder/virt-builder.pod:33 ../builder/virt-builder.pod:1177
 #, no-wrap
 msgid ""
 " virt-builder --print-cache\n"
@@ -1239,7 +1239,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:35 ../builder/virt-builder.pod:1161
+#: ../builder/virt-builder.pod:35 ../builder/virt-builder.pod:1185
 #, no-wrap
 msgid ""
 " virt-builder --cache-all-templates\n"
@@ -1247,7 +1247,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:37 ../builder/virt-builder.pod:1157
+#: ../builder/virt-builder.pod:37 ../builder/virt-builder.pod:1181
 #, no-wrap
 msgid ""
 " virt-builder --delete-cache\n"
@@ -1616,7 +1616,7 @@ msgstr ""
 #: ../builder/virt-builder.pod:192
 msgid ""
 "See also: I<--run>, L</Installing packages at build time from a side "
-"repository>, L<virt-make-fs(1)>."
+"repository>, L<genisoimage(1)>, L<virt-make-fs(1)>."
 msgstr ""
 
 #. type: =item
@@ -2062,7 +2062,7 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:390 ../builder/virt-builder.pod:783 ../examples/guestfs-faq.pod:512 ../examples/guestfs-performance.pod:161 ../examples/guestfs-performance.pod:211 ../examples/guestfs-recipes.pod:411 ../rescue/virt-rescue.pod:328 ../resize/virt-resize.pod:31 ../resize/virt-resize.pod:621 ../sparsify/virt-sparsify.pod:278 ../src/guestfs.pod:487 ../src/guestfs.pod:1773 ../src/guestfs.pod:2045 ../src/guestfs.pod:2343 ../src/guestfs.pod:3837
+#: ../builder/virt-builder.pod:390 ../builder/virt-builder.pod:790 ../examples/guestfs-faq.pod:512 ../examples/guestfs-performance.pod:161 ../examples/guestfs-performance.pod:211 ../examples/guestfs-recipes.pod:411 ../rescue/virt-rescue.pod:328 ../resize/virt-resize.pod:31 ../resize/virt-resize.pod:621 ../sparsify/virt-sparsify.pod:278 ../src/guestfs.pod:487 ../src/guestfs.pod:1773 ../src/guestfs.pod:2045 ../src/guestfs.pod:2343 ../src/guestfs.pod:3837
 msgid "1."
 msgstr ""
 
@@ -2074,7 +2074,7 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:395 ../builder/virt-builder.pod:788 ../examples/guestfs-faq.pod:522 ../examples/guestfs-performance.pod:167 ../examples/guestfs-performance.pod:218 ../examples/guestfs-recipes.pod:417 ../rescue/virt-rescue.pod:336 ../resize/virt-resize.pod:44 ../resize/virt-resize.pod:628 ../sparsify/virt-sparsify.pod:285 ../src/guestfs.pod:493 ../src/guestfs.pod:1777 ../src/guestfs.pod:2049 ../src/guestfs.pod:2347 ../src/guestfs.pod:3862
+#: ../builder/virt-builder.pod:395 ../builder/virt-builder.pod:795 ../examples/guestfs-faq.pod:522 ../examples/guestfs-performance.pod:167 ../examples/guestfs-performance.pod:218 ../examples/guestfs-recipes.pod:417 ../rescue/virt-rescue.pod:336 ../resize/virt-resize.pod:44 ../resize/virt-resize.pod:628 ../sparsify/virt-sparsify.pod:285 ../src/guestfs.pod:493 ../src/guestfs.pod:1777 ../src/guestfs.pod:2049 ../src/guestfs.pod:2347 ../src/guestfs.pod:3862
 msgid "2."
 msgstr ""
 
@@ -2311,30 +2311,37 @@ msgid ""
 "device, partition, etc then the size of that device is used."
 msgstr ""
 
-#. type: =item
+#. type: textblock
 #: ../builder/virt-builder.pod:518
+msgid ""
+"To specify size in bytes, the number must be followed by the lowercase "
+"letter I<b>, eg: S<C<--size 10737418240b>>."
+msgstr ""
+
+#. type: =item
+#: ../builder/virt-builder.pod:521
 msgid "B<--source> URL"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:520
+#: ../builder/virt-builder.pod:523
 msgid ""
 "Set the source URL to look for templates.  If not specified it defaults to "
 "L<http://libguestfs.org/download/builder/index.asc>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:523
+#: ../builder/virt-builder.pod:526
 msgid "See also L</CREATING YOUR OWN TEMPLATES> below."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:525
+#: ../builder/virt-builder.pod:528
 msgid "You can also set the C<VIRT_BUILDER_SOURCE> environment variable."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:527
+#: ../builder/virt-builder.pod:530
 msgid ""
 "Note that you should not point I<--source> to sources that you don't trust "
 "(unless the source is signed by someone you do trust).  See also the "
@@ -2342,12 +2349,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:531
+#: ../builder/virt-builder.pod:534
 msgid "B<--upload> FILE:DEST"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:533
+#: ../builder/virt-builder.pod:536
 msgid ""
 "Upload local file C<FILE> to destination C<DEST> in the disk image.  File "
 "owner and permissions from the original are preserved, so you should set "
@@ -2355,14 +2362,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:537
+#: ../builder/virt-builder.pod:540
 msgid ""
 "C<DEST> could be the final filename.  This can be used to rename the file on "
 "upload."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:540
+#: ../builder/virt-builder.pod:543
 msgid ""
 "If C<DEST> is a directory name (which must already exist in the guest)  then "
 "the file is uploaded into that directory, and it keeps the same name as on "
@@ -2370,46 +2377,46 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:544
+#: ../builder/virt-builder.pod:547
 msgid "See also: I<--mkdir>, I<--delete>, I<--scrub>."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:550
+#: ../builder/virt-builder.pod:553
 msgid "Enable debug messages and/or produce verbose output."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:552
+#: ../builder/virt-builder.pod:555
 msgid ""
 "When reporting bugs, use this option and attach the complete output to your "
 "bug report."
 msgstr ""
 
 #. type: =head1
-#: ../builder/virt-builder.pod:563
+#: ../builder/virt-builder.pod:566
 msgid "REFERENCE"
 msgstr ""
 
 #. type: =head2
-#: ../builder/virt-builder.pod:565
+#: ../builder/virt-builder.pod:568
 msgid "INSTALLING PACKAGES"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:567
+#: ../builder/virt-builder.pod:570
 msgid ""
 "There are several approaches to installing packages or applications in the "
 "guest which have different trade-offs."
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:570
+#: ../builder/virt-builder.pod:573
 msgid "Installing packages at build time"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:572
+#: ../builder/virt-builder.pod:575
 msgid ""
 "If the guest OS you are installing is similar to the host OS (eg.  both are "
 "Linux), and if libguestfs supports network connections, then you can use "
@@ -2417,7 +2424,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:576
+#: ../builder/virt-builder.pod:579
 #, no-wrap
 msgid ""
 " virt-builder fedora-20 --install inkscape\n"
@@ -2425,22 +2432,22 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:578
+#: ../builder/virt-builder.pod:581
 msgid "This uses the guest's package manager and the host's network connection."
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:581
+#: ../builder/virt-builder.pod:584
 msgid "Installing packages at first boot"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:583
+#: ../builder/virt-builder.pod:586
 msgid "Another option is to install the packages when the guest first boots:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:585
+#: ../builder/virt-builder.pod:588
 #, no-wrap
 msgid ""
 " virt-builder fedora-20 --firstboot-install inkscape\n"
@@ -2448,12 +2455,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:587
+#: ../builder/virt-builder.pod:590
 msgid "This uses the guest's package manager and the guest's network connection."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:590
+#: ../builder/virt-builder.pod:593
 msgid ""
 "The downsides are that it will take the guest a lot longer to boot first "
 "time, and there's nothing much you can do if package installation fails "
@@ -2462,12 +2469,12 @@ msgid ""
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:595
+#: ../builder/virt-builder.pod:598
 msgid "Installing packages at build time from a side repository"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:597
+#: ../builder/virt-builder.pod:600
 msgid ""
 "If the software you want to install is not available in the main package "
 "repository of the guest, then you can add a side repository.  Usually this "
@@ -2475,31 +2482,38 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:602
+#: ../builder/virt-builder.pod:605
 msgid ""
-"Create a script that mounts the ISO and sets up the repository.  For yum, "
-"create /tmp/install.sh containing:"
+"You can create the disk image using either L<genisoimage(1)> or "
+"L<virt-make-fs(1)>.  For genisoimage, use a command like this:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:605 ../builder/virt-builder.pod:621
+#: ../builder/virt-builder.pod:608
 #, no-wrap
 msgid ""
-" mkdir /tmp/mount\n"
-" \n"
+" genisoimage -o extra-packages.iso -R -J -V EXTRA cdcontents/\n"
+"\n"
+msgstr ""
+
+#. type: textblock
+#: ../builder/virt-builder.pod:610
+msgid ""
+"Create a script that mounts the ISO and sets up the repository.  For yum, "
+"create /tmp/install.sh containing:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:607 ../builder/virt-builder.pod:623
+#: ../builder/virt-builder.pod:613 ../builder/virt-builder.pod:627
 #, no-wrap
 msgid ""
-" # Assume the volume label of the CD is 'EXTRA':\n"
+" mkdir /tmp/mount\n"
 " mount LABEL=EXTRA /tmp/mount\n"
 " \n"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:610
+#: ../builder/virt-builder.pod:616
 #, no-wrap
 msgid ""
 " cat <<'EOF' > /etc/yum.repos.d/extra.repo\n"
@@ -2512,7 +2526,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:617
+#: ../builder/virt-builder.pod:623
 #, no-wrap
 msgid ""
 " yum -y install famousdatabase\n"
@@ -2520,12 +2534,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:619
+#: ../builder/virt-builder.pod:625
 msgid "For apt, create /tmp/install.sh containing:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:626
+#: ../builder/virt-builder.pod:630
 #, no-wrap
 msgid ""
 " apt-cdrom -d=/tmp/mount add\n"
@@ -2534,25 +2548,29 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:629
-msgid "Use the I<--attach> option to attach the CD:"
+#: ../builder/virt-builder.pod:633
+msgid ""
+"Use the I<--attach> option to attach the CD / disk image and the I<--run> "
+"option to run the script:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:631
+#: ../builder/virt-builder.pod:636
 #, no-wrap
 msgid ""
-" virt-builder fedora 20 --attach extra.iso --run /tmp/install.sh\n"
+" virt-builder fedora-20 \\\n"
+"   --attach extra-packages.iso \\\n"
+"   --run /tmp/install.sh\n"
 "\n"
 msgstr ""
 
 #. type: =head2
-#: ../builder/virt-builder.pod:633
+#: ../builder/virt-builder.pod:640
 msgid "USERS AND PASSWORDS"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:635
+#: ../builder/virt-builder.pod:642
 msgid ""
 "The I<--root-password> option is used to change the root password (otherwise "
 "a random password is used).  This option takes a password C<SELECTOR> in one "
@@ -2560,12 +2578,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:641
+#: ../builder/virt-builder.pod:648
 msgid "B<--root-password> file:FILENAME"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:643
+#: ../builder/virt-builder.pod:650
 msgid ""
 "Read the root password from C<FILENAME>.  The whole first line of this file "
 "is the replacement password.  Any other lines are ignored.  You should "
@@ -2573,36 +2591,36 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:648
+#: ../builder/virt-builder.pod:655
 msgid "B<--root-password> password:PASSWORD"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:650
+#: ../builder/virt-builder.pod:657
 msgid "Set the root password to the literal string C<PASSWORD>."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:652 ../sysprep/sysprep-extra-options.pod:39
+#: ../builder/virt-builder.pod:659 ../sysprep/sysprep-extra-options.pod:39
 msgid ""
 "B<Note: this is not secure> since any user on the same machine can see the "
 "cleartext password using L<ps(1)>."
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:657
+#: ../builder/virt-builder.pod:664
 msgid "Creating user accounts"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:659
+#: ../builder/virt-builder.pod:666
 msgid ""
 "To create user accounts, use the L<useradd(8)> command with "
 "L<--firstboot-command> like this:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:662
+#: ../builder/virt-builder.pod:669
 #, no-wrap
 msgid ""
 " virt-builder --firstboot-command \\\n"
@@ -2611,7 +2629,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:665
+#: ../builder/virt-builder.pod:672
 msgid ""
 "The above command will create an C<rjones> account with no password, and "
 "force the user to set a password when they first log in.  There are other "
@@ -2619,12 +2637,12 @@ msgid ""
 msgstr ""
 
 #. type: =head2
-#: ../builder/virt-builder.pod:669
+#: ../builder/virt-builder.pod:676
 msgid "LOG FILE"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:671
+#: ../builder/virt-builder.pod:678
 msgid ""
 "Scripts and package installation that runs at build time (I<--run>, "
 "I<--run-command>, I<--install>, but I<not> firstboot) is logged in one of "
@@ -2632,128 +2650,128 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:677
+#: ../builder/virt-builder.pod:684
 msgid "C</tmp/builder.log>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:679
+#: ../builder/virt-builder.pod:686
 msgid "On Linux, BSD and other guests."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:681
+#: ../builder/virt-builder.pod:688
 msgid "C<C:\\Temp\\builder.log>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:683
+#: ../builder/virt-builder.pod:690
 msgid "On Windows, DOS guests."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:685
+#: ../builder/virt-builder.pod:692
 msgid "C</builder.log>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:687
+#: ../builder/virt-builder.pod:694
 msgid "If C</tmp> or C<C:\\Temp> is missing."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:691
+#: ../builder/virt-builder.pod:698
 msgid ""
 "If you don't want the log file to appear in the final image, then use the "
 "I<--no-logfile> command line option."
 msgstr ""
 
 #. type: =head2
-#: ../builder/virt-builder.pod:694
+#: ../builder/virt-builder.pod:701
 msgid "INSTALLATION PROCESS"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:696
+#: ../builder/virt-builder.pod:703
 msgid "When you invoke virt-builder, installation proceeds as follows:"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:702
+#: ../builder/virt-builder.pod:709
 msgid "The template image is downloaded."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:704
+#: ../builder/virt-builder.pod:711
 msgid ""
 "If the template image is present in the cache, the cached version is used "
 "instead.  (See L</CACHING>)."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:709
+#: ../builder/virt-builder.pod:716
 msgid "The template signature is checked."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:713
+#: ../builder/virt-builder.pod:720
 msgid "The template is uncompressed to a tmp file."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:717
+#: ../builder/virt-builder.pod:724
 msgid "The template image is resized into the destination, using L<virt-resize(1)>."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:722
+#: ../builder/virt-builder.pod:729
 msgid "Extra disks are attached (I<--attach>)."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:726
+#: ../builder/virt-builder.pod:733
 msgid "A new random seed is generated for the guest."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:730
+#: ../builder/virt-builder.pod:737
 msgid "The hostname is set (I<--hostname>)."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:734
+#: ../builder/virt-builder.pod:741
 msgid "The root password is changed (I<--root-password>)."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:738
+#: ../builder/virt-builder.pod:745
 msgid "Packages are installed (I<--install>)."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:742
+#: ../builder/virt-builder.pod:749
 msgid "Files are uploaded (I<--upload>)."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:746
+#: ../builder/virt-builder.pod:753
 msgid "Files are edited (I<--edit>)."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:750
+#: ../builder/virt-builder.pod:757
 msgid "Files are deleted (I<--delete>, I<--scrub>)."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:754
+#: ../builder/virt-builder.pod:761
 msgid ""
 "Firstboot scripts are installed (I<--firstboot>, I<--firstboot-command>, "
 "I<--firstboot-install>)."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:757
+#: ../builder/virt-builder.pod:764
 msgid ""
 "Note that although firstboot scripts are installed at this step, they do not "
 "run until the guest is booted first time.  Firstboot scripts will run in the "
@@ -2761,34 +2779,34 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:763
+#: ../builder/virt-builder.pod:770
 msgid "Scripts are run (I<--run>, I<--run-command>)."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:765
+#: ../builder/virt-builder.pod:772
 msgid "Scripts run in the order they appear on the command line."
 msgstr ""
 
 #. type: =head2
-#: ../builder/virt-builder.pod:769
+#: ../builder/virt-builder.pod:776
 msgid "IMPORTING THE DISK IMAGE"
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:771
+#: ../builder/virt-builder.pod:778
 msgid "Importing into libvirt"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:773
+#: ../builder/virt-builder.pod:780
 msgid ""
 "Import the disk image into libvirt using L<virt-install(1)> I<--import> "
 "option."
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:776
+#: ../builder/virt-builder.pod:783
 #, no-wrap
 msgid ""
 " virt-install --import \\\n"
@@ -2797,19 +2815,19 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:779 ../examples/guestfs-recipes.pod:264 ../fish/guestfish-actions.pod:2058 ../fish/guestfish-actions.pod:2600 ../fish/guestfish-actions.pod:3196 ../src/guestfs-actions.pod:3252 ../src/guestfs-actions.pod:4114 ../src/guestfs-actions.pod:4999 ../src/guestfs.pod:778 ../src/guestfs.pod:2623 ../tools/virt-win-reg:721
+#: ../builder/virt-builder.pod:786 ../examples/guestfs-recipes.pod:264 ../fish/guestfish-actions.pod:2058 ../fish/guestfish-actions.pod:2600 ../fish/guestfish-actions.pod:3196 ../src/guestfs-actions.pod:3252 ../src/guestfs-actions.pod:4114 ../src/guestfs-actions.pod:4999 ../src/guestfs.pod:778 ../src/guestfs.pod:2623 ../tools/virt-win-reg:721
 msgid "Notes:"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:785
+#: ../builder/virt-builder.pod:792
 msgid ""
 "You I<must> specify the correct format.  The format is C<raw> unless you "
 "used virt-builder's I<--format> option."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:790
+#: ../builder/virt-builder.pod:797
 msgid ""
 "You can run virt-install as root or non-root.  Each works slightly "
 "differently because libvirt manages a different set of virtual machines for "
@@ -2818,52 +2836,95 @@ msgid ""
 "differently as well."
 msgstr ""
 
-#. type: =end
-#: ../builder/virt-builder.pod:798 ../builder/virt-builder.pod:804 ../examples/guestfs-recipes.pod:3 ../examples/guestfs-recipes.pod:8 ../guestfs-release-notes.pod:7 ../guestfs-release-notes.pod:14 ../guestfs-release-notes.pod:200 ../guestfs-release-notes.pod:204 ../guestfs-release-notes.pod:549 ../guestfs-release-notes.pod:553 ../guestfs-release-notes.pod:1105 ../guestfs-release-notes.pod:1109
-msgid "comment"
-msgstr ""
-
 #. type: =head3
-#: ../builder/virt-builder.pod:800
+#: ../builder/virt-builder.pod:805
 msgid "Importing into OpenStack"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:802
-msgid "XXX"
+#: ../builder/virt-builder.pod:807
+msgid "Import the image into Glance (the OpenStack image store) by doing:"
+msgstr ""
+
+#. type: verbatim
+#: ../builder/virt-builder.pod:809
+#, no-wrap
+msgid ""
+" glance image-create --name fedora-20-image --file fedora-20.img \\\n"
+"   --disk-format raw --container-format bare \\\n"
+"   --is-public True\n"
+"\n"
+msgstr ""
+
+#. type: textblock
+#: ../builder/virt-builder.pod:813
+msgid ""
+"The I<--file> parameter is the virt-builder-generated disk image.  It should "
+"match virt-builder's I<--output> option.  The I<--disk-format> parameter "
+"should match virt-builder's I<--format> option (or C<raw> if you didn't use "
+"that option).  The I<--container-format> should always be C<bare> since "
+"virt-builder doesn't put images into containers."
+msgstr ""
+
+#. type: textblock
+#: ../builder/virt-builder.pod:819
+msgid ""
+"You can use the S<C<glance image-show I<fedora-20-image>>> command to "
+"display the properties of the image."
+msgstr ""
+
+#. type: textblock
+#: ../builder/virt-builder.pod:822
+msgid "To boot up an instance of your image on a Nova compute node, do:"
+msgstr ""
+
+#. type: verbatim
+#: ../builder/virt-builder.pod:824
+#, no-wrap
+msgid ""
+" nova boot fedora-20-server --image fedora-20-image \\\n"
+"   --flavor m1.medium\n"
+"\n"
+msgstr ""
+
+#. type: textblock
+#: ../builder/virt-builder.pod:827
+msgid ""
+"Use S<C<nova flavor-list>> to list possible machine flavors.  Use S<C<nova "
+"list>> to list running instances."
 msgstr ""
 
 #. type: =head2
-#: ../builder/virt-builder.pod:806
+#: ../builder/virt-builder.pod:830
 msgid "DEBUGGING BUILDS"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:808
+#: ../builder/virt-builder.pod:832
 msgid ""
 "If virt-builder fails with an error, then enable debugging (I<-v>) and "
 "report a bug (see L</BUGS> below)."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:811
+#: ../builder/virt-builder.pod:835
 msgid ""
 "If virt-builder is successful but the image doesn't work, here are some "
 "things to try:"
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:816
+#: ../builder/virt-builder.pod:840
 msgid "Use virt-rescue"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:818
+#: ../builder/virt-builder.pod:842
 msgid "Run L<virt-rescue(1)> on the disk image:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:820
+#: ../builder/virt-builder.pod:844
 #, no-wrap
 msgid ""
 " virt-rescue -a disk.img\n"
@@ -2871,7 +2932,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:822
+#: ../builder/virt-builder.pod:846
 msgid ""
 "This gives you a rescue shell.  You can mount the filesystems from the disk "
 "image on C</sysroot> and examine them using ordinary Linux commands.  You "
@@ -2880,17 +2941,17 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:828
+#: ../builder/virt-builder.pod:852
 msgid "Use guestfish"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:830
+#: ../builder/virt-builder.pod:854
 msgid "Run L<guestfish(1)> on the disk image:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:832
+#: ../builder/virt-builder.pod:856
 #, no-wrap
 msgid ""
 " guestfish -a disk.img -i\n"
@@ -2898,24 +2959,24 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:834
+#: ../builder/virt-builder.pod:858
 msgid ""
 "Use guestfish commands like C<ll /directory> and C<cat /file> to examine "
 "directories and files."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:837
+#: ../builder/virt-builder.pod:861
 msgid "Use guestmount"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:839
+#: ../builder/virt-builder.pod:863
 msgid "Mount the disk image safely on the host using FUSE and L<guestmount(1)>:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:841
+#: ../builder/virt-builder.pod:865
 #, no-wrap
 msgid ""
 " mkdir /tmp/mp\n"
@@ -2925,12 +2986,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:845
+#: ../builder/virt-builder.pod:869
 msgid "To unmount the disk image do:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:847
+#: ../builder/virt-builder.pod:871
 #, no-wrap
 msgid ""
 " fusermount -u /tmp/mp\n"
@@ -2938,12 +2999,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:849
+#: ../builder/virt-builder.pod:873
 msgid "Add a serial console"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:851
+#: ../builder/virt-builder.pod:875
 msgid ""
 "If the guest hangs during boot, it can be helpful to add a serial console to "
 "the guest, and direct kernel messages to the serial console.  Adding the "
@@ -2953,7 +3014,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:857
+#: ../builder/virt-builder.pod:881
 #, no-wrap
 msgid ""
 " console=tty0 console=ttyS0,115200\n"
@@ -2961,24 +3022,24 @@ msgid ""
 msgstr ""
 
 #. type: =head2
-#: ../builder/virt-builder.pod:861
+#: ../builder/virt-builder.pod:885
 msgid "CREATING YOUR OWN TEMPLATES"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:863
+#: ../builder/virt-builder.pod:887
 msgid ""
 "For serious virt-builder use, you may want to create your own repository of "
 "templates."
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:866
+#: ../builder/virt-builder.pod:890
 msgid "Libguestfs.org repository"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:868
+#: ../builder/virt-builder.pod:892
 msgid ""
 "Out of the box, virt-builder downloads the file "
 "L<http://libguestfs.org/download/builder/index.asc> which is an index of "
@@ -2988,7 +3049,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:874
+#: ../builder/virt-builder.pod:898
 msgid ""
 "The templates hosted on libguestfs.org were created using shell scripts, "
 "kickstart files and preseed files which can be found in the libguestfs "
@@ -2996,19 +3057,19 @@ msgid ""
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:878
+#: ../builder/virt-builder.pod:902
 msgid "Setting up the repository"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:880
+#: ../builder/virt-builder.pod:904
 msgid ""
 "You can set up your own site containing an index file and some templates, "
 "and then point virt-builder at the site by using the I<--source> option:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:884
+#: ../builder/virt-builder.pod:908
 #, no-wrap
 msgid ""
 " virt-builder --source https://example.com/builder/index.asc \\\n"
@@ -3018,26 +3079,26 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:888
+#: ../builder/virt-builder.pod:912
 msgid ""
 "(Note setting the environment variables C<VIRT_BUILDER_SOURCE> and "
 "C<VIRT_BUILDER_FINGERPRINT> may be easier to type!)"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:891
+#: ../builder/virt-builder.pod:915
 msgid ""
 "You can host this on any web or FTP server, or a local or network "
 "filesystem."
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:894
+#: ../builder/virt-builder.pod:918
 msgid "Setting up a GPG key"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:896
+#: ../builder/virt-builder.pod:920
 msgid ""
 "If you don't have a GnuPG key, you will need to set one up.  (Strictly "
 "speaking this is optional, but if your index and template files are not "
@@ -3046,21 +3107,21 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:901
+#: ../builder/virt-builder.pod:925
 msgid ""
 "To create a key, see the GPG manual "
 "L<http://www.gnupg.org/gph/en/manual.html>."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:904
+#: ../builder/virt-builder.pod:928
 msgid ""
 "Export your GPG public key and add it to the keyring of all virt-builder "
 "users:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:907
+#: ../builder/virt-builder.pod:931
 #, no-wrap
 msgid ""
 " gpg --export -a \"you at example.com\" > pubkey\n"
@@ -3068,7 +3129,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:909
+#: ../builder/virt-builder.pod:933
 #, no-wrap
 msgid ""
 " # For each virt-builder user:\n"
@@ -3077,12 +3138,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:912
+#: ../builder/virt-builder.pod:936
 msgid "Also find the fingerprint of your key:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:914
+#: ../builder/virt-builder.pod:938
 #, no-wrap
 msgid ""
 " gpg --list-keys --fingerprint\n"
@@ -3090,12 +3151,12 @@ msgid ""
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:916
+#: ../builder/virt-builder.pod:940
 msgid "Create the templates"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:918
+#: ../builder/virt-builder.pod:942
 msgid ""
 "There are many ways to create the templates.  For example you could clone "
 "existing guests (see L<virt-sysprep(1)>), or you could install a guest by "
@@ -3104,14 +3165,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:923
+#: ../builder/virt-builder.pod:947
 msgid ""
 "For best results when compressing the templates, use the following xz "
 "options (see L<nbdkit-xz-plugin(1)> for further explanation):"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:926
+#: ../builder/virt-builder.pod:950
 #, no-wrap
 msgid ""
 " xz --best --block-size=16777216 disk\n"
@@ -3119,19 +3180,19 @@ msgid ""
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:928
+#: ../builder/virt-builder.pod:952
 msgid "Creating and signing the index file"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:930
+#: ../builder/virt-builder.pod:954
 msgid ""
 "The index file has a simple text format (shown here without the digital "
 "signature):"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:933
+#: ../builder/virt-builder.pod:957
 #, no-wrap
 msgid ""
 " [fedora-18]\n"
@@ -3147,7 +3208,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:943
+#: ../builder/virt-builder.pod:967
 #, no-wrap
 msgid ""
 " [fedora-19]\n"
@@ -3164,21 +3225,21 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:954
+#: ../builder/virt-builder.pod:978
 msgid ""
 "The part in square brackets is the C<os-version>, which is the same string "
 "that is used on the virt-builder command line to build that OS."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:957
+#: ../builder/virt-builder.pod:981
 msgid ""
 "After preparing the C<index> file in the correct format, clearsign it using "
 "the following command:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:960
+#: ../builder/virt-builder.pod:984
 #, no-wrap
 msgid ""
 " gpg --clearsign --armor index\n"
@@ -3186,7 +3247,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:962
+#: ../builder/virt-builder.pod:986
 msgid ""
 "This will create the final file called C<index.asc> which can be uploaded to "
 "the server (and is the I<--source> URL).  As noted above, signing the index "
@@ -3194,46 +3255,46 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:966
+#: ../builder/virt-builder.pod:990
 msgid "The following fields can appear:"
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:970
+#: ../builder/virt-builder.pod:994
 msgid "C<name=NAME>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:972
+#: ../builder/virt-builder.pod:996
 msgid ""
 "The user-friendly name of this template.  This is displayed in the I<--list> "
 "output but is otherwise not significant."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:975
+#: ../builder/virt-builder.pod:999
 msgid "C<osinfo=ID>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:977
+#: ../builder/virt-builder.pod:1001
 msgid ""
 "This optional field maps the operating system to the associated libosinfo "
 "ID.  Virt-builder does not use it (yet)."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:980
+#: ../builder/virt-builder.pod:1004
 msgid "C<file=PATH>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:982
+#: ../builder/virt-builder.pod:1006
 msgid "The path (relative to the index) of the xz-compressed template."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:984 ../builder/virt-builder.pod:995
+#: ../builder/virt-builder.pod:1008 ../builder/virt-builder.pod:1019
 msgid ""
 "Note that absolute paths or URIs are B<not> permitted here.  This is because "
 "virt-builder has a \"same origin\" policy for templates so they cannot come "
@@ -3241,29 +3302,29 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:988
+#: ../builder/virt-builder.pod:1012
 msgid "C<sig=PATH>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:990
+#: ../builder/virt-builder.pod:1014
 msgid "B<This option is deprecated>.  Use the checksum field instead."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:992
+#: ../builder/virt-builder.pod:1016
 msgid ""
 "The path (relative to the index) of the GPG detached signature of the xz "
 "file."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:999
+#: ../builder/virt-builder.pod:1023
 msgid "The file can be created as follows:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1001
+#: ../builder/virt-builder.pod:1025
 #, no-wrap
 msgid ""
 " gpg --detach-sign --armor -o disk.xz.sig disk.xz\n"
@@ -3271,19 +3332,19 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1003
+#: ../builder/virt-builder.pod:1027
 msgid "C<checksum[sha512]=7b882fe9b82eb0fef...>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1005
+#: ../builder/virt-builder.pod:1029
 msgid ""
 "The SHA-512 checksum of the B<compressed> file is checked after it is "
 "downloaded.  To work out the signature, do:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1008
+#: ../builder/virt-builder.pod:1032
 #, no-wrap
 msgid ""
 " sha512sum disk.xz\n"
@@ -3291,24 +3352,24 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1010
+#: ../builder/virt-builder.pod:1034
 msgid ""
 "Note if you use this, you don't need to sign the file, ie. don't use "
 "C<sig>.  This option overrides C<sig>."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1013
+#: ../builder/virt-builder.pod:1037
 msgid "C<checksum=7b882fe9b82eb0fef...>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1015
+#: ../builder/virt-builder.pod:1039
 msgid "C<checksum> is an alias for C<checksum[sha512]>."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1017
+#: ../builder/virt-builder.pod:1041
 msgid ""
 "If you need to interoperate with virt-builder = 1.24.0 then you have to use "
 "C<checksum> because that version would give a parse error with square "
@@ -3317,12 +3378,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1022
+#: ../builder/virt-builder.pod:1046
 msgid "C<revision=N>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1024
+#: ../builder/virt-builder.pod:1048
 msgid ""
 "The revision is an integer which is used to control the template cache.  "
 "Increasing the revision number causes clients to download the template again "
@@ -3330,22 +3391,22 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1028
+#: ../builder/virt-builder.pod:1052
 msgid "The revision number is optional.  If omitted it defaults to C<1>."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1030
+#: ../builder/virt-builder.pod:1054
 msgid "C<format=raw>"
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1032
+#: ../builder/virt-builder.pod:1056
 msgid "C<format=qcow2>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1034
+#: ../builder/virt-builder.pod:1058
 msgid ""
 "Specify the format of the disk image (before it was compressed).  If not "
 "given, the format is autodetected, but generally it is better to be explicit "
@@ -3353,7 +3414,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1038
+#: ../builder/virt-builder.pod:1062
 msgid ""
 "Note this is the source format, which is different from the I<--format> "
 "option (requested output format).  Virt-builder does on-the-fly conversion "
@@ -3361,12 +3422,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1043
+#: ../builder/virt-builder.pod:1067
 msgid "C<size=NNN>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1045
+#: ../builder/virt-builder.pod:1069
 msgid ""
 "The virtual size of the image in bytes.  This is the size of the image when "
 "uncompressed.  If using a non-raw format such as qcow2 then it means the "
@@ -3374,12 +3435,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1049
+#: ../builder/virt-builder.pod:1073
 msgid "This field is required."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1051
+#: ../builder/virt-builder.pod:1075
 msgid ""
 "Virt-builder also uses this as the minimum size that users can request via "
 "the I<--size> option, or as the default size if there is no I<--size> "
@@ -3387,24 +3448,24 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1055
+#: ../builder/virt-builder.pod:1079
 msgid "C<compressed_size=NNN>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1057
+#: ../builder/virt-builder.pod:1081
 msgid ""
 "The compressed size of the disk image in bytes.  This is just used for "
 "information (when using I<--list --long>)."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1060
+#: ../builder/virt-builder.pod:1084
 msgid "C<expand=/dev/sdaX>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1062
+#: ../builder/virt-builder.pod:1086
 msgid ""
 "When expanding the image to its final size, instruct L<virt-resize(1)> to "
 "expand the named partition in the guest image to fill up all available "
@@ -3412,12 +3473,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1066
+#: ../builder/virt-builder.pod:1090
 msgid "You should usually put the device name of the guest's root filesystem here."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1068
+#: ../builder/virt-builder.pod:1092
 msgid ""
 "It's a good idea to use this, but not required.  If the field is omitted "
 "then virt-resize will create an extra partition at the end of the disk to "
@@ -3425,12 +3486,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1072
+#: ../builder/virt-builder.pod:1096
 msgid "C<lvexpand=/dev/VolGroup/LogVol>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1074
+#: ../builder/virt-builder.pod:1098
 msgid ""
 "When expanding the image to its final size, instruct L<virt-resize(1)> to "
 "expand the named logical volume in the guest image to fill up all available "
@@ -3438,7 +3499,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1078
+#: ../builder/virt-builder.pod:1102
 msgid ""
 "If the guest uses LVM2 you should usually put the LV of the guest's root "
 "filesystem here.  If the guest does not use LVM2 or its root filesystem is "
@@ -3446,48 +3507,48 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1082
+#: ../builder/virt-builder.pod:1106
 msgid "C<notes=NOTES>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1084
+#: ../builder/virt-builder.pod:1108
 msgid ""
 "Any notes that go with this image, especially notes describing what packages "
 "are in the image, how the image was prepared, and licensing information."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1088
+#: ../builder/virt-builder.pod:1112
 msgid "This information is shown in the I<--notes> and I<--list> I<--long> modes."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1090
+#: ../builder/virt-builder.pod:1114
 msgid ""
 "You can use multi-line notes here by indenting each new line with at least "
 "one character of whitespace (even on blank lines):"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1093
+#: ../builder/virt-builder.pod:1117
 #, no-wrap
 msgid ""
 " notes=This image was prepared using\n"
 "  the following kickstart script:\n"
 "                                <-- one space at beginning of line\n"
-"  timezone Europe/London\n"
 "  part /boot --fstype ext3\n"
+"  ...\n"
 "\n"
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1099
+#: ../builder/virt-builder.pod:1123
 msgid "C<hidden=true>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1101
+#: ../builder/virt-builder.pod:1125
 msgid ""
 "Using the hidden flag prevents the template from being listed by the "
 "I<--list> option (but it is still installable).  This is used for test "
@@ -3495,41 +3556,41 @@ msgid ""
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:1107
+#: ../builder/virt-builder.pod:1131
 msgid "Running virt-builder against the alternate repository"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1109
+#: ../builder/virt-builder.pod:1133
 msgid ""
 "Ensure each virt-builder user has imported your public key into their gpg "
 "keyring (see above)."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1112
+#: ../builder/virt-builder.pod:1136
 msgid "Each virt-builder user should export these environment variables:"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1118
+#: ../builder/virt-builder.pod:1142
 msgid "C<VIRT_BUILDER_SOURCE> to point to the URL of the C<index.asc> file."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1122
+#: ../builder/virt-builder.pod:1146
 msgid ""
 "C<VIRT_BUILDER_FINGERPRINT> to contain the fingerprint (long hex string) of "
 "the user who signed the index file and the templates."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1127
+#: ../builder/virt-builder.pod:1151
 msgid "Now run virt-builder commands as normal, eg:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1129
+#: ../builder/virt-builder.pod:1153
 #, no-wrap
 msgid ""
 " virt-builder --list --long\n"
@@ -3537,7 +3598,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1131
+#: ../builder/virt-builder.pod:1155
 #, no-wrap
 msgid ""
 " virt-builder os-version\n"
@@ -3545,17 +3606,17 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1133
+#: ../builder/virt-builder.pod:1157
 msgid "To debug problems, add the C<-v> option to these commands."
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:1135
+#: ../builder/virt-builder.pod:1159
 msgid "Licensing of templates"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1137
+#: ../builder/virt-builder.pod:1161
 msgid ""
 "You should be aware of the licensing of images that you distribute.  For "
 "open source guests, provide a link to the source code in the C<notes> field "
@@ -3563,55 +3624,55 @@ msgid ""
 msgstr ""
 
 #. type: =head2
-#: ../builder/virt-builder.pod:1142
+#: ../builder/virt-builder.pod:1166
 msgid "CACHING"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1144
+#: ../builder/virt-builder.pod:1168
 msgid ""
 "Since the templates are usually very large, downloaded templates are cached "
 "in the user's home directory."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1147
+#: ../builder/virt-builder.pod:1171
 msgid ""
 "The location of the cache is C<$XDG_CACHE_HOME/virt-builder/> or "
 "C<$HOME/.cache/virt-builder>."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1150
+#: ../builder/virt-builder.pod:1174
 msgid ""
 "You can print out information about the cache directory, including which "
 "guests are currently cached, by doing:"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1155
+#: ../builder/virt-builder.pod:1179
 msgid "The cache can be deleted if you want to save space by doing:"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1159
+#: ../builder/virt-builder.pod:1183
 msgid "You can download all (current) templates to the local cache by doing:"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1163
+#: ../builder/virt-builder.pod:1187
 msgid "To disable the template cache, use I<--no-cache>."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1165
+#: ../builder/virt-builder.pod:1189
 msgid ""
 "Only templates are cached.  The index and detached digital signatures are "
 "not cached."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1168
+#: ../builder/virt-builder.pod:1192
 msgid ""
 "Virt-builder uses L<curl(1)> to download files and it also uses the current "
 "C<http_proxy> (etc) settings when installing packages (I<--install>).  You "
@@ -3621,24 +3682,24 @@ msgid ""
 msgstr ""
 
 #. type: =head2
-#: ../builder/virt-builder.pod:1174
+#: ../builder/virt-builder.pod:1198
 msgid "DIGITAL SIGNATURES"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1176
+#: ../builder/virt-builder.pod:1200
 msgid ""
 "Virt-builder uses GNU Privacy Guard (GnuPG or gpg) to verify that the index "
 "and templates have not been tampered with."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1179
+#: ../builder/virt-builder.pod:1203
 msgid "The source points to an index file, which is optionally signed."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1181
+#: ../builder/virt-builder.pod:1205
 msgid ""
 "Virt-builder downloads the index and checks that the signature is valid and "
 "the signer's fingerprint matches the specified fingerprint "
@@ -3647,7 +3708,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1186
+#: ../builder/virt-builder.pod:1210
 msgid ""
 "For checking against the built-in public key/fingerprint, this requires "
 "importing the public key into the user's local gpg keyring (that's just the "
@@ -3655,12 +3716,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1190
+#: ../builder/virt-builder.pod:1214
 msgid "When a template is downloaded, its signature is checked in the same way."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1193
+#: ../builder/virt-builder.pod:1217
 msgid ""
 "Although the signatures are optional, if you don't have them then "
 "virt-builder users will have to use I<--no-check-signature> on the command "
@@ -3671,19 +3732,19 @@ msgid ""
 msgstr ""
 
 #. type: =head1
-#: ../builder/virt-builder.pod:1200 ../src/guestfs.pod:3343
+#: ../builder/virt-builder.pod:1224 ../src/guestfs.pod:3343
 msgid "ARCHITECTURE"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1202
+#: ../builder/virt-builder.pod:1226
 msgid ""
 "Virt-builder can build a guest for any architecture no matter what the host "
 "architecture is.  For example an x86-64 guest on an ARM host."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1205
+#: ../builder/virt-builder.pod:1229
 msgid ""
 "However certain options may not work correctly, specifically options that "
 "require running commands in the guest during the build process: "
@@ -3692,26 +3753,26 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1210
+#: ../builder/virt-builder.pod:1234
 msgid ""
 "An x86-64 host building 32 bit i686 guests should work without any special "
 "steps."
 msgstr ""
 
 #. type: =head1
-#: ../builder/virt-builder.pod:1213 ../src/guestfs.pod:1889 ../sysprep/virt-sysprep.pod:447
+#: ../builder/virt-builder.pod:1237 ../src/guestfs.pod:1889 ../sysprep/virt-sysprep.pod:447
 msgid "SECURITY"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1215
+#: ../builder/virt-builder.pod:1239
 msgid ""
 "Virt-builder does not need to run as root (in fact, should not be run as "
 "root), and doesn't use setuid, C<sudo> or any similar mechanism."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1218
+#: ../builder/virt-builder.pod:1242
 msgid ""
 "I<--install>, I<--run> and I<--run-command> are implemented using an "
 "appliance (a small virtual machine) so these commands do not run on the "
@@ -3721,7 +3782,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1224
+#: ../builder/virt-builder.pod:1248
 msgid ""
 "However these options will have access to the host's network and since the "
 "template may contain untrusted code, the code might try to access host "
@@ -3730,14 +3791,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1229
+#: ../builder/virt-builder.pod:1253
 msgid ""
 "Firstboot commands run in the context of the guest when it is booted, and so "
 "the security of your hypervisor / cloud should be considered."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1232
+#: ../builder/virt-builder.pod:1256
 msgid ""
 "Virt-builder injects a random seed into every guest which it builds.  This "
 "helps to ensure that TCP sequence numbers, UUIDs, ssh host keys etc are "
@@ -3745,17 +3806,17 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1236
+#: ../builder/virt-builder.pod:1260
 msgid "You should check digital signatures and not ignore any signing errors."
 msgstr ""
 
 #. type: =head2
-#: ../builder/virt-builder.pod:1238
+#: ../builder/virt-builder.pod:1262
 msgid "USER MODE LINUX"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1240
+#: ../builder/virt-builder.pod:1264
 msgid ""
 "You can use virt-builder with the User-Mode Linux (UML) backend.  This may "
 "be faster when running virt-builder inside a virtual machine (eg. in the "
@@ -3763,72 +3824,99 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1244
+#: ../builder/virt-builder.pod:1268
 msgid ""
 "To enable the UML backend, read the instructions in L<guestfs(3)/USER-MODE "
 "LINUX BACKEND>."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1247
+#: ../builder/virt-builder.pod:1271
 msgid ""
 "Currently you have to use the I<--no-network> option.  This should be fixed "
 "in a future version."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1250
+#: ../builder/virt-builder.pod:1274
 msgid ""
 "The qcow2 output format is not supported by UML.  You can only create "
 "raw-format guests."
 msgstr ""
 
+#. type: =head2
+#: ../builder/virt-builder.pod:1277 ../src/guestfs.pod:479
+msgid "SELINUX"
+msgstr ""
+
 #. type: textblock
-#: ../builder/virt-builder.pod:1255
+#: ../builder/virt-builder.pod:1279
+msgid ""
+"Guests which use SELinux (such as Fedora and Red Hat Enterprise Linux)  "
+"require that each file has a correct SELinux label."
+msgstr ""
+
+#. type: textblock
+#: ../builder/virt-builder.pod:1282
+msgid ""
+"Since virt-builder does not know how to give new files a correct label, it "
+"touches C</.autorelabel> in the guest and relies on the guest to relabel "
+"itself at first boot."
+msgstr ""
+
+#. type: textblock
+#: ../builder/virt-builder.pod:1286
+msgid ""
+"This usually means that these guests will reboot themselves once the first "
+"time you use them.  This is normal, and harmless."
+msgstr ""
+
+#. type: textblock
+#: ../builder/virt-builder.pod:1291
 msgid ""
 "For other environment variables which affect all libguestfs programs, see "
 "L<guestfs(3)/ENVIRONMENT VARIABLES>."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1260
+#: ../builder/virt-builder.pod:1296
 msgid "C<http_proxy>"
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1262
+#: ../builder/virt-builder.pod:1298
 msgid "C<https_proxy>"
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1264
+#: ../builder/virt-builder.pod:1300
 msgid "C<no_proxy>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1266
+#: ../builder/virt-builder.pod:1302
 msgid ""
 "Set the proxy for downloads.  These environment variables (and more)  are "
 "actually interpreted by L<curl(1)>, not virt-builder."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1269
+#: ../builder/virt-builder.pod:1305
 msgid "C<HOME>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1271 ../builder/virt-builder.pod:1291
+#: ../builder/virt-builder.pod:1307 ../builder/virt-builder.pod:1327
 msgid "Used to determine the location of the template cache.  See L</CACHING>."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1273
+#: ../builder/virt-builder.pod:1309
 msgid "C<LIBGUESTFS_MEMSIZE>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1275
+#: ../builder/virt-builder.pod:1311
 msgid ""
 "The size (in megabytes) of the appliance.  The default can be found using "
 "the command S<C<guestfish get-memsize>>.  Increase this if you find that "
@@ -3836,50 +3924,50 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1279
+#: ../builder/virt-builder.pod:1315
 msgid "C<VIRT_BUILDER_FINGERPRINT>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1281
+#: ../builder/virt-builder.pod:1317
 msgid ""
 "Set the default value for the GPG signature fingerprint (see "
 "I<--fingerprint> option)."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1284
+#: ../builder/virt-builder.pod:1320
 msgid "C<VIRT_BUILDER_SOURCE>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1286
+#: ../builder/virt-builder.pod:1322
 msgid ""
 "Set the default value for the source URL for the template repository (see "
 "I<--source> option)."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1289
+#: ../builder/virt-builder.pod:1325
 msgid "C<XDG_CACHE_HOME>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1297 ../cat/virt-cat.pod:246 ../cat/virt-filesystems.pod:392 ../cat/virt-ls.pod:504 ../daemon/guestfsd.pod:75 ../df/virt-df.pod:262 ../edit/virt-edit.pod:359 ../fuse/guestmount.pod:403 ../inspector/virt-inspector.pod:498 ../resize/virt-resize.pod:753 ../sparsify/virt-sparsify.pod:309
+#: ../builder/virt-builder.pod:1333 ../cat/virt-cat.pod:246 ../cat/virt-filesystems.pod:392 ../cat/virt-ls.pod:504 ../daemon/guestfsd.pod:75 ../df/virt-df.pod:262 ../edit/virt-edit.pod:359 ../fuse/guestmount.pod:403 ../inspector/virt-inspector.pod:498 ../resize/virt-resize.pod:753 ../sparsify/virt-sparsify.pod:309
 msgid "This program returns 0 if successful, or non-zero if there was an error."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1302
+#: ../builder/virt-builder.pod:1338
 msgid ""
 "L<guestfs(3)>, L<guestfish(1)>, L<guestmount(1)>, L<virt-copy-out(1)>, "
 "L<virt-install(1)>, L<virt-rescue(1)>, L<virt-resize(1)>, "
 "L<virt-sysprep(1)>, L<oz-install(1)>, L<gpg(1)>, L<curl(1)>, "
-"L<http://libguestfs.org/>."
+"L<virt-make-fs(1)>, L<genisoimage(1)>, L<http://libguestfs.org/>."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1321 ../fuse/guestunmount.pod:164 ../golang/examples/guestfs-golang.pod:99
+#: ../builder/virt-builder.pod:1359 ../fuse/guestunmount.pod:164 ../golang/examples/guestfs-golang.pod:99
 msgid "Copyright (C) 2013 Red Hat Inc."
 msgstr ""
 
@@ -10320,6 +10408,11 @@ msgstr ""
 msgid "Copyright (C) 2012 Red Hat Inc."
 msgstr ""
 
+#. type: =end
+#: ../examples/guestfs-recipes.pod:3 ../examples/guestfs-recipes.pod:8 ../guestfs-release-notes.pod:7 ../guestfs-release-notes.pod:14 ../guestfs-release-notes.pod:200 ../guestfs-release-notes.pod:204 ../guestfs-release-notes.pod:549 ../guestfs-release-notes.pod:553 ../guestfs-release-notes.pod:1105 ../guestfs-release-notes.pod:1109
+msgid "comment"
+msgstr ""
+
 #. type: textblock
 #: ../examples/guestfs-recipes.pod:5
 msgid ""
@@ -61582,11 +61675,6 @@ msgid ""
 "L<sd_journal_open(3)>."
 msgstr ""
 
-#. type: =head2
-#: ../src/guestfs.pod:479
-msgid "SELINUX"
-msgstr ""
-
 #. type: textblock
 #: ../src/guestfs.pod:481
 msgid ""
diff --git a/po-docs/uk.po b/po-docs/uk.po
index 52ad613..6aae954 100644
--- a/po-docs/uk.po
+++ b/po-docs/uk.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libguestfs\n"
 "Report-Msgid-Bugs-To: libguestfs at redhat.com\n"
-"POT-Creation-Date: 2014-01-02 20:24+0000\n"
+"POT-Creation-Date: 2014-01-20 12:50+0000\n"
 "PO-Revision-Date: 2013-10-17 14:46+0000\n"
 "Last-Translator: rjones <rjones at redhat.com>\n"
 "Language-Team: Ukrainian (http://www.transifex.com/projects/p/fedora/"
@@ -740,7 +740,7 @@ msgstr ""
 "(якщо не вказано параметрів I<-a> і I<-d>)."
 
 #. type: =item
-#: ../align/virt-alignment-scan.pod:195 ../builder/virt-builder.pod:546
+#: ../align/virt-alignment-scan.pod:195 ../builder/virt-builder.pod:549
 #: ../cat/virt-cat.pod:140 ../cat/virt-filesystems.pod:267
 #: ../cat/virt-ls.pod:437 ../daemon/guestfsd.pod:62 ../df/virt-df.pod:185
 #: ../edit/virt-edit.pod:169 ../fish/guestfish.pod:421
@@ -752,7 +752,7 @@ msgid "B<-v>"
 msgstr "B<-v>"
 
 #. type: =item
-#: ../align/virt-alignment-scan.pod:197 ../builder/virt-builder.pod:548
+#: ../align/virt-alignment-scan.pod:197 ../builder/virt-builder.pod:551
 #: ../cat/virt-cat.pod:142 ../cat/virt-filesystems.pod:269
 #: ../cat/virt-ls.pod:439 ../daemon/guestfsd.pod:64 ../df/virt-df.pod:187
 #: ../edit/virt-edit.pod:171 ../fish/guestfish.pod:423
@@ -776,7 +776,7 @@ msgstr "Увімкнути докладний показ повідомлень
 #. type: =item
 #: ../align/virt-alignment-scan.pod:201
 #: ../appliance/libguestfs-make-fixed-appliance.pod:107
-#: ../builder/virt-builder.pod:555 ../cat/virt-cat.pod:146
+#: ../builder/virt-builder.pod:558 ../cat/virt-cat.pod:146
 #: ../cat/virt-filesystems.pod:273 ../cat/virt-ls.pod:443
 #: ../df/virt-df.pod:191 ../edit/virt-edit.pod:175 ../fish/guestfish.pod:428
 #: ../format/virt-format.pod:161 ../fuse/guestmount.pod:360
@@ -790,7 +790,7 @@ msgstr "B<-V>"
 #. type: =item
 #: ../align/virt-alignment-scan.pod:203
 #: ../appliance/libguestfs-make-fixed-appliance.pod:109
-#: ../builder/virt-builder.pod:557 ../cat/virt-cat.pod:148
+#: ../builder/virt-builder.pod:560 ../cat/virt-cat.pod:148
 #: ../cat/virt-filesystems.pod:275 ../cat/virt-ls.pod:445
 #: ../df/virt-df.pod:193 ../edit/virt-edit.pod:177 ../fish/guestfish.pod:430
 #: ../format/virt-format.pod:163 ../fuse/guestmount.pod:362
@@ -804,7 +804,7 @@ msgid "B<--version>"
 msgstr "B<--version>"
 
 #. type: textblock
-#: ../align/virt-alignment-scan.pod:205 ../builder/virt-builder.pod:559
+#: ../align/virt-alignment-scan.pod:205 ../builder/virt-builder.pod:562
 #: ../cat/virt-cat.pod:150 ../cat/virt-filesystems.pod:277
 #: ../cat/virt-ls.pod:447 ../df/virt-df.pod:195 ../edit/virt-edit.pod:179
 #: ../format/virt-format.pod:165 ../inspector/virt-inspector.pod:128
@@ -1175,7 +1175,7 @@ msgstr ""
 #. type: =head1
 #: ../align/virt-alignment-scan.pod:359
 #: ../appliance/libguestfs-make-fixed-appliance.pod:156
-#: ../builder/virt-builder.pod:1295 ../cat/virt-cat.pod:244
+#: ../builder/virt-builder.pod:1331 ../cat/virt-cat.pod:244
 #: ../cat/virt-filesystems.pod:390 ../cat/virt-ls.pod:502
 #: ../daemon/guestfsd.pod:73 ../df/virt-df.pod:260 ../edit/virt-edit.pod:357
 #: ../fish/guestfish.pod:1356 ../format/virt-format.pod:183
@@ -1200,14 +1200,14 @@ msgstr "Ця програма повертає:"
 #: ../appliance/libguestfs-make-fixed-appliance.pod:54
 #: ../appliance/libguestfs-make-fixed-appliance.pod:75
 #: ../builder/virt-builder.pod:495 ../builder/virt-builder.pod:499
-#: ../builder/virt-builder.pod:700 ../builder/virt-builder.pod:707
-#: ../builder/virt-builder.pod:711 ../builder/virt-builder.pod:715
-#: ../builder/virt-builder.pod:720 ../builder/virt-builder.pod:724
-#: ../builder/virt-builder.pod:728 ../builder/virt-builder.pod:732
-#: ../builder/virt-builder.pod:736 ../builder/virt-builder.pod:740
-#: ../builder/virt-builder.pod:744 ../builder/virt-builder.pod:748
-#: ../builder/virt-builder.pod:752 ../builder/virt-builder.pod:761
-#: ../builder/virt-builder.pod:1116 ../builder/virt-builder.pod:1120
+#: ../builder/virt-builder.pod:707 ../builder/virt-builder.pod:714
+#: ../builder/virt-builder.pod:718 ../builder/virt-builder.pod:722
+#: ../builder/virt-builder.pod:727 ../builder/virt-builder.pod:731
+#: ../builder/virt-builder.pod:735 ../builder/virt-builder.pod:739
+#: ../builder/virt-builder.pod:743 ../builder/virt-builder.pod:747
+#: ../builder/virt-builder.pod:751 ../builder/virt-builder.pod:755
+#: ../builder/virt-builder.pod:759 ../builder/virt-builder.pod:768
+#: ../builder/virt-builder.pod:1140 ../builder/virt-builder.pod:1144
 #: ../cat/virt-cat.pod:183 ../cat/virt-cat.pod:188 ../cat/virt-cat.pod:193
 #: ../cat/virt-cat.pod:204 ../cat/virt-cat.pod:208 ../edit/virt-edit.pod:274
 #: ../edit/virt-edit.pod:279 ../edit/virt-edit.pod:284
@@ -1377,7 +1377,7 @@ msgstr ""
 #. type: =head1
 #: ../align/virt-alignment-scan.pod:393
 #: ../appliance/libguestfs-make-fixed-appliance.pod:166
-#: ../builder/virt-builder.pod:1300 ../cat/virt-cat.pod:249
+#: ../builder/virt-builder.pod:1336 ../cat/virt-cat.pod:249
 #: ../cat/virt-filesystems.pod:395 ../cat/virt-ls.pod:507
 #: ../daemon/guestfsd.pod:117 ../df/virt-df.pod:265 ../edit/virt-edit.pod:362
 #: ../erlang/examples/guestfs-erlang.pod:97
@@ -1411,7 +1411,7 @@ msgstr ""
 "L<virt-resize(1)>, L<http://libguestfs.org/>."
 
 #. type: =head1
-#: ../align/virt-alignment-scan.pod:402 ../builder/virt-builder.pod:1315
+#: ../align/virt-alignment-scan.pod:402 ../builder/virt-builder.pod:1353
 #: ../cat/virt-cat.pod:258 ../cat/virt-filesystems.pod:406
 #: ../cat/virt-ls.pod:516 ../daemon/guestfsd.pod:122 ../df/virt-df.pod:273
 #: ../edit/virt-edit.pod:373 ../format/virt-format.pod:197
@@ -1423,7 +1423,7 @@ msgid "AUTHOR"
 msgstr "АВТОР"
 
 #. type: textblock
-#: ../align/virt-alignment-scan.pod:404 ../builder/virt-builder.pod:1317
+#: ../align/virt-alignment-scan.pod:404 ../builder/virt-builder.pod:1355
 #: ../cat/virt-cat.pod:260 ../cat/virt-filesystems.pod:408
 #: ../cat/virt-ls.pod:518 ../daemon/guestfsd.pod:124 ../df/virt-df.pod:275
 #: ../edit/virt-edit.pod:375 ../format/virt-format.pod:199
@@ -1438,7 +1438,7 @@ msgstr "Richard W.M. Jones L<http://people.redhat.com/~rjones/>"
 #. type: =head1
 #: ../align/virt-alignment-scan.pod:406
 #: ../appliance/libguestfs-make-fixed-appliance.pod:179
-#: ../builder/virt-builder.pod:1319 ../cat/virt-cat.pod:262
+#: ../builder/virt-builder.pod:1357 ../cat/virt-cat.pod:262
 #: ../cat/virt-filesystems.pod:410 ../cat/virt-ls.pod:520
 #: ../daemon/guestfsd.pod:126 ../df/virt-df.pod:277 ../edit/virt-edit.pod:377
 #: ../erlang/examples/guestfs-erlang.pod:116
@@ -1769,7 +1769,7 @@ msgstr ""
 
 #. type: =head1
 #: ../appliance/libguestfs-make-fixed-appliance.pod:161
-#: ../builder/virt-builder.pod:1253 ../edit/virt-edit.pod:337
+#: ../builder/virt-builder.pod:1289 ../edit/virt-edit.pod:337
 #: ../fish/guestfish.pod:1361 ../fuse/guestunmount.pod:115
 #: ../rescue/virt-rescue.pod:390 ../sparsify/virt-sparsify.pod:312
 #: ../src/guestfs.pod:4578 ../test-tool/libguestfs-test-tool.pod:178
@@ -1870,7 +1870,8 @@ msgstr ""
 #: ../builder/virt-builder.pod:16
 #, no-wrap
 msgid ""
-" virt-builder [-o|--output DISKIMAGE] [--size SIZE] [--format raw|qcow2]\n"
+" virt-builder os-version\n"
+"    [-o|--output DISKIMAGE] [--size SIZE] [--format raw|qcow2]\n"
 "    [--attach ISOFILE]\n"
 "    [--root-password SELECTOR]\n"
 "    [--hostname HOSTNAME]\n"
@@ -1881,7 +1882,6 @@ msgid ""
 "    [--run SCRIPT] [--run-command 'CMD ARGS ...']\n"
 "    [--firstboot SCRIPT] [--firstboot-command 'CMD ARGS ...']\n"
 "    [--firstboot-install PKG,[PKG...]]\n"
-"    os-version\n"
 "\n"
 msgstr ""
 
@@ -1902,7 +1902,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:33 ../builder/virt-builder.pod:1153
+#: ../builder/virt-builder.pod:33 ../builder/virt-builder.pod:1177
 #, no-wrap
 msgid ""
 " virt-builder --print-cache\n"
@@ -1910,7 +1910,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:35 ../builder/virt-builder.pod:1161
+#: ../builder/virt-builder.pod:35 ../builder/virt-builder.pod:1185
 #, no-wrap
 msgid ""
 " virt-builder --cache-all-templates\n"
@@ -1918,7 +1918,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:37 ../builder/virt-builder.pod:1157
+#: ../builder/virt-builder.pod:37 ../builder/virt-builder.pod:1181
 #, no-wrap
 msgid ""
 " virt-builder --delete-cache\n"
@@ -2294,7 +2294,7 @@ msgstr ""
 #: ../builder/virt-builder.pod:192
 msgid ""
 "See also: I<--run>, L</Installing packages at build time from a side "
-"repository>, L<virt-make-fs(1)>."
+"repository>, L<genisoimage(1)>, L<virt-make-fs(1)>."
 msgstr ""
 
 #. type: =item
@@ -2748,7 +2748,7 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:390 ../builder/virt-builder.pod:783
+#: ../builder/virt-builder.pod:390 ../builder/virt-builder.pod:790
 #: ../examples/guestfs-faq.pod:512 ../examples/guestfs-performance.pod:161
 #: ../examples/guestfs-performance.pod:211 ../examples/guestfs-recipes.pod:411
 #: ../rescue/virt-rescue.pod:328 ../resize/virt-resize.pod:31
@@ -2766,7 +2766,7 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:395 ../builder/virt-builder.pod:788
+#: ../builder/virt-builder.pod:395 ../builder/virt-builder.pod:795
 #: ../examples/guestfs-faq.pod:522 ../examples/guestfs-performance.pod:167
 #: ../examples/guestfs-performance.pod:218 ../examples/guestfs-recipes.pod:417
 #: ../rescue/virt-rescue.pod:336 ../resize/virt-resize.pod:44
@@ -3025,30 +3025,37 @@ msgid ""
 "device, partition, etc then the size of that device is used."
 msgstr ""
 
-#. type: =item
+#. type: textblock
 #: ../builder/virt-builder.pod:518
+msgid ""
+"To specify size in bytes, the number must be followed by the lowercase "
+"letter I<b>, eg: S<C<--size 10737418240b>>."
+msgstr ""
+
+#. type: =item
+#: ../builder/virt-builder.pod:521
 msgid "B<--source> URL"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:520
+#: ../builder/virt-builder.pod:523
 msgid ""
 "Set the source URL to look for templates.  If not specified it defaults to "
 "L<http://libguestfs.org/download/builder/index.asc>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:523
+#: ../builder/virt-builder.pod:526
 msgid "See also L</CREATING YOUR OWN TEMPLATES> below."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:525
+#: ../builder/virt-builder.pod:528
 msgid "You can also set the C<VIRT_BUILDER_SOURCE> environment variable."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:527
+#: ../builder/virt-builder.pod:530
 msgid ""
 "Note that you should not point I<--source> to sources that you don't trust "
 "(unless the source is signed by someone you do trust).  See also the I<--no-"
@@ -3056,12 +3063,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:531
+#: ../builder/virt-builder.pod:534
 msgid "B<--upload> FILE:DEST"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:533
+#: ../builder/virt-builder.pod:536
 msgid ""
 "Upload local file C<FILE> to destination C<DEST> in the disk image.  File "
 "owner and permissions from the original are preserved, so you should set "
@@ -3069,14 +3076,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:537
+#: ../builder/virt-builder.pod:540
 msgid ""
 "C<DEST> could be the final filename.  This can be used to rename the file on "
 "upload."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:540
+#: ../builder/virt-builder.pod:543
 msgid ""
 "If C<DEST> is a directory name (which must already exist in the guest)  then "
 "the file is uploaded into that directory, and it keeps the same name as on "
@@ -3084,46 +3091,46 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:544
+#: ../builder/virt-builder.pod:547
 msgid "See also: I<--mkdir>, I<--delete>, I<--scrub>."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:550
+#: ../builder/virt-builder.pod:553
 msgid "Enable debug messages and/or produce verbose output."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:552
+#: ../builder/virt-builder.pod:555
 msgid ""
 "When reporting bugs, use this option and attach the complete output to your "
 "bug report."
 msgstr ""
 
 #. type: =head1
-#: ../builder/virt-builder.pod:563
+#: ../builder/virt-builder.pod:566
 msgid "REFERENCE"
 msgstr ""
 
 #. type: =head2
-#: ../builder/virt-builder.pod:565
+#: ../builder/virt-builder.pod:568
 msgid "INSTALLING PACKAGES"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:567
+#: ../builder/virt-builder.pod:570
 msgid ""
 "There are several approaches to installing packages or applications in the "
 "guest which have different trade-offs."
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:570
+#: ../builder/virt-builder.pod:573
 msgid "Installing packages at build time"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:572
+#: ../builder/virt-builder.pod:575
 msgid ""
 "If the guest OS you are installing is similar to the host OS (eg.  both are "
 "Linux), and if libguestfs supports network connections, then you can use I<--"
@@ -3131,7 +3138,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:576
+#: ../builder/virt-builder.pod:579
 #, no-wrap
 msgid ""
 " virt-builder fedora-20 --install inkscape\n"
@@ -3139,23 +3146,23 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:578
+#: ../builder/virt-builder.pod:581
 msgid ""
 "This uses the guest's package manager and the host's network connection."
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:581
+#: ../builder/virt-builder.pod:584
 msgid "Installing packages at first boot"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:583
+#: ../builder/virt-builder.pod:586
 msgid "Another option is to install the packages when the guest first boots:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:585
+#: ../builder/virt-builder.pod:588
 #, no-wrap
 msgid ""
 " virt-builder fedora-20 --firstboot-install inkscape\n"
@@ -3163,13 +3170,13 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:587
+#: ../builder/virt-builder.pod:590
 msgid ""
 "This uses the guest's package manager and the guest's network connection."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:590
+#: ../builder/virt-builder.pod:593
 msgid ""
 "The downsides are that it will take the guest a lot longer to boot first "
 "time, and there's nothing much you can do if package installation fails (eg. "
@@ -3177,12 +3184,12 @@ msgid ""
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:595
+#: ../builder/virt-builder.pod:598
 msgid "Installing packages at build time from a side repository"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:597
+#: ../builder/virt-builder.pod:600
 msgid ""
 "If the software you want to install is not available in the main package "
 "repository of the guest, then you can add a side repository.  Usually this "
@@ -3190,31 +3197,38 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:602
+#: ../builder/virt-builder.pod:605
 msgid ""
-"Create a script that mounts the ISO and sets up the repository.  For yum, "
-"create /tmp/install.sh containing:"
+"You can create the disk image using either L<genisoimage(1)> or L<virt-make-"
+"fs(1)>.  For genisoimage, use a command like this:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:605 ../builder/virt-builder.pod:621
+#: ../builder/virt-builder.pod:608
 #, no-wrap
 msgid ""
-" mkdir /tmp/mount\n"
-" \n"
+" genisoimage -o extra-packages.iso -R -J -V EXTRA cdcontents/\n"
+"\n"
+msgstr ""
+
+#. type: textblock
+#: ../builder/virt-builder.pod:610
+msgid ""
+"Create a script that mounts the ISO and sets up the repository.  For yum, "
+"create /tmp/install.sh containing:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:607 ../builder/virt-builder.pod:623
+#: ../builder/virt-builder.pod:613 ../builder/virt-builder.pod:627
 #, no-wrap
 msgid ""
-" # Assume the volume label of the CD is 'EXTRA':\n"
+" mkdir /tmp/mount\n"
 " mount LABEL=EXTRA /tmp/mount\n"
 " \n"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:610
+#: ../builder/virt-builder.pod:616
 #, no-wrap
 msgid ""
 " cat <<'EOF' > /etc/yum.repos.d/extra.repo\n"
@@ -3227,7 +3241,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:617
+#: ../builder/virt-builder.pod:623
 #, no-wrap
 msgid ""
 " yum -y install famousdatabase\n"
@@ -3235,12 +3249,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:619
+#: ../builder/virt-builder.pod:625
 msgid "For apt, create /tmp/install.sh containing:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:626
+#: ../builder/virt-builder.pod:630
 #, no-wrap
 msgid ""
 " apt-cdrom -d=/tmp/mount add\n"
@@ -3249,25 +3263,29 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:629
-msgid "Use the I<--attach> option to attach the CD:"
+#: ../builder/virt-builder.pod:633
+msgid ""
+"Use the I<--attach> option to attach the CD / disk image and the I<--run> "
+"option to run the script:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:631
+#: ../builder/virt-builder.pod:636
 #, no-wrap
 msgid ""
-" virt-builder fedora 20 --attach extra.iso --run /tmp/install.sh\n"
+" virt-builder fedora-20 \\\n"
+"   --attach extra-packages.iso \\\n"
+"   --run /tmp/install.sh\n"
 "\n"
 msgstr ""
 
 #. type: =head2
-#: ../builder/virt-builder.pod:633
+#: ../builder/virt-builder.pod:640
 msgid "USERS AND PASSWORDS"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:635
+#: ../builder/virt-builder.pod:642
 msgid ""
 "The I<--root-password> option is used to change the root password (otherwise "
 "a random password is used).  This option takes a password C<SELECTOR> in one "
@@ -3275,12 +3293,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:641
+#: ../builder/virt-builder.pod:648
 msgid "B<--root-password> file:FILENAME"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:643
+#: ../builder/virt-builder.pod:650
 msgid ""
 "Read the root password from C<FILENAME>.  The whole first line of this file "
 "is the replacement password.  Any other lines are ignored.  You should "
@@ -3288,36 +3306,36 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:648
+#: ../builder/virt-builder.pod:655
 msgid "B<--root-password> password:PASSWORD"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:650
+#: ../builder/virt-builder.pod:657
 msgid "Set the root password to the literal string C<PASSWORD>."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:652 ../sysprep/sysprep-extra-options.pod:39
+#: ../builder/virt-builder.pod:659 ../sysprep/sysprep-extra-options.pod:39
 msgid ""
 "B<Note: this is not secure> since any user on the same machine can see the "
 "cleartext password using L<ps(1)>."
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:657
+#: ../builder/virt-builder.pod:664
 msgid "Creating user accounts"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:659
+#: ../builder/virt-builder.pod:666
 msgid ""
 "To create user accounts, use the L<useradd(8)> command with L<--firstboot-"
 "command> like this:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:662
+#: ../builder/virt-builder.pod:669
 #, no-wrap
 msgid ""
 " virt-builder --firstboot-command \\\n"
@@ -3326,7 +3344,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:665
+#: ../builder/virt-builder.pod:672
 msgid ""
 "The above command will create an C<rjones> account with no password, and "
 "force the user to set a password when they first log in.  There are other "
@@ -3334,12 +3352,12 @@ msgid ""
 msgstr ""
 
 #. type: =head2
-#: ../builder/virt-builder.pod:669
+#: ../builder/virt-builder.pod:676
 msgid "LOG FILE"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:671
+#: ../builder/virt-builder.pod:678
 msgid ""
 "Scripts and package installation that runs at build time (I<--run>, I<--run-"
 "command>, I<--install>, but I<not> firstboot) is logged in one of the "
@@ -3347,131 +3365,131 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:677
+#: ../builder/virt-builder.pod:684
 msgid "C</tmp/builder.log>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:679
+#: ../builder/virt-builder.pod:686
 msgid "On Linux, BSD and other guests."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:681
+#: ../builder/virt-builder.pod:688
 msgid "C<C:\\Temp\\builder.log>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:683
+#: ../builder/virt-builder.pod:690
 msgid "On Windows, DOS guests."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:685
+#: ../builder/virt-builder.pod:692
 msgid "C</builder.log>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:687
+#: ../builder/virt-builder.pod:694
 msgid "If C</tmp> or C<C:\\Temp> is missing."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:691
+#: ../builder/virt-builder.pod:698
 msgid ""
 "If you don't want the log file to appear in the final image, then use the "
 "I<--no-logfile> command line option."
 msgstr ""
 
 #. type: =head2
-#: ../builder/virt-builder.pod:694
+#: ../builder/virt-builder.pod:701
 msgid "INSTALLATION PROCESS"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:696
+#: ../builder/virt-builder.pod:703
 msgid "When you invoke virt-builder, installation proceeds as follows:"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:702
+#: ../builder/virt-builder.pod:709
 msgid "The template image is downloaded."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:704
+#: ../builder/virt-builder.pod:711
 msgid ""
 "If the template image is present in the cache, the cached version is used "
 "instead.  (See L</CACHING>)."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:709
+#: ../builder/virt-builder.pod:716
 msgid "The template signature is checked."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:713
+#: ../builder/virt-builder.pod:720
 #, fuzzy
 #| msgid "The file is compressed on-disk."
 msgid "The template is uncompressed to a tmp file."
 msgstr "Файл стиснено на диску."
 
 #. type: textblock
-#: ../builder/virt-builder.pod:717
+#: ../builder/virt-builder.pod:724
 msgid ""
 "The template image is resized into the destination, using L<virt-resize(1)>."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:722
+#: ../builder/virt-builder.pod:729
 msgid "Extra disks are attached (I<--attach>)."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:726
+#: ../builder/virt-builder.pod:733
 msgid "A new random seed is generated for the guest."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:730
+#: ../builder/virt-builder.pod:737
 msgid "The hostname is set (I<--hostname>)."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:734
+#: ../builder/virt-builder.pod:741
 msgid "The root password is changed (I<--root-password>)."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:738
+#: ../builder/virt-builder.pod:745
 msgid "Packages are installed (I<--install>)."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:742
+#: ../builder/virt-builder.pod:749
 msgid "Files are uploaded (I<--upload>)."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:746
+#: ../builder/virt-builder.pod:753
 msgid "Files are edited (I<--edit>)."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:750
+#: ../builder/virt-builder.pod:757
 msgid "Files are deleted (I<--delete>, I<--scrub>)."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:754
+#: ../builder/virt-builder.pod:761
 msgid ""
 "Firstboot scripts are installed (I<--firstboot>, I<--firstboot-command>, I<--"
 "firstboot-install>)."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:757
+#: ../builder/virt-builder.pod:764
 msgid ""
 "Note that although firstboot scripts are installed at this step, they do not "
 "run until the guest is booted first time.  Firstboot scripts will run in the "
@@ -3479,34 +3497,34 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:763
+#: ../builder/virt-builder.pod:770
 msgid "Scripts are run (I<--run>, I<--run-command>)."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:765
+#: ../builder/virt-builder.pod:772
 msgid "Scripts run in the order they appear on the command line."
 msgstr ""
 
 #. type: =head2
-#: ../builder/virt-builder.pod:769
+#: ../builder/virt-builder.pod:776
 msgid "IMPORTING THE DISK IMAGE"
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:771
+#: ../builder/virt-builder.pod:778
 msgid "Importing into libvirt"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:773
+#: ../builder/virt-builder.pod:780
 msgid ""
 "Import the disk image into libvirt using L<virt-install(1)> I<--import> "
 "option."
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:776
+#: ../builder/virt-builder.pod:783
 #, no-wrap
 msgid ""
 " virt-install --import \\\n"
@@ -3515,7 +3533,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:779 ../examples/guestfs-recipes.pod:264
+#: ../builder/virt-builder.pod:786 ../examples/guestfs-recipes.pod:264
 #: ../fish/guestfish-actions.pod:2058 ../fish/guestfish-actions.pod:2600
 #: ../fish/guestfish-actions.pod:3196 ../src/guestfs-actions.pod:3252
 #: ../src/guestfs-actions.pod:4114 ../src/guestfs-actions.pod:4999
@@ -3524,14 +3542,14 @@ msgid "Notes:"
 msgstr "Нотатки:"
 
 #. type: textblock
-#: ../builder/virt-builder.pod:785
+#: ../builder/virt-builder.pod:792
 msgid ""
 "You I<must> specify the correct format.  The format is C<raw> unless you "
 "used virt-builder's I<--format> option."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:790
+#: ../builder/virt-builder.pod:797
 msgid ""
 "You can run virt-install as root or non-root.  Each works slightly "
 "differently because libvirt manages a different set of virtual machines for "
@@ -3540,57 +3558,95 @@ msgid ""
 "differently as well."
 msgstr ""
 
-#. type: =end
-#: ../builder/virt-builder.pod:798 ../builder/virt-builder.pod:804
-#: ../examples/guestfs-recipes.pod:3 ../examples/guestfs-recipes.pod:8
-#: ../guestfs-release-notes.pod:7 ../guestfs-release-notes.pod:14
-#: ../guestfs-release-notes.pod:200 ../guestfs-release-notes.pod:204
-#: ../guestfs-release-notes.pod:549 ../guestfs-release-notes.pod:553
-#: ../guestfs-release-notes.pod:1105 ../guestfs-release-notes.pod:1109
-msgid "comment"
-msgstr "коментар"
-
 #. type: =head3
-#: ../builder/virt-builder.pod:800
+#: ../builder/virt-builder.pod:805
 msgid "Importing into OpenStack"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:802
-msgid "XXX"
+#: ../builder/virt-builder.pod:807
+msgid "Import the image into Glance (the OpenStack image store) by doing:"
+msgstr ""
+
+#. type: verbatim
+#: ../builder/virt-builder.pod:809
+#, no-wrap
+msgid ""
+" glance image-create --name fedora-20-image --file fedora-20.img \\\n"
+"   --disk-format raw --container-format bare \\\n"
+"   --is-public True\n"
+"\n"
+msgstr ""
+
+#. type: textblock
+#: ../builder/virt-builder.pod:813
+msgid ""
+"The I<--file> parameter is the virt-builder-generated disk image.  It should "
+"match virt-builder's I<--output> option.  The I<--disk-format> parameter "
+"should match virt-builder's I<--format> option (or C<raw> if you didn't use "
+"that option).  The I<--container-format> should always be C<bare> since virt-"
+"builder doesn't put images into containers."
+msgstr ""
+
+#. type: textblock
+#: ../builder/virt-builder.pod:819
+msgid ""
+"You can use the S<C<glance image-show I<fedora-20-image>>> command to "
+"display the properties of the image."
+msgstr ""
+
+#. type: textblock
+#: ../builder/virt-builder.pod:822
+msgid "To boot up an instance of your image on a Nova compute node, do:"
+msgstr ""
+
+#. type: verbatim
+#: ../builder/virt-builder.pod:824
+#, no-wrap
+msgid ""
+" nova boot fedora-20-server --image fedora-20-image \\\n"
+"   --flavor m1.medium\n"
+"\n"
+msgstr ""
+
+#. type: textblock
+#: ../builder/virt-builder.pod:827
+msgid ""
+"Use S<C<nova flavor-list>> to list possible machine flavors.  Use S<C<nova "
+"list>> to list running instances."
 msgstr ""
 
 #. type: =head2
-#: ../builder/virt-builder.pod:806
+#: ../builder/virt-builder.pod:830
 msgid "DEBUGGING BUILDS"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:808
+#: ../builder/virt-builder.pod:832
 msgid ""
 "If virt-builder fails with an error, then enable debugging (I<-v>) and "
 "report a bug (see L</BUGS> below)."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:811
+#: ../builder/virt-builder.pod:835
 msgid ""
 "If virt-builder is successful but the image doesn't work, here are some "
 "things to try:"
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:816
+#: ../builder/virt-builder.pod:840
 msgid "Use virt-rescue"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:818
+#: ../builder/virt-builder.pod:842
 msgid "Run L<virt-rescue(1)> on the disk image:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:820
+#: ../builder/virt-builder.pod:844
 #, no-wrap
 msgid ""
 " virt-rescue -a disk.img\n"
@@ -3598,7 +3654,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:822
+#: ../builder/virt-builder.pod:846
 msgid ""
 "This gives you a rescue shell.  You can mount the filesystems from the disk "
 "image on C</sysroot> and examine them using ordinary Linux commands.  You "
@@ -3607,17 +3663,17 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:828
+#: ../builder/virt-builder.pod:852
 msgid "Use guestfish"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:830
+#: ../builder/virt-builder.pod:854
 msgid "Run L<guestfish(1)> on the disk image:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:832
+#: ../builder/virt-builder.pod:856
 #, no-wrap
 msgid ""
 " guestfish -a disk.img -i\n"
@@ -3625,25 +3681,25 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:834
+#: ../builder/virt-builder.pod:858
 msgid ""
 "Use guestfish commands like C<ll /directory> and C<cat /file> to examine "
 "directories and files."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:837
+#: ../builder/virt-builder.pod:861
 msgid "Use guestmount"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:839
+#: ../builder/virt-builder.pod:863
 msgid ""
 "Mount the disk image safely on the host using FUSE and L<guestmount(1)>:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:841
+#: ../builder/virt-builder.pod:865
 #, no-wrap
 msgid ""
 " mkdir /tmp/mp\n"
@@ -3653,12 +3709,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:845
+#: ../builder/virt-builder.pod:869
 msgid "To unmount the disk image do:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:847
+#: ../builder/virt-builder.pod:871
 #, no-wrap
 msgid ""
 " fusermount -u /tmp/mp\n"
@@ -3666,12 +3722,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:849
+#: ../builder/virt-builder.pod:873
 msgid "Add a serial console"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:851
+#: ../builder/virt-builder.pod:875
 msgid ""
 "If the guest hangs during boot, it can be helpful to add a serial console to "
 "the guest, and direct kernel messages to the serial console.  Adding the "
@@ -3681,7 +3737,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:857
+#: ../builder/virt-builder.pod:881
 #, no-wrap
 msgid ""
 " console=tty0 console=ttyS0,115200\n"
@@ -3689,26 +3745,26 @@ msgid ""
 msgstr ""
 
 #. type: =head2
-#: ../builder/virt-builder.pod:861
+#: ../builder/virt-builder.pod:885
 msgid "CREATING YOUR OWN TEMPLATES"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:863
+#: ../builder/virt-builder.pod:887
 msgid ""
 "For serious virt-builder use, you may want to create your own repository of "
 "templates."
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:866
+#: ../builder/virt-builder.pod:890
 #, fuzzy
 #| msgid "guestfs_grepi"
 msgid "Libguestfs.org repository"
 msgstr "guestfs_grepi"
 
 #. type: textblock
-#: ../builder/virt-builder.pod:868
+#: ../builder/virt-builder.pod:892
 msgid ""
 "Out of the box, virt-builder downloads the file L<http://libguestfs.org/"
 "download/builder/index.asc> which is an index of available templates plus "
@@ -3717,7 +3773,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:874
+#: ../builder/virt-builder.pod:898
 msgid ""
 "The templates hosted on libguestfs.org were created using shell scripts, "
 "kickstart files and preseed files which can be found in the libguestfs "
@@ -3725,19 +3781,19 @@ msgid ""
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:878
+#: ../builder/virt-builder.pod:902
 msgid "Setting up the repository"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:880
+#: ../builder/virt-builder.pod:904
 msgid ""
 "You can set up your own site containing an index file and some templates, "
 "and then point virt-builder at the site by using the I<--source> option:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:884
+#: ../builder/virt-builder.pod:908
 #, no-wrap
 msgid ""
 " virt-builder --source https://example.com/builder/index.asc \\\n"
@@ -3747,25 +3803,25 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:888
+#: ../builder/virt-builder.pod:912
 msgid ""
 "(Note setting the environment variables C<VIRT_BUILDER_SOURCE> and "
 "C<VIRT_BUILDER_FINGERPRINT> may be easier to type!)"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:891
+#: ../builder/virt-builder.pod:915
 msgid ""
 "You can host this on any web or FTP server, or a local or network filesystem."
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:894
+#: ../builder/virt-builder.pod:918
 msgid "Setting up a GPG key"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:896
+#: ../builder/virt-builder.pod:920
 msgid ""
 "If you don't have a GnuPG key, you will need to set one up.  (Strictly "
 "speaking this is optional, but if your index and template files are not "
@@ -3774,21 +3830,21 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:901
+#: ../builder/virt-builder.pod:925
 msgid ""
 "To create a key, see the GPG manual L<http://www.gnupg.org/gph/en/manual."
 "html>."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:904
+#: ../builder/virt-builder.pod:928
 msgid ""
 "Export your GPG public key and add it to the keyring of all virt-builder "
 "users:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:907
+#: ../builder/virt-builder.pod:931
 #, no-wrap
 msgid ""
 " gpg --export -a \"you at example.com\" > pubkey\n"
@@ -3796,7 +3852,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:909
+#: ../builder/virt-builder.pod:933
 #, no-wrap
 msgid ""
 " # For each virt-builder user:\n"
@@ -3805,12 +3861,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:912
+#: ../builder/virt-builder.pod:936
 msgid "Also find the fingerprint of your key:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:914
+#: ../builder/virt-builder.pod:938
 #, no-wrap
 msgid ""
 " gpg --list-keys --fingerprint\n"
@@ -3818,12 +3874,12 @@ msgid ""
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:916
+#: ../builder/virt-builder.pod:940
 msgid "Create the templates"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:918
+#: ../builder/virt-builder.pod:942
 msgid ""
 "There are many ways to create the templates.  For example you could clone "
 "existing guests (see L<virt-sysprep(1)>), or you could install a guest by "
@@ -3832,14 +3888,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:923
+#: ../builder/virt-builder.pod:947
 msgid ""
 "For best results when compressing the templates, use the following xz "
 "options (see L<nbdkit-xz-plugin(1)> for further explanation):"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:926
+#: ../builder/virt-builder.pod:950
 #, no-wrap
 msgid ""
 " xz --best --block-size=16777216 disk\n"
@@ -3847,19 +3903,19 @@ msgid ""
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:928
+#: ../builder/virt-builder.pod:952
 msgid "Creating and signing the index file"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:930
+#: ../builder/virt-builder.pod:954
 msgid ""
 "The index file has a simple text format (shown here without the digital "
 "signature):"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:933
+#: ../builder/virt-builder.pod:957
 #, no-wrap
 msgid ""
 " [fedora-18]\n"
@@ -3875,7 +3931,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:943
+#: ../builder/virt-builder.pod:967
 #, no-wrap
 msgid ""
 " [fedora-19]\n"
@@ -3892,21 +3948,21 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:954
+#: ../builder/virt-builder.pod:978
 msgid ""
 "The part in square brackets is the C<os-version>, which is the same string "
 "that is used on the virt-builder command line to build that OS."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:957
+#: ../builder/virt-builder.pod:981
 msgid ""
 "After preparing the C<index> file in the correct format, clearsign it using "
 "the following command:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:960
+#: ../builder/virt-builder.pod:984
 #, no-wrap
 msgid ""
 " gpg --clearsign --armor index\n"
@@ -3914,7 +3970,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:962
+#: ../builder/virt-builder.pod:986
 msgid ""
 "This will create the final file called C<index.asc> which can be uploaded to "
 "the server (and is the I<--source> URL).  As noted above, signing the index "
@@ -3922,46 +3978,46 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:966
+#: ../builder/virt-builder.pod:990
 msgid "The following fields can appear:"
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:970
+#: ../builder/virt-builder.pod:994
 msgid "C<name=NAME>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:972
+#: ../builder/virt-builder.pod:996
 msgid ""
 "The user-friendly name of this template.  This is displayed in the I<--list> "
 "output but is otherwise not significant."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:975
+#: ../builder/virt-builder.pod:999
 msgid "C<osinfo=ID>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:977
+#: ../builder/virt-builder.pod:1001
 msgid ""
 "This optional field maps the operating system to the associated libosinfo "
 "ID.  Virt-builder does not use it (yet)."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:980
+#: ../builder/virt-builder.pod:1004
 msgid "C<file=PATH>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:982
+#: ../builder/virt-builder.pod:1006
 msgid "The path (relative to the index) of the xz-compressed template."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:984 ../builder/virt-builder.pod:995
+#: ../builder/virt-builder.pod:1008 ../builder/virt-builder.pod:1019
 msgid ""
 "Note that absolute paths or URIs are B<not> permitted here.  This is because "
 "virt-builder has a \"same origin\" policy for templates so they cannot come "
@@ -3969,29 +4025,29 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:988
+#: ../builder/virt-builder.pod:1012
 msgid "C<sig=PATH>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:990
+#: ../builder/virt-builder.pod:1014
 msgid "B<This option is deprecated>.  Use the checksum field instead."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:992
+#: ../builder/virt-builder.pod:1016
 msgid ""
 "The path (relative to the index) of the GPG detached signature of the xz "
 "file."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:999
+#: ../builder/virt-builder.pod:1023
 msgid "The file can be created as follows:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1001
+#: ../builder/virt-builder.pod:1025
 #, no-wrap
 msgid ""
 " gpg --detach-sign --armor -o disk.xz.sig disk.xz\n"
@@ -3999,19 +4055,19 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1003
+#: ../builder/virt-builder.pod:1027
 msgid "C<checksum[sha512]=7b882fe9b82eb0fef...>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1005
+#: ../builder/virt-builder.pod:1029
 msgid ""
 "The SHA-512 checksum of the B<compressed> file is checked after it is "
 "downloaded.  To work out the signature, do:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1008
+#: ../builder/virt-builder.pod:1032
 #, no-wrap
 msgid ""
 " sha512sum disk.xz\n"
@@ -4019,24 +4075,24 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1010
+#: ../builder/virt-builder.pod:1034
 msgid ""
 "Note if you use this, you don't need to sign the file, ie. don't use "
 "C<sig>.  This option overrides C<sig>."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1013
+#: ../builder/virt-builder.pod:1037
 msgid "C<checksum=7b882fe9b82eb0fef...>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1015
+#: ../builder/virt-builder.pod:1039
 msgid "C<checksum> is an alias for C<checksum[sha512]>."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1017
+#: ../builder/virt-builder.pod:1041
 msgid ""
 "If you need to interoperate with virt-builder = 1.24.0 then you have to use "
 "C<checksum> because that version would give a parse error with square "
@@ -4045,12 +4101,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1022
+#: ../builder/virt-builder.pod:1046
 msgid "C<revision=N>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1024
+#: ../builder/virt-builder.pod:1048
 msgid ""
 "The revision is an integer which is used to control the template cache.  "
 "Increasing the revision number causes clients to download the template again "
@@ -4058,22 +4114,22 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1028
+#: ../builder/virt-builder.pod:1052
 msgid "The revision number is optional.  If omitted it defaults to C<1>."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1030
+#: ../builder/virt-builder.pod:1054
 msgid "C<format=raw>"
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1032
+#: ../builder/virt-builder.pod:1056
 msgid "C<format=qcow2>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1034
+#: ../builder/virt-builder.pod:1058
 msgid ""
 "Specify the format of the disk image (before it was compressed).  If not "
 "given, the format is autodetected, but generally it is better to be explicit "
@@ -4081,7 +4137,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1038
+#: ../builder/virt-builder.pod:1062
 msgid ""
 "Note this is the source format, which is different from the I<--format> "
 "option (requested output format).  Virt-builder does on-the-fly conversion "
@@ -4089,12 +4145,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1043
+#: ../builder/virt-builder.pod:1067
 msgid "C<size=NNN>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1045
+#: ../builder/virt-builder.pod:1069
 msgid ""
 "The virtual size of the image in bytes.  This is the size of the image when "
 "uncompressed.  If using a non-raw format such as qcow2 then it means the "
@@ -4102,36 +4158,36 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1049
+#: ../builder/virt-builder.pod:1073
 msgid "This field is required."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1051
+#: ../builder/virt-builder.pod:1075
 msgid ""
 "Virt-builder also uses this as the minimum size that users can request via "
 "the I<--size> option, or as the default size if there is no I<--size> option."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1055
+#: ../builder/virt-builder.pod:1079
 msgid "C<compressed_size=NNN>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1057
+#: ../builder/virt-builder.pod:1081
 msgid ""
 "The compressed size of the disk image in bytes.  This is just used for "
 "information (when using I<--list --long>)."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1060
+#: ../builder/virt-builder.pod:1084
 msgid "C<expand=/dev/sdaX>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1062
+#: ../builder/virt-builder.pod:1086
 msgid ""
 "When expanding the image to its final size, instruct L<virt-resize(1)> to "
 "expand the named partition in the guest image to fill up all available "
@@ -4139,13 +4195,13 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1066
+#: ../builder/virt-builder.pod:1090
 msgid ""
 "You should usually put the device name of the guest's root filesystem here."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1068
+#: ../builder/virt-builder.pod:1092
 msgid ""
 "It's a good idea to use this, but not required.  If the field is omitted "
 "then virt-resize will create an extra partition at the end of the disk to "
@@ -4153,12 +4209,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1072
+#: ../builder/virt-builder.pod:1096
 msgid "C<lvexpand=/dev/VolGroup/LogVol>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1074
+#: ../builder/virt-builder.pod:1098
 msgid ""
 "When expanding the image to its final size, instruct L<virt-resize(1)> to "
 "expand the named logical volume in the guest image to fill up all available "
@@ -4166,7 +4222,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1078
+#: ../builder/virt-builder.pod:1102
 msgid ""
 "If the guest uses LVM2 you should usually put the LV of the guest's root "
 "filesystem here.  If the guest does not use LVM2 or its root filesystem is "
@@ -4174,90 +4230,90 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1082
+#: ../builder/virt-builder.pod:1106
 msgid "C<notes=NOTES>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1084
+#: ../builder/virt-builder.pod:1108
 msgid ""
 "Any notes that go with this image, especially notes describing what packages "
 "are in the image, how the image was prepared, and licensing information."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1088
+#: ../builder/virt-builder.pod:1112
 msgid ""
 "This information is shown in the I<--notes> and I<--list> I<--long> modes."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1090
+#: ../builder/virt-builder.pod:1114
 msgid ""
 "You can use multi-line notes here by indenting each new line with at least "
 "one character of whitespace (even on blank lines):"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1093
+#: ../builder/virt-builder.pod:1117
 #, no-wrap
 msgid ""
 " notes=This image was prepared using\n"
 "  the following kickstart script:\n"
 "                                <-- one space at beginning of line\n"
-"  timezone Europe/London\n"
 "  part /boot --fstype ext3\n"
+"  ...\n"
 "\n"
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1099
+#: ../builder/virt-builder.pod:1123
 msgid "C<hidden=true>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1101
+#: ../builder/virt-builder.pod:1125
 msgid ""
 "Using the hidden flag prevents the template from being listed by the I<--"
 "list> option (but it is still installable).  This is used for test images."
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:1107
+#: ../builder/virt-builder.pod:1131
 msgid "Running virt-builder against the alternate repository"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1109
+#: ../builder/virt-builder.pod:1133
 msgid ""
 "Ensure each virt-builder user has imported your public key into their gpg "
 "keyring (see above)."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1112
+#: ../builder/virt-builder.pod:1136
 msgid "Each virt-builder user should export these environment variables:"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1118
+#: ../builder/virt-builder.pod:1142
 msgid "C<VIRT_BUILDER_SOURCE> to point to the URL of the C<index.asc> file."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1122
+#: ../builder/virt-builder.pod:1146
 msgid ""
 "C<VIRT_BUILDER_FINGERPRINT> to contain the fingerprint (long hex string) of "
 "the user who signed the index file and the templates."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1127
+#: ../builder/virt-builder.pod:1151
 msgid "Now run virt-builder commands as normal, eg:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1129
+#: ../builder/virt-builder.pod:1153
 #, no-wrap
 msgid ""
 " virt-builder --list --long\n"
@@ -4265,7 +4321,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1131
+#: ../builder/virt-builder.pod:1155
 #, no-wrap
 msgid ""
 " virt-builder os-version\n"
@@ -4273,17 +4329,17 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1133
+#: ../builder/virt-builder.pod:1157
 msgid "To debug problems, add the C<-v> option to these commands."
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:1135
+#: ../builder/virt-builder.pod:1159
 msgid "Licensing of templates"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1137
+#: ../builder/virt-builder.pod:1161
 msgid ""
 "You should be aware of the licensing of images that you distribute.  For "
 "open source guests, provide a link to the source code in the C<notes> field "
@@ -4291,55 +4347,55 @@ msgid ""
 msgstr ""
 
 #. type: =head2
-#: ../builder/virt-builder.pod:1142
+#: ../builder/virt-builder.pod:1166
 msgid "CACHING"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1144
+#: ../builder/virt-builder.pod:1168
 msgid ""
 "Since the templates are usually very large, downloaded templates are cached "
 "in the user's home directory."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1147
+#: ../builder/virt-builder.pod:1171
 msgid ""
 "The location of the cache is C<$XDG_CACHE_HOME/virt-builder/> or C<$HOME/."
 "cache/virt-builder>."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1150
+#: ../builder/virt-builder.pod:1174
 msgid ""
 "You can print out information about the cache directory, including which "
 "guests are currently cached, by doing:"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1155
+#: ../builder/virt-builder.pod:1179
 msgid "The cache can be deleted if you want to save space by doing:"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1159
+#: ../builder/virt-builder.pod:1183
 msgid "You can download all (current) templates to the local cache by doing:"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1163
+#: ../builder/virt-builder.pod:1187
 msgid "To disable the template cache, use I<--no-cache>."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1165
+#: ../builder/virt-builder.pod:1189
 msgid ""
 "Only templates are cached.  The index and detached digital signatures are "
 "not cached."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1168
+#: ../builder/virt-builder.pod:1192
 msgid ""
 "Virt-builder uses L<curl(1)> to download files and it also uses the current "
 "C<http_proxy> (etc) settings when installing packages (I<--install>).  You "
@@ -4349,24 +4405,24 @@ msgid ""
 msgstr ""
 
 #. type: =head2
-#: ../builder/virt-builder.pod:1174
+#: ../builder/virt-builder.pod:1198
 msgid "DIGITAL SIGNATURES"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1176
+#: ../builder/virt-builder.pod:1200
 msgid ""
 "Virt-builder uses GNU Privacy Guard (GnuPG or gpg) to verify that the index "
 "and templates have not been tampered with."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1179
+#: ../builder/virt-builder.pod:1203
 msgid "The source points to an index file, which is optionally signed."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1181
+#: ../builder/virt-builder.pod:1205
 msgid ""
 "Virt-builder downloads the index and checks that the signature is valid and "
 "the signer's fingerprint matches the specified fingerprint (ie. I<--"
@@ -4375,7 +4431,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1186
+#: ../builder/virt-builder.pod:1210
 msgid ""
 "For checking against the built-in public key/fingerprint, this requires "
 "importing the public key into the user's local gpg keyring (that's just the "
@@ -4383,13 +4439,13 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1190
+#: ../builder/virt-builder.pod:1214
 msgid ""
 "When a template is downloaded, its signature is checked in the same way."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1193
+#: ../builder/virt-builder.pod:1217
 msgid ""
 "Although the signatures are optional, if you don't have them then virt-"
 "builder users will have to use I<--no-check-signature> on the command line.  "
@@ -4400,19 +4456,19 @@ msgid ""
 msgstr ""
 
 #. type: =head1
-#: ../builder/virt-builder.pod:1200 ../src/guestfs.pod:3343
+#: ../builder/virt-builder.pod:1224 ../src/guestfs.pod:3343
 msgid "ARCHITECTURE"
 msgstr "АРХІТЕКТУРА"
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1202
+#: ../builder/virt-builder.pod:1226
 msgid ""
 "Virt-builder can build a guest for any architecture no matter what the host "
 "architecture is.  For example an x86-64 guest on an ARM host."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1205
+#: ../builder/virt-builder.pod:1229
 msgid ""
 "However certain options may not work correctly, specifically options that "
 "require running commands in the guest during the build process: I<--"
@@ -4421,27 +4477,27 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1210
+#: ../builder/virt-builder.pod:1234
 msgid ""
 "An x86-64 host building 32 bit i686 guests should work without any special "
 "steps."
 msgstr ""
 
 #. type: =head1
-#: ../builder/virt-builder.pod:1213 ../src/guestfs.pod:1889
+#: ../builder/virt-builder.pod:1237 ../src/guestfs.pod:1889
 #: ../sysprep/virt-sysprep.pod:447
 msgid "SECURITY"
 msgstr "БЕЗПЕКА"
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1215
+#: ../builder/virt-builder.pod:1239
 msgid ""
 "Virt-builder does not need to run as root (in fact, should not be run as "
 "root), and doesn't use setuid, C<sudo> or any similar mechanism."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1218
+#: ../builder/virt-builder.pod:1242
 msgid ""
 "I<--install>, I<--run> and I<--run-command> are implemented using an "
 "appliance (a small virtual machine) so these commands do not run on the "
@@ -4451,7 +4507,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1224
+#: ../builder/virt-builder.pod:1248
 msgid ""
 "However these options will have access to the host's network and since the "
 "template may contain untrusted code, the code might try to access host "
@@ -4460,14 +4516,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1229
+#: ../builder/virt-builder.pod:1253
 msgid ""
 "Firstboot commands run in the context of the guest when it is booted, and so "
 "the security of your hypervisor / cloud should be considered."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1232
+#: ../builder/virt-builder.pod:1256
 msgid ""
 "Virt-builder injects a random seed into every guest which it builds.  This "
 "helps to ensure that TCP sequence numbers, UUIDs, ssh host keys etc are "
@@ -4475,17 +4531,17 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1236
+#: ../builder/virt-builder.pod:1260
 msgid "You should check digital signatures and not ignore any signing errors."
 msgstr ""
 
 #. type: =head2
-#: ../builder/virt-builder.pod:1238
+#: ../builder/virt-builder.pod:1262
 msgid "USER MODE LINUX"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1240
+#: ../builder/virt-builder.pod:1264
 msgid ""
 "You can use virt-builder with the User-Mode Linux (UML) backend.  This may "
 "be faster when running virt-builder inside a virtual machine (eg. in the "
@@ -4493,74 +4549,101 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1244
+#: ../builder/virt-builder.pod:1268
 msgid ""
 "To enable the UML backend, read the instructions in L<guestfs(3)/USER-MODE "
 "LINUX BACKEND>."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1247
+#: ../builder/virt-builder.pod:1271
 msgid ""
 "Currently you have to use the I<--no-network> option.  This should be fixed "
 "in a future version."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1250
+#: ../builder/virt-builder.pod:1274
 msgid ""
 "The qcow2 output format is not supported by UML.  You can only create raw-"
 "format guests."
 msgstr ""
 
+#. type: =head2
+#: ../builder/virt-builder.pod:1277 ../src/guestfs.pod:479
+msgid "SELINUX"
+msgstr "SELINUX"
+
+#. type: textblock
+#: ../builder/virt-builder.pod:1279
+msgid ""
+"Guests which use SELinux (such as Fedora and Red Hat Enterprise Linux)  "
+"require that each file has a correct SELinux label."
+msgstr ""
+
+#. type: textblock
+#: ../builder/virt-builder.pod:1282
+msgid ""
+"Since virt-builder does not know how to give new files a correct label, it "
+"touches C</.autorelabel> in the guest and relies on the guest to relabel "
+"itself at first boot."
+msgstr ""
+
+#. type: textblock
+#: ../builder/virt-builder.pod:1286
+msgid ""
+"This usually means that these guests will reboot themselves once the first "
+"time you use them.  This is normal, and harmless."
+msgstr ""
+
 #. type: textblock
-#: ../builder/virt-builder.pod:1255
+#: ../builder/virt-builder.pod:1291
 msgid ""
 "For other environment variables which affect all libguestfs programs, see "
 "L<guestfs(3)/ENVIRONMENT VARIABLES>."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1260
+#: ../builder/virt-builder.pod:1296
 msgid "C<http_proxy>"
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1262
+#: ../builder/virt-builder.pod:1298
 msgid "C<https_proxy>"
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1264
+#: ../builder/virt-builder.pod:1300
 msgid "C<no_proxy>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1266
+#: ../builder/virt-builder.pod:1302
 msgid ""
 "Set the proxy for downloads.  These environment variables (and more)  are "
 "actually interpreted by L<curl(1)>, not virt-builder."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1269
+#: ../builder/virt-builder.pod:1305
 msgid "C<HOME>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1271 ../builder/virt-builder.pod:1291
+#: ../builder/virt-builder.pod:1307 ../builder/virt-builder.pod:1327
 msgid "Used to determine the location of the template cache.  See L</CACHING>."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1273
+#: ../builder/virt-builder.pod:1309
 #, fuzzy
 #| msgid "LIBGUESTFS_MEMSIZE"
 msgid "C<LIBGUESTFS_MEMSIZE>"
 msgstr "LIBGUESTFS_MEMSIZE"
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1275
+#: ../builder/virt-builder.pod:1311
 msgid ""
 "The size (in megabytes) of the appliance.  The default can be found using "
 "the command S<C<guestfish get-memsize>>.  Increase this if you find that I<--"
@@ -4568,36 +4651,36 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1279
+#: ../builder/virt-builder.pod:1315
 msgid "C<VIRT_BUILDER_FINGERPRINT>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1281
+#: ../builder/virt-builder.pod:1317
 msgid ""
 "Set the default value for the GPG signature fingerprint (see I<--"
 "fingerprint> option)."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1284
+#: ../builder/virt-builder.pod:1320
 msgid "C<VIRT_BUILDER_SOURCE>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1286
+#: ../builder/virt-builder.pod:1322
 msgid ""
 "Set the default value for the source URL for the template repository (see "
 "I<--source> option)."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1289
+#: ../builder/virt-builder.pod:1325
 msgid "C<XDG_CACHE_HOME>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1297 ../cat/virt-cat.pod:246
+#: ../builder/virt-builder.pod:1333 ../cat/virt-cat.pod:246
 #: ../cat/virt-filesystems.pod:392 ../cat/virt-ls.pod:504
 #: ../daemon/guestfsd.pod:75 ../df/virt-df.pod:262 ../edit/virt-edit.pod:359
 #: ../fuse/guestmount.pod:403 ../inspector/virt-inspector.pod:498
@@ -4609,7 +4692,7 @@ msgstr ""
 "значення, якщо сталася помилка."
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1302
+#: ../builder/virt-builder.pod:1338
 #, fuzzy
 #| msgid ""
 #| "L<guestfs(3)>, L<guestfish(1)>, L<virt-clone(1)>, L<virt-rescue(1)>, "
@@ -4619,15 +4702,15 @@ msgstr ""
 msgid ""
 "L<guestfs(3)>, L<guestfish(1)>, L<guestmount(1)>, L<virt-copy-out(1)>, "
 "L<virt-install(1)>, L<virt-rescue(1)>, L<virt-resize(1)>, L<virt-"
-"sysprep(1)>, L<oz-install(1)>, L<gpg(1)>, L<curl(1)>, L<http://libguestfs."
-"org/>."
+"sysprep(1)>, L<oz-install(1)>, L<gpg(1)>, L<curl(1)>, L<virt-make-fs(1)>, "
+"L<genisoimage(1)>, L<http://libguestfs.org/>."
 msgstr ""
 "L<guestfs(3)>, L<guestfish(1)>, L<virt-clone(1)>, L<virt-rescue(1)>, L<virt-"
 "resize(1)>, L<virt-sparsify(1)>, L<virsh(1)>, L<lvcreate(8)>, L<qemu-"
 "img(1)>, L<scrub(1)>, L<http://libguestfs.org/>, L<http://libvirt.org/>."
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1321 ../fuse/guestunmount.pod:164
+#: ../builder/virt-builder.pod:1359 ../fuse/guestunmount.pod:164
 #: ../golang/examples/guestfs-golang.pod:99
 msgid "Copyright (C) 2013 Red Hat Inc."
 msgstr "© Red Hat Inc., 2013"
@@ -11659,6 +11742,15 @@ msgstr ""
 msgid "Copyright (C) 2012 Red Hat Inc."
 msgstr "© Red Hat Inc., 2012"
 
+#. type: =end
+#: ../examples/guestfs-recipes.pod:3 ../examples/guestfs-recipes.pod:8
+#: ../guestfs-release-notes.pod:7 ../guestfs-release-notes.pod:14
+#: ../guestfs-release-notes.pod:200 ../guestfs-release-notes.pod:204
+#: ../guestfs-release-notes.pod:549 ../guestfs-release-notes.pod:553
+#: ../guestfs-release-notes.pod:1105 ../guestfs-release-notes.pod:1109
+msgid "comment"
+msgstr "коментар"
+
 #. type: textblock
 #: ../examples/guestfs-recipes.pod:5
 msgid ""
@@ -68409,11 +68501,6 @@ msgid ""
 "L<sd_journal_open(3)>."
 msgstr ""
 
-#. type: =head2
-#: ../src/guestfs.pod:479
-msgid "SELINUX"
-msgstr "SELINUX"
-
 #. type: textblock
 #: ../src/guestfs.pod:481
 msgid ""
diff --git a/po/en_GB.po b/po/en_GB.po
index a23f2d3..e4d85a1 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: libguestfs\n"
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-01-02 20:24+0000\n"
+"POT-Creation-Date: 2014-01-20 12:50+0000\n"
 "PO-Revision-Date: 2013-08-06 13:32+0000\n"
 "Last-Translator: rjones <rjones at redhat.com>\n"
 "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/"
@@ -4104,43 +4104,43 @@ msgid ""
 "compiled without the libmagic library"
 msgstr ""
 
-#: src/fuse.c:936
+#: src/fuse.c:938
 msgid "filesystem is already mounted in another thread"
 msgstr ""
 
-#: src/fuse.c:961
+#: src/fuse.c:963
 #, c-format
 msgid "fuse_opt_add_arg: %s"
 msgstr ""
 
-#: src/fuse.c:978
+#: src/fuse.c:980
 #, c-format
 msgid "fuse_mount: %s"
 msgstr ""
 
-#: src/fuse.c:996
+#: src/fuse.c:998
 #, c-format
 msgid "fuse_new: %s"
 msgstr ""
 
-#: src/fuse.c:1025
+#: src/fuse.c:1027
 msgid "you must call guestfs_mount_local first"
 msgstr ""
 
-#: src/fuse.c:1034
+#: src/fuse.c:1036
 #, c-format
 msgid "fuse_loop: %s"
 msgstr ""
 
-#: src/fuse.c:1084
+#: src/fuse.c:1086
 msgid "no filesystem is mounted"
 msgstr ""
 
-#: src/fuse.c:1202
+#: src/fuse.c:1204
 msgid "could not initialize dir cache hashtables"
 msgstr ""
 
-#: src/fuse.c:1454
+#: src/fuse.c:1456
 msgid ""
 "FUSE is not supported in this build of libguestfs because libfuse was not "
 "found when libguestfs was compiled"
@@ -4264,11 +4264,11 @@ msgid ""
 "might need to log out and log in again)."
 msgstr ""
 
-#: src/launch-direct.c:246 src/launch-uml.c:120
+#: src/launch-direct.c:247 src/launch-uml.c:120
 msgid "you must call guestfs_add_drive before guestfs_launch"
 msgstr ""
 
-#: src/launch-direct.c:771 src/launch-libvirt.c:481
+#: src/launch-direct.c:762 src/launch-libvirt.c:481
 msgid "qemu launched and contacted daemon, but state != READY"
 msgstr ""
 
@@ -4334,49 +4334,49 @@ msgstr ""
 msgid "error constructing libvirt XML at \"%s\""
 msgstr ""
 
-#: src/launch-libvirt.c:1109
+#: src/launch-libvirt.c:1126
 msgid "'iface' parameter is not supported by the libvirt backend"
 msgstr ""
 
-#: src/launch-libvirt.c:1220
+#: src/launch-libvirt.c:1237
 msgid ""
 "libvirt does not support the qemu curl driver protocols (ftp, http, etc.); "
 "try setting LIBGUESTFS_BACKEND=direct"
 msgstr ""
 
-#: src/launch-libvirt.c:1258
+#: src/launch-libvirt.c:1275
 msgid ""
 "could not auto-detect the format.\n"
 "If the format is known, pass the format to libguestfs, eg. using the\n"
 "'--format' option, or via the optional 'format' argument to 'add-drive'."
 msgstr ""
 
-#: src/launch-libvirt.c:1269
+#: src/launch-libvirt.c:1286
 msgid ""
 "could not auto-detect the format when using a non-file protocol.\n"
 "If the format is known, pass the format to libguestfs, eg. using the\n"
 "'--format' option, or via the optional 'format' argument to 'add-drive'."
 msgstr ""
 
-#: src/launch-libvirt.c:1624
+#: src/launch-libvirt.c:1641
 #, c-format
 msgid "realpath: could not convert '%s' to absolute path"
 msgstr ""
 
-#: src/launch-libvirt.c:1706
+#: src/launch-libvirt.c:1723
 msgid "could not destroy libvirt domain"
 msgstr ""
 
-#: src/launch-libvirt.c:1743
+#: src/launch-libvirt.c:1760
 #, c-format
 msgid "%s: internal error forming error message"
 msgstr ""
 
-#: src/launch-libvirt.c:1805
+#: src/launch-libvirt.c:1822
 msgid "could not attach disk to libvirt domain"
 msgstr ""
 
-#: src/launch-libvirt.c:1836
+#: src/launch-libvirt.c:1853
 msgid "could not detach disk from libvirt domain"
 msgstr ""
 
@@ -4649,27 +4649,27 @@ msgstr ""
 msgid "%s: cannot create temporary directory"
 msgstr ""
 
-#: src/utils.c:114
+#: src/utils.c:195
 #, c-format
 msgid "%s exited successfully"
 msgstr ""
 
-#: src/utils.c:117
+#: src/utils.c:198
 #, c-format
 msgid "%s exited with error status %d"
 msgstr ""
 
-#: src/utils.c:121
+#: src/utils.c:202
 #, c-format
 msgid "%s killed by signal %d (%s)"
 msgstr ""
 
-#: src/utils.c:125
+#: src/utils.c:206
 #, c-format
 msgid "%s stopped by signal %d (%s)"
 msgstr ""
 
-#: src/utils.c:129
+#: src/utils.c:210
 #, c-format
 msgid "%s exited for an unknown reason (status %d)"
 msgstr ""
@@ -5101,6 +5101,10 @@ msgstr ""
 msgid "%s: cannot output to a character device or /dev/null\n"
 msgstr ""
 
+#: ../builder/downloader.ml:112
+msgid "%s: curl (download) command failed downloading '%s'\n"
+msgstr ""
+
 #: ../builder/builder.ml:94
 msgid "%s: curl is not installed (or does not work)\n"
 msgstr ""
@@ -5115,6 +5119,13 @@ msgstr ""
 msgid "%s: empty --expand option"
 msgstr ""
 
+#: ../builder/index_parser.ml:102
+msgid ""
+"%s: error parsing index near this line:\n"
+"\n"
+"%s\n"
+msgstr ""
+
 #: ../mllib/common_utils.ml:192
 msgid "%s: error: %s"
 msgstr ""
@@ -5155,6 +5166,10 @@ msgstr ""
 msgid "%s: exception: %s\n"
 msgstr ""
 
+#: ../builder/downloader.ml:91
+msgid "%s: failed to download %s: HTTP status code %s\n"
+msgstr ""
+
 #: ../builder/builder.ml:733
 msgid "%s: failure: %s\n"
 msgstr ""
@@ -5310,6 +5325,12 @@ msgstr ""
 msgid "%s: this partition overlaps the previous one"
 msgstr ""
 
+#: ../builder/downloader.ml:80
+msgid ""
+"%s: unexpected output from curl command, enable debug and look at previous "
+"messages\n"
+msgstr ""
+
 #: ../resize/resize.ml:302
 msgid ""
 "%s: unknown partition table type\n"
@@ -6569,15 +6590,15 @@ msgstr ""
 msgid "error parsing URI '%s'. Look for error messages printed above."
 msgstr ""
 
-#: ../mllib/common_utils.ml:343
+#: ../mllib/common_utils.ml:346
 msgid "external command '%s' exited with error %d"
 msgstr ""
 
-#: ../mllib/common_utils.ml:345
+#: ../mllib/common_utils.ml:348
 msgid "external command '%s' killed by signal %d"
 msgstr ""
 
-#: ../mllib/common_utils.ml:347
+#: ../mllib/common_utils.ml:350
 msgid "external command '%s' stopped by signal %d"
 msgstr ""
 
@@ -6770,17 +6791,6 @@ msgstr ""
 msgid "virt-builder: cannot use a URI ('%s') in the index file\n"
 msgstr ""
 
-#: ../builder/downloader.ml:123 ../builder/downloader.ml:84
-msgid "virt-builder: curl (download) command failed downloading '%s'\n"
-msgstr ""
-
-#: ../builder/index_parser.ml:102
-msgid ""
-"virt-builder: error parsing index near this line:\n"
-"\n"
-"%s\n"
-msgstr ""
-
 #: ../builder/sigchecker.ml:168
 msgid ""
 "virt-builder: error: GPG failure: could not verify digital signature of "
@@ -6834,18 +6844,6 @@ msgid ""
 "you are susceptible to man-in-the-middle attacks.\n"
 msgstr ""
 
-#: ../builder/downloader.ml:87
-msgid "virt-builder: external command '%s' killed by signal %d\n"
-msgstr ""
-
-#: ../builder/downloader.ml:91
-msgid "virt-builder: external command '%s' stopped by signal %d\n"
-msgstr ""
-
-#: ../builder/downloader.ml:102
-msgid "virt-builder: failed to download %s: HTTP status code %s\n"
-msgstr ""
-
 #: ../builder/index_parser.ml:233
 msgid "virt-builder: field '%s' cannot span multiple lines\n"
 msgstr ""
diff --git a/po/es.po b/po/es.po
index 7532c49..33e3c06 100644
--- a/po/es.po
+++ b/po/es.po
@@ -11,7 +11,7 @@ msgstr ""
 "Project-Id-Version: libguestfs\n"
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-01-02 20:24+0000\n"
+"POT-Creation-Date: 2014-01-20 12:50+0000\n"
 "PO-Revision-Date: 2013-08-06 13:32+0000\n"
 "Last-Translator: rjones <rjones at redhat.com>\n"
 "Language-Team: Spanish <trans-es at lists.fedoraproject.org>\n"
@@ -4228,43 +4228,43 @@ msgstr ""
 "no está disponible la arquitectura del archivo API debido a que esta versión "
 "de libguestfs ha sido compilada sin la biblioteca libmagic"
 
-#: src/fuse.c:936
+#: src/fuse.c:938
 msgid "filesystem is already mounted in another thread"
 msgstr ""
 
-#: src/fuse.c:961
+#: src/fuse.c:963
 #, c-format
 msgid "fuse_opt_add_arg: %s"
 msgstr ""
 
-#: src/fuse.c:978
+#: src/fuse.c:980
 #, c-format
 msgid "fuse_mount: %s"
 msgstr ""
 
-#: src/fuse.c:996
+#: src/fuse.c:998
 #, c-format
 msgid "fuse_new: %s"
 msgstr ""
 
-#: src/fuse.c:1025
+#: src/fuse.c:1027
 msgid "you must call guestfs_mount_local first"
 msgstr ""
 
-#: src/fuse.c:1034
+#: src/fuse.c:1036
 #, c-format
 msgid "fuse_loop: %s"
 msgstr ""
 
-#: src/fuse.c:1084
+#: src/fuse.c:1086
 msgid "no filesystem is mounted"
 msgstr ""
 
-#: src/fuse.c:1202
+#: src/fuse.c:1204
 msgid "could not initialize dir cache hashtables"
 msgstr ""
 
-#: src/fuse.c:1454
+#: src/fuse.c:1456
 msgid ""
 "FUSE is not supported in this build of libguestfs because libfuse was not "
 "found when libguestfs was compiled"
@@ -4390,11 +4390,11 @@ msgid ""
 "might need to log out and log in again)."
 msgstr ""
 
-#: src/launch-direct.c:246 src/launch-uml.c:120
+#: src/launch-direct.c:247 src/launch-uml.c:120
 msgid "you must call guestfs_add_drive before guestfs_launch"
 msgstr "antes de guestfs_launch, debe llamar guestfs_add_drive"
 
-#: src/launch-direct.c:771 src/launch-libvirt.c:481
+#: src/launch-direct.c:762 src/launch-libvirt.c:481
 msgid "qemu launched and contacted daemon, but state != READY"
 msgstr ""
 "qemu ha sido iniciado y contactado el demonio, pero es estado es != READY"
@@ -4461,49 +4461,49 @@ msgstr ""
 msgid "error constructing libvirt XML at \"%s\""
 msgstr ""
 
-#: src/launch-libvirt.c:1109
+#: src/launch-libvirt.c:1126
 msgid "'iface' parameter is not supported by the libvirt backend"
 msgstr ""
 
-#: src/launch-libvirt.c:1220
+#: src/launch-libvirt.c:1237
 msgid ""
 "libvirt does not support the qemu curl driver protocols (ftp, http, etc.); "
 "try setting LIBGUESTFS_BACKEND=direct"
 msgstr ""
 
-#: src/launch-libvirt.c:1258
+#: src/launch-libvirt.c:1275
 msgid ""
 "could not auto-detect the format.\n"
 "If the format is known, pass the format to libguestfs, eg. using the\n"
 "'--format' option, or via the optional 'format' argument to 'add-drive'."
 msgstr ""
 
-#: src/launch-libvirt.c:1269
+#: src/launch-libvirt.c:1286
 msgid ""
 "could not auto-detect the format when using a non-file protocol.\n"
 "If the format is known, pass the format to libguestfs, eg. using the\n"
 "'--format' option, or via the optional 'format' argument to 'add-drive'."
 msgstr ""
 
-#: src/launch-libvirt.c:1624
+#: src/launch-libvirt.c:1641
 #, c-format
 msgid "realpath: could not convert '%s' to absolute path"
 msgstr ""
 
-#: src/launch-libvirt.c:1706
+#: src/launch-libvirt.c:1723
 msgid "could not destroy libvirt domain"
 msgstr ""
 
-#: src/launch-libvirt.c:1743
+#: src/launch-libvirt.c:1760
 #, c-format
 msgid "%s: internal error forming error message"
 msgstr ""
 
-#: src/launch-libvirt.c:1805
+#: src/launch-libvirt.c:1822
 msgid "could not attach disk to libvirt domain"
 msgstr ""
 
-#: src/launch-libvirt.c:1836
+#: src/launch-libvirt.c:1853
 msgid "could not detach disk from libvirt domain"
 msgstr ""
 
@@ -4794,27 +4794,27 @@ msgstr ""
 msgid "%s: cannot create temporary directory"
 msgstr "%s: no es posible crear directorio temporal"
 
-#: src/utils.c:114
+#: src/utils.c:195
 #, c-format
 msgid "%s exited successfully"
 msgstr ""
 
-#: src/utils.c:117
+#: src/utils.c:198
 #, c-format
 msgid "%s exited with error status %d"
 msgstr ""
 
-#: src/utils.c:121
+#: src/utils.c:202
 #, c-format
 msgid "%s killed by signal %d (%s)"
 msgstr ""
 
-#: src/utils.c:125
+#: src/utils.c:206
 #, c-format
 msgid "%s stopped by signal %d (%s)"
 msgstr ""
 
-#: src/utils.c:129
+#: src/utils.c:210
 #, c-format
 msgid "%s exited for an unknown reason (status %d)"
 msgstr ""
@@ -5275,6 +5275,10 @@ msgstr ""
 msgid "%s: cannot output to a character device or /dev/null\n"
 msgstr ""
 
+#: ../builder/downloader.ml:112
+msgid "%s: curl (download) command failed downloading '%s'\n"
+msgstr ""
+
 #: ../builder/builder.ml:94
 msgid "%s: curl is not installed (or does not work)\n"
 msgstr ""
@@ -5289,6 +5293,13 @@ msgstr ""
 msgid "%s: empty --expand option"
 msgstr ""
 
+#: ../builder/index_parser.ml:102
+msgid ""
+"%s: error parsing index near this line:\n"
+"\n"
+"%s\n"
+msgstr ""
+
 #: ../mllib/common_utils.ml:192
 msgid "%s: error: %s"
 msgstr ""
@@ -5329,6 +5340,10 @@ msgstr ""
 msgid "%s: exception: %s\n"
 msgstr ""
 
+#: ../builder/downloader.ml:91
+msgid "%s: failed to download %s: HTTP status code %s\n"
+msgstr ""
+
 #: ../builder/builder.ml:733
 msgid "%s: failure: %s\n"
 msgstr ""
@@ -5484,6 +5499,12 @@ msgstr ""
 msgid "%s: this partition overlaps the previous one"
 msgstr ""
 
+#: ../builder/downloader.ml:80
+msgid ""
+"%s: unexpected output from curl command, enable debug and look at previous "
+"messages\n"
+msgstr ""
+
 #: ../resize/resize.ml:302
 msgid ""
 "%s: unknown partition table type\n"
@@ -6743,15 +6764,15 @@ msgstr ""
 msgid "error parsing URI '%s'. Look for error messages printed above."
 msgstr ""
 
-#: ../mllib/common_utils.ml:343
+#: ../mllib/common_utils.ml:346
 msgid "external command '%s' exited with error %d"
 msgstr ""
 
-#: ../mllib/common_utils.ml:345
+#: ../mllib/common_utils.ml:348
 msgid "external command '%s' killed by signal %d"
 msgstr ""
 
-#: ../mllib/common_utils.ml:347
+#: ../mllib/common_utils.ml:350
 msgid "external command '%s' stopped by signal %d"
 msgstr ""
 
@@ -6944,17 +6965,6 @@ msgstr ""
 msgid "virt-builder: cannot use a URI ('%s') in the index file\n"
 msgstr ""
 
-#: ../builder/downloader.ml:123 ../builder/downloader.ml:84
-msgid "virt-builder: curl (download) command failed downloading '%s'\n"
-msgstr ""
-
-#: ../builder/index_parser.ml:102
-msgid ""
-"virt-builder: error parsing index near this line:\n"
-"\n"
-"%s\n"
-msgstr ""
-
 #: ../builder/sigchecker.ml:168
 msgid ""
 "virt-builder: error: GPG failure: could not verify digital signature of "
@@ -7008,18 +7018,6 @@ msgid ""
 "you are susceptible to man-in-the-middle attacks.\n"
 msgstr ""
 
-#: ../builder/downloader.ml:87
-msgid "virt-builder: external command '%s' killed by signal %d\n"
-msgstr ""
-
-#: ../builder/downloader.ml:91
-msgid "virt-builder: external command '%s' stopped by signal %d\n"
-msgstr ""
-
-#: ../builder/downloader.ml:102
-msgid "virt-builder: failed to download %s: HTTP status code %s\n"
-msgstr ""
-
 #: ../builder/index_parser.ml:233
 msgid "virt-builder: field '%s' cannot span multiple lines\n"
 msgstr ""
diff --git a/po/gu.po b/po/gu.po
index 2c0ac09..ac92d8c 100644
--- a/po/gu.po
+++ b/po/gu.po
@@ -10,7 +10,7 @@ msgstr ""
 "Project-Id-Version: libguestfs\n"
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-01-02 20:24+0000\n"
+"POT-Creation-Date: 2014-01-20 12:50+0000\n"
 "PO-Revision-Date: 2013-08-06 13:32+0000\n"
 "Last-Translator: rjones <rjones at redhat.com>\n"
 "Language-Team: Gujarati <trans-gu at lists.fedoraproject.org>\n"
@@ -4063,43 +4063,43 @@ msgid ""
 "compiled without the libmagic library"
 msgstr ""
 
-#: src/fuse.c:936
+#: src/fuse.c:938
 msgid "filesystem is already mounted in another thread"
 msgstr ""
 
-#: src/fuse.c:961
+#: src/fuse.c:963
 #, c-format
 msgid "fuse_opt_add_arg: %s"
 msgstr ""
 
-#: src/fuse.c:978
+#: src/fuse.c:980
 #, c-format
 msgid "fuse_mount: %s"
 msgstr ""
 
-#: src/fuse.c:996
+#: src/fuse.c:998
 #, c-format
 msgid "fuse_new: %s"
 msgstr ""
 
-#: src/fuse.c:1025
+#: src/fuse.c:1027
 msgid "you must call guestfs_mount_local first"
 msgstr ""
 
-#: src/fuse.c:1034
+#: src/fuse.c:1036
 #, c-format
 msgid "fuse_loop: %s"
 msgstr ""
 
-#: src/fuse.c:1084
+#: src/fuse.c:1086
 msgid "no filesystem is mounted"
 msgstr ""
 
-#: src/fuse.c:1202
+#: src/fuse.c:1204
 msgid "could not initialize dir cache hashtables"
 msgstr ""
 
-#: src/fuse.c:1454
+#: src/fuse.c:1456
 msgid ""
 "FUSE is not supported in this build of libguestfs because libfuse was not "
 "found when libguestfs was compiled"
@@ -4223,11 +4223,11 @@ msgid ""
 "might need to log out and log in again)."
 msgstr ""
 
-#: src/launch-direct.c:246 src/launch-uml.c:120
+#: src/launch-direct.c:247 src/launch-uml.c:120
 msgid "you must call guestfs_add_drive before guestfs_launch"
 msgstr "તમારે guestfs_launch પહેલાં guestfs_add_drive ને કોલ કરવુ જ જોઇએ"
 
-#: src/launch-direct.c:771 src/launch-libvirt.c:481
+#: src/launch-direct.c:762 src/launch-libvirt.c:481
 msgid "qemu launched and contacted daemon, but state != READY"
 msgstr "qemu શરૂ થયેલ છે, ડિમનનો સંપર્ક થયેલ છે, પરંતુ state != READY"
 
@@ -4293,49 +4293,49 @@ msgstr ""
 msgid "error constructing libvirt XML at \"%s\""
 msgstr ""
 
-#: src/launch-libvirt.c:1109
+#: src/launch-libvirt.c:1126
 msgid "'iface' parameter is not supported by the libvirt backend"
 msgstr ""
 
-#: src/launch-libvirt.c:1220
+#: src/launch-libvirt.c:1237
 msgid ""
 "libvirt does not support the qemu curl driver protocols (ftp, http, etc.); "
 "try setting LIBGUESTFS_BACKEND=direct"
 msgstr ""
 
-#: src/launch-libvirt.c:1258
+#: src/launch-libvirt.c:1275
 msgid ""
 "could not auto-detect the format.\n"
 "If the format is known, pass the format to libguestfs, eg. using the\n"
 "'--format' option, or via the optional 'format' argument to 'add-drive'."
 msgstr ""
 
-#: src/launch-libvirt.c:1269
+#: src/launch-libvirt.c:1286
 msgid ""
 "could not auto-detect the format when using a non-file protocol.\n"
 "If the format is known, pass the format to libguestfs, eg. using the\n"
 "'--format' option, or via the optional 'format' argument to 'add-drive'."
 msgstr ""
 
-#: src/launch-libvirt.c:1624
+#: src/launch-libvirt.c:1641
 #, c-format
 msgid "realpath: could not convert '%s' to absolute path"
 msgstr ""
 
-#: src/launch-libvirt.c:1706
+#: src/launch-libvirt.c:1723
 msgid "could not destroy libvirt domain"
 msgstr ""
 
-#: src/launch-libvirt.c:1743
+#: src/launch-libvirt.c:1760
 #, c-format
 msgid "%s: internal error forming error message"
 msgstr ""
 
-#: src/launch-libvirt.c:1805
+#: src/launch-libvirt.c:1822
 msgid "could not attach disk to libvirt domain"
 msgstr ""
 
-#: src/launch-libvirt.c:1836
+#: src/launch-libvirt.c:1853
 msgid "could not detach disk from libvirt domain"
 msgstr ""
 
@@ -4608,27 +4608,27 @@ msgstr ""
 msgid "%s: cannot create temporary directory"
 msgstr "%s: કામચલાઉ ડિરેક્ટરીને બનાવી શકાતી નથી"
 
-#: src/utils.c:114
+#: src/utils.c:195
 #, c-format
 msgid "%s exited successfully"
 msgstr ""
 
-#: src/utils.c:117
+#: src/utils.c:198
 #, c-format
 msgid "%s exited with error status %d"
 msgstr ""
 
-#: src/utils.c:121
+#: src/utils.c:202
 #, c-format
 msgid "%s killed by signal %d (%s)"
 msgstr ""
 
-#: src/utils.c:125
+#: src/utils.c:206
 #, c-format
 msgid "%s stopped by signal %d (%s)"
 msgstr ""
 
-#: src/utils.c:129
+#: src/utils.c:210
 #, c-format
 msgid "%s exited for an unknown reason (status %d)"
 msgstr ""
@@ -5060,6 +5060,10 @@ msgstr ""
 msgid "%s: cannot output to a character device or /dev/null\n"
 msgstr ""
 
+#: ../builder/downloader.ml:112
+msgid "%s: curl (download) command failed downloading '%s'\n"
+msgstr ""
+
 #: ../builder/builder.ml:94
 msgid "%s: curl is not installed (or does not work)\n"
 msgstr ""
@@ -5074,6 +5078,13 @@ msgstr ""
 msgid "%s: empty --expand option"
 msgstr ""
 
+#: ../builder/index_parser.ml:102
+msgid ""
+"%s: error parsing index near this line:\n"
+"\n"
+"%s\n"
+msgstr ""
+
 #: ../mllib/common_utils.ml:192
 msgid "%s: error: %s"
 msgstr ""
@@ -5114,6 +5125,10 @@ msgstr ""
 msgid "%s: exception: %s\n"
 msgstr ""
 
+#: ../builder/downloader.ml:91
+msgid "%s: failed to download %s: HTTP status code %s\n"
+msgstr ""
+
 #: ../builder/builder.ml:733
 msgid "%s: failure: %s\n"
 msgstr ""
@@ -5269,6 +5284,12 @@ msgstr ""
 msgid "%s: this partition overlaps the previous one"
 msgstr ""
 
+#: ../builder/downloader.ml:80
+msgid ""
+"%s: unexpected output from curl command, enable debug and look at previous "
+"messages\n"
+msgstr ""
+
 #: ../resize/resize.ml:302
 msgid ""
 "%s: unknown partition table type\n"
@@ -6528,15 +6549,15 @@ msgstr ""
 msgid "error parsing URI '%s'. Look for error messages printed above."
 msgstr ""
 
-#: ../mllib/common_utils.ml:343
+#: ../mllib/common_utils.ml:346
 msgid "external command '%s' exited with error %d"
 msgstr ""
 
-#: ../mllib/common_utils.ml:345
+#: ../mllib/common_utils.ml:348
 msgid "external command '%s' killed by signal %d"
 msgstr ""
 
-#: ../mllib/common_utils.ml:347
+#: ../mllib/common_utils.ml:350
 msgid "external command '%s' stopped by signal %d"
 msgstr ""
 
@@ -6729,17 +6750,6 @@ msgstr ""
 msgid "virt-builder: cannot use a URI ('%s') in the index file\n"
 msgstr ""
 
-#: ../builder/downloader.ml:123 ../builder/downloader.ml:84
-msgid "virt-builder: curl (download) command failed downloading '%s'\n"
-msgstr ""
-
-#: ../builder/index_parser.ml:102
-msgid ""
-"virt-builder: error parsing index near this line:\n"
-"\n"
-"%s\n"
-msgstr ""
-
 #: ../builder/sigchecker.ml:168
 msgid ""
 "virt-builder: error: GPG failure: could not verify digital signature of "
@@ -6793,18 +6803,6 @@ msgid ""
 "you are susceptible to man-in-the-middle attacks.\n"
 msgstr ""
 
-#: ../builder/downloader.ml:87
-msgid "virt-builder: external command '%s' killed by signal %d\n"
-msgstr ""
-
-#: ../builder/downloader.ml:91
-msgid "virt-builder: external command '%s' stopped by signal %d\n"
-msgstr ""
-
-#: ../builder/downloader.ml:102
-msgid "virt-builder: failed to download %s: HTTP status code %s\n"
-msgstr ""
-
 #: ../builder/index_parser.ml:233
 msgid "virt-builder: field '%s' cannot span multiple lines\n"
 msgstr ""
diff --git a/po/hi.po b/po/hi.po
index 9976451..62585d2 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -10,7 +10,7 @@ msgstr ""
 "Project-Id-Version: libguestfs\n"
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-01-02 20:24+0000\n"
+"POT-Creation-Date: 2014-01-20 12:50+0000\n"
 "PO-Revision-Date: 2013-08-06 13:32+0000\n"
 "Last-Translator: rjones <rjones at redhat.com>\n"
 "Language-Team: Hindi <indlinux-hindi at lists.sourceforge.net>\n"
@@ -4061,43 +4061,43 @@ msgid ""
 "compiled without the libmagic library"
 msgstr ""
 
-#: src/fuse.c:936
+#: src/fuse.c:938
 msgid "filesystem is already mounted in another thread"
 msgstr ""
 
-#: src/fuse.c:961
+#: src/fuse.c:963
 #, c-format
 msgid "fuse_opt_add_arg: %s"
 msgstr ""
 
-#: src/fuse.c:978
+#: src/fuse.c:980
 #, c-format
 msgid "fuse_mount: %s"
 msgstr ""
 
-#: src/fuse.c:996
+#: src/fuse.c:998
 #, c-format
 msgid "fuse_new: %s"
 msgstr ""
 
-#: src/fuse.c:1025
+#: src/fuse.c:1027
 msgid "you must call guestfs_mount_local first"
 msgstr ""
 
-#: src/fuse.c:1034
+#: src/fuse.c:1036
 #, c-format
 msgid "fuse_loop: %s"
 msgstr ""
 
-#: src/fuse.c:1084
+#: src/fuse.c:1086
 msgid "no filesystem is mounted"
 msgstr ""
 
-#: src/fuse.c:1202
+#: src/fuse.c:1204
 msgid "could not initialize dir cache hashtables"
 msgstr ""
 
-#: src/fuse.c:1454
+#: src/fuse.c:1456
 msgid ""
 "FUSE is not supported in this build of libguestfs because libfuse was not "
 "found when libguestfs was compiled"
@@ -4221,11 +4221,11 @@ msgid ""
 "might need to log out and log in again)."
 msgstr ""
 
-#: src/launch-direct.c:246 src/launch-uml.c:120
+#: src/launch-direct.c:247 src/launch-uml.c:120
 msgid "you must call guestfs_add_drive before guestfs_launch"
 msgstr "you must call guestfs_add_drive before guestfs_launch"
 
-#: src/launch-direct.c:771 src/launch-libvirt.c:481
+#: src/launch-direct.c:762 src/launch-libvirt.c:481
 msgid "qemu launched and contacted daemon, but state != READY"
 msgstr "qemu launched and contacted daemon, but state != READY"
 
@@ -4291,49 +4291,49 @@ msgstr ""
 msgid "error constructing libvirt XML at \"%s\""
 msgstr ""
 
-#: src/launch-libvirt.c:1109
+#: src/launch-libvirt.c:1126
 msgid "'iface' parameter is not supported by the libvirt backend"
 msgstr ""
 
-#: src/launch-libvirt.c:1220
+#: src/launch-libvirt.c:1237
 msgid ""
 "libvirt does not support the qemu curl driver protocols (ftp, http, etc.); "
 "try setting LIBGUESTFS_BACKEND=direct"
 msgstr ""
 
-#: src/launch-libvirt.c:1258
+#: src/launch-libvirt.c:1275
 msgid ""
 "could not auto-detect the format.\n"
 "If the format is known, pass the format to libguestfs, eg. using the\n"
 "'--format' option, or via the optional 'format' argument to 'add-drive'."
 msgstr ""
 
-#: src/launch-libvirt.c:1269
+#: src/launch-libvirt.c:1286
 msgid ""
 "could not auto-detect the format when using a non-file protocol.\n"
 "If the format is known, pass the format to libguestfs, eg. using the\n"
 "'--format' option, or via the optional 'format' argument to 'add-drive'."
 msgstr ""
 
-#: src/launch-libvirt.c:1624
+#: src/launch-libvirt.c:1641
 #, c-format
 msgid "realpath: could not convert '%s' to absolute path"
 msgstr ""
 
-#: src/launch-libvirt.c:1706
+#: src/launch-libvirt.c:1723
 msgid "could not destroy libvirt domain"
 msgstr ""
 
-#: src/launch-libvirt.c:1743
+#: src/launch-libvirt.c:1760
 #, c-format
 msgid "%s: internal error forming error message"
 msgstr ""
 
-#: src/launch-libvirt.c:1805
+#: src/launch-libvirt.c:1822
 msgid "could not attach disk to libvirt domain"
 msgstr ""
 
-#: src/launch-libvirt.c:1836
+#: src/launch-libvirt.c:1853
 msgid "could not detach disk from libvirt domain"
 msgstr ""
 
@@ -4606,27 +4606,27 @@ msgstr ""
 msgid "%s: cannot create temporary directory"
 msgstr "%s: को अस्थायी निर्देशिका नहीं बना सकता है"
 
-#: src/utils.c:114
+#: src/utils.c:195
 #, c-format
 msgid "%s exited successfully"
 msgstr ""
 
-#: src/utils.c:117
+#: src/utils.c:198
 #, c-format
 msgid "%s exited with error status %d"
 msgstr ""
 
-#: src/utils.c:121
+#: src/utils.c:202
 #, c-format
 msgid "%s killed by signal %d (%s)"
 msgstr ""
 
-#: src/utils.c:125
+#: src/utils.c:206
 #, c-format
 msgid "%s stopped by signal %d (%s)"
 msgstr ""
 
-#: src/utils.c:129
+#: src/utils.c:210
 #, c-format
 msgid "%s exited for an unknown reason (status %d)"
 msgstr ""
@@ -5058,6 +5058,10 @@ msgstr ""
 msgid "%s: cannot output to a character device or /dev/null\n"
 msgstr ""
 
+#: ../builder/downloader.ml:112
+msgid "%s: curl (download) command failed downloading '%s'\n"
+msgstr ""
+
 #: ../builder/builder.ml:94
 msgid "%s: curl is not installed (or does not work)\n"
 msgstr ""
@@ -5072,6 +5076,13 @@ msgstr ""
 msgid "%s: empty --expand option"
 msgstr ""
 
+#: ../builder/index_parser.ml:102
+msgid ""
+"%s: error parsing index near this line:\n"
+"\n"
+"%s\n"
+msgstr ""
+
 #: ../mllib/common_utils.ml:192
 msgid "%s: error: %s"
 msgstr ""
@@ -5112,6 +5123,10 @@ msgstr ""
 msgid "%s: exception: %s\n"
 msgstr ""
 
+#: ../builder/downloader.ml:91
+msgid "%s: failed to download %s: HTTP status code %s\n"
+msgstr ""
+
 #: ../builder/builder.ml:733
 msgid "%s: failure: %s\n"
 msgstr ""
@@ -5267,6 +5282,12 @@ msgstr ""
 msgid "%s: this partition overlaps the previous one"
 msgstr ""
 
+#: ../builder/downloader.ml:80
+msgid ""
+"%s: unexpected output from curl command, enable debug and look at previous "
+"messages\n"
+msgstr ""
+
 #: ../resize/resize.ml:302
 msgid ""
 "%s: unknown partition table type\n"
@@ -6526,15 +6547,15 @@ msgstr ""
 msgid "error parsing URI '%s'. Look for error messages printed above."
 msgstr ""
 
-#: ../mllib/common_utils.ml:343
+#: ../mllib/common_utils.ml:346
 msgid "external command '%s' exited with error %d"
 msgstr ""
 
-#: ../mllib/common_utils.ml:345
+#: ../mllib/common_utils.ml:348
 msgid "external command '%s' killed by signal %d"
 msgstr ""
 
-#: ../mllib/common_utils.ml:347
+#: ../mllib/common_utils.ml:350
 msgid "external command '%s' stopped by signal %d"
 msgstr ""
 
@@ -6727,17 +6748,6 @@ msgstr ""
 msgid "virt-builder: cannot use a URI ('%s') in the index file\n"
 msgstr ""
 
-#: ../builder/downloader.ml:123 ../builder/downloader.ml:84
-msgid "virt-builder: curl (download) command failed downloading '%s'\n"
-msgstr ""
-
-#: ../builder/index_parser.ml:102
-msgid ""
-"virt-builder: error parsing index near this line:\n"
-"\n"
-"%s\n"
-msgstr ""
-
 #: ../builder/sigchecker.ml:168
 msgid ""
 "virt-builder: error: GPG failure: could not verify digital signature of "
@@ -6791,18 +6801,6 @@ msgid ""
 "you are susceptible to man-in-the-middle attacks.\n"
 msgstr ""
 
-#: ../builder/downloader.ml:87
-msgid "virt-builder: external command '%s' killed by signal %d\n"
-msgstr ""
-
-#: ../builder/downloader.ml:91
-msgid "virt-builder: external command '%s' stopped by signal %d\n"
-msgstr ""
-
-#: ../builder/downloader.ml:102
-msgid "virt-builder: failed to download %s: HTTP status code %s\n"
-msgstr ""
-
 #: ../builder/index_parser.ml:233
 msgid "virt-builder: field '%s' cannot span multiple lines\n"
 msgstr ""
diff --git a/po/kn.po b/po/kn.po
index 1e8f2aa..82db823 100644
--- a/po/kn.po
+++ b/po/kn.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: libguestfs\n"
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-01-02 20:24+0000\n"
+"POT-Creation-Date: 2014-01-20 12:50+0000\n"
 "PO-Revision-Date: 2013-08-06 13:32+0000\n"
 "Last-Translator: rjones <rjones at redhat.com>\n"
 "Language-Team: Kannada (http://www.transifex.com/projects/p/fedora/language/"
@@ -4066,43 +4066,43 @@ msgid ""
 "compiled without the libmagic library"
 msgstr ""
 
-#: src/fuse.c:936
+#: src/fuse.c:938
 msgid "filesystem is already mounted in another thread"
 msgstr ""
 
-#: src/fuse.c:961
+#: src/fuse.c:963
 #, c-format
 msgid "fuse_opt_add_arg: %s"
 msgstr ""
 
-#: src/fuse.c:978
+#: src/fuse.c:980
 #, c-format
 msgid "fuse_mount: %s"
 msgstr ""
 
-#: src/fuse.c:996
+#: src/fuse.c:998
 #, c-format
 msgid "fuse_new: %s"
 msgstr ""
 
-#: src/fuse.c:1025
+#: src/fuse.c:1027
 msgid "you must call guestfs_mount_local first"
 msgstr ""
 
-#: src/fuse.c:1034
+#: src/fuse.c:1036
 #, c-format
 msgid "fuse_loop: %s"
 msgstr ""
 
-#: src/fuse.c:1084
+#: src/fuse.c:1086
 msgid "no filesystem is mounted"
 msgstr ""
 
-#: src/fuse.c:1202
+#: src/fuse.c:1204
 msgid "could not initialize dir cache hashtables"
 msgstr ""
 
-#: src/fuse.c:1454
+#: src/fuse.c:1456
 msgid ""
 "FUSE is not supported in this build of libguestfs because libfuse was not "
 "found when libguestfs was compiled"
@@ -4226,11 +4226,11 @@ msgid ""
 "might need to log out and log in again)."
 msgstr ""
 
-#: src/launch-direct.c:246 src/launch-uml.c:120
+#: src/launch-direct.c:247 src/launch-uml.c:120
 msgid "you must call guestfs_add_drive before guestfs_launch"
 msgstr "ನೀವು guestfs_launch ನ ಮೊದಲು guestfs_add_drive ಅನ್ನು ಕರೆಯಬೇಕು"
 
-#: src/launch-direct.c:771 src/launch-libvirt.c:481
+#: src/launch-direct.c:762 src/launch-libvirt.c:481
 msgid "qemu launched and contacted daemon, but state != READY"
 msgstr "qemu ಆರಂಭಗೊಂಡಿದೆ ಹಾಗು ಡೀಮನ್ ಅನ್ನು ಸಂಪರ್ಕಿಸಿದೆ, ಆದರೆ != READY ಸ್ಥಿತಿಯಲ್ಲಿದೆ"
 
@@ -4296,49 +4296,49 @@ msgstr ""
 msgid "error constructing libvirt XML at \"%s\""
 msgstr ""
 
-#: src/launch-libvirt.c:1109
+#: src/launch-libvirt.c:1126
 msgid "'iface' parameter is not supported by the libvirt backend"
 msgstr ""
 
-#: src/launch-libvirt.c:1220
+#: src/launch-libvirt.c:1237
 msgid ""
 "libvirt does not support the qemu curl driver protocols (ftp, http, etc.); "
 "try setting LIBGUESTFS_BACKEND=direct"
 msgstr ""
 
-#: src/launch-libvirt.c:1258
+#: src/launch-libvirt.c:1275
 msgid ""
 "could not auto-detect the format.\n"
 "If the format is known, pass the format to libguestfs, eg. using the\n"
 "'--format' option, or via the optional 'format' argument to 'add-drive'."
 msgstr ""
 
-#: src/launch-libvirt.c:1269
+#: src/launch-libvirt.c:1286
 msgid ""
 "could not auto-detect the format when using a non-file protocol.\n"
 "If the format is known, pass the format to libguestfs, eg. using the\n"
 "'--format' option, or via the optional 'format' argument to 'add-drive'."
 msgstr ""
 
-#: src/launch-libvirt.c:1624
+#: src/launch-libvirt.c:1641
 #, c-format
 msgid "realpath: could not convert '%s' to absolute path"
 msgstr ""
 
-#: src/launch-libvirt.c:1706
+#: src/launch-libvirt.c:1723
 msgid "could not destroy libvirt domain"
 msgstr ""
 
-#: src/launch-libvirt.c:1743
+#: src/launch-libvirt.c:1760
 #, c-format
 msgid "%s: internal error forming error message"
 msgstr ""
 
-#: src/launch-libvirt.c:1805
+#: src/launch-libvirt.c:1822
 msgid "could not attach disk to libvirt domain"
 msgstr ""
 
-#: src/launch-libvirt.c:1836
+#: src/launch-libvirt.c:1853
 msgid "could not detach disk from libvirt domain"
 msgstr ""
 
@@ -4611,27 +4611,27 @@ msgstr ""
 msgid "%s: cannot create temporary directory"
 msgstr "%s: ಒಂದು ತಾತ್ಕಾಲಿಕ ಕೋಶವನ್ನು ರಚಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ"
 
-#: src/utils.c:114
+#: src/utils.c:195
 #, c-format
 msgid "%s exited successfully"
 msgstr ""
 
-#: src/utils.c:117
+#: src/utils.c:198
 #, c-format
 msgid "%s exited with error status %d"
 msgstr ""
 
-#: src/utils.c:121
+#: src/utils.c:202
 #, c-format
 msgid "%s killed by signal %d (%s)"
 msgstr ""
 
-#: src/utils.c:125
+#: src/utils.c:206
 #, c-format
 msgid "%s stopped by signal %d (%s)"
 msgstr ""
 
-#: src/utils.c:129
+#: src/utils.c:210
 #, c-format
 msgid "%s exited for an unknown reason (status %d)"
 msgstr ""
@@ -5063,6 +5063,10 @@ msgstr ""
 msgid "%s: cannot output to a character device or /dev/null\n"
 msgstr ""
 
+#: ../builder/downloader.ml:112
+msgid "%s: curl (download) command failed downloading '%s'\n"
+msgstr ""
+
 #: ../builder/builder.ml:94
 msgid "%s: curl is not installed (or does not work)\n"
 msgstr ""
@@ -5077,6 +5081,13 @@ msgstr ""
 msgid "%s: empty --expand option"
 msgstr ""
 
+#: ../builder/index_parser.ml:102
+msgid ""
+"%s: error parsing index near this line:\n"
+"\n"
+"%s\n"
+msgstr ""
+
 #: ../mllib/common_utils.ml:192
 msgid "%s: error: %s"
 msgstr ""
@@ -5117,6 +5128,10 @@ msgstr ""
 msgid "%s: exception: %s\n"
 msgstr ""
 
+#: ../builder/downloader.ml:91
+msgid "%s: failed to download %s: HTTP status code %s\n"
+msgstr ""
+
 #: ../builder/builder.ml:733
 msgid "%s: failure: %s\n"
 msgstr ""
@@ -5272,6 +5287,12 @@ msgstr ""
 msgid "%s: this partition overlaps the previous one"
 msgstr ""
 
+#: ../builder/downloader.ml:80
+msgid ""
+"%s: unexpected output from curl command, enable debug and look at previous "
+"messages\n"
+msgstr ""
+
 #: ../resize/resize.ml:302
 msgid ""
 "%s: unknown partition table type\n"
@@ -6531,15 +6552,15 @@ msgstr ""
 msgid "error parsing URI '%s'. Look for error messages printed above."
 msgstr ""
 
-#: ../mllib/common_utils.ml:343
+#: ../mllib/common_utils.ml:346
 msgid "external command '%s' exited with error %d"
 msgstr ""
 
-#: ../mllib/common_utils.ml:345
+#: ../mllib/common_utils.ml:348
 msgid "external command '%s' killed by signal %d"
 msgstr ""
 
-#: ../mllib/common_utils.ml:347
+#: ../mllib/common_utils.ml:350
 msgid "external command '%s' stopped by signal %d"
 msgstr ""
 
@@ -6732,17 +6753,6 @@ msgstr ""
 msgid "virt-builder: cannot use a URI ('%s') in the index file\n"
 msgstr ""
 
-#: ../builder/downloader.ml:123 ../builder/downloader.ml:84
-msgid "virt-builder: curl (download) command failed downloading '%s'\n"
-msgstr ""
-
-#: ../builder/index_parser.ml:102
-msgid ""
-"virt-builder: error parsing index near this line:\n"
-"\n"
-"%s\n"
-msgstr ""
-
 #: ../builder/sigchecker.ml:168
 msgid ""
 "virt-builder: error: GPG failure: could not verify digital signature of "
@@ -6796,18 +6806,6 @@ msgid ""
 "you are susceptible to man-in-the-middle attacks.\n"
 msgstr ""
 
-#: ../builder/downloader.ml:87
-msgid "virt-builder: external command '%s' killed by signal %d\n"
-msgstr ""
-
-#: ../builder/downloader.ml:91
-msgid "virt-builder: external command '%s' stopped by signal %d\n"
-msgstr ""
-
-#: ../builder/downloader.ml:102
-msgid "virt-builder: failed to download %s: HTTP status code %s\n"
-msgstr ""
-
 #: ../builder/index_parser.ml:233
 msgid "virt-builder: field '%s' cannot span multiple lines\n"
 msgstr ""
diff --git a/po/libguestfs.pot b/po/libguestfs.pot
index abf5cec..9f30b14 100644
--- a/po/libguestfs.pot
+++ b/po/libguestfs.pot
@@ -6,10 +6,10 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: libguestfs 1.24.4\n"
+"Project-Id-Version: libguestfs 1.24.5\n"
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-01-02 20:24+0000\n"
+"POT-Creation-Date: 2014-01-20 12:50+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -4052,43 +4052,43 @@ msgid ""
 "compiled without the libmagic library"
 msgstr ""
 
-#: src/fuse.c:936
+#: src/fuse.c:938
 msgid "filesystem is already mounted in another thread"
 msgstr ""
 
-#: src/fuse.c:961
+#: src/fuse.c:963
 #, c-format
 msgid "fuse_opt_add_arg: %s"
 msgstr ""
 
-#: src/fuse.c:978
+#: src/fuse.c:980
 #, c-format
 msgid "fuse_mount: %s"
 msgstr ""
 
-#: src/fuse.c:996
+#: src/fuse.c:998
 #, c-format
 msgid "fuse_new: %s"
 msgstr ""
 
-#: src/fuse.c:1025
+#: src/fuse.c:1027
 msgid "you must call guestfs_mount_local first"
 msgstr ""
 
-#: src/fuse.c:1034
+#: src/fuse.c:1036
 #, c-format
 msgid "fuse_loop: %s"
 msgstr ""
 
-#: src/fuse.c:1084
+#: src/fuse.c:1086
 msgid "no filesystem is mounted"
 msgstr ""
 
-#: src/fuse.c:1202
+#: src/fuse.c:1204
 msgid "could not initialize dir cache hashtables"
 msgstr ""
 
-#: src/fuse.c:1454
+#: src/fuse.c:1456
 msgid ""
 "FUSE is not supported in this build of libguestfs because libfuse was not "
 "found when libguestfs was compiled"
@@ -4212,11 +4212,11 @@ msgid ""
 "might need to log out and log in again)."
 msgstr ""
 
-#: src/launch-direct.c:246 src/launch-uml.c:120
+#: src/launch-direct.c:247 src/launch-uml.c:120
 msgid "you must call guestfs_add_drive before guestfs_launch"
 msgstr ""
 
-#: src/launch-direct.c:771 src/launch-libvirt.c:481
+#: src/launch-direct.c:762 src/launch-libvirt.c:481
 msgid "qemu launched and contacted daemon, but state != READY"
 msgstr ""
 
@@ -4282,49 +4282,49 @@ msgstr ""
 msgid "error constructing libvirt XML at \"%s\""
 msgstr ""
 
-#: src/launch-libvirt.c:1109
+#: src/launch-libvirt.c:1126
 msgid "'iface' parameter is not supported by the libvirt backend"
 msgstr ""
 
-#: src/launch-libvirt.c:1220
+#: src/launch-libvirt.c:1237
 msgid ""
 "libvirt does not support the qemu curl driver protocols (ftp, http, etc.); "
 "try setting LIBGUESTFS_BACKEND=direct"
 msgstr ""
 
-#: src/launch-libvirt.c:1258
+#: src/launch-libvirt.c:1275
 msgid ""
 "could not auto-detect the format.\n"
 "If the format is known, pass the format to libguestfs, eg. using the\n"
 "'--format' option, or via the optional 'format' argument to 'add-drive'."
 msgstr ""
 
-#: src/launch-libvirt.c:1269
+#: src/launch-libvirt.c:1286
 msgid ""
 "could not auto-detect the format when using a non-file protocol.\n"
 "If the format is known, pass the format to libguestfs, eg. using the\n"
 "'--format' option, or via the optional 'format' argument to 'add-drive'."
 msgstr ""
 
-#: src/launch-libvirt.c:1624
+#: src/launch-libvirt.c:1641
 #, c-format
 msgid "realpath: could not convert '%s' to absolute path"
 msgstr ""
 
-#: src/launch-libvirt.c:1706
+#: src/launch-libvirt.c:1723
 msgid "could not destroy libvirt domain"
 msgstr ""
 
-#: src/launch-libvirt.c:1743
+#: src/launch-libvirt.c:1760
 #, c-format
 msgid "%s: internal error forming error message"
 msgstr ""
 
-#: src/launch-libvirt.c:1805
+#: src/launch-libvirt.c:1822
 msgid "could not attach disk to libvirt domain"
 msgstr ""
 
-#: src/launch-libvirt.c:1836
+#: src/launch-libvirt.c:1853
 msgid "could not detach disk from libvirt domain"
 msgstr ""
 
@@ -4597,27 +4597,27 @@ msgstr ""
 msgid "%s: cannot create temporary directory"
 msgstr ""
 
-#: src/utils.c:114
+#: src/utils.c:195
 #, c-format
 msgid "%s exited successfully"
 msgstr ""
 
-#: src/utils.c:117
+#: src/utils.c:198
 #, c-format
 msgid "%s exited with error status %d"
 msgstr ""
 
-#: src/utils.c:121
+#: src/utils.c:202
 #, c-format
 msgid "%s killed by signal %d (%s)"
 msgstr ""
 
-#: src/utils.c:125
+#: src/utils.c:206
 #, c-format
 msgid "%s stopped by signal %d (%s)"
 msgstr ""
 
-#: src/utils.c:129
+#: src/utils.c:210
 #, c-format
 msgid "%s exited for an unknown reason (status %d)"
 msgstr ""
@@ -4991,6 +4991,10 @@ msgstr ""
 msgid "%s: cannot output to a character device or /dev/null\n"
 msgstr ""
 
+#: ../builder/downloader.ml:112
+msgid "%s: curl (download) command failed downloading '%s'\n"
+msgstr ""
+
 #: ../builder/builder.ml:94
 msgid "%s: curl is not installed (or does not work)\n"
 msgstr ""
@@ -5003,6 +5007,10 @@ msgstr ""
 msgid "%s: empty --expand option"
 msgstr ""
 
+#: ../builder/index_parser.ml:102
+msgid "%s: error parsing index near this line:\n\n%s\n"
+msgstr ""
+
 #: ../mllib/common_utils.ml:192
 msgid "%s: error: %s"
 msgstr ""
@@ -5043,6 +5051,10 @@ msgstr ""
 msgid "%s: exception: %s\n"
 msgstr ""
 
+#: ../builder/downloader.ml:91
+msgid "%s: failed to download %s: HTTP status code %s\n"
+msgstr ""
+
 #: ../builder/builder.ml:733
 msgid "%s: failure: %s\n"
 msgstr ""
@@ -5167,6 +5179,10 @@ msgstr ""
 msgid "%s: this partition overlaps the previous one"
 msgstr ""
 
+#: ../builder/downloader.ml:80
+msgid "%s: unexpected output from curl command, enable debug and look at previous messages\n"
+msgstr ""
+
 #: ../resize/resize.ml:302
 msgid "%s: unknown partition table type\nvirt-resize only supports MBR (DOS) and GPT partition tables."
 msgstr ""
@@ -6171,15 +6187,15 @@ msgstr ""
 msgid "error parsing URI '%s'. Look for error messages printed above."
 msgstr ""
 
-#: ../mllib/common_utils.ml:343
+#: ../mllib/common_utils.ml:346
 msgid "external command '%s' exited with error %d"
 msgstr ""
 
-#: ../mllib/common_utils.ml:345
+#: ../mllib/common_utils.ml:348
 msgid "external command '%s' killed by signal %d"
 msgstr ""
 
-#: ../mllib/common_utils.ml:347
+#: ../mllib/common_utils.ml:350
 msgid "external command '%s' stopped by signal %d"
 msgstr ""
 
@@ -6364,14 +6380,6 @@ msgstr ""
 msgid "virt-builder: cannot use a URI ('%s') in the index file\n"
 msgstr ""
 
-#: ../builder/downloader.ml:123 ../builder/downloader.ml:84
-msgid "virt-builder: curl (download) command failed downloading '%s'\n"
-msgstr ""
-
-#: ../builder/index_parser.ml:102
-msgid "virt-builder: error parsing index near this line:\n\n%s\n"
-msgstr ""
-
 #: ../builder/sigchecker.ml:168
 msgid "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"
 msgstr ""
@@ -6400,18 +6408,6 @@ msgstr ""
 msgid "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"
 msgstr ""
 
-#: ../builder/downloader.ml:87
-msgid "virt-builder: external command '%s' killed by signal %d\n"
-msgstr ""
-
-#: ../builder/downloader.ml:91
-msgid "virt-builder: external command '%s' stopped by signal %d\n"
-msgstr ""
-
-#: ../builder/downloader.ml:102
-msgid "virt-builder: failed to download %s: HTTP status code %s\n"
-msgstr ""
-
 #: ../builder/index_parser.ml:233
 msgid "virt-builder: field '%s' cannot span multiple lines\n"
 msgstr ""
diff --git a/po/ml.po b/po/ml.po
index 4c22523..2d02194 100644
--- a/po/ml.po
+++ b/po/ml.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: libguestfs\n"
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-01-02 20:24+0000\n"
+"POT-Creation-Date: 2014-01-20 12:50+0000\n"
 "PO-Revision-Date: 2013-08-06 13:32+0000\n"
 "Last-Translator: rjones <rjones at redhat.com>\n"
 "Language-Team: Malayalam <discuss at lists.smc.org.in>\n"
@@ -4063,43 +4063,43 @@ msgid ""
 "compiled without the libmagic library"
 msgstr ""
 
-#: src/fuse.c:936
+#: src/fuse.c:938
 msgid "filesystem is already mounted in another thread"
 msgstr ""
 
-#: src/fuse.c:961
+#: src/fuse.c:963
 #, c-format
 msgid "fuse_opt_add_arg: %s"
 msgstr ""
 
-#: src/fuse.c:978
+#: src/fuse.c:980
 #, c-format
 msgid "fuse_mount: %s"
 msgstr ""
 
-#: src/fuse.c:996
+#: src/fuse.c:998
 #, c-format
 msgid "fuse_new: %s"
 msgstr ""
 
-#: src/fuse.c:1025
+#: src/fuse.c:1027
 msgid "you must call guestfs_mount_local first"
 msgstr ""
 
-#: src/fuse.c:1034
+#: src/fuse.c:1036
 #, c-format
 msgid "fuse_loop: %s"
 msgstr ""
 
-#: src/fuse.c:1084
+#: src/fuse.c:1086
 msgid "no filesystem is mounted"
 msgstr ""
 
-#: src/fuse.c:1202
+#: src/fuse.c:1204
 msgid "could not initialize dir cache hashtables"
 msgstr ""
 
-#: src/fuse.c:1454
+#: src/fuse.c:1456
 msgid ""
 "FUSE is not supported in this build of libguestfs because libfuse was not "
 "found when libguestfs was compiled"
@@ -4223,11 +4223,11 @@ msgid ""
 "might need to log out and log in again)."
 msgstr ""
 
-#: src/launch-direct.c:246 src/launch-uml.c:120
+#: src/launch-direct.c:247 src/launch-uml.c:120
 msgid "you must call guestfs_add_drive before guestfs_launch"
 msgstr "guestfs_launch-നു് മുമ്പു് guestfs_add_drive വിളിക്കേണ്ടതു്"
 
-#: src/launch-direct.c:771 src/launch-libvirt.c:481
+#: src/launch-direct.c:762 src/launch-libvirt.c:481
 msgid "qemu launched and contacted daemon, but state != READY"
 msgstr "qemu വിന്യസിച്ചു് ഡെമണുമായി ബന്ധപ്പെട്ടു, പക്ഷേ state != READY"
 
@@ -4293,49 +4293,49 @@ msgstr ""
 msgid "error constructing libvirt XML at \"%s\""
 msgstr ""
 
-#: src/launch-libvirt.c:1109
+#: src/launch-libvirt.c:1126
 msgid "'iface' parameter is not supported by the libvirt backend"
 msgstr ""
 
-#: src/launch-libvirt.c:1220
+#: src/launch-libvirt.c:1237
 msgid ""
 "libvirt does not support the qemu curl driver protocols (ftp, http, etc.); "
 "try setting LIBGUESTFS_BACKEND=direct"
 msgstr ""
 
-#: src/launch-libvirt.c:1258
+#: src/launch-libvirt.c:1275
 msgid ""
 "could not auto-detect the format.\n"
 "If the format is known, pass the format to libguestfs, eg. using the\n"
 "'--format' option, or via the optional 'format' argument to 'add-drive'."
 msgstr ""
 
-#: src/launch-libvirt.c:1269
+#: src/launch-libvirt.c:1286
 msgid ""
 "could not auto-detect the format when using a non-file protocol.\n"
 "If the format is known, pass the format to libguestfs, eg. using the\n"
 "'--format' option, or via the optional 'format' argument to 'add-drive'."
 msgstr ""
 
-#: src/launch-libvirt.c:1624
+#: src/launch-libvirt.c:1641
 #, c-format
 msgid "realpath: could not convert '%s' to absolute path"
 msgstr ""
 
-#: src/launch-libvirt.c:1706
+#: src/launch-libvirt.c:1723
 msgid "could not destroy libvirt domain"
 msgstr ""
 
-#: src/launch-libvirt.c:1743
+#: src/launch-libvirt.c:1760
 #, c-format
 msgid "%s: internal error forming error message"
 msgstr ""
 
-#: src/launch-libvirt.c:1805
+#: src/launch-libvirt.c:1822
 msgid "could not attach disk to libvirt domain"
 msgstr ""
 
-#: src/launch-libvirt.c:1836
+#: src/launch-libvirt.c:1853
 msgid "could not detach disk from libvirt domain"
 msgstr ""
 
@@ -4608,27 +4608,27 @@ msgstr ""
 msgid "%s: cannot create temporary directory"
 msgstr "%s: താല്‍ക്കാലിക ഡയറക്ടറി ഉണ്ടാക്കുവാന്‍ സാധ്യമല്ല"
 
-#: src/utils.c:114
+#: src/utils.c:195
 #, c-format
 msgid "%s exited successfully"
 msgstr ""
 
-#: src/utils.c:117
+#: src/utils.c:198
 #, c-format
 msgid "%s exited with error status %d"
 msgstr ""
 
-#: src/utils.c:121
+#: src/utils.c:202
 #, c-format
 msgid "%s killed by signal %d (%s)"
 msgstr ""
 
-#: src/utils.c:125
+#: src/utils.c:206
 #, c-format
 msgid "%s stopped by signal %d (%s)"
 msgstr ""
 
-#: src/utils.c:129
+#: src/utils.c:210
 #, c-format
 msgid "%s exited for an unknown reason (status %d)"
 msgstr ""
@@ -5060,6 +5060,10 @@ msgstr ""
 msgid "%s: cannot output to a character device or /dev/null\n"
 msgstr ""
 
+#: ../builder/downloader.ml:112
+msgid "%s: curl (download) command failed downloading '%s'\n"
+msgstr ""
+
 #: ../builder/builder.ml:94
 msgid "%s: curl is not installed (or does not work)\n"
 msgstr ""
@@ -5074,6 +5078,13 @@ msgstr ""
 msgid "%s: empty --expand option"
 msgstr ""
 
+#: ../builder/index_parser.ml:102
+msgid ""
+"%s: error parsing index near this line:\n"
+"\n"
+"%s\n"
+msgstr ""
+
 #: ../mllib/common_utils.ml:192
 msgid "%s: error: %s"
 msgstr ""
@@ -5114,6 +5125,10 @@ msgstr ""
 msgid "%s: exception: %s\n"
 msgstr ""
 
+#: ../builder/downloader.ml:91
+msgid "%s: failed to download %s: HTTP status code %s\n"
+msgstr ""
+
 #: ../builder/builder.ml:733
 msgid "%s: failure: %s\n"
 msgstr ""
@@ -5269,6 +5284,12 @@ msgstr ""
 msgid "%s: this partition overlaps the previous one"
 msgstr ""
 
+#: ../builder/downloader.ml:80
+msgid ""
+"%s: unexpected output from curl command, enable debug and look at previous "
+"messages\n"
+msgstr ""
+
 #: ../resize/resize.ml:302
 msgid ""
 "%s: unknown partition table type\n"
@@ -6528,15 +6549,15 @@ msgstr ""
 msgid "error parsing URI '%s'. Look for error messages printed above."
 msgstr ""
 
-#: ../mllib/common_utils.ml:343
+#: ../mllib/common_utils.ml:346
 msgid "external command '%s' exited with error %d"
 msgstr ""
 
-#: ../mllib/common_utils.ml:345
+#: ../mllib/common_utils.ml:348
 msgid "external command '%s' killed by signal %d"
 msgstr ""
 
-#: ../mllib/common_utils.ml:347
+#: ../mllib/common_utils.ml:350
 msgid "external command '%s' stopped by signal %d"
 msgstr ""
 
@@ -6729,17 +6750,6 @@ msgstr ""
 msgid "virt-builder: cannot use a URI ('%s') in the index file\n"
 msgstr ""
 
-#: ../builder/downloader.ml:123 ../builder/downloader.ml:84
-msgid "virt-builder: curl (download) command failed downloading '%s'\n"
-msgstr ""
-
-#: ../builder/index_parser.ml:102
-msgid ""
-"virt-builder: error parsing index near this line:\n"
-"\n"
-"%s\n"
-msgstr ""
-
 #: ../builder/sigchecker.ml:168
 msgid ""
 "virt-builder: error: GPG failure: could not verify digital signature of "
@@ -6793,18 +6803,6 @@ msgid ""
 "you are susceptible to man-in-the-middle attacks.\n"
 msgstr ""
 
-#: ../builder/downloader.ml:87
-msgid "virt-builder: external command '%s' killed by signal %d\n"
-msgstr ""
-
-#: ../builder/downloader.ml:91
-msgid "virt-builder: external command '%s' stopped by signal %d\n"
-msgstr ""
-
-#: ../builder/downloader.ml:102
-msgid "virt-builder: failed to download %s: HTTP status code %s\n"
-msgstr ""
-
 #: ../builder/index_parser.ml:233
 msgid "virt-builder: field '%s' cannot span multiple lines\n"
 msgstr ""
diff --git a/po/mr.po b/po/mr.po
index 41de12d..206fa7f 100644
--- a/po/mr.po
+++ b/po/mr.po
@@ -10,7 +10,7 @@ msgstr ""
 "Project-Id-Version: libguestfs\n"
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-01-02 20:24+0000\n"
+"POT-Creation-Date: 2014-01-20 12:50+0000\n"
 "PO-Revision-Date: 2013-08-06 13:32+0000\n"
 "Last-Translator: rjones <rjones at redhat.com>\n"
 "Language-Team: Marathi (http://www.transifex.com/projects/p/fedora/language/"
@@ -4148,43 +4148,43 @@ msgid ""
 "compiled without the libmagic library"
 msgstr ""
 
-#: src/fuse.c:936
+#: src/fuse.c:938
 msgid "filesystem is already mounted in another thread"
 msgstr ""
 
-#: src/fuse.c:961
+#: src/fuse.c:963
 #, c-format
 msgid "fuse_opt_add_arg: %s"
 msgstr ""
 
-#: src/fuse.c:978
+#: src/fuse.c:980
 #, c-format
 msgid "fuse_mount: %s"
 msgstr ""
 
-#: src/fuse.c:996
+#: src/fuse.c:998
 #, c-format
 msgid "fuse_new: %s"
 msgstr ""
 
-#: src/fuse.c:1025
+#: src/fuse.c:1027
 msgid "you must call guestfs_mount_local first"
 msgstr ""
 
-#: src/fuse.c:1034
+#: src/fuse.c:1036
 #, c-format
 msgid "fuse_loop: %s"
 msgstr ""
 
-#: src/fuse.c:1084
+#: src/fuse.c:1086
 msgid "no filesystem is mounted"
 msgstr ""
 
-#: src/fuse.c:1202
+#: src/fuse.c:1204
 msgid "could not initialize dir cache hashtables"
 msgstr ""
 
-#: src/fuse.c:1454
+#: src/fuse.c:1456
 msgid ""
 "FUSE is not supported in this build of libguestfs because libfuse was not "
 "found when libguestfs was compiled"
@@ -4310,11 +4310,11 @@ msgid ""
 "might need to log out and log in again)."
 msgstr ""
 
-#: src/launch-direct.c:246 src/launch-uml.c:120
+#: src/launch-direct.c:247 src/launch-uml.c:120
 msgid "you must call guestfs_add_drive before guestfs_launch"
 msgstr "guestfs_add_drive यांस guestfs_launch च्या अगोदर कॉल करा"
 
-#: src/launch-direct.c:771 src/launch-libvirt.c:481
+#: src/launch-direct.c:762 src/launch-libvirt.c:481
 msgid "qemu launched and contacted daemon, but state != READY"
 msgstr "qemu सुरू झाले व डिमन सुरू केले, परंतु state != READY आढळले"
 
@@ -4380,49 +4380,49 @@ msgstr ""
 msgid "error constructing libvirt XML at \"%s\""
 msgstr ""
 
-#: src/launch-libvirt.c:1109
+#: src/launch-libvirt.c:1126
 msgid "'iface' parameter is not supported by the libvirt backend"
 msgstr ""
 
-#: src/launch-libvirt.c:1220
+#: src/launch-libvirt.c:1237
 msgid ""
 "libvirt does not support the qemu curl driver protocols (ftp, http, etc.); "
 "try setting LIBGUESTFS_BACKEND=direct"
 msgstr ""
 
-#: src/launch-libvirt.c:1258
+#: src/launch-libvirt.c:1275
 msgid ""
 "could not auto-detect the format.\n"
 "If the format is known, pass the format to libguestfs, eg. using the\n"
 "'--format' option, or via the optional 'format' argument to 'add-drive'."
 msgstr ""
 
-#: src/launch-libvirt.c:1269
+#: src/launch-libvirt.c:1286
 msgid ""
 "could not auto-detect the format when using a non-file protocol.\n"
 "If the format is known, pass the format to libguestfs, eg. using the\n"
 "'--format' option, or via the optional 'format' argument to 'add-drive'."
 msgstr ""
 
-#: src/launch-libvirt.c:1624
+#: src/launch-libvirt.c:1641
 #, c-format
 msgid "realpath: could not convert '%s' to absolute path"
 msgstr ""
 
-#: src/launch-libvirt.c:1706
+#: src/launch-libvirt.c:1723
 msgid "could not destroy libvirt domain"
 msgstr ""
 
-#: src/launch-libvirt.c:1743
+#: src/launch-libvirt.c:1760
 #, c-format
 msgid "%s: internal error forming error message"
 msgstr ""
 
-#: src/launch-libvirt.c:1805
+#: src/launch-libvirt.c:1822
 msgid "could not attach disk to libvirt domain"
 msgstr ""
 
-#: src/launch-libvirt.c:1836
+#: src/launch-libvirt.c:1853
 msgid "could not detach disk from libvirt domain"
 msgstr ""
 
@@ -4702,27 +4702,27 @@ msgstr ""
 msgid "%s: cannot create temporary directory"
 msgstr "%s: तात्पुर्ती डिरेक्ट्री निर्माण करणे अशक्य"
 
-#: src/utils.c:114
+#: src/utils.c:195
 #, c-format
 msgid "%s exited successfully"
 msgstr ""
 
-#: src/utils.c:117
+#: src/utils.c:198
 #, c-format
 msgid "%s exited with error status %d"
 msgstr ""
 
-#: src/utils.c:121
+#: src/utils.c:202
 #, c-format
 msgid "%s killed by signal %d (%s)"
 msgstr ""
 
-#: src/utils.c:125
+#: src/utils.c:206
 #, c-format
 msgid "%s stopped by signal %d (%s)"
 msgstr ""
 
-#: src/utils.c:129
+#: src/utils.c:210
 #, c-format
 msgid "%s exited for an unknown reason (status %d)"
 msgstr ""
@@ -5166,6 +5166,10 @@ msgstr ""
 msgid "%s: cannot output to a character device or /dev/null\n"
 msgstr ""
 
+#: ../builder/downloader.ml:112
+msgid "%s: curl (download) command failed downloading '%s'\n"
+msgstr ""
+
 #: ../builder/builder.ml:94
 msgid "%s: curl is not installed (or does not work)\n"
 msgstr ""
@@ -5180,6 +5184,13 @@ msgstr ""
 msgid "%s: empty --expand option"
 msgstr ""
 
+#: ../builder/index_parser.ml:102
+msgid ""
+"%s: error parsing index near this line:\n"
+"\n"
+"%s\n"
+msgstr ""
+
 #: ../mllib/common_utils.ml:192
 msgid "%s: error: %s"
 msgstr ""
@@ -5220,6 +5231,10 @@ msgstr ""
 msgid "%s: exception: %s\n"
 msgstr ""
 
+#: ../builder/downloader.ml:91
+msgid "%s: failed to download %s: HTTP status code %s\n"
+msgstr ""
+
 #: ../builder/builder.ml:733
 msgid "%s: failure: %s\n"
 msgstr ""
@@ -5375,6 +5390,12 @@ msgstr ""
 msgid "%s: this partition overlaps the previous one"
 msgstr ""
 
+#: ../builder/downloader.ml:80
+msgid ""
+"%s: unexpected output from curl command, enable debug and look at previous "
+"messages\n"
+msgstr ""
+
 #: ../resize/resize.ml:302
 msgid ""
 "%s: unknown partition table type\n"
@@ -6634,15 +6655,15 @@ msgstr ""
 msgid "error parsing URI '%s'. Look for error messages printed above."
 msgstr ""
 
-#: ../mllib/common_utils.ml:343
+#: ../mllib/common_utils.ml:346
 msgid "external command '%s' exited with error %d"
 msgstr ""
 
-#: ../mllib/common_utils.ml:345
+#: ../mllib/common_utils.ml:348
 msgid "external command '%s' killed by signal %d"
 msgstr ""
 
-#: ../mllib/common_utils.ml:347
+#: ../mllib/common_utils.ml:350
 msgid "external command '%s' stopped by signal %d"
 msgstr ""
 
@@ -6835,17 +6856,6 @@ msgstr ""
 msgid "virt-builder: cannot use a URI ('%s') in the index file\n"
 msgstr ""
 
-#: ../builder/downloader.ml:123 ../builder/downloader.ml:84
-msgid "virt-builder: curl (download) command failed downloading '%s'\n"
-msgstr ""
-
-#: ../builder/index_parser.ml:102
-msgid ""
-"virt-builder: error parsing index near this line:\n"
-"\n"
-"%s\n"
-msgstr ""
-
 #: ../builder/sigchecker.ml:168
 msgid ""
 "virt-builder: error: GPG failure: could not verify digital signature of "
@@ -6899,18 +6909,6 @@ msgid ""
 "you are susceptible to man-in-the-middle attacks.\n"
 msgstr ""
 
-#: ../builder/downloader.ml:87
-msgid "virt-builder: external command '%s' killed by signal %d\n"
-msgstr ""
-
-#: ../builder/downloader.ml:91
-msgid "virt-builder: external command '%s' stopped by signal %d\n"
-msgstr ""
-
-#: ../builder/downloader.ml:102
-msgid "virt-builder: failed to download %s: HTTP status code %s\n"
-msgstr ""
-
 #: ../builder/index_parser.ml:233
 msgid "virt-builder: field '%s' cannot span multiple lines\n"
 msgstr ""
diff --git a/po/nl.po b/po/nl.po
index eb50bbc..2387521 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -11,7 +11,7 @@ msgstr ""
 "Project-Id-Version: libguestfs\n"
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-01-02 20:24+0000\n"
+"POT-Creation-Date: 2014-01-20 12:50+0000\n"
 "PO-Revision-Date: 2013-08-06 13:32+0000\n"
 "Last-Translator: rjones <rjones at redhat.com>\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/fedora/language/"
@@ -4309,43 +4309,43 @@ msgstr ""
 "bestand-architectuur API is niet beschikbaar omdat deze versie van "
 "libguestfs gecompileerd werd zonder de libmagic bibliotheek"
 
-#: src/fuse.c:936
+#: src/fuse.c:938
 msgid "filesystem is already mounted in another thread"
 msgstr "bestandssysteem is al aangekoppeld in een andere thread"
 
-#: src/fuse.c:961
+#: src/fuse.c:963
 #, c-format
 msgid "fuse_opt_add_arg: %s"
 msgstr "fuse_opt_add_arg: %s"
 
-#: src/fuse.c:978
+#: src/fuse.c:980
 #, c-format
 msgid "fuse_mount: %s"
 msgstr "fuse_mount: %s"
 
-#: src/fuse.c:996
+#: src/fuse.c:998
 #, c-format
 msgid "fuse_new: %s"
 msgstr "fuse_new: %s"
 
-#: src/fuse.c:1025
+#: src/fuse.c:1027
 msgid "you must call guestfs_mount_local first"
 msgstr "je moet guestfs_mount_local eerst aanroepen"
 
-#: src/fuse.c:1034
+#: src/fuse.c:1036
 #, c-format
 msgid "fuse_loop: %s"
 msgstr "fuse_loop: %s"
 
-#: src/fuse.c:1084
+#: src/fuse.c:1086
 msgid "no filesystem is mounted"
 msgstr "er is geen bestandssysteem aangekoppeld"
 
-#: src/fuse.c:1202
+#: src/fuse.c:1204
 msgid "could not initialize dir cache hashtables"
 msgstr "kon map cache hashtabellen niet initialiseren"
 
-#: src/fuse.c:1454
+#: src/fuse.c:1456
 msgid ""
 "FUSE is not supported in this build of libguestfs because libfuse was not "
 "found when libguestfs was compiled"
@@ -4472,11 +4472,11 @@ msgid ""
 "might need to log out and log in again)."
 msgstr ""
 
-#: src/launch-direct.c:246 src/launch-uml.c:120
+#: src/launch-direct.c:247 src/launch-uml.c:120
 msgid "you must call guestfs_add_drive before guestfs_launch"
 msgstr "je moet guestfs_add_drive aanroepen voor guestfs_launch"
 
-#: src/launch-direct.c:771 src/launch-libvirt.c:481
+#: src/launch-direct.c:762 src/launch-libvirt.c:481
 msgid "qemu launched and contacted daemon, but state != READY"
 msgstr ""
 "qemu gelanceerd en contact opgenomen met daemon, maar toestand != READY"
@@ -4543,49 +4543,49 @@ msgstr ""
 msgid "error constructing libvirt XML at \"%s\""
 msgstr "fout bij het construeren van libvirt XML op \"%s\""
 
-#: src/launch-libvirt.c:1109
+#: src/launch-libvirt.c:1126
 msgid "'iface' parameter is not supported by the libvirt backend"
 msgstr ""
 
-#: src/launch-libvirt.c:1220
+#: src/launch-libvirt.c:1237
 msgid ""
 "libvirt does not support the qemu curl driver protocols (ftp, http, etc.); "
 "try setting LIBGUESTFS_BACKEND=direct"
 msgstr ""
 
-#: src/launch-libvirt.c:1258
+#: src/launch-libvirt.c:1275
 msgid ""
 "could not auto-detect the format.\n"
 "If the format is known, pass the format to libguestfs, eg. using the\n"
 "'--format' option, or via the optional 'format' argument to 'add-drive'."
 msgstr ""
 
-#: src/launch-libvirt.c:1269
+#: src/launch-libvirt.c:1286
 msgid ""
 "could not auto-detect the format when using a non-file protocol.\n"
 "If the format is known, pass the format to libguestfs, eg. using the\n"
 "'--format' option, or via the optional 'format' argument to 'add-drive'."
 msgstr ""
 
-#: src/launch-libvirt.c:1624
+#: src/launch-libvirt.c:1641
 #, c-format
 msgid "realpath: could not convert '%s' to absolute path"
 msgstr "realpath: kon '%s' niet converteren naar een absoluut pad"
 
-#: src/launch-libvirt.c:1706
+#: src/launch-libvirt.c:1723
 msgid "could not destroy libvirt domain"
 msgstr "kon libvirt domein niet vernietigen"
 
-#: src/launch-libvirt.c:1743
+#: src/launch-libvirt.c:1760
 #, c-format
 msgid "%s: internal error forming error message"
 msgstr "%s: interne fout bij formuleren van foutboodschap"
 
-#: src/launch-libvirt.c:1805
+#: src/launch-libvirt.c:1822
 msgid "could not attach disk to libvirt domain"
 msgstr "kon schijf niet koppelen aan libvirt domein"
 
-#: src/launch-libvirt.c:1836
+#: src/launch-libvirt.c:1853
 msgid "could not detach disk from libvirt domain"
 msgstr "kon schijf niet loskoppelen van libvirt domein"
 
@@ -4873,27 +4873,27 @@ msgstr "tijdelijke map '%s' is geen map"
 msgid "%s: cannot create temporary directory"
 msgstr "%s: kan geen tijdelijke map aanmaken"
 
-#: src/utils.c:114
+#: src/utils.c:195
 #, c-format
 msgid "%s exited successfully"
 msgstr ""
 
-#: src/utils.c:117
+#: src/utils.c:198
 #, c-format
 msgid "%s exited with error status %d"
 msgstr ""
 
-#: src/utils.c:121
+#: src/utils.c:202
 #, c-format
 msgid "%s killed by signal %d (%s)"
 msgstr ""
 
-#: src/utils.c:125
+#: src/utils.c:206
 #, c-format
 msgid "%s stopped by signal %d (%s)"
 msgstr ""
 
-#: src/utils.c:129
+#: src/utils.c:210
 #, c-format
 msgid "%s exited for an unknown reason (status %d)"
 msgstr ""
@@ -5361,6 +5361,10 @@ msgstr ""
 msgid "%s: cannot output to a character device or /dev/null\n"
 msgstr ""
 
+#: ../builder/downloader.ml:112
+msgid "%s: curl (download) command failed downloading '%s'\n"
+msgstr ""
+
 #: ../builder/builder.ml:94
 msgid "%s: curl is not installed (or does not work)\n"
 msgstr ""
@@ -5375,6 +5379,13 @@ msgstr ""
 msgid "%s: empty --expand option"
 msgstr "%s: lege --expand optie"
 
+#: ../builder/index_parser.ml:102
+msgid ""
+"%s: error parsing index near this line:\n"
+"\n"
+"%s\n"
+msgstr ""
+
 #: ../mllib/common_utils.ml:192
 msgid "%s: error: %s"
 msgstr ""
@@ -5415,6 +5426,10 @@ msgstr ""
 msgid "%s: exception: %s\n"
 msgstr ""
 
+#: ../builder/downloader.ml:91
+msgid "%s: failed to download %s: HTTP status code %s\n"
+msgstr ""
+
 #: ../builder/builder.ml:733
 msgid "%s: failure: %s\n"
 msgstr ""
@@ -5600,6 +5615,12 @@ msgstr "%s: deze partitie is als gemarkeerd om in grootte veranderd te worden"
 msgid "%s: this partition overlaps the previous one"
 msgstr "%s: deze partitie overlapt de vorige"
 
+#: ../builder/downloader.ml:80
+msgid ""
+"%s: unexpected output from curl command, enable debug and look at previous "
+"messages\n"
+msgstr ""
+
 #: ../resize/resize.ml:302
 msgid ""
 "%s: unknown partition table type\n"
@@ -7003,15 +7024,15 @@ msgstr "empty --shrink optie"
 msgid "error parsing URI '%s'. Look for error messages printed above."
 msgstr ""
 
-#: ../mllib/common_utils.ml:343
+#: ../mllib/common_utils.ml:346
 msgid "external command '%s' exited with error %d"
 msgstr ""
 
-#: ../mllib/common_utils.ml:345
+#: ../mllib/common_utils.ml:348
 msgid "external command '%s' killed by signal %d"
 msgstr "extern commando '%s' werd afgeschoten door signaal %d"
 
-#: ../mllib/common_utils.ml:347
+#: ../mllib/common_utils.ml:350
 msgid "external command '%s' stopped by signal %d"
 msgstr "extern commando '%s' werd gestopt door signaal %d"
 
@@ -7211,17 +7232,6 @@ msgstr ""
 msgid "virt-builder: cannot use a URI ('%s') in the index file\n"
 msgstr ""
 
-#: ../builder/downloader.ml:123 ../builder/downloader.ml:84
-msgid "virt-builder: curl (download) command failed downloading '%s'\n"
-msgstr ""
-
-#: ../builder/index_parser.ml:102
-msgid ""
-"virt-builder: error parsing index near this line:\n"
-"\n"
-"%s\n"
-msgstr ""
-
 #: ../builder/sigchecker.ml:168
 msgid ""
 "virt-builder: error: GPG failure: could not verify digital signature of "
@@ -7275,18 +7285,6 @@ msgid ""
 "you are susceptible to man-in-the-middle attacks.\n"
 msgstr ""
 
-#: ../builder/downloader.ml:87
-msgid "virt-builder: external command '%s' killed by signal %d\n"
-msgstr ""
-
-#: ../builder/downloader.ml:91
-msgid "virt-builder: external command '%s' stopped by signal %d\n"
-msgstr ""
-
-#: ../builder/downloader.ml:102
-msgid "virt-builder: failed to download %s: HTTP status code %s\n"
-msgstr ""
-
 #: ../builder/index_parser.ml:233
 msgid "virt-builder: field '%s' cannot span multiple lines\n"
 msgstr ""
diff --git a/po/or.po b/po/or.po
index 78fece7..108d466 100644
--- a/po/or.po
+++ b/po/or.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: libguestfs\n"
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-01-02 20:24+0000\n"
+"POT-Creation-Date: 2014-01-20 12:50+0000\n"
 "PO-Revision-Date: 2013-08-06 13:32+0000\n"
 "Last-Translator: rjones <rjones at redhat.com>\n"
 "Language-Team: Oriya (http://www.transifex.com/projects/p/fedora/language/"
@@ -4062,43 +4062,43 @@ msgid ""
 "compiled without the libmagic library"
 msgstr ""
 
-#: src/fuse.c:936
+#: src/fuse.c:938
 msgid "filesystem is already mounted in another thread"
 msgstr ""
 
-#: src/fuse.c:961
+#: src/fuse.c:963
 #, c-format
 msgid "fuse_opt_add_arg: %s"
 msgstr ""
 
-#: src/fuse.c:978
+#: src/fuse.c:980
 #, c-format
 msgid "fuse_mount: %s"
 msgstr ""
 
-#: src/fuse.c:996
+#: src/fuse.c:998
 #, c-format
 msgid "fuse_new: %s"
 msgstr ""
 
-#: src/fuse.c:1025
+#: src/fuse.c:1027
 msgid "you must call guestfs_mount_local first"
 msgstr ""
 
-#: src/fuse.c:1034
+#: src/fuse.c:1036
 #, c-format
 msgid "fuse_loop: %s"
 msgstr ""
 
-#: src/fuse.c:1084
+#: src/fuse.c:1086
 msgid "no filesystem is mounted"
 msgstr ""
 
-#: src/fuse.c:1202
+#: src/fuse.c:1204
 msgid "could not initialize dir cache hashtables"
 msgstr ""
 
-#: src/fuse.c:1454
+#: src/fuse.c:1456
 msgid ""
 "FUSE is not supported in this build of libguestfs because libfuse was not "
 "found when libguestfs was compiled"
@@ -4222,11 +4222,11 @@ msgid ""
 "might need to log out and log in again)."
 msgstr ""
 
-#: src/launch-direct.c:246 src/launch-uml.c:120
+#: src/launch-direct.c:247 src/launch-uml.c:120
 msgid "you must call guestfs_add_drive before guestfs_launch"
 msgstr "ଆପଣ ନିଶ୍ଚିତ ଭାବରେ guestfs_add_drive କୁ guestfs_launch ପୂର୍ବରୁ ଡାକିବା ଉଚିତ"
 
-#: src/launch-direct.c:771 src/launch-libvirt.c:481
+#: src/launch-direct.c:762 src/launch-libvirt.c:481
 msgid "qemu launched and contacted daemon, but state != READY"
 msgstr "qemu ଆରମ୍ଭ ହୋଇଛି ଏବଂ ଡେମନ ସହିତ ଯୋଗାଯୋଗ ଆରମ୍ଭ କରିଛି, କିନ୍ତୁ ଅବସ୍ଥା != READY"
 
@@ -4292,49 +4292,49 @@ msgstr ""
 msgid "error constructing libvirt XML at \"%s\""
 msgstr ""
 
-#: src/launch-libvirt.c:1109
+#: src/launch-libvirt.c:1126
 msgid "'iface' parameter is not supported by the libvirt backend"
 msgstr ""
 
-#: src/launch-libvirt.c:1220
+#: src/launch-libvirt.c:1237
 msgid ""
 "libvirt does not support the qemu curl driver protocols (ftp, http, etc.); "
 "try setting LIBGUESTFS_BACKEND=direct"
 msgstr ""
 
-#: src/launch-libvirt.c:1258
+#: src/launch-libvirt.c:1275
 msgid ""
 "could not auto-detect the format.\n"
 "If the format is known, pass the format to libguestfs, eg. using the\n"
 "'--format' option, or via the optional 'format' argument to 'add-drive'."
 msgstr ""
 
-#: src/launch-libvirt.c:1269
+#: src/launch-libvirt.c:1286
 msgid ""
 "could not auto-detect the format when using a non-file protocol.\n"
 "If the format is known, pass the format to libguestfs, eg. using the\n"
 "'--format' option, or via the optional 'format' argument to 'add-drive'."
 msgstr ""
 
-#: src/launch-libvirt.c:1624
+#: src/launch-libvirt.c:1641
 #, c-format
 msgid "realpath: could not convert '%s' to absolute path"
 msgstr ""
 
-#: src/launch-libvirt.c:1706
+#: src/launch-libvirt.c:1723
 msgid "could not destroy libvirt domain"
 msgstr ""
 
-#: src/launch-libvirt.c:1743
+#: src/launch-libvirt.c:1760
 #, c-format
 msgid "%s: internal error forming error message"
 msgstr ""
 
-#: src/launch-libvirt.c:1805
+#: src/launch-libvirt.c:1822
 msgid "could not attach disk to libvirt domain"
 msgstr ""
 
-#: src/launch-libvirt.c:1836
+#: src/launch-libvirt.c:1853
 msgid "could not detach disk from libvirt domain"
 msgstr ""
 
@@ -4607,27 +4607,27 @@ msgstr ""
 msgid "%s: cannot create temporary directory"
 msgstr "%s: ଅସ୍ଥାୟୀ ଡିରେକ୍ଟୋରୀ ନିର୍ମାଣ କରିପାରିବେ ନାହିଁ"
 
-#: src/utils.c:114
+#: src/utils.c:195
 #, c-format
 msgid "%s exited successfully"
 msgstr ""
 
-#: src/utils.c:117
+#: src/utils.c:198
 #, c-format
 msgid "%s exited with error status %d"
 msgstr ""
 
-#: src/utils.c:121
+#: src/utils.c:202
 #, c-format
 msgid "%s killed by signal %d (%s)"
 msgstr ""
 
-#: src/utils.c:125
+#: src/utils.c:206
 #, c-format
 msgid "%s stopped by signal %d (%s)"
 msgstr ""
 
-#: src/utils.c:129
+#: src/utils.c:210
 #, c-format
 msgid "%s exited for an unknown reason (status %d)"
 msgstr ""
@@ -5059,6 +5059,10 @@ msgstr ""
 msgid "%s: cannot output to a character device or /dev/null\n"
 msgstr ""
 
+#: ../builder/downloader.ml:112
+msgid "%s: curl (download) command failed downloading '%s'\n"
+msgstr ""
+
 #: ../builder/builder.ml:94
 msgid "%s: curl is not installed (or does not work)\n"
 msgstr ""
@@ -5073,6 +5077,13 @@ msgstr ""
 msgid "%s: empty --expand option"
 msgstr ""
 
+#: ../builder/index_parser.ml:102
+msgid ""
+"%s: error parsing index near this line:\n"
+"\n"
+"%s\n"
+msgstr ""
+
 #: ../mllib/common_utils.ml:192
 msgid "%s: error: %s"
 msgstr ""
@@ -5113,6 +5124,10 @@ msgstr ""
 msgid "%s: exception: %s\n"
 msgstr ""
 
+#: ../builder/downloader.ml:91
+msgid "%s: failed to download %s: HTTP status code %s\n"
+msgstr ""
+
 #: ../builder/builder.ml:733
 msgid "%s: failure: %s\n"
 msgstr ""
@@ -5268,6 +5283,12 @@ msgstr ""
 msgid "%s: this partition overlaps the previous one"
 msgstr ""
 
+#: ../builder/downloader.ml:80
+msgid ""
+"%s: unexpected output from curl command, enable debug and look at previous "
+"messages\n"
+msgstr ""
+
 #: ../resize/resize.ml:302
 msgid ""
 "%s: unknown partition table type\n"
@@ -6527,15 +6548,15 @@ msgstr ""
 msgid "error parsing URI '%s'. Look for error messages printed above."
 msgstr ""
 
-#: ../mllib/common_utils.ml:343
+#: ../mllib/common_utils.ml:346
 msgid "external command '%s' exited with error %d"
 msgstr ""
 
-#: ../mllib/common_utils.ml:345
+#: ../mllib/common_utils.ml:348
 msgid "external command '%s' killed by signal %d"
 msgstr ""
 
-#: ../mllib/common_utils.ml:347
+#: ../mllib/common_utils.ml:350
 msgid "external command '%s' stopped by signal %d"
 msgstr ""
 
@@ -6728,17 +6749,6 @@ msgstr ""
 msgid "virt-builder: cannot use a URI ('%s') in the index file\n"
 msgstr ""
 
-#: ../builder/downloader.ml:123 ../builder/downloader.ml:84
-msgid "virt-builder: curl (download) command failed downloading '%s'\n"
-msgstr ""
-
-#: ../builder/index_parser.ml:102
-msgid ""
-"virt-builder: error parsing index near this line:\n"
-"\n"
-"%s\n"
-msgstr ""
-
 #: ../builder/sigchecker.ml:168
 msgid ""
 "virt-builder: error: GPG failure: could not verify digital signature of "
@@ -6792,18 +6802,6 @@ msgid ""
 "you are susceptible to man-in-the-middle attacks.\n"
 msgstr ""
 
-#: ../builder/downloader.ml:87
-msgid "virt-builder: external command '%s' killed by signal %d\n"
-msgstr ""
-
-#: ../builder/downloader.ml:91
-msgid "virt-builder: external command '%s' stopped by signal %d\n"
-msgstr ""
-
-#: ../builder/downloader.ml:102
-msgid "virt-builder: failed to download %s: HTTP status code %s\n"
-msgstr ""
-
 #: ../builder/index_parser.ml:233
 msgid "virt-builder: field '%s' cannot span multiple lines\n"
 msgstr ""
diff --git a/po/pa.po b/po/pa.po
index b2a5573..98423bd 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -10,7 +10,7 @@ msgstr ""
 "Project-Id-Version: libguestfs\n"
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-01-02 20:24+0000\n"
+"POT-Creation-Date: 2014-01-20 12:50+0000\n"
 "PO-Revision-Date: 2013-08-06 13:32+0000\n"
 "Last-Translator: rjones <rjones at redhat.com>\n"
 "Language-Team: Panjabi (Punjabi) <punjabi-users at lists.sf.net>\n"
@@ -4144,43 +4144,43 @@ msgid ""
 "compiled without the libmagic library"
 msgstr ""
 
-#: src/fuse.c:936
+#: src/fuse.c:938
 msgid "filesystem is already mounted in another thread"
 msgstr ""
 
-#: src/fuse.c:961
+#: src/fuse.c:963
 #, c-format
 msgid "fuse_opt_add_arg: %s"
 msgstr ""
 
-#: src/fuse.c:978
+#: src/fuse.c:980
 #, c-format
 msgid "fuse_mount: %s"
 msgstr ""
 
-#: src/fuse.c:996
+#: src/fuse.c:998
 #, c-format
 msgid "fuse_new: %s"
 msgstr ""
 
-#: src/fuse.c:1025
+#: src/fuse.c:1027
 msgid "you must call guestfs_mount_local first"
 msgstr ""
 
-#: src/fuse.c:1034
+#: src/fuse.c:1036
 #, c-format
 msgid "fuse_loop: %s"
 msgstr ""
 
-#: src/fuse.c:1084
+#: src/fuse.c:1086
 msgid "no filesystem is mounted"
 msgstr ""
 
-#: src/fuse.c:1202
+#: src/fuse.c:1204
 msgid "could not initialize dir cache hashtables"
 msgstr ""
 
-#: src/fuse.c:1454
+#: src/fuse.c:1456
 msgid ""
 "FUSE is not supported in this build of libguestfs because libfuse was not "
 "found when libguestfs was compiled"
@@ -4306,11 +4306,11 @@ msgid ""
 "might need to log out and log in again)."
 msgstr ""
 
-#: src/launch-direct.c:246 src/launch-uml.c:120
+#: src/launch-direct.c:247 src/launch-uml.c:120
 msgid "you must call guestfs_add_drive before guestfs_launch"
 msgstr "you must call guestfs_add_drive before guestfs_launch"
 
-#: src/launch-direct.c:771 src/launch-libvirt.c:481
+#: src/launch-direct.c:762 src/launch-libvirt.c:481
 msgid "qemu launched and contacted daemon, but state != READY"
 msgstr "qemu launched and contacted daemon, but state != READY"
 
@@ -4376,49 +4376,49 @@ msgstr ""
 msgid "error constructing libvirt XML at \"%s\""
 msgstr ""
 
-#: src/launch-libvirt.c:1109
+#: src/launch-libvirt.c:1126
 msgid "'iface' parameter is not supported by the libvirt backend"
 msgstr ""
 
-#: src/launch-libvirt.c:1220
+#: src/launch-libvirt.c:1237
 msgid ""
 "libvirt does not support the qemu curl driver protocols (ftp, http, etc.); "
 "try setting LIBGUESTFS_BACKEND=direct"
 msgstr ""
 
-#: src/launch-libvirt.c:1258
+#: src/launch-libvirt.c:1275
 msgid ""
 "could not auto-detect the format.\n"
 "If the format is known, pass the format to libguestfs, eg. using the\n"
 "'--format' option, or via the optional 'format' argument to 'add-drive'."
 msgstr ""
 
-#: src/launch-libvirt.c:1269
+#: src/launch-libvirt.c:1286
 msgid ""
 "could not auto-detect the format when using a non-file protocol.\n"
 "If the format is known, pass the format to libguestfs, eg. using the\n"
 "'--format' option, or via the optional 'format' argument to 'add-drive'."
 msgstr ""
 
-#: src/launch-libvirt.c:1624
+#: src/launch-libvirt.c:1641
 #, c-format
 msgid "realpath: could not convert '%s' to absolute path"
 msgstr ""
 
-#: src/launch-libvirt.c:1706
+#: src/launch-libvirt.c:1723
 msgid "could not destroy libvirt domain"
 msgstr ""
 
-#: src/launch-libvirt.c:1743
+#: src/launch-libvirt.c:1760
 #, c-format
 msgid "%s: internal error forming error message"
 msgstr ""
 
-#: src/launch-libvirt.c:1805
+#: src/launch-libvirt.c:1822
 msgid "could not attach disk to libvirt domain"
 msgstr ""
 
-#: src/launch-libvirt.c:1836
+#: src/launch-libvirt.c:1853
 msgid "could not detach disk from libvirt domain"
 msgstr ""
 
@@ -4699,27 +4699,27 @@ msgstr ""
 msgid "%s: cannot create temporary directory"
 msgstr "%s: ਆਰਜੀ ਡਾਇਰੈਕਟਰੀ ਨਹੀਂ ਬਣਾ ਸਕਿਆ"
 
-#: src/utils.c:114
+#: src/utils.c:195
 #, c-format
 msgid "%s exited successfully"
 msgstr ""
 
-#: src/utils.c:117
+#: src/utils.c:198
 #, c-format
 msgid "%s exited with error status %d"
 msgstr ""
 
-#: src/utils.c:121
+#: src/utils.c:202
 #, c-format
 msgid "%s killed by signal %d (%s)"
 msgstr ""
 
-#: src/utils.c:125
+#: src/utils.c:206
 #, c-format
 msgid "%s stopped by signal %d (%s)"
 msgstr ""
 
-#: src/utils.c:129
+#: src/utils.c:210
 #, c-format
 msgid "%s exited for an unknown reason (status %d)"
 msgstr ""
@@ -5163,6 +5163,10 @@ msgstr ""
 msgid "%s: cannot output to a character device or /dev/null\n"
 msgstr ""
 
+#: ../builder/downloader.ml:112
+msgid "%s: curl (download) command failed downloading '%s'\n"
+msgstr ""
+
 #: ../builder/builder.ml:94
 msgid "%s: curl is not installed (or does not work)\n"
 msgstr ""
@@ -5177,6 +5181,13 @@ msgstr ""
 msgid "%s: empty --expand option"
 msgstr ""
 
+#: ../builder/index_parser.ml:102
+msgid ""
+"%s: error parsing index near this line:\n"
+"\n"
+"%s\n"
+msgstr ""
+
 #: ../mllib/common_utils.ml:192
 msgid "%s: error: %s"
 msgstr ""
@@ -5217,6 +5228,10 @@ msgstr ""
 msgid "%s: exception: %s\n"
 msgstr ""
 
+#: ../builder/downloader.ml:91
+msgid "%s: failed to download %s: HTTP status code %s\n"
+msgstr ""
+
 #: ../builder/builder.ml:733
 msgid "%s: failure: %s\n"
 msgstr ""
@@ -5372,6 +5387,12 @@ msgstr ""
 msgid "%s: this partition overlaps the previous one"
 msgstr ""
 
+#: ../builder/downloader.ml:80
+msgid ""
+"%s: unexpected output from curl command, enable debug and look at previous "
+"messages\n"
+msgstr ""
+
 #: ../resize/resize.ml:302
 msgid ""
 "%s: unknown partition table type\n"
@@ -6631,15 +6652,15 @@ msgstr ""
 msgid "error parsing URI '%s'. Look for error messages printed above."
 msgstr ""
 
-#: ../mllib/common_utils.ml:343
+#: ../mllib/common_utils.ml:346
 msgid "external command '%s' exited with error %d"
 msgstr ""
 
-#: ../mllib/common_utils.ml:345
+#: ../mllib/common_utils.ml:348
 msgid "external command '%s' killed by signal %d"
 msgstr ""
 
-#: ../mllib/common_utils.ml:347
+#: ../mllib/common_utils.ml:350
 msgid "external command '%s' stopped by signal %d"
 msgstr ""
 
@@ -6832,17 +6853,6 @@ msgstr ""
 msgid "virt-builder: cannot use a URI ('%s') in the index file\n"
 msgstr ""
 
-#: ../builder/downloader.ml:123 ../builder/downloader.ml:84
-msgid "virt-builder: curl (download) command failed downloading '%s'\n"
-msgstr ""
-
-#: ../builder/index_parser.ml:102
-msgid ""
-"virt-builder: error parsing index near this line:\n"
-"\n"
-"%s\n"
-msgstr ""
-
 #: ../builder/sigchecker.ml:168
 msgid ""
 "virt-builder: error: GPG failure: could not verify digital signature of "
@@ -6896,18 +6906,6 @@ msgid ""
 "you are susceptible to man-in-the-middle attacks.\n"
 msgstr ""
 
-#: ../builder/downloader.ml:87
-msgid "virt-builder: external command '%s' killed by signal %d\n"
-msgstr ""
-
-#: ../builder/downloader.ml:91
-msgid "virt-builder: external command '%s' stopped by signal %d\n"
-msgstr ""
-
-#: ../builder/downloader.ml:102
-msgid "virt-builder: failed to download %s: HTTP status code %s\n"
-msgstr ""
-
 #: ../builder/index_parser.ml:233
 msgid "virt-builder: field '%s' cannot span multiple lines\n"
 msgstr ""
diff --git a/po/pl.po b/po/pl.po
index f154570..b65eb5e 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -12,7 +12,7 @@ msgstr ""
 "Project-Id-Version: libguestfs\n"
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-01-02 20:24+0000\n"
+"POT-Creation-Date: 2014-01-20 12:50+0000\n"
 "PO-Revision-Date: 2013-08-06 13:32+0000\n"
 "Last-Translator: rjones <rjones at redhat.com>\n"
 "Language-Team: Polish <trans-pl at lists.fedoraproject.org>\n"
@@ -4331,43 +4331,43 @@ msgstr ""
 "API architektury plików jest niedostępne, ponieważ ta wersja biblioteki "
 "libguestfs została skompilowana bez biblioteki libmagic"
 
-#: src/fuse.c:936
+#: src/fuse.c:938
 msgid "filesystem is already mounted in another thread"
 msgstr "system plików jest już zamontowany w innym wątku"
 
-#: src/fuse.c:961
+#: src/fuse.c:963
 #, c-format
 msgid "fuse_opt_add_arg: %s"
 msgstr "fuse_opt_add_arg: %s"
 
-#: src/fuse.c:978
+#: src/fuse.c:980
 #, c-format
 msgid "fuse_mount: %s"
 msgstr "fuse_mount: %s"
 
-#: src/fuse.c:996
+#: src/fuse.c:998
 #, c-format
 msgid "fuse_new: %s"
 msgstr "fuse_new: %s"
 
-#: src/fuse.c:1025
+#: src/fuse.c:1027
 msgid "you must call guestfs_mount_local first"
 msgstr "należy najpierw wywołać guestfs_mount_local"
 
-#: src/fuse.c:1034
+#: src/fuse.c:1036
 #, c-format
 msgid "fuse_loop: %s"
 msgstr "fuse_loop: %s"
 
-#: src/fuse.c:1084
+#: src/fuse.c:1086
 msgid "no filesystem is mounted"
 msgstr "żaden system plików nie jest zamontowany"
 
-#: src/fuse.c:1202
+#: src/fuse.c:1204
 msgid "could not initialize dir cache hashtables"
 msgstr "nie można zainicjować tablic sum mieszania katalogu pamięci podręcznej"
 
-#: src/fuse.c:1454
+#: src/fuse.c:1456
 msgid ""
 "FUSE is not supported in this build of libguestfs because libfuse was not "
 "found when libguestfs was compiled"
@@ -4495,11 +4495,11 @@ msgid ""
 "might need to log out and log in again)."
 msgstr ""
 
-#: src/launch-direct.c:246 src/launch-uml.c:120
+#: src/launch-direct.c:247 src/launch-uml.c:120
 msgid "you must call guestfs_add_drive before guestfs_launch"
 msgstr "należy wywołać guestfs_add_drive przed guestfs_launch"
 
-#: src/launch-direct.c:771 src/launch-libvirt.c:481
+#: src/launch-direct.c:762 src/launch-libvirt.c:481
 msgid "qemu launched and contacted daemon, but state != READY"
 msgstr ""
 "QEMU zostało uruchomione i skontaktowano się z demonem, ale stan != GOTOWY"
@@ -4566,49 +4566,49 @@ msgstr ""
 msgid "error constructing libvirt XML at \"%s\""
 msgstr ""
 
-#: src/launch-libvirt.c:1109
+#: src/launch-libvirt.c:1126
 msgid "'iface' parameter is not supported by the libvirt backend"
 msgstr ""
 
-#: src/launch-libvirt.c:1220
+#: src/launch-libvirt.c:1237
 msgid ""
 "libvirt does not support the qemu curl driver protocols (ftp, http, etc.); "
 "try setting LIBGUESTFS_BACKEND=direct"
 msgstr ""
 
-#: src/launch-libvirt.c:1258
+#: src/launch-libvirt.c:1275
 msgid ""
 "could not auto-detect the format.\n"
 "If the format is known, pass the format to libguestfs, eg. using the\n"
 "'--format' option, or via the optional 'format' argument to 'add-drive'."
 msgstr ""
 
-#: src/launch-libvirt.c:1269
+#: src/launch-libvirt.c:1286
 msgid ""
 "could not auto-detect the format when using a non-file protocol.\n"
 "If the format is known, pass the format to libguestfs, eg. using the\n"
 "'--format' option, or via the optional 'format' argument to 'add-drive'."
 msgstr ""
 
-#: src/launch-libvirt.c:1624
+#: src/launch-libvirt.c:1641
 #, c-format
 msgid "realpath: could not convert '%s' to absolute path"
 msgstr ""
 
-#: src/launch-libvirt.c:1706
+#: src/launch-libvirt.c:1723
 msgid "could not destroy libvirt domain"
 msgstr ""
 
-#: src/launch-libvirt.c:1743
+#: src/launch-libvirt.c:1760
 #, c-format
 msgid "%s: internal error forming error message"
 msgstr ""
 
-#: src/launch-libvirt.c:1805
+#: src/launch-libvirt.c:1822
 msgid "could not attach disk to libvirt domain"
 msgstr "niemożna dołączyć dysku do domeny biblioteki libvirt"
 
-#: src/launch-libvirt.c:1836
+#: src/launch-libvirt.c:1853
 msgid "could not detach disk from libvirt domain"
 msgstr "nie można odłączyć dysku od domeny biblioteki libvirt"
 
@@ -4898,27 +4898,27 @@ msgstr ""
 msgid "%s: cannot create temporary directory"
 msgstr "%s: nie można utworzyć katalogu tymczasowego"
 
-#: src/utils.c:114
+#: src/utils.c:195
 #, c-format
 msgid "%s exited successfully"
 msgstr ""
 
-#: src/utils.c:117
+#: src/utils.c:198
 #, c-format
 msgid "%s exited with error status %d"
 msgstr ""
 
-#: src/utils.c:121
+#: src/utils.c:202
 #, c-format
 msgid "%s killed by signal %d (%s)"
 msgstr ""
 
-#: src/utils.c:125
+#: src/utils.c:206
 #, c-format
 msgid "%s stopped by signal %d (%s)"
 msgstr ""
 
-#: src/utils.c:129
+#: src/utils.c:210
 #, c-format
 msgid "%s exited for an unknown reason (status %d)"
 msgstr ""
@@ -5375,6 +5375,10 @@ msgstr ""
 msgid "%s: cannot output to a character device or /dev/null\n"
 msgstr ""
 
+#: ../builder/downloader.ml:112
+msgid "%s: curl (download) command failed downloading '%s'\n"
+msgstr ""
+
 #: ../builder/builder.ml:94
 msgid "%s: curl is not installed (or does not work)\n"
 msgstr ""
@@ -5389,6 +5393,13 @@ msgstr ""
 msgid "%s: empty --expand option"
 msgstr ""
 
+#: ../builder/index_parser.ml:102
+msgid ""
+"%s: error parsing index near this line:\n"
+"\n"
+"%s\n"
+msgstr ""
+
 #: ../mllib/common_utils.ml:192
 msgid "%s: error: %s"
 msgstr ""
@@ -5429,6 +5440,10 @@ msgstr ""
 msgid "%s: exception: %s\n"
 msgstr ""
 
+#: ../builder/downloader.ml:91
+msgid "%s: failed to download %s: HTTP status code %s\n"
+msgstr ""
+
 #: ../builder/builder.ml:733
 msgid "%s: failure: %s\n"
 msgstr ""
@@ -5584,6 +5599,12 @@ msgstr ""
 msgid "%s: this partition overlaps the previous one"
 msgstr ""
 
+#: ../builder/downloader.ml:80
+msgid ""
+"%s: unexpected output from curl command, enable debug and look at previous "
+"messages\n"
+msgstr ""
+
 #: ../resize/resize.ml:302
 msgid ""
 "%s: unknown partition table type\n"
@@ -6855,15 +6876,15 @@ msgstr ""
 msgid "error parsing URI '%s'. Look for error messages printed above."
 msgstr ""
 
-#: ../mllib/common_utils.ml:343
+#: ../mllib/common_utils.ml:346
 msgid "external command '%s' exited with error %d"
 msgstr ""
 
-#: ../mllib/common_utils.ml:345
+#: ../mllib/common_utils.ml:348
 msgid "external command '%s' killed by signal %d"
 msgstr ""
 
-#: ../mllib/common_utils.ml:347
+#: ../mllib/common_utils.ml:350
 msgid "external command '%s' stopped by signal %d"
 msgstr ""
 
@@ -7056,17 +7077,6 @@ msgstr ""
 msgid "virt-builder: cannot use a URI ('%s') in the index file\n"
 msgstr ""
 
-#: ../builder/downloader.ml:123 ../builder/downloader.ml:84
-msgid "virt-builder: curl (download) command failed downloading '%s'\n"
-msgstr ""
-
-#: ../builder/index_parser.ml:102
-msgid ""
-"virt-builder: error parsing index near this line:\n"
-"\n"
-"%s\n"
-msgstr ""
-
 #: ../builder/sigchecker.ml:168
 msgid ""
 "virt-builder: error: GPG failure: could not verify digital signature of "
@@ -7120,18 +7130,6 @@ msgid ""
 "you are susceptible to man-in-the-middle attacks.\n"
 msgstr ""
 
-#: ../builder/downloader.ml:87
-msgid "virt-builder: external command '%s' killed by signal %d\n"
-msgstr ""
-
-#: ../builder/downloader.ml:91
-msgid "virt-builder: external command '%s' stopped by signal %d\n"
-msgstr ""
-
-#: ../builder/downloader.ml:102
-msgid "virt-builder: failed to download %s: HTTP status code %s\n"
-msgstr ""
-
 #: ../builder/index_parser.ml:233
 msgid "virt-builder: field '%s' cannot span multiple lines\n"
 msgstr ""
diff --git a/po/ta.po b/po/ta.po
index 592a128..1f434aa 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: libguestfs\n"
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-01-02 20:24+0000\n"
+"POT-Creation-Date: 2014-01-20 12:50+0000\n"
 "PO-Revision-Date: 2013-08-06 13:32+0000\n"
 "Last-Translator: rjones <rjones at redhat.com>\n"
 "Language-Team: Tamil <tamil-users at lists.fedoraproject.org>\n"
@@ -4062,43 +4062,43 @@ msgid ""
 "compiled without the libmagic library"
 msgstr ""
 
-#: src/fuse.c:936
+#: src/fuse.c:938
 msgid "filesystem is already mounted in another thread"
 msgstr ""
 
-#: src/fuse.c:961
+#: src/fuse.c:963
 #, c-format
 msgid "fuse_opt_add_arg: %s"
 msgstr ""
 
-#: src/fuse.c:978
+#: src/fuse.c:980
 #, c-format
 msgid "fuse_mount: %s"
 msgstr ""
 
-#: src/fuse.c:996
+#: src/fuse.c:998
 #, c-format
 msgid "fuse_new: %s"
 msgstr ""
 
-#: src/fuse.c:1025
+#: src/fuse.c:1027
 msgid "you must call guestfs_mount_local first"
 msgstr ""
 
-#: src/fuse.c:1034
+#: src/fuse.c:1036
 #, c-format
 msgid "fuse_loop: %s"
 msgstr ""
 
-#: src/fuse.c:1084
+#: src/fuse.c:1086
 msgid "no filesystem is mounted"
 msgstr ""
 
-#: src/fuse.c:1202
+#: src/fuse.c:1204
 msgid "could not initialize dir cache hashtables"
 msgstr ""
 
-#: src/fuse.c:1454
+#: src/fuse.c:1456
 msgid ""
 "FUSE is not supported in this build of libguestfs because libfuse was not "
 "found when libguestfs was compiled"
@@ -4222,11 +4222,11 @@ msgid ""
 "might need to log out and log in again)."
 msgstr ""
 
-#: src/launch-direct.c:246 src/launch-uml.c:120
+#: src/launch-direct.c:247 src/launch-uml.c:120
 msgid "you must call guestfs_add_drive before guestfs_launch"
 msgstr "நீங்கள் guestfs_add_drive ஐ guestfs_launchக்கு முன் அழைக்க வேண்டும்"
 
-#: src/launch-direct.c:771 src/launch-libvirt.c:481
+#: src/launch-direct.c:762 src/launch-libvirt.c:481
 msgid "qemu launched and contacted daemon, but state != READY"
 msgstr "qemu டொமைனுடன் துவக்கப்பட்டு தொடர்பு கொண்டது, ஆனால் நிலையானது != READY"
 
@@ -4292,49 +4292,49 @@ msgstr ""
 msgid "error constructing libvirt XML at \"%s\""
 msgstr ""
 
-#: src/launch-libvirt.c:1109
+#: src/launch-libvirt.c:1126
 msgid "'iface' parameter is not supported by the libvirt backend"
 msgstr ""
 
-#: src/launch-libvirt.c:1220
+#: src/launch-libvirt.c:1237
 msgid ""
 "libvirt does not support the qemu curl driver protocols (ftp, http, etc.); "
 "try setting LIBGUESTFS_BACKEND=direct"
 msgstr ""
 
-#: src/launch-libvirt.c:1258
+#: src/launch-libvirt.c:1275
 msgid ""
 "could not auto-detect the format.\n"
 "If the format is known, pass the format to libguestfs, eg. using the\n"
 "'--format' option, or via the optional 'format' argument to 'add-drive'."
 msgstr ""
 
-#: src/launch-libvirt.c:1269
+#: src/launch-libvirt.c:1286
 msgid ""
 "could not auto-detect the format when using a non-file protocol.\n"
 "If the format is known, pass the format to libguestfs, eg. using the\n"
 "'--format' option, or via the optional 'format' argument to 'add-drive'."
 msgstr ""
 
-#: src/launch-libvirt.c:1624
+#: src/launch-libvirt.c:1641
 #, c-format
 msgid "realpath: could not convert '%s' to absolute path"
 msgstr ""
 
-#: src/launch-libvirt.c:1706
+#: src/launch-libvirt.c:1723
 msgid "could not destroy libvirt domain"
 msgstr ""
 
-#: src/launch-libvirt.c:1743
+#: src/launch-libvirt.c:1760
 #, c-format
 msgid "%s: internal error forming error message"
 msgstr ""
 
-#: src/launch-libvirt.c:1805
+#: src/launch-libvirt.c:1822
 msgid "could not attach disk to libvirt domain"
 msgstr ""
 
-#: src/launch-libvirt.c:1836
+#: src/launch-libvirt.c:1853
 msgid "could not detach disk from libvirt domain"
 msgstr ""
 
@@ -4607,27 +4607,27 @@ msgstr ""
 msgid "%s: cannot create temporary directory"
 msgstr "%s: தற்காலிக அடைவை உருவாக்க முடியவில்லை"
 
-#: src/utils.c:114
+#: src/utils.c:195
 #, c-format
 msgid "%s exited successfully"
 msgstr ""
 
-#: src/utils.c:117
+#: src/utils.c:198
 #, c-format
 msgid "%s exited with error status %d"
 msgstr ""
 
-#: src/utils.c:121
+#: src/utils.c:202
 #, c-format
 msgid "%s killed by signal %d (%s)"
 msgstr ""
 
-#: src/utils.c:125
+#: src/utils.c:206
 #, c-format
 msgid "%s stopped by signal %d (%s)"
 msgstr ""
 
-#: src/utils.c:129
+#: src/utils.c:210
 #, c-format
 msgid "%s exited for an unknown reason (status %d)"
 msgstr ""
@@ -5059,6 +5059,10 @@ msgstr ""
 msgid "%s: cannot output to a character device or /dev/null\n"
 msgstr ""
 
+#: ../builder/downloader.ml:112
+msgid "%s: curl (download) command failed downloading '%s'\n"
+msgstr ""
+
 #: ../builder/builder.ml:94
 msgid "%s: curl is not installed (or does not work)\n"
 msgstr ""
@@ -5073,6 +5077,13 @@ msgstr ""
 msgid "%s: empty --expand option"
 msgstr ""
 
+#: ../builder/index_parser.ml:102
+msgid ""
+"%s: error parsing index near this line:\n"
+"\n"
+"%s\n"
+msgstr ""
+
 #: ../mllib/common_utils.ml:192
 msgid "%s: error: %s"
 msgstr ""
@@ -5113,6 +5124,10 @@ msgstr ""
 msgid "%s: exception: %s\n"
 msgstr ""
 
+#: ../builder/downloader.ml:91
+msgid "%s: failed to download %s: HTTP status code %s\n"
+msgstr ""
+
 #: ../builder/builder.ml:733
 msgid "%s: failure: %s\n"
 msgstr ""
@@ -5268,6 +5283,12 @@ msgstr ""
 msgid "%s: this partition overlaps the previous one"
 msgstr ""
 
+#: ../builder/downloader.ml:80
+msgid ""
+"%s: unexpected output from curl command, enable debug and look at previous "
+"messages\n"
+msgstr ""
+
 #: ../resize/resize.ml:302
 msgid ""
 "%s: unknown partition table type\n"
@@ -6527,15 +6548,15 @@ msgstr ""
 msgid "error parsing URI '%s'. Look for error messages printed above."
 msgstr ""
 
-#: ../mllib/common_utils.ml:343
+#: ../mllib/common_utils.ml:346
 msgid "external command '%s' exited with error %d"
 msgstr ""
 
-#: ../mllib/common_utils.ml:345
+#: ../mllib/common_utils.ml:348
 msgid "external command '%s' killed by signal %d"
 msgstr ""
 
-#: ../mllib/common_utils.ml:347
+#: ../mllib/common_utils.ml:350
 msgid "external command '%s' stopped by signal %d"
 msgstr ""
 
@@ -6728,17 +6749,6 @@ msgstr ""
 msgid "virt-builder: cannot use a URI ('%s') in the index file\n"
 msgstr ""
 
-#: ../builder/downloader.ml:123 ../builder/downloader.ml:84
-msgid "virt-builder: curl (download) command failed downloading '%s'\n"
-msgstr ""
-
-#: ../builder/index_parser.ml:102
-msgid ""
-"virt-builder: error parsing index near this line:\n"
-"\n"
-"%s\n"
-msgstr ""
-
 #: ../builder/sigchecker.ml:168
 msgid ""
 "virt-builder: error: GPG failure: could not verify digital signature of "
@@ -6792,18 +6802,6 @@ msgid ""
 "you are susceptible to man-in-the-middle attacks.\n"
 msgstr ""
 
-#: ../builder/downloader.ml:87
-msgid "virt-builder: external command '%s' killed by signal %d\n"
-msgstr ""
-
-#: ../builder/downloader.ml:91
-msgid "virt-builder: external command '%s' stopped by signal %d\n"
-msgstr ""
-
-#: ../builder/downloader.ml:102
-msgid "virt-builder: failed to download %s: HTTP status code %s\n"
-msgstr ""
-
 #: ../builder/index_parser.ml:233
 msgid "virt-builder: field '%s' cannot span multiple lines\n"
 msgstr ""
diff --git a/po/te.po b/po/te.po
index e367372..a366e19 100644
--- a/po/te.po
+++ b/po/te.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: libguestfs\n"
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-01-02 20:24+0000\n"
+"POT-Creation-Date: 2014-01-20 12:50+0000\n"
 "PO-Revision-Date: 2013-08-06 13:32+0000\n"
 "Last-Translator: rjones <rjones at redhat.com>\n"
 "Language-Team: Telugu (http://www.transifex.com/projects/p/fedora/language/"
@@ -4060,43 +4060,43 @@ msgid ""
 "compiled without the libmagic library"
 msgstr ""
 
-#: src/fuse.c:936
+#: src/fuse.c:938
 msgid "filesystem is already mounted in another thread"
 msgstr ""
 
-#: src/fuse.c:961
+#: src/fuse.c:963
 #, c-format
 msgid "fuse_opt_add_arg: %s"
 msgstr ""
 
-#: src/fuse.c:978
+#: src/fuse.c:980
 #, c-format
 msgid "fuse_mount: %s"
 msgstr ""
 
-#: src/fuse.c:996
+#: src/fuse.c:998
 #, c-format
 msgid "fuse_new: %s"
 msgstr ""
 
-#: src/fuse.c:1025
+#: src/fuse.c:1027
 msgid "you must call guestfs_mount_local first"
 msgstr ""
 
-#: src/fuse.c:1034
+#: src/fuse.c:1036
 #, c-format
 msgid "fuse_loop: %s"
 msgstr ""
 
-#: src/fuse.c:1084
+#: src/fuse.c:1086
 msgid "no filesystem is mounted"
 msgstr ""
 
-#: src/fuse.c:1202
+#: src/fuse.c:1204
 msgid "could not initialize dir cache hashtables"
 msgstr ""
 
-#: src/fuse.c:1454
+#: src/fuse.c:1456
 msgid ""
 "FUSE is not supported in this build of libguestfs because libfuse was not "
 "found when libguestfs was compiled"
@@ -4220,11 +4220,11 @@ msgid ""
 "might need to log out and log in again)."
 msgstr ""
 
-#: src/launch-direct.c:246 src/launch-uml.c:120
+#: src/launch-direct.c:247 src/launch-uml.c:120
 msgid "you must call guestfs_add_drive before guestfs_launch"
 msgstr "guestfs_launchకు ముందుగా మీరు guestfs_add_driveను పిలువవలెను"
 
-#: src/launch-direct.c:771 src/launch-libvirt.c:481
+#: src/launch-direct.c:762 src/launch-libvirt.c:481
 msgid "qemu launched and contacted daemon, but state != READY"
 msgstr "qemu ఆరంభించబడింది మరియు డెమోన్‌ను సంప్రదించింది, అయితే state != READY"
 
@@ -4290,49 +4290,49 @@ msgstr ""
 msgid "error constructing libvirt XML at \"%s\""
 msgstr ""
 
-#: src/launch-libvirt.c:1109
+#: src/launch-libvirt.c:1126
 msgid "'iface' parameter is not supported by the libvirt backend"
 msgstr ""
 
-#: src/launch-libvirt.c:1220
+#: src/launch-libvirt.c:1237
 msgid ""
 "libvirt does not support the qemu curl driver protocols (ftp, http, etc.); "
 "try setting LIBGUESTFS_BACKEND=direct"
 msgstr ""
 
-#: src/launch-libvirt.c:1258
+#: src/launch-libvirt.c:1275
 msgid ""
 "could not auto-detect the format.\n"
 "If the format is known, pass the format to libguestfs, eg. using the\n"
 "'--format' option, or via the optional 'format' argument to 'add-drive'."
 msgstr ""
 
-#: src/launch-libvirt.c:1269
+#: src/launch-libvirt.c:1286
 msgid ""
 "could not auto-detect the format when using a non-file protocol.\n"
 "If the format is known, pass the format to libguestfs, eg. using the\n"
 "'--format' option, or via the optional 'format' argument to 'add-drive'."
 msgstr ""
 
-#: src/launch-libvirt.c:1624
+#: src/launch-libvirt.c:1641
 #, c-format
 msgid "realpath: could not convert '%s' to absolute path"
 msgstr ""
 
-#: src/launch-libvirt.c:1706
+#: src/launch-libvirt.c:1723
 msgid "could not destroy libvirt domain"
 msgstr ""
 
-#: src/launch-libvirt.c:1743
+#: src/launch-libvirt.c:1760
 #, c-format
 msgid "%s: internal error forming error message"
 msgstr ""
 
-#: src/launch-libvirt.c:1805
+#: src/launch-libvirt.c:1822
 msgid "could not attach disk to libvirt domain"
 msgstr ""
 
-#: src/launch-libvirt.c:1836
+#: src/launch-libvirt.c:1853
 msgid "could not detach disk from libvirt domain"
 msgstr ""
 
@@ -4605,27 +4605,27 @@ msgstr ""
 msgid "%s: cannot create temporary directory"
 msgstr "%s: తాత్కాలిక డైరెక్టరీను సృష్టించలేదు"
 
-#: src/utils.c:114
+#: src/utils.c:195
 #, c-format
 msgid "%s exited successfully"
 msgstr ""
 
-#: src/utils.c:117
+#: src/utils.c:198
 #, c-format
 msgid "%s exited with error status %d"
 msgstr ""
 
-#: src/utils.c:121
+#: src/utils.c:202
 #, c-format
 msgid "%s killed by signal %d (%s)"
 msgstr ""
 
-#: src/utils.c:125
+#: src/utils.c:206
 #, c-format
 msgid "%s stopped by signal %d (%s)"
 msgstr ""
 
-#: src/utils.c:129
+#: src/utils.c:210
 #, c-format
 msgid "%s exited for an unknown reason (status %d)"
 msgstr ""
@@ -5057,6 +5057,10 @@ msgstr ""
 msgid "%s: cannot output to a character device or /dev/null\n"
 msgstr ""
 
+#: ../builder/downloader.ml:112
+msgid "%s: curl (download) command failed downloading '%s'\n"
+msgstr ""
+
 #: ../builder/builder.ml:94
 msgid "%s: curl is not installed (or does not work)\n"
 msgstr ""
@@ -5071,6 +5075,13 @@ msgstr ""
 msgid "%s: empty --expand option"
 msgstr ""
 
+#: ../builder/index_parser.ml:102
+msgid ""
+"%s: error parsing index near this line:\n"
+"\n"
+"%s\n"
+msgstr ""
+
 #: ../mllib/common_utils.ml:192
 msgid "%s: error: %s"
 msgstr ""
@@ -5111,6 +5122,10 @@ msgstr ""
 msgid "%s: exception: %s\n"
 msgstr ""
 
+#: ../builder/downloader.ml:91
+msgid "%s: failed to download %s: HTTP status code %s\n"
+msgstr ""
+
 #: ../builder/builder.ml:733
 msgid "%s: failure: %s\n"
 msgstr ""
@@ -5266,6 +5281,12 @@ msgstr ""
 msgid "%s: this partition overlaps the previous one"
 msgstr ""
 
+#: ../builder/downloader.ml:80
+msgid ""
+"%s: unexpected output from curl command, enable debug and look at previous "
+"messages\n"
+msgstr ""
+
 #: ../resize/resize.ml:302
 msgid ""
 "%s: unknown partition table type\n"
@@ -6525,15 +6546,15 @@ msgstr ""
 msgid "error parsing URI '%s'. Look for error messages printed above."
 msgstr ""
 
-#: ../mllib/common_utils.ml:343
+#: ../mllib/common_utils.ml:346
 msgid "external command '%s' exited with error %d"
 msgstr ""
 
-#: ../mllib/common_utils.ml:345
+#: ../mllib/common_utils.ml:348
 msgid "external command '%s' killed by signal %d"
 msgstr ""
 
-#: ../mllib/common_utils.ml:347
+#: ../mllib/common_utils.ml:350
 msgid "external command '%s' stopped by signal %d"
 msgstr ""
 
@@ -6726,17 +6747,6 @@ msgstr ""
 msgid "virt-builder: cannot use a URI ('%s') in the index file\n"
 msgstr ""
 
-#: ../builder/downloader.ml:123 ../builder/downloader.ml:84
-msgid "virt-builder: curl (download) command failed downloading '%s'\n"
-msgstr ""
-
-#: ../builder/index_parser.ml:102
-msgid ""
-"virt-builder: error parsing index near this line:\n"
-"\n"
-"%s\n"
-msgstr ""
-
 #: ../builder/sigchecker.ml:168
 msgid ""
 "virt-builder: error: GPG failure: could not verify digital signature of "
@@ -6790,18 +6800,6 @@ msgid ""
 "you are susceptible to man-in-the-middle attacks.\n"
 msgstr ""
 
-#: ../builder/downloader.ml:87
-msgid "virt-builder: external command '%s' killed by signal %d\n"
-msgstr ""
-
-#: ../builder/downloader.ml:91
-msgid "virt-builder: external command '%s' stopped by signal %d\n"
-msgstr ""
-
-#: ../builder/downloader.ml:102
-msgid "virt-builder: failed to download %s: HTTP status code %s\n"
-msgstr ""
-
 #: ../builder/index_parser.ml:233
 msgid "virt-builder: field '%s' cannot span multiple lines\n"
 msgstr ""
diff --git a/po/uk.po b/po/uk.po
index bf14510..3a8547a 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -10,7 +10,7 @@ msgstr ""
 "Project-Id-Version: libguestfs\n"
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-01-02 20:24+0000\n"
+"POT-Creation-Date: 2014-01-20 12:50+0000\n"
 "PO-Revision-Date: 2013-08-06 13:32+0000\n"
 "Last-Translator: rjones <rjones at redhat.com>\n"
 "Language-Team: Ukrainian <trans-uk at lists.fedoraproject.org>\n"
@@ -4489,43 +4489,43 @@ msgstr ""
 "файлово-архітектурний програмний інтерфейс недоступний, оскільки цю версію "
 "libguestfs було зібрано без підтримки бібліотеки libmagic"
 
-#: src/fuse.c:936
+#: src/fuse.c:938
 msgid "filesystem is already mounted in another thread"
 msgstr "файлову систему вже змонтовано у іншому потоці виконання команд"
 
-#: src/fuse.c:961
+#: src/fuse.c:963
 #, c-format
 msgid "fuse_opt_add_arg: %s"
 msgstr "fuse_opt_add_arg: %s"
 
-#: src/fuse.c:978
+#: src/fuse.c:980
 #, c-format
 msgid "fuse_mount: %s"
 msgstr "fuse_mount: %s"
 
-#: src/fuse.c:996
+#: src/fuse.c:998
 #, c-format
 msgid "fuse_new: %s"
 msgstr "fuse_new: %s"
 
-#: src/fuse.c:1025
+#: src/fuse.c:1027
 msgid "you must call guestfs_mount_local first"
 msgstr "вам слід спочатку викликати guestfs_mount_local"
 
-#: src/fuse.c:1034
+#: src/fuse.c:1036
 #, c-format
 msgid "fuse_loop: %s"
 msgstr "fuse_loop: %s"
 
-#: src/fuse.c:1084
+#: src/fuse.c:1086
 msgid "no filesystem is mounted"
 msgstr "не змонтовано жодної файлової системи"
 
-#: src/fuse.c:1202
+#: src/fuse.c:1204
 msgid "could not initialize dir cache hashtables"
 msgstr "не вдалося ініціалізувати таблиці хешів каталогів кешу"
 
-#: src/fuse.c:1454
+#: src/fuse.c:1456
 msgid ""
 "FUSE is not supported in this build of libguestfs because libfuse was not "
 "found when libguestfs was compiled"
@@ -4661,11 +4661,11 @@ msgid ""
 "might need to log out and log in again)."
 msgstr ""
 
-#: src/launch-direct.c:246 src/launch-uml.c:120
+#: src/launch-direct.c:247 src/launch-uml.c:120
 msgid "you must call guestfs_add_drive before guestfs_launch"
 msgstr "вам слід викликати guestfs_add_drive перед викликом guestfs_launch"
 
-#: src/launch-direct.c:771 src/launch-libvirt.c:481
+#: src/launch-direct.c:762 src/launch-libvirt.c:481
 msgid "qemu launched and contacted daemon, but state != READY"
 msgstr ""
 "qemu запущено, встановлено зв’язок з фоновою службою, але стан процесу не "
@@ -4749,11 +4749,11 @@ msgstr ""
 msgid "error constructing libvirt XML at \"%s\""
 msgstr "помилка під час спроби побудувати XML для libvirt у «%s»"
 
-#: src/launch-libvirt.c:1109
+#: src/launch-libvirt.c:1126
 msgid "'iface' parameter is not supported by the libvirt backend"
 msgstr "підтримки параметра «iface» у модулі libvirt не передбачено"
 
-#: src/launch-libvirt.c:1220
+#: src/launch-libvirt.c:1237
 msgid ""
 "libvirt does not support the qemu curl driver protocols (ftp, http, etc.); "
 "try setting LIBGUESTFS_BACKEND=direct"
@@ -4761,7 +4761,7 @@ msgstr ""
 "у libvirt не передбачено підтримки драйверів протоколів curl qemu (ftp, http "
 "тощо); спробуйте встановити LIBGUESTFS_BACKEND=direct"
 
-#: src/launch-libvirt.c:1258
+#: src/launch-libvirt.c:1275
 msgid ""
 "could not auto-detect the format.\n"
 "If the format is known, pass the format to libguestfs, eg. using the\n"
@@ -4773,7 +4773,7 @@ msgstr ""
 "параметра «--format» або за допомогою додаткового параметра аргументу "
 "формату до «add-drive»."
 
-#: src/launch-libvirt.c:1269
+#: src/launch-libvirt.c:1286
 msgid ""
 "could not auto-detect the format when using a non-file protocol.\n"
 "If the format is known, pass the format to libguestfs, eg. using the\n"
@@ -4786,25 +4786,25 @@ msgstr ""
 "параметра «--format» або за допомогою додаткового параметра аргументу "
 "формату до «add-drive»."
 
-#: src/launch-libvirt.c:1624
+#: src/launch-libvirt.c:1641
 #, c-format
 msgid "realpath: could not convert '%s' to absolute path"
 msgstr "realpath: не вдалося перетворити «%s» на абсолютний шлях"
 
-#: src/launch-libvirt.c:1706
+#: src/launch-libvirt.c:1723
 msgid "could not destroy libvirt domain"
 msgstr "не вдалося знищити домен libvirt"
 
-#: src/launch-libvirt.c:1743
+#: src/launch-libvirt.c:1760
 #, c-format
 msgid "%s: internal error forming error message"
 msgstr "%s: внутрішня помилка формування повідомлення щодо помилки"
 
-#: src/launch-libvirt.c:1805
+#: src/launch-libvirt.c:1822
 msgid "could not attach disk to libvirt domain"
 msgstr "не вдалося долучити диск до домену libvirt"
 
-#: src/launch-libvirt.c:1836
+#: src/launch-libvirt.c:1853
 msgid "could not detach disk from libvirt domain"
 msgstr "не вдалося від’єднати диск від домену libvirt"
 
@@ -5102,27 +5102,27 @@ msgstr "тимчасовий каталог «%s» не є каталогом"
 msgid "%s: cannot create temporary directory"
 msgstr "%s: не вдалося створити тимчасовий каталог"
 
-#: src/utils.c:114
+#: src/utils.c:195
 #, c-format
 msgid "%s exited successfully"
 msgstr "Успішно завершено роботу %s"
 
-#: src/utils.c:117
+#: src/utils.c:198
 #, c-format
 msgid "%s exited with error status %d"
 msgstr "Роботу %s завершено зі станом виходу %d"
 
-#: src/utils.c:121
+#: src/utils.c:202
 #, c-format
 msgid "%s killed by signal %d (%s)"
 msgstr "Роботу %s припинено за допомогою сигналу %d (%s)"
 
-#: src/utils.c:125
+#: src/utils.c:206
 #, c-format
 msgid "%s stopped by signal %d (%s)"
 msgstr "Роботу %s завершено за допомогою сигналу %d (%s)"
 
-#: src/utils.c:129
+#: src/utils.c:210
 #, c-format
 msgid "%s exited for an unknown reason (status %d)"
 msgstr "Роботу %s завершено з невідомої причини (стан %d)"
@@ -5598,6 +5598,10 @@ msgstr ""
 msgid "%s: cannot output to a character device or /dev/null\n"
 msgstr ""
 
+#: ../builder/downloader.ml:112
+msgid "%s: curl (download) command failed downloading '%s'\n"
+msgstr ""
+
 #: ../builder/builder.ml:94
 msgid "%s: curl is not installed (or does not work)\n"
 msgstr ""
@@ -5612,6 +5616,13 @@ msgstr ""
 msgid "%s: empty --expand option"
 msgstr "%s: порожній аргумент параметра --expand"
 
+#: ../builder/index_parser.ml:102
+msgid ""
+"%s: error parsing index near this line:\n"
+"\n"
+"%s\n"
+msgstr ""
+
 #: ../mllib/common_utils.ml:192
 msgid "%s: error: %s"
 msgstr ""
@@ -5652,6 +5663,10 @@ msgstr ""
 msgid "%s: exception: %s\n"
 msgstr ""
 
+#: ../builder/downloader.ml:91
+msgid "%s: failed to download %s: HTTP status code %s\n"
+msgstr ""
+
 #: ../builder/builder.ml:733
 msgid "%s: failure: %s\n"
 msgstr ""
@@ -5837,6 +5852,12 @@ msgstr "%s: цей розділ вже було позначено для змі
 msgid "%s: this partition overlaps the previous one"
 msgstr "%s: цей розділ перекривається з попереднім"
 
+#: ../builder/downloader.ml:80
+msgid ""
+"%s: unexpected output from curl command, enable debug and look at previous "
+"messages\n"
+msgstr ""
+
 #: ../resize/resize.ml:302
 msgid ""
 "%s: unknown partition table type\n"
@@ -7240,15 +7261,15 @@ msgstr "порожній параметр --shrink"
 msgid "error parsing URI '%s'. Look for error messages printed above."
 msgstr ""
 
-#: ../mllib/common_utils.ml:343
+#: ../mllib/common_utils.ml:346
 msgid "external command '%s' exited with error %d"
 msgstr ""
 
-#: ../mllib/common_utils.ml:345
+#: ../mllib/common_utils.ml:348
 msgid "external command '%s' killed by signal %d"
 msgstr "роботу зовнішньої програми «%s» перервано з сигналом %d"
 
-#: ../mllib/common_utils.ml:347
+#: ../mllib/common_utils.ml:350
 msgid "external command '%s' stopped by signal %d"
 msgstr "роботу зовнішньої програми «%s» зупинено з сигналом %d"
 
@@ -7454,17 +7475,6 @@ msgstr ""
 msgid "virt-builder: cannot use a URI ('%s') in the index file\n"
 msgstr ""
 
-#: ../builder/downloader.ml:123 ../builder/downloader.ml:84
-msgid "virt-builder: curl (download) command failed downloading '%s'\n"
-msgstr ""
-
-#: ../builder/index_parser.ml:102
-msgid ""
-"virt-builder: error parsing index near this line:\n"
-"\n"
-"%s\n"
-msgstr ""
-
 #: ../builder/sigchecker.ml:168
 msgid ""
 "virt-builder: error: GPG failure: could not verify digital signature of "
@@ -7518,18 +7528,6 @@ msgid ""
 "you are susceptible to man-in-the-middle attacks.\n"
 msgstr ""
 
-#: ../builder/downloader.ml:87
-msgid "virt-builder: external command '%s' killed by signal %d\n"
-msgstr ""
-
-#: ../builder/downloader.ml:91
-msgid "virt-builder: external command '%s' stopped by signal %d\n"
-msgstr ""
-
-#: ../builder/downloader.ml:102
-msgid "virt-builder: failed to download %s: HTTP status code %s\n"
-msgstr ""
-
 #: ../builder/index_parser.ml:233
 msgid "virt-builder: field '%s' cannot span multiple lines\n"
 msgstr ""

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-libvirt/libguestfs.git



More information about the Pkg-libvirt-commits mailing list