fish: Document that remote run in cmd substitution context hangs.

[libguestfs.git] / po-docs / ja.po

diff --git a/po-docs/ja.po b/po-docs/ja.po
index 7d15fc1..987ee9c 100644 (file)
--- a/po-docs/ja.po
+++ b/po-docs/ja.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: libguestfs@redhat.com\n"
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: libguestfs@redhat.com\n"

-"POT-Creation-Date: 2011-03-08 16:20+0000\n"
+"POT-Creation-Date: 2011-08-07 23:15+0200\n"

 "PO-Revision-Date: 2010-09-02 14:46+0100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "PO-Revision-Date: 2010-09-02 14:46+0100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"


@@ -21,9 +21,8 @@ msgstr ""
 #: ../src/guestfs.pod:3 ../fish/guestfish.pod:3
 #: ../test-tool/libguestfs-test-tool.pod:3 ../fuse/guestmount.pod:3
 #: ../tools/virt-edit.pl:32 ../tools/virt-win-reg.pl:35
 #: ../src/guestfs.pod:3 ../fish/guestfish.pod:3
 #: ../test-tool/libguestfs-test-tool.pod:3 ../fuse/guestmount.pod:3
 #: ../tools/virt-edit.pl:32 ../tools/virt-win-reg.pl:35

-#: ../tools/virt-resize.pl:40 ../tools/virt-list-filesystems.pl:30
-#: ../tools/virt-tar.pl:31 ../tools/virt-make-fs.pl:35
-#: ../tools/virt-list-partitions.pl:30
+#: ../tools/virt-list-filesystems.pl:30 ../tools/virt-tar.pl:31
+#: ../tools/virt-make-fs.pl:35 ../tools/virt-list-partitions.pl:30

 msgid "NAME"
 msgstr "名前"
 
 msgid "NAME"
 msgstr "名前"
 


@@ -38,9 +37,8 @@ msgstr ""
 #: ../src/guestfs.pod:7 ../fish/guestfish.pod:7
 #: ../test-tool/libguestfs-test-tool.pod:7 ../fuse/guestmount.pod:7
 #: ../tools/virt-edit.pl:36 ../tools/virt-win-reg.pl:39
 #: ../src/guestfs.pod:7 ../fish/guestfish.pod:7
 #: ../test-tool/libguestfs-test-tool.pod:7 ../fuse/guestmount.pod:7
 #: ../tools/virt-edit.pl:36 ../tools/virt-win-reg.pl:39

-#: ../tools/virt-resize.pl:44 ../tools/virt-list-filesystems.pl:34
-#: ../tools/virt-tar.pl:35 ../tools/virt-make-fs.pl:39
-#: ../tools/virt-list-partitions.pl:34
+#: ../tools/virt-list-filesystems.pl:34 ../tools/virt-tar.pl:35
+#: ../tools/virt-make-fs.pl:39 ../tools/virt-list-partitions.pl:34

 msgid "SYNOPSIS"
 msgstr ""
 
 msgid "SYNOPSIS"
 msgstr ""
 


@@ -84,9 +82,8 @@ msgstr ""
 #: ../src/guestfs.pod:23 ../fish/guestfish.pod:30
 #: ../test-tool/libguestfs-test-tool.pod:11 ../fuse/guestmount.pod:20
 #: ../tools/virt-edit.pl:50 ../tools/virt-win-reg.pl:63
 #: ../src/guestfs.pod:23 ../fish/guestfish.pod:30
 #: ../test-tool/libguestfs-test-tool.pod:11 ../fuse/guestmount.pod:20
 #: ../tools/virt-edit.pl:50 ../tools/virt-win-reg.pl:63

-#: ../tools/virt-resize.pl:50 ../tools/virt-list-filesystems.pl:40
-#: ../tools/virt-tar.pl:77 ../tools/virt-make-fs.pl:47
-#: ../tools/virt-list-partitions.pl:40
+#: ../tools/virt-list-filesystems.pl:40 ../tools/virt-tar.pl:77
+#: ../tools/virt-make-fs.pl:47 ../tools/virt-list-partitions.pl:40

 msgid "DESCRIPTION"
 msgstr ""
 
 msgid "DESCRIPTION"
 msgstr ""
 


@@ -250,7 +247,6 @@ msgid ""
 " \n"
 msgstr ""
 
 " \n"
 msgstr ""
 

-# type: verbatim

 #. type: verbatim
 #: ../src/guestfs.pod:98
 #, no-wrap
 #. type: verbatim
 #: ../src/guestfs.pod:98
 #, no-wrap


@@ -259,7 +255,7 @@ msgid ""
 "  * disk image.\n"
 "  */\n"
 " guestfs_touch (g, \"/hello\");\n"
 "  * disk image.\n"
 "  */\n"
 " guestfs_touch (g, \"/hello\");\n"

-"\n"
+" \n"

 msgstr ""
 
 # type: verbatim
 msgstr ""
 
 # type: verbatim


@@ -839,10 +835,9 @@ msgid ""
 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #: ../src/guestfs.pod:357
 #. type: textblock
 #: ../src/guestfs.pod:357

-msgid "and you can write tar output to a pipe C<fd> by doing:"
+msgid "and you can write tar output to a file descriptor C<fd> by doing:"

 msgstr ""
 
 #. type: verbatim
 msgstr ""
 
 #. type: verbatim


@@ -918,44 +913,47 @@ msgstr ""
 #. type: =item
 #: ../src/guestfs.pod:388 ../src/guestfs.pod:393 ../src/guestfs.pod:398
 #: ../src/guestfs.pod:402 ../src/guestfs.pod:407 ../src/guestfs.pod:411
 #. type: =item
 #: ../src/guestfs.pod:388 ../src/guestfs.pod:393 ../src/guestfs.pod:398
 #: ../src/guestfs.pod:402 ../src/guestfs.pod:407 ../src/guestfs.pod:411

-#: ../src/guestfs.pod:416 ../src/guestfs.pod:421 ../src/guestfs.pod:1088
-#: ../src/guestfs.pod:1092 ../src/guestfs.pod:1096 ../src/guestfs.pod:1101
-#: ../src/guestfs.pod:1109 ../src/guestfs.pod:1128 ../src/guestfs.pod:1136
-#: ../src/guestfs.pod:1158 ../src/guestfs.pod:1162 ../src/guestfs.pod:1166
-#: ../src/guestfs.pod:1170 ../src/guestfs.pod:1174 ../src/guestfs.pod:1178
-#: ../src/guestfs.pod:1660 ../src/guestfs.pod:1665 ../src/guestfs.pod:1669
-#: ../src/guestfs.pod:1779 ../src/guestfs.pod:1784 ../src/guestfs.pod:1788
-#: ../src/guestfs.pod:2140 ../src/guestfs.pod:2146 ../src/guestfs.pod:2151
-#: ../src/guestfs.pod:2157 ../src/guestfs.pod:2622 ../src/guestfs.pod:2626
-#: ../src/guestfs.pod:2630 ../src/guestfs.pod:2634
-#: ../src/guestfs-actions.pod:15 ../src/guestfs-actions.pod:22
-#: ../src/guestfs-actions.pod:577 ../src/guestfs-actions.pod:585
-#: ../src/guestfs-actions.pod:592 ../src/guestfs-actions.pod:599
-#: ../src/guestfs-actions.pod:1595 ../src/guestfs-actions.pod:1599
-#: ../src/guestfs-actions.pod:1603 ../src/guestfs-actions.pod:1607
-#: ../src/guestfs-actions.pod:1615 ../src/guestfs-actions.pod:1619
-#: ../src/guestfs-actions.pod:1623 ../src/guestfs-actions.pod:1633
-#: ../src/guestfs-actions.pod:1637 ../src/guestfs-actions.pod:1641
-#: ../src/guestfs-actions.pod:1779 ../src/guestfs-actions.pod:1783
-#: ../src/guestfs-actions.pod:1788 ../src/guestfs-actions.pod:1793
-#: ../src/guestfs-actions.pod:1854 ../src/guestfs-actions.pod:1858
-#: ../src/guestfs-actions.pod:1863 ../fish/guestfish.pod:432
-#: ../fish/guestfish.pod:436 ../fish/guestfish.pod:440
-#: ../fish/guestfish.pod:444 ../fish/guestfish-actions.pod:13
-#: ../fish/guestfish-actions.pod:20 ../fish/guestfish-actions.pod:380
-#: ../fish/guestfish-actions.pod:388 ../fish/guestfish-actions.pod:395
-#: ../fish/guestfish-actions.pod:402 ../fish/guestfish-actions.pod:1072
-#: ../fish/guestfish-actions.pod:1076 ../fish/guestfish-actions.pod:1080
-#: ../fish/guestfish-actions.pod:1084 ../fish/guestfish-actions.pod:1092
-#: ../fish/guestfish-actions.pod:1096 ../fish/guestfish-actions.pod:1100
-#: ../fish/guestfish-actions.pod:1110 ../fish/guestfish-actions.pod:1114
-#: ../fish/guestfish-actions.pod:1118 ../fish/guestfish-actions.pod:1208
-#: ../fish/guestfish-actions.pod:1212 ../fish/guestfish-actions.pod:1217
-#: ../fish/guestfish-actions.pod:1222 ../fish/guestfish-actions.pod:1264
-#: ../fish/guestfish-actions.pod:1268 ../fish/guestfish-actions.pod:1273
+#: ../src/guestfs.pod:416 ../src/guestfs.pod:421 ../src/guestfs.pod:1064
+#: ../src/guestfs.pod:1068 ../src/guestfs.pod:1072 ../src/guestfs.pod:1077
+#: ../src/guestfs.pod:1085 ../src/guestfs.pod:1104 ../src/guestfs.pod:1112
+#: ../src/guestfs.pod:1134 ../src/guestfs.pod:1138 ../src/guestfs.pod:1142
+#: ../src/guestfs.pod:1146 ../src/guestfs.pod:1150 ../src/guestfs.pod:1154
+#: ../src/guestfs.pod:1643 ../src/guestfs.pod:1648 ../src/guestfs.pod:1652
+#: ../src/guestfs.pod:1753 ../src/guestfs.pod:1758 ../src/guestfs.pod:1762
+#: ../src/guestfs.pod:1772 ../src/guestfs.pod:2007 ../src/guestfs.pod:2012
+#: ../src/guestfs.pod:2018 ../src/guestfs.pod:2026 ../src/guestfs.pod:2380
+#: ../src/guestfs.pod:2386 ../src/guestfs.pod:2391 ../src/guestfs.pod:2397
+#: ../src/guestfs.pod:2968 ../src/guestfs.pod:2972 ../src/guestfs.pod:2976
+#: ../src/guestfs.pod:2980 ../src/guestfs-actions.pod:15
+#: ../src/guestfs-actions.pod:22 ../src/guestfs-actions.pod:577
+#: ../src/guestfs-actions.pod:585 ../src/guestfs-actions.pod:592
+#: ../src/guestfs-actions.pod:599 ../src/guestfs-actions.pod:1597
+#: ../src/guestfs-actions.pod:1601 ../src/guestfs-actions.pod:1605
+#: ../src/guestfs-actions.pod:1609 ../src/guestfs-actions.pod:1617
+#: ../src/guestfs-actions.pod:1621 ../src/guestfs-actions.pod:1625
+#: ../src/guestfs-actions.pod:1635 ../src/guestfs-actions.pod:1639
+#: ../src/guestfs-actions.pod:1643 ../src/guestfs-actions.pod:1781
+#: ../src/guestfs-actions.pod:1785 ../src/guestfs-actions.pod:1790
+#: ../src/guestfs-actions.pod:1795 ../src/guestfs-actions.pod:1856
+#: ../src/guestfs-actions.pod:1860 ../src/guestfs-actions.pod:1865
+#: ../fish/guestfish.pod:443 ../fish/guestfish.pod:447
+#: ../fish/guestfish.pod:451 ../fish/guestfish.pod:455
+#: ../fish/guestfish-actions.pod:13 ../fish/guestfish-actions.pod:20
+#: ../fish/guestfish-actions.pod:380 ../fish/guestfish-actions.pod:388
+#: ../fish/guestfish-actions.pod:395 ../fish/guestfish-actions.pod:402
+#: ../fish/guestfish-actions.pod:1069 ../fish/guestfish-actions.pod:1073
+#: ../fish/guestfish-actions.pod:1077 ../fish/guestfish-actions.pod:1081
+#: ../fish/guestfish-actions.pod:1089 ../fish/guestfish-actions.pod:1093
+#: ../fish/guestfish-actions.pod:1097 ../fish/guestfish-actions.pod:1107
+#: ../fish/guestfish-actions.pod:1111 ../fish/guestfish-actions.pod:1115
+#: ../fish/guestfish-actions.pod:1205 ../fish/guestfish-actions.pod:1209
+#: ../fish/guestfish-actions.pod:1214 ../fish/guestfish-actions.pod:1219
+#: ../fish/guestfish-actions.pod:1261 ../fish/guestfish-actions.pod:1265
+#: ../fish/guestfish-actions.pod:1270 ../tools/virt-edit.pl:351
+#: ../tools/virt-edit.pl:356 ../tools/virt-edit.pl:361
+#: ../tools/virt-edit.pl:372 ../tools/virt-edit.pl:376

 #: ../tools/virt-win-reg.pl:536 ../tools/virt-win-reg.pl:542
 #: ../tools/virt-win-reg.pl:536 ../tools/virt-win-reg.pl:542

-#: ../tools/virt-win-reg.pl:548 ../tools/virt-resize.pl:345
-#: ../tools/virt-resize.pl:350 ../tools/virt-resize.pl:360
+#: ../tools/virt-win-reg.pl:548

 msgid "*"
 msgstr ""
 
 msgid "*"
 msgstr ""
 


@@ -1100,8 +1098,8 @@ msgstr ""
 
 # type: =item
 #. type: =item
 
 # type: =item
 #. type: =item

-#: ../src/guestfs.pod:469 ../src/guestfs.pod:1281 ../src/guestfs.pod:1412
-#: ../src/guestfs.pod:2185
+#: ../src/guestfs.pod:469 ../src/guestfs.pod:1257 ../src/guestfs.pod:1395
+#: ../src/guestfs.pod:2425

 msgid "1."
 msgstr ""
 
 msgid "1."
 msgstr ""
 


@@ -1122,8 +1120,8 @@ msgstr ""
 
 # type: =item
 #. type: =item
 
 # type: =item
 #. type: =item

-#: ../src/guestfs.pod:475 ../src/guestfs.pod:1285 ../src/guestfs.pod:1416
-#: ../src/guestfs.pod:2210
+#: ../src/guestfs.pod:475 ../src/guestfs.pod:1261 ../src/guestfs.pod:1399
+#: ../src/guestfs.pod:2450

 msgid "2."
 msgstr ""
 
 msgid "2."
 msgstr ""
 


@@ -1154,7 +1152,7 @@ msgstr ""
 
 # type: =item
 #. type: =item
 
 # type: =item
 #. type: =item

-#: ../src/guestfs.pod:486 ../src/guestfs.pod:1422
+#: ../src/guestfs.pod:486 ../src/guestfs.pod:1405

 msgid "3."
 msgstr ""
 
 msgid "3."
 msgstr ""
 


@@ -1231,7 +1229,7 @@ msgstr ""
 
 # type: =head1
 #. type: =head1
 
 # type: =head1
 #. type: =head1

-#: ../src/guestfs.pod:519 ../fish/guestfish.pod:751
+#: ../src/guestfs.pod:519 ../fish/guestfish.pod:765

 msgid "ENCRYPTED DISKS"
 msgstr ""
 
 msgid "ENCRYPTED DISKS"
 msgstr ""
 


@@ -1477,41 +1475,37 @@ msgid ""
 "might be referred to as C</WINDOWS/System32>."
 msgstr ""
 
 "might be referred to as C</WINDOWS/System32>."
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #: ../src/guestfs.pod:644
 msgid ""
 #. type: textblock
 #: ../src/guestfs.pod:644
 msgid ""

-"Drive letter mappings are outside the scope of libguestfs.  You have to use "
-"libguestfs to read the appropriate Windows Registry and configuration files, "
-"to determine yourself how drives are mapped (see also L<hivex(3)> and L<virt-"
-"inspector(1)>)."
+"Drive letter mappings can be found using inspection (see L</INSPECTION> and "
+"L</guestfs_inspect_get_drive_mappings>)"

 msgstr ""
 
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:649
+#: ../src/guestfs.pod:647

 msgid ""
 msgid ""

-"Replacing backslash characters with forward slash characters is also outside "
-"the scope of libguestfs, but something that you can easily do."
+"Dealing with separator characters (backslash vs forward slash) is outside "
+"the scope of libguestfs, but usually a simple character replacement will "
+"work."

 msgstr ""
 
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:652
+#: ../src/guestfs.pod:651

 msgid ""
 msgid ""

-"Where we can help is in resolving the case insensitivity of paths.  For "
-"this, call L</guestfs_case_sensitive_path>."
+"To resolve the case insensitivity of paths, call L</"
+"guestfs_case_sensitive_path>."

 msgstr ""
 
 # type: =head3
 #. type: =head3
 msgstr ""
 
 # type: =head3
 #. type: =head3

-#: ../src/guestfs.pod:655
+#: ../src/guestfs.pod:654

 msgid "ACCESSING THE WINDOWS REGISTRY"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgid "ACCESSING THE WINDOWS REGISTRY"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:657
+#: ../src/guestfs.pod:656

 msgid ""
 "Libguestfs also provides some help for decoding Windows Registry \"hive\" "
 "files, through the library C<hivex> which is part of the libguestfs project "
 msgid ""
 "Libguestfs also provides some help for decoding Windows Registry \"hive\" "
 "files, through the library C<hivex> which is part of the libguestfs project "


@@ -1523,13 +1517,13 @@ msgstr ""
 
 # type: =head3
 #. type: =head3
 
 # type: =head3
 #. type: =head3

-#: ../src/guestfs.pod:665
+#: ../src/guestfs.pod:664

 msgid "SYMLINKS ON NTFS-3G FILESYSTEMS"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgid "SYMLINKS ON NTFS-3G FILESYSTEMS"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:667
+#: ../src/guestfs.pod:666

 msgid ""
 "Ntfs-3g tries to rewrite \"Junction Points\" and NTFS \"symbolic links\" to "
 "provide something which looks like a Linux symlink.  The way it tries to do "
 msgid ""
 "Ntfs-3g tries to rewrite \"Junction Points\" and NTFS \"symbolic links\" to "
 "provide something which looks like a Linux symlink.  The way it tries to do "


@@ -1538,7 +1532,7 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:671
+#: ../src/guestfs.pod:670

 msgid ""
 "L<http://www.tuxera.com/community/ntfs-3g-advanced/junction-points-and-"
 "symbolic-links/>"
 msgid ""
 "L<http://www.tuxera.com/community/ntfs-3g-advanced/junction-points-and-"
 "symbolic-links/>"


@@ -1546,7 +1540,7 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:673
+#: ../src/guestfs.pod:672

 msgid ""
 "The essential problem is that ntfs-3g simply does not have enough "
 "information to do a correct job.  NTFS links can contain drive letters and "
 msgid ""
 "The essential problem is that ntfs-3g simply does not have enough "
 "information to do a correct job.  NTFS links can contain drive letters and "


@@ -1557,7 +1551,7 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:680
+#: ../src/guestfs.pod:679

 msgid ""
 "Instead if you encounter a symbolic link on an ntfs-3g filesystem, use L</"
 "guestfs_lgetxattr> to read the C<system.ntfs_reparse_data> extended "
 msgid ""
 "Instead if you encounter a symbolic link on an ntfs-3g filesystem, use L</"
 "guestfs_lgetxattr> to read the C<system.ntfs_reparse_data> extended "


@@ -1567,13 +1561,13 @@ msgstr ""
 
 # type: =head3
 #. type: =head3
 
 # type: =head3
 #. type: =head3

-#: ../src/guestfs.pod:685
+#: ../src/guestfs.pod:684

 msgid "EXTENDED ATTRIBUTES ON NTFS-3G FILESYSTEMS"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgid "EXTENDED ATTRIBUTES ON NTFS-3G FILESYSTEMS"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:687
+#: ../src/guestfs.pod:686

 msgid ""
 "There are other useful extended attributes that can be read from ntfs-3g "
 "filesystems (using L</guestfs_getxattr>).  See:"
 msgid ""
 "There are other useful extended attributes that can be read from ntfs-3g "
 "filesystems (using L</guestfs_getxattr>).  See:"


@@ -1581,27 +1575,27 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:690
+#: ../src/guestfs.pod:689

 msgid ""
 "L<http://www.tuxera.com/community/ntfs-3g-advanced/extended-attributes/>"
 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgid ""
 "L<http://www.tuxera.com/community/ntfs-3g-advanced/extended-attributes/>"
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs.pod:692
+#: ../src/guestfs.pod:691

 msgid "USING LIBGUESTFS WITH OTHER PROGRAMMING LANGUAGES"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgid "USING LIBGUESTFS WITH OTHER PROGRAMMING LANGUAGES"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:694
+#: ../src/guestfs.pod:693

 msgid ""
 "Although we don't want to discourage you from using the C API, we will "
 "mention here that the same API is also available in other languages."
 msgstr ""
 
 #. type: textblock
 msgid ""
 "Although we don't want to discourage you from using the C API, we will "
 "mention here that the same API is also available in other languages."
 msgstr ""
 
 #. type: textblock

-#: ../src/guestfs.pod:697
+#: ../src/guestfs.pod:696

 msgid ""
 "The API is broadly identical in all supported languages.  This means that "
 "the C call C<guestfs_add_drive_ro(g,file)> is C<$g-E<gt>add_drive_ro($file)> "
 msgid ""
 "The API is broadly identical in all supported languages.  This means that "
 "the C call C<guestfs_add_drive_ro(g,file)> is C<$g-E<gt>add_drive_ro($file)> "


@@ -1612,7 +1606,7 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:703
+#: ../src/guestfs.pod:702

 msgid ""
 "Error messages are automatically transformed into exceptions if the language "
 "supports it."
 msgid ""
 "Error messages are automatically transformed into exceptions if the language "
 "supports it."


@@ -1620,7 +1614,7 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:706
+#: ../src/guestfs.pod:705

 msgid ""
 "We don't try to \"object orientify\" parts of the API in OO languages, "
 "although contributors are welcome to write higher level APIs above what we "
 msgid ""
 "We don't try to \"object orientify\" parts of the API in OO languages, "
 "although contributors are welcome to write higher level APIs above what we "


@@ -1629,13 +1623,13 @@ msgstr ""
 
 # type: =item
 #. type: =item
 
 # type: =item
 #. type: =item

-#: ../src/guestfs.pod:712
+#: ../src/guestfs.pod:711

 msgid "B<C++>"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgid "B<C++>"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:714
+#: ../src/guestfs.pod:713

 msgid ""
 "You can use the I<guestfs.h> header file from C++ programs.  The C++ API is "
 "identical to the C API.  C++ classes and exceptions are not used."
 msgid ""
 "You can use the I<guestfs.h> header file from C++ programs.  The C++ API is "
 "identical to the C API.  C++ classes and exceptions are not used."


@@ -1643,13 +1637,13 @@ msgstr ""
 
 # type: =item
 #. type: =item
 
 # type: =item
 #. type: =item

-#: ../src/guestfs.pod:718
+#: ../src/guestfs.pod:717

 msgid "B<C#>"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgid "B<C#>"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:720
+#: ../src/guestfs.pod:719

 msgid ""
 "The C# bindings are highly experimental.  Please read the warnings at the "
 "top of C<csharp/Libguestfs.cs>."
 msgid ""
 "The C# bindings are highly experimental.  Please read the warnings at the "
 "top of C<csharp/Libguestfs.cs>."


@@ -1657,13 +1651,13 @@ msgstr ""
 
 # type: =item
 #. type: =item
 
 # type: =item
 #. type: =item

-#: ../src/guestfs.pod:723
+#: ../src/guestfs.pod:722

 msgid "B<Haskell>"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgid "B<Haskell>"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:725
+#: ../src/guestfs.pod:724

 msgid ""
 "This is the only language binding that is working but incomplete.  Only "
 "calls which return simple integers have been bound in Haskell, and we are "
 msgid ""
 "This is the only language binding that is working but incomplete.  Only "
 "calls which return simple integers have been bound in Haskell, and we are "


@@ -1672,13 +1666,13 @@ msgstr ""
 
 # type: =item
 #. type: =item
 
 # type: =item
 #. type: =item

-#: ../src/guestfs.pod:729
+#: ../src/guestfs.pod:728

 msgid "B<Java>"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgid "B<Java>"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:731
+#: ../src/guestfs.pod:730

 msgid ""
 "Full documentation is contained in the Javadoc which is distributed with "
 "libguestfs."
 msgid ""
 "Full documentation is contained in the Javadoc which is distributed with "
 "libguestfs."


@@ -1686,35 +1680,35 @@ msgstr ""
 
 # type: =item
 #. type: =item
 
 # type: =item
 #. type: =item

-#: ../src/guestfs.pod:734
+#: ../src/guestfs.pod:733

 msgid "B<OCaml>"
 msgstr ""
 
 #. type: textblock
 msgid "B<OCaml>"
 msgstr ""
 
 #. type: textblock

-#: ../src/guestfs.pod:736
+#: ../src/guestfs.pod:735

 msgid "See L<guestfs-ocaml(3)>."
 msgstr ""
 
 # type: =item
 #. type: =item
 msgid "See L<guestfs-ocaml(3)>."
 msgstr ""
 
 # type: =item
 #. type: =item

-#: ../src/guestfs.pod:738
+#: ../src/guestfs.pod:737

 msgid "B<Perl>"
 msgstr ""
 
 #. type: textblock
 msgid "B<Perl>"
 msgstr ""
 
 #. type: textblock

-#: ../src/guestfs.pod:740
+#: ../src/guestfs.pod:739

 msgid "See L<guestfs-perl(3)> and L<Sys::Guestfs(3)>."
 msgstr ""
 
 # type: =item
 #. type: =item
 msgid "See L<guestfs-perl(3)> and L<Sys::Guestfs(3)>."
 msgstr ""
 
 # type: =item
 #. type: =item

-#: ../src/guestfs.pod:742
+#: ../src/guestfs.pod:741

 msgid "B<PHP>"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgid "B<PHP>"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:744
+#: ../src/guestfs.pod:743

 msgid ""
 "For documentation see C<README-PHP> supplied with libguestfs sources or in "
 "the php-libguestfs package for your distribution."
 msgid ""
 "For documentation see C<README-PHP> supplied with libguestfs sources or in "
 "the php-libguestfs package for your distribution."


@@ -1722,52 +1716,52 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:747
+#: ../src/guestfs.pod:746

 msgid "The PHP binding only works correctly on 64 bit machines."
 msgstr ""
 
 # type: =item
 #. type: =item
 msgid "The PHP binding only works correctly on 64 bit machines."
 msgstr ""
 
 # type: =item
 #. type: =item

-#: ../src/guestfs.pod:749
+#: ../src/guestfs.pod:748

 msgid "B<Python>"
 msgstr ""
 
 #. type: textblock
 msgid "B<Python>"
 msgstr ""
 
 #. type: textblock

-#: ../src/guestfs.pod:751
+#: ../src/guestfs.pod:750

 msgid "See L<guestfs-python(3)>."
 msgstr ""
 
 # type: =item
 #. type: =item
 msgid "See L<guestfs-python(3)>."
 msgstr ""
 
 # type: =item
 #. type: =item

-#: ../src/guestfs.pod:753
+#: ../src/guestfs.pod:752

 msgid "B<Ruby>"
 msgstr ""
 
 #. type: textblock
 msgid "B<Ruby>"
 msgstr ""
 
 #. type: textblock

-#: ../src/guestfs.pod:755
+#: ../src/guestfs.pod:754

 msgid "See L<guestfs-ruby(3)>."
 msgstr ""
 
 # type: =item
 #. type: =item
 msgid "See L<guestfs-ruby(3)>."
 msgstr ""
 
 # type: =item
 #. type: =item

-#: ../src/guestfs.pod:757
+#: ../src/guestfs.pod:756

 msgid "B<shell scripts>"
 msgstr ""
 
 #. type: textblock
 msgid "B<shell scripts>"
 msgstr ""
 
 #. type: textblock

-#: ../src/guestfs.pod:759
+#: ../src/guestfs.pod:758

 msgid "See L<guestfish(1)>."
 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgid "See L<guestfish(1)>."
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs.pod:763
+#: ../src/guestfs.pod:762

 msgid "LIBGUESTFS GOTCHAS"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgid "LIBGUESTFS GOTCHAS"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:765
+#: ../src/guestfs.pod:764

 msgid ""
 "L<http://en.wikipedia.org/wiki/Gotcha_(programming)>: \"A feature of a "
 "system [...] that works in the way it is documented but is counterintuitive "
 msgid ""
 "L<http://en.wikipedia.org/wiki/Gotcha_(programming)>: \"A feature of a "
 "system [...] that works in the way it is documented but is counterintuitive "


@@ -1776,7 +1770,7 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:769
+#: ../src/guestfs.pod:768

 msgid ""
 "Since we developed libguestfs and the associated tools, there are several "
 "things we would have designed differently, but are now stuck with for "
 msgid ""
 "Since we developed libguestfs and the associated tools, there are several "
 "things we would have designed differently, but are now stuck with for "


@@ -1786,13 +1780,20 @@ msgstr ""
 
 # type: =item
 #. type: =item
 
 # type: =item
 #. type: =item

-#: ../src/guestfs.pod:777
+#: ../src/guestfs.pod:776

 msgid "Autosync / forgetting to sync."
 msgstr ""
 
 msgid "Autosync / forgetting to sync."
 msgstr ""
 

+#. type: textblock
+#: ../src/guestfs.pod:778
+msgid ""
+"I<Update:> Autosync is enabled by default for all API users starting from "
+"libguestfs 1.5.24.  This section only applies to older versions."
+msgstr ""
+

 # type: textblock
 #. type: textblock
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:779
+#: ../src/guestfs.pod:781

 msgid ""
 "When modifying a filesystem from C or another language, you B<must> unmount "
 "all filesystems and call L</guestfs_sync> explicitly before you close the "
 msgid ""
 "When modifying a filesystem from C or another language, you B<must> unmount "
 "all filesystems and call L</guestfs_sync> explicitly before you close the "


@@ -1801,7 +1802,7 @@ msgstr ""
 
 # type: verbatim
 #. type: verbatim
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs.pod:783
+#: ../src/guestfs.pod:785

 #, no-wrap
 msgid ""
 " guestfs_set_autosync (g, 1);\n"
 #, no-wrap
 msgid ""
 " guestfs_set_autosync (g, 1);\n"


@@ -1810,7 +1811,7 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:785
+#: ../src/guestfs.pod:787

 msgid ""
 "to have the unmount/sync done automatically for you when the handle 'g' is "
 "closed.  (This feature is called \"autosync\", L</guestfs_set_autosync> q.v.)"
 msgid ""
 "to have the unmount/sync done automatically for you when the handle 'g' is "
 "closed.  (This feature is called \"autosync\", L</guestfs_set_autosync> q.v.)"


@@ -1818,7 +1819,7 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:789
+#: ../src/guestfs.pod:791

 msgid ""
 "If you forget to do this, then it is entirely possible that your changes "
 "won't be written out, or will be partially written, or (very rarely) that "
 msgid ""
 "If you forget to do this, then it is entirely possible that your changes "
 "won't be written out, or will be partially written, or (very rarely) that "


@@ -1827,30 +1828,22 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:793
+#: ../src/guestfs.pod:795

 msgid ""
 "Note that in L<guestfish(3)> autosync is the default.  So quick and dirty "
 "guestfish scripts that forget to sync will work just fine, which can make "
 "this very puzzling if you are trying to debug a problem."
 msgstr ""
 
 msgid ""
 "Note that in L<guestfish(3)> autosync is the default.  So quick and dirty "
 "guestfish scripts that forget to sync will work just fine, which can make "
 "this very puzzling if you are trying to debug a problem."
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../src/guestfs.pod:797
-msgid ""
-"Update: Autosync is enabled by default for all API users starting from "
-"libguestfs 1.5.24."
-msgstr ""
-

 # type: =item
 #. type: =item
 # type: =item
 #. type: =item

-#: ../src/guestfs.pod:800
+#: ../src/guestfs.pod:799

 msgid "Mount option C<-o sync> should not be the default."
 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgid "Mount option C<-o sync> should not be the default."
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:802
+#: ../src/guestfs.pod:801

 msgid ""
 "If you use L</guestfs_mount>, then C<-o sync,noatime> are added implicitly.  "
 "However C<-o sync> does not add any reliability benefit, but does have a "
 msgid ""
 "If you use L</guestfs_mount>, then C<-o sync,noatime> are added implicitly.  "
 "However C<-o sync> does not add any reliability benefit, but does have a "


@@ -1859,7 +1852,7 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:806
+#: ../src/guestfs.pod:805

 msgid ""
 "The work around is to use L</guestfs_mount_options> and set the mount "
 "options that you actually want to use."
 msgid ""
 "The work around is to use L</guestfs_mount_options> and set the mount "
 "options that you actually want to use."


@@ -1867,13 +1860,13 @@ msgstr ""
 
 # type: =item
 #. type: =item
 
 # type: =item
 #. type: =item

-#: ../src/guestfs.pod:809
+#: ../src/guestfs.pod:808

 msgid "Read-only should be the default."
 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgid "Read-only should be the default."
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:811
+#: ../src/guestfs.pod:810

 msgid ""
 "In L<guestfish(3)>, I<--ro> should be the default, and you should have to "
 "specify I<--rw> if you want to make changes to the image."
 msgid ""
 "In L<guestfish(3)>, I<--ro> should be the default, and you should have to "
 "specify I<--rw> if you want to make changes to the image."


@@ -1881,13 +1874,13 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:814
+#: ../src/guestfs.pod:813

 msgid "This would reduce the potential to corrupt live VM images."
 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgid "This would reduce the potential to corrupt live VM images."
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:816
+#: ../src/guestfs.pod:815

 msgid ""
 "Note that many filesystems change the disk when you just mount and unmount, "
 "even if you didn't perform any writes.  You need to use L</"
 msgid ""
 "Note that many filesystems change the disk when you just mount and unmount, "
 "even if you didn't perform any writes.  You need to use L</"


@@ -1896,13 +1889,13 @@ msgstr ""
 
 # type: =item
 #. type: =item
 
 # type: =item
 #. type: =item

-#: ../src/guestfs.pod:820
+#: ../src/guestfs.pod:819

 msgid "guestfish command line is hard to use."
 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgid "guestfish command line is hard to use."
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:822
+#: ../src/guestfs.pod:821

 msgid ""
 "C<guestfish disk.img> doesn't do what people expect (open C<disk.img> for "
 "examination).  It tries to run a guestfish command C<disk.img> which doesn't "
 msgid ""
 "C<guestfish disk.img> doesn't do what people expect (open C<disk.img> for "
 "examination).  It tries to run a guestfish command C<disk.img> which doesn't "


@@ -1913,13 +1906,13 @@ msgstr ""
 
 # type: =item
 #. type: =item
 
 # type: =item
 #. type: =item

-#: ../src/guestfs.pod:829
+#: ../src/guestfs.pod:828

 msgid "guestfish megabyte modifiers don't work right on all commands"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgid "guestfish megabyte modifiers don't work right on all commands"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:831
+#: ../src/guestfs.pod:830

 msgid ""
 "In recent guestfish you can use C<1M> to mean 1 megabyte (and similarly for "
 "other modifiers).  What guestfish actually does is to multiply the number "
 msgid ""
 "In recent guestfish you can use C<1M> to mean 1 megabyte (and similarly for "
 "other modifiers).  What guestfish actually does is to multiply the number "


@@ -1930,13 +1923,13 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:838
+#: ../src/guestfs.pod:837

 msgid "The most common is L</guestfs_lvcreate>.  The guestfish command:"
 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgid "The most common is L</guestfs_lvcreate>.  The guestfish command:"
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs.pod:840
+#: ../src/guestfs.pod:839

 #, no-wrap
 msgid ""
 " lvcreate LV VG 100M\n"
 #, no-wrap
 msgid ""
 " lvcreate LV VG 100M\n"


@@ -1945,7 +1938,7 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:842
+#: ../src/guestfs.pod:841

 msgid ""
 "does not do what you might expect.  Instead because L</guestfs_lvcreate> is "
 "already expecting megabytes, this tries to create a 100 I<terabyte> (100 "
 msgid ""
 "does not do what you might expect.  Instead because L</guestfs_lvcreate> is "
 "already expecting megabytes, this tries to create a 100 I<terabyte> (100 "


@@ -1955,7 +1948,7 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:847
+#: ../src/guestfs.pod:846

 msgid ""
 "This could be fixed in the generator by specially marking parameters and "
 "return values which take bytes or other units."
 msgid ""
 "This could be fixed in the generator by specially marking parameters and "
 "return values which take bytes or other units."


@@ -1963,13 +1956,13 @@ msgstr ""
 
 # type: =item
 #. type: =item
 
 # type: =item
 #. type: =item

-#: ../src/guestfs.pod:850
+#: ../src/guestfs.pod:849

 msgid "Ambiguity between devices and paths"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgid "Ambiguity between devices and paths"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:852
+#: ../src/guestfs.pod:851

 msgid ""
 "There is a subtle ambiguity in the API between a device name (eg. C</dev/"
 "sdb2>) and a similar pathname.  A file might just happen to be called "
 msgid ""
 "There is a subtle ambiguity in the API between a device name (eg. C</dev/"
 "sdb2>) and a similar pathname.  A file might just happen to be called "


@@ -1978,7 +1971,7 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:857
+#: ../src/guestfs.pod:856

 msgid ""
 "In the current API we usually resolve this ambiguity by having two separate "
 "calls, for example L</guestfs_checksum> and L</guestfs_checksum_device>.  "
 msgid ""
 "In the current API we usually resolve this ambiguity by having two separate "
 "calls, for example L</guestfs_checksum> and L</guestfs_checksum_device>.  "


@@ -1988,7 +1981,7 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:863
+#: ../src/guestfs.pod:862

 msgid ""
 "To avoid both the ambiguity and the need to duplicate some calls, we could "
 "make paths/devices into structured names.  One way to do this would be to "
 msgid ""
 "To avoid both the ambiguity and the need to duplicate some calls, we could "
 "make paths/devices into structured names.  One way to do this would be to "


@@ -1999,7 +1992,7 @@ msgstr ""
 
 # type: verbatim
 #. type: verbatim
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs.pod:869
+#: ../src/guestfs.pod:868

 #, no-wrap
 msgid ""
 " type path = Path of string | Device of int | Partition of int * int\n"
 #, no-wrap
 msgid ""
 " type path = Path of string | Device of int | Partition of int * int\n"


@@ -2008,13 +2001,13 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:871
+#: ../src/guestfs.pod:870

 msgid "which would allow you to pass arguments like:"
 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgid "which would allow you to pass arguments like:"
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs.pod:873
+#: ../src/guestfs.pod:872

 #, no-wrap
 msgid ""
 " Path \"/foo/bar\"\n"
 #, no-wrap
 msgid ""
 " Path \"/foo/bar\"\n"


@@ -2026,7 +2019,7 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:878
+#: ../src/guestfs.pod:877

 msgid ""
 "As you can see there are still problems to resolve even with this "
 "representation.  Also consider how it might work in guestfish."
 msgid ""
 "As you can see there are still problems to resolve even with this "
 "representation.  Also consider how it might work in guestfish."


@@ -2034,58 +2027,13 @@ msgstr ""
 
 # type: =head2
 #. type: =head2
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs.pod:883
-msgid "PROTOCOL LIMITS"
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../src/guestfs.pod:885
-msgid ""
-"Internally libguestfs uses a message-based protocol to pass API calls and "
-"their responses to and from a small \"appliance\" (see L</INTERNALS> for "
-"plenty more detail about this).  The maximum message size used by the "
-"protocol is slightly less than 4 MB.  For some API calls you may need to be "
-"aware of this limit.  The API calls which may be affected are individually "
-"documented, with a link back to this section of the documentation."
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../src/guestfs.pod:893
-msgid ""
-"A simple call such as L</guestfs_cat> returns its result (the file data) in "
-"a simple string.  Because this string is at some point internally encoded as "
-"a message, the maximum size that it can return is slightly under 4 MB.  If "
-"the requested file is larger than this then you will get an error."
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../src/guestfs.pod:899
-msgid ""
-"In order to transfer large files into and out of the guest filesystem, you "
-"need to use particular calls that support this.  The sections L</UPLOADING> "
-"and L</DOWNLOADING> document how to do this."
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../src/guestfs.pod:903
-msgid ""
-"You might also consider mounting the disk image using our FUSE filesystem "
-"support (L<guestmount(1)>)."
-msgstr ""
-
-# type: =head2
-#. type: =head2
-#: ../src/guestfs.pod:906
+#: ../src/guestfs.pod:882

 msgid "KEYS AND PASSPHRASES"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgid "KEYS AND PASSPHRASES"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:908
+#: ../src/guestfs.pod:884

 msgid ""
 "Certain libguestfs calls take a parameter that contains sensitive key "
 "material, passed in as a C string."
 msgid ""
 "Certain libguestfs calls take a parameter that contains sensitive key "
 "material, passed in as a C string."


@@ -2093,7 +2041,7 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:911
+#: ../src/guestfs.pod:887

 msgid ""
 "In the future we would hope to change the libguestfs implementation so that "
 "keys are L<mlock(2)>-ed into physical RAM, and thus can never end up in "
 msgid ""
 "In the future we would hope to change the libguestfs implementation so that "
 "keys are L<mlock(2)>-ed into physical RAM, and thus can never end up in "


@@ -2103,7 +2051,7 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:916
+#: ../src/guestfs.pod:892

 msgid ""
 "Therefore you should be aware that any key parameter you pass to libguestfs "
 "might end up being written out to the swap partition.  If this is a concern, "
 msgid ""
 "Therefore you should be aware that any key parameter you pass to libguestfs "
 "might end up being written out to the swap partition.  If this is a concern, "


@@ -2112,13 +2060,13 @@ msgstr ""
 
 # type: =head1
 #. type: =head2
 
 # type: =head1
 #. type: =head2

-#: ../src/guestfs.pod:921
+#: ../src/guestfs.pod:897

 msgid "MULTIPLE HANDLES AND MULTIPLE THREADS"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgid "MULTIPLE HANDLES AND MULTIPLE THREADS"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:923
+#: ../src/guestfs.pod:899

 msgid ""
 "All high-level libguestfs actions are synchronous.  If you want to use "
 "libguestfs asynchronously then you must create a thread."
 msgid ""
 "All high-level libguestfs actions are synchronous.  If you want to use "
 "libguestfs asynchronously then you must create a thread."


@@ -2126,7 +2074,7 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:926
+#: ../src/guestfs.pod:902

 msgid ""
 "Only use the handle from a single thread.  Either use the handle exclusively "
 "from one thread, or provide your own mutex so that two threads cannot issue "
 msgid ""
 "Only use the handle from a single thread.  Either use the handle exclusively "
 "from one thread, or provide your own mutex so that two threads cannot issue "


@@ -2135,7 +2083,7 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:930
+#: ../src/guestfs.pod:906

 msgid ""
 "See the graphical program guestfs-browser for one possible architecture for "
 "multithreaded programs using libvirt and libguestfs."
 msgid ""
 "See the graphical program guestfs-browser for one possible architecture for "
 "multithreaded programs using libvirt and libguestfs."


@@ -2143,21 +2091,20 @@ msgstr ""
 
 # type: =head1
 #. type: =head2
 
 # type: =head1
 #. type: =head2

-#: ../src/guestfs.pod:933
+#: ../src/guestfs.pod:909

 msgid "PATH"
 msgstr ""
 
 msgid "PATH"
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:935
+#: ../src/guestfs.pod:911

 msgid ""
 msgid ""

-"Libguestfs needs a kernel and initrd.img, which it finds by looking along an "
+"Libguestfs needs a supermin appliance, which it finds by looking along an "

 "internal path."
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "internal path."
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:938
+#: ../src/guestfs.pod:914

 msgid ""
 "By default it looks for these in the directory C<$libdir/guestfs> (eg. C</"
 "usr/local/lib/guestfs> or C</usr/lib64/guestfs>)."
 msgid ""
 "By default it looks for these in the directory C<$libdir/guestfs> (eg. C</"
 "usr/local/lib/guestfs> or C</usr/lib64/guestfs>)."


@@ -2165,7 +2112,7 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:941
+#: ../src/guestfs.pod:917

 msgid ""
 "Use L</guestfs_set_path> or set the environment variable L</LIBGUESTFS_PATH> "
 "to change the directories that libguestfs will search in.  The value is a "
 msgid ""
 "Use L</guestfs_set_path> or set the environment variable L</LIBGUESTFS_PATH> "
 "to change the directories that libguestfs will search in.  The value is a "


@@ -2177,13 +2124,13 @@ msgstr ""
 
 # type: =head1
 #. type: =head2
 
 # type: =head1
 #. type: =head2

-#: ../src/guestfs.pod:948
+#: ../src/guestfs.pod:924

 msgid "QEMU WRAPPERS"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgid "QEMU WRAPPERS"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:950
+#: ../src/guestfs.pod:926

 msgid ""
 "If you want to compile your own qemu, run qemu from a non-standard location, "
 "or pass extra arguments to qemu, then you can write a shell-script wrapper "
 msgid ""
 "If you want to compile your own qemu, run qemu from a non-standard location, "
 "or pass extra arguments to qemu, then you can write a shell-script wrapper "


@@ -2192,7 +2139,7 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:954
+#: ../src/guestfs.pod:930

 msgid ""
 "There is one important rule to remember: you I<must C<exec qemu>> as the "
 "last command in the shell script (so that qemu replaces the shell and "
 msgid ""
 "There is one important rule to remember: you I<must C<exec qemu>> as the "
 "last command in the shell script (so that qemu replaces the shell and "


@@ -2202,7 +2149,7 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:959
+#: ../src/guestfs.pod:935

 msgid ""
 "Here is an example of a wrapper, where I have built my own copy of qemu from "
 "source:"
 msgid ""
 "Here is an example of a wrapper, where I have built my own copy of qemu from "
 "source:"


@@ -2210,7 +2157,7 @@ msgstr ""
 
 # type: verbatim
 #. type: verbatim
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs.pod:962
+#: ../src/guestfs.pod:938

 #, no-wrap
 msgid ""
 " #!/bin/sh -\n"
 #, no-wrap
 msgid ""
 " #!/bin/sh -\n"


@@ -2221,7 +2168,7 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:966
+#: ../src/guestfs.pod:942

 msgid ""
 "Save this script as C</tmp/qemu.wrapper> (or wherever), C<chmod +x>, and "
 "then use it by setting the LIBGUESTFS_QEMU environment variable.  For "
 msgid ""
 "Save this script as C</tmp/qemu.wrapper> (or wherever), C<chmod +x>, and "
 "then use it by setting the LIBGUESTFS_QEMU environment variable.  For "


@@ -2230,7 +2177,7 @@ msgstr ""
 
 # type: verbatim
 #. type: verbatim
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs.pod:970
+#: ../src/guestfs.pod:946

 #, no-wrap
 msgid ""
 " LIBGUESTFS_QEMU=/tmp/qemu.wrapper guestfish\n"
 #, no-wrap
 msgid ""
 " LIBGUESTFS_QEMU=/tmp/qemu.wrapper guestfish\n"


@@ -2239,26 +2186,26 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:972
+#: ../src/guestfs.pod:948

 msgid ""
 "Note that libguestfs also calls qemu with the -help and -version options in "
 "order to determine features."
 msgstr ""
 
 #. type: =head2
 msgid ""
 "Note that libguestfs also calls qemu with the -help and -version options in "
 "order to determine features."
 msgstr ""
 
 #. type: =head2

-#: ../src/guestfs.pod:975
+#: ../src/guestfs.pod:951

 msgid "ATTACHING TO RUNNING DAEMONS"
 msgstr ""
 
 #. type: textblock
 msgid "ATTACHING TO RUNNING DAEMONS"
 msgstr ""
 
 #. type: textblock

-#: ../src/guestfs.pod:977
+#: ../src/guestfs.pod:953

 msgid ""
 "I<Note (1):> This is B<highly experimental> and has a tendency to eat "
 "babies.  Use with caution."
 msgstr ""
 
 #. type: textblock
 msgid ""
 "I<Note (1):> This is B<highly experimental> and has a tendency to eat "
 "babies.  Use with caution."
 msgstr ""
 
 #. type: textblock

-#: ../src/guestfs.pod:980
+#: ../src/guestfs.pod:956

 msgid ""
 "I<Note (2):> This section explains how to attach to a running daemon from a "
 "low level perspective.  For most users, simply using virt tools such as "
 msgid ""
 "I<Note (2):> This section explains how to attach to a running daemon from a "
 "low level perspective.  For most users, simply using virt tools such as "


@@ -2266,12 +2213,12 @@ msgid ""
 msgstr ""
 
 #. type: =head3
 msgstr ""
 
 #. type: =head3

-#: ../src/guestfs.pod:984
+#: ../src/guestfs.pod:960

 msgid "Using guestfs_set_attach_method"
 msgstr ""
 
 #. type: textblock
 msgid "Using guestfs_set_attach_method"
 msgstr ""
 
 #. type: textblock

-#: ../src/guestfs.pod:986
+#: ../src/guestfs.pod:962

 msgid ""
 "By calling L</guestfs_set_attach_method> you can change how the library "
 "connects to the C<guestfsd> daemon in L</guestfs_launch> (read L</"
 msgid ""
 "By calling L</guestfs_set_attach_method> you can change how the library "
 "connects to the C<guestfsd> daemon in L</guestfs_launch> (read L</"


@@ -2279,14 +2226,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
 msgstr ""
 
 #. type: textblock

-#: ../src/guestfs.pod:990
+#: ../src/guestfs.pod:966

 msgid ""
 "The normal attach method is C<appliance>, where a small appliance is created "
 "containing the daemon, and then the library connects to this."
 msgstr ""
 
 #. type: textblock
 msgid ""
 "The normal attach method is C<appliance>, where a small appliance is created "
 "containing the daemon, and then the library connects to this."
 msgstr ""
 
 #. type: textblock

-#: ../src/guestfs.pod:993
+#: ../src/guestfs.pod:969

 msgid ""
 "Setting attach method to C<unix:I<path>> (where I<path> is the path of a "
 "Unix domain socket) causes L</guestfs_launch> to connect to an existing "
 msgid ""
 "Setting attach method to C<unix:I<path>> (where I<path> is the path of a "
 "Unix domain socket) causes L</guestfs_launch> to connect to an existing "


@@ -2294,7 +2241,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
 msgstr ""
 
 #. type: textblock

-#: ../src/guestfs.pod:997
+#: ../src/guestfs.pod:973

 msgid ""
 "The normal use for this is to connect to a running virtual machine that "
 "contains a C<guestfsd> daemon, and send commands so you can read and write "
 msgid ""
 "The normal use for this is to connect to a running virtual machine that "
 "contains a C<guestfsd> daemon, and send commands so you can read and write "


@@ -2302,12 +2249,12 @@ msgid ""
 msgstr ""
 
 #. type: =head3
 msgstr ""
 
 #. type: =head3

-#: ../src/guestfs.pod:1001
+#: ../src/guestfs.pod:977

 msgid "Using guestfs_add_domain with live flag"
 msgstr ""
 
 #. type: textblock
 msgid "Using guestfs_add_domain with live flag"
 msgstr ""
 
 #. type: textblock

-#: ../src/guestfs.pod:1003
+#: ../src/guestfs.pod:979

 msgid ""
 "L</guestfs_add_domain> provides some help for getting the correct attach "
 "method.  If you pass the C<live> option to this function, then (if the "
 msgid ""
 "L</guestfs_add_domain> provides some help for getting the correct attach "
 "method.  If you pass the C<live> option to this function, then (if the "


@@ -2316,7 +2263,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
 msgstr ""
 
 #. type: verbatim

-#: ../src/guestfs.pod:1009
+#: ../src/guestfs.pod:985

 #, no-wrap
 msgid ""
 " <domain>\n"
 #, no-wrap
 msgid ""
 " <domain>\n"


@@ -2334,14 +2281,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
 msgstr ""
 
 #. type: textblock

-#: ../src/guestfs.pod:1021
+#: ../src/guestfs.pod:997

 msgid ""
 "L</guestfs_add_domain> extracts C</path/to/socket> and sets the attach "
 "method to C<unix:/path/to/socket>."
 msgstr ""
 
 #. type: textblock
 msgid ""
 "L</guestfs_add_domain> extracts C</path/to/socket> and sets the attach "
 "method to C<unix:/path/to/socket>."
 msgstr ""
 
 #. type: textblock

-#: ../src/guestfs.pod:1024
+#: ../src/guestfs.pod:1000

 msgid ""
 "Some of the libguestfs tools (including guestfish) support a I<--live> "
 "option which is passed through to L</guestfs_add_domain> thus allowing you "
 msgid ""
 "Some of the libguestfs tools (including guestfish) support a I<--live> "
 "option which is passed through to L</guestfs_add_domain> thus allowing you "


@@ -2349,7 +2296,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
 msgstr ""
 
 #. type: textblock

-#: ../src/guestfs.pod:1028
+#: ../src/guestfs.pod:1004

 msgid ""
 "The virtual machine needs to have been set up beforehand so that it has the "
 "virtio-serial channel and so that guestfsd is running inside it."
 msgid ""
 "The virtual machine needs to have been set up beforehand so that it has the "
 "virtio-serial channel and so that guestfsd is running inside it."


@@ -2357,13 +2304,13 @@ msgstr ""
 
 # type: =head2
 #. type: =head2
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs.pod:1032
+#: ../src/guestfs.pod:1008

 msgid "ABI GUARANTEE"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgid "ABI GUARANTEE"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1034
+#: ../src/guestfs.pod:1010

 msgid ""
 "We guarantee the libguestfs ABI (binary interface), for public, high-level "
 "actions as outlined in this section.  Although we will deprecate some "
 msgid ""
 "We guarantee the libguestfs ABI (binary interface), for public, high-level "
 "actions as outlined in this section.  Although we will deprecate some "


@@ -2374,13 +2321,13 @@ msgstr ""
 
 # type: =head1
 #. type: =head2
 
 # type: =head1
 #. type: =head2

-#: ../src/guestfs.pod:1040
+#: ../src/guestfs.pod:1016

 msgid "BLOCK DEVICE NAMING"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgid "BLOCK DEVICE NAMING"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1042
+#: ../src/guestfs.pod:1018

 msgid ""
 "In the kernel there is now quite a profusion of schemata for naming block "
 "devices (in this context, by I<block device> I mean a physical or virtual "
 msgid ""
 "In the kernel there is now quite a profusion of schemata for naming block "
 "devices (in this context, by I<block device> I mean a physical or virtual "


@@ -2395,7 +2342,7 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1054
+#: ../src/guestfs.pod:1030

 msgid ""
 "As discussed above, libguestfs uses a qemu appliance running an embedded "
 "Linux kernel to access block devices.  We can run a variety of appliances "
 msgid ""
 "As discussed above, libguestfs uses a qemu appliance running an embedded "
 "Linux kernel to access block devices.  We can run a variety of appliances "


@@ -2404,7 +2351,7 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1058
+#: ../src/guestfs.pod:1034

 msgid ""
 "This causes a problem for libguestfs because many API calls use device or "
 "partition names.  Working scripts and the recipe (example) scripts that we "
 msgid ""
 "This causes a problem for libguestfs because many API calls use device or "
 "partition names.  Working scripts and the recipe (example) scripts that we "


@@ -2413,7 +2360,7 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1063
+#: ../src/guestfs.pod:1039

 msgid ""
 "Therefore libguestfs defines C</dev/sd*> as the I<standard naming scheme>.  "
 "Internally C</dev/sd*> names are translated, if necessary, to other names as "
 msgid ""
 "Therefore libguestfs defines C</dev/sd*> as the I<standard naming scheme>.  "
 "Internally C</dev/sd*> names are translated, if necessary, to other names as "


@@ -2423,7 +2370,7 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1069
+#: ../src/guestfs.pod:1045

 msgid ""
 "Note that this I<only> applies to parameters.  The L</guestfs_list_devices>, "
 "L</guestfs_list_partitions> and similar calls return the true names of the "
 msgid ""
 "Note that this I<only> applies to parameters.  The L</guestfs_list_devices>, "
 "L</guestfs_list_partitions> and similar calls return the true names of the "


@@ -2432,13 +2379,13 @@ msgstr ""
 
 # type: =head2
 #. type: =head3
 
 # type: =head2
 #. type: =head3

-#: ../src/guestfs.pod:1074
+#: ../src/guestfs.pod:1050

 msgid "ALGORITHM FOR BLOCK DEVICE NAME TRANSLATION"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgid "ALGORITHM FOR BLOCK DEVICE NAME TRANSLATION"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1076
+#: ../src/guestfs.pod:1052

 msgid ""
 "Usually this translation is transparent.  However in some (very rare)  cases "
 "you may need to know the exact algorithm.  Such cases include where you use "
 msgid ""
 "Usually this translation is transparent.  However in some (very rare)  cases "
 "you may need to know the exact algorithm.  Such cases include where you use "


@@ -2448,7 +2395,7 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1082
+#: ../src/guestfs.pod:1058

 msgid ""
 "The algorithm is applied only to I<parameters> which are known to be either "
 "device or partition names.  Return values from functions such as L</"
 msgid ""
 "The algorithm is applied only to I<parameters> which are known to be either "
 "device or partition names.  Return values from functions such as L</"


@@ -2457,19 +2404,19 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1090
+#: ../src/guestfs.pod:1066

 msgid "Is the string a parameter which is a device or partition name?"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgid "Is the string a parameter which is a device or partition name?"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1094
+#: ../src/guestfs.pod:1070

 msgid "Does the string begin with C</dev/sd>?"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgid "Does the string begin with C</dev/sd>?"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1098
+#: ../src/guestfs.pod:1074

 msgid ""
 "Does the named device exist? If so, we use that device.  However if I<not> "
 "then we continue with this algorithm."
 msgid ""
 "Does the named device exist? If so, we use that device.  However if I<not> "
 "then we continue with this algorithm."


@@ -2477,43 +2424,43 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1103
+#: ../src/guestfs.pod:1079

 msgid "Replace initial C</dev/sd> string with C</dev/hd>."
 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgid "Replace initial C</dev/sd> string with C</dev/hd>."
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1105
+#: ../src/guestfs.pod:1081

 msgid "For example, change C</dev/sda2> to C</dev/hda2>."
 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgid "For example, change C</dev/sda2> to C</dev/hda2>."
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1107
+#: ../src/guestfs.pod:1083

 msgid "If that named device exists, use it.  If not, continue."
 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgid "If that named device exists, use it.  If not, continue."
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1111
+#: ../src/guestfs.pod:1087

 msgid "Replace initial C</dev/sd> string with C</dev/vd>."
 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgid "Replace initial C</dev/sd> string with C</dev/vd>."
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1113
+#: ../src/guestfs.pod:1089

 msgid "If that named device exists, use it.  If not, return an error."
 msgstr ""
 
 # type: =head3
 #. type: =head3
 msgid "If that named device exists, use it.  If not, return an error."
 msgstr ""
 
 # type: =head3
 #. type: =head3

-#: ../src/guestfs.pod:1117
+#: ../src/guestfs.pod:1093

 msgid "PORTABILITY CONCERNS WITH BLOCK DEVICE NAMING"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgid "PORTABILITY CONCERNS WITH BLOCK DEVICE NAMING"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1119
+#: ../src/guestfs.pod:1095

 msgid ""
 "Although the standard naming scheme and automatic translation is useful for "
 "simple programs and guestfish scripts, for larger programs it is best not to "
 msgid ""
 "Although the standard naming scheme and automatic translation is useful for "
 "simple programs and guestfish scripts, for larger programs it is best not to "


@@ -2522,7 +2469,7 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1123
+#: ../src/guestfs.pod:1099

 msgid ""
 "Where possible for maximum future portability programs using libguestfs "
 "should use these future-proof techniques:"
 msgid ""
 "Where possible for maximum future portability programs using libguestfs "
 "should use these future-proof techniques:"


@@ -2530,7 +2477,7 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1130
+#: ../src/guestfs.pod:1106

 msgid ""
 "Use L</guestfs_list_devices> or L</guestfs_list_partitions> to list actual "
 "device names, and then use those names directly."
 msgid ""
 "Use L</guestfs_list_devices> or L</guestfs_list_partitions> to list actual "
 "device names, and then use those names directly."


@@ -2538,14 +2485,14 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1133
+#: ../src/guestfs.pod:1109

 msgid ""
 "Since those device names exist by definition, they will never be translated."
 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgid ""
 "Since those device names exist by definition, they will never be translated."
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1138
+#: ../src/guestfs.pod:1114

 msgid ""
 "Use higher level ways to identify filesystems, such as LVM names, UUIDs and "
 "filesystem labels."
 msgid ""
 "Use higher level ways to identify filesystems, such as LVM names, UUIDs and "
 "filesystem labels."


@@ -2553,13 +2500,13 @@ msgstr ""
 
 # type: =head1
 #. type: =head1
 
 # type: =head1
 #. type: =head1

-#: ../src/guestfs.pod:1143
+#: ../src/guestfs.pod:1119

 msgid "SECURITY"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgid "SECURITY"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1145
+#: ../src/guestfs.pod:1121

 msgid ""
 "This section discusses security implications of using libguestfs, "
 "particularly with untrusted or malicious guests or disk images."
 msgid ""
 "This section discusses security implications of using libguestfs, "
 "particularly with untrusted or malicious guests or disk images."


@@ -2567,13 +2514,13 @@ msgstr ""
 
 # type: =head2
 #. type: =head2
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs.pod:1148
+#: ../src/guestfs.pod:1124

 msgid "GENERAL SECURITY CONSIDERATIONS"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgid "GENERAL SECURITY CONSIDERATIONS"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1150
+#: ../src/guestfs.pod:1126

 msgid ""
 "Be careful with any files or data that you download from a guest (by "
 "\"download\" we mean not just the L</guestfs_download> command but any "
 msgid ""
 "Be careful with any files or data that you download from a guest (by "
 "\"download\" we mean not just the L</guestfs_download> command but any "


@@ -2584,49 +2531,49 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1160
+#: ../src/guestfs.pod:1136

 msgid "the data (file etc) not being present"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgid "the data (file etc) not being present"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1164
+#: ../src/guestfs.pod:1140

 msgid "being present but empty"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgid "being present but empty"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1168
+#: ../src/guestfs.pod:1144

 msgid "being much larger than normal"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgid "being much larger than normal"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1172
+#: ../src/guestfs.pod:1148

 msgid "containing arbitrary 8 bit data"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgid "containing arbitrary 8 bit data"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1176
+#: ../src/guestfs.pod:1152

 msgid "being in an unexpected character encoding"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgid "being in an unexpected character encoding"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1180
+#: ../src/guestfs.pod:1156

 msgid "containing homoglyphs."
 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgid "containing homoglyphs."
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs.pod:1184
+#: ../src/guestfs.pod:1160

 msgid "SECURITY OF MOUNTING FILESYSTEMS"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgid "SECURITY OF MOUNTING FILESYSTEMS"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1186
+#: ../src/guestfs.pod:1162

 msgid ""
 "When you mount a filesystem under Linux, mistakes in the kernel filesystem "
 "(VFS) module can sometimes be escalated into exploits by deliberately "
 msgid ""
 "When you mount a filesystem under Linux, mistakes in the kernel filesystem "
 "(VFS) module can sometimes be escalated into exploits by deliberately "


@@ -2643,7 +2590,7 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1199
+#: ../src/guestfs.pod:1175

 msgid ""
 "That explains why you should never mount a filesystem from an untrusted "
 "guest on your host kernel.  How about libguestfs? We run a Linux kernel "
 msgid ""
 "That explains why you should never mount a filesystem from an untrusted "
 "guest on your host kernel.  How about libguestfs? We run a Linux kernel "


@@ -2658,7 +2605,7 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1210
+#: ../src/guestfs.pod:1186

 msgid ""
 "In any case callers can reduce the attack surface by forcing the filesystem "
 "type when mounting (use L</guestfs_mount_vfs>)."
 msgid ""
 "In any case callers can reduce the attack surface by forcing the filesystem "
 "type when mounting (use L</guestfs_mount_vfs>)."


@@ -2666,13 +2613,13 @@ msgstr ""
 
 # type: =head2
 #. type: =head2
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs.pod:1213
+#: ../src/guestfs.pod:1189

 msgid "PROTOCOL SECURITY"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgid "PROTOCOL SECURITY"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1215
+#: ../src/guestfs.pod:1191

 msgid ""
 "The protocol is designed to be secure, being based on RFC 4506 (XDR)  with a "
 "defined upper message size.  However a program that uses libguestfs must "
 msgid ""
 "The protocol is designed to be secure, being based on RFC 4506 (XDR)  with a "
 "defined upper message size.  However a program that uses libguestfs must "


@@ -2683,13 +2630,13 @@ msgstr ""
 
 # type: =head2
 #. type: =head2
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs.pod:1221
+#: ../src/guestfs.pod:1197

 msgid "INSPECTION SECURITY"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgid "INSPECTION SECURITY"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1223
+#: ../src/guestfs.pod:1199

 msgid ""
 "Parts of the inspection API (see L</INSPECTION>) return untrusted strings "
 "directly from the guest, and these could contain any 8 bit data.  Callers "
 msgid ""
 "Parts of the inspection API (see L</INSPECTION>) return untrusted strings "
 "directly from the guest, and these could contain any 8 bit data.  Callers "


@@ -2699,7 +2646,7 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1229
+#: ../src/guestfs.pod:1205

 msgid ""
 "Guest configuration may be altered in unusual ways by the administrator of "
 "the virtual machine, and may not reflect reality (particularly for untrusted "
 msgid ""
 "Guest configuration may be altered in unusual ways by the administrator of "
 "the virtual machine, and may not reflect reality (particularly for untrusted "


@@ -2711,7 +2658,7 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1237
+#: ../src/guestfs.pod:1213

 msgid ""
 "The inspection API parses guest configuration using two external libraries: "
 "Augeas (Linux configuration) and hivex (Windows Registry).  Both are "
 msgid ""
 "The inspection API parses guest configuration using two external libraries: "
 "Augeas (Linux configuration) and hivex (Windows Registry).  Both are "


@@ -2722,13 +2669,13 @@ msgstr ""
 
 # type: =head2
 #. type: =head2
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs.pod:1243
+#: ../src/guestfs.pod:1219

 msgid "RUNNING UNTRUSTED GUEST COMMANDS"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgid "RUNNING UNTRUSTED GUEST COMMANDS"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1245
+#: ../src/guestfs.pod:1221

 msgid ""
 "Be very cautious about running commands from the guest.  By running a "
 "command in the guest, you are giving CPU time to a binary that you do not "
 msgid ""
 "Be very cautious about running commands from the guest.  By running a "
 "command in the guest, you are giving CPU time to a binary that you do not "


@@ -2739,19 +2686,19 @@ msgstr ""
 
 # type: =head2
 #. type: =head2
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs.pod:1251
+#: ../src/guestfs.pod:1227

 msgid "CVE-2010-3851"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgid "CVE-2010-3851"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1253
+#: ../src/guestfs.pod:1229

 msgid "https://bugzilla.redhat.com/642934"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgid "https://bugzilla.redhat.com/642934"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1255
+#: ../src/guestfs.pod:1231

 msgid ""
 "This security bug concerns the automatic disk format detection that qemu "
 "does on disk images."
 msgid ""
 "This security bug concerns the automatic disk format detection that qemu "
 "does on disk images."


@@ -2759,7 +2706,7 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1258
+#: ../src/guestfs.pod:1234

 msgid ""
 "A raw disk image is just the raw bytes, there is no header.  Other disk "
 "images like qcow2 contain a special header.  Qemu deals with this by looking "
 msgid ""
 "A raw disk image is just the raw bytes, there is no header.  Other disk "
 "images like qcow2 contain a special header.  Qemu deals with this by looking "


@@ -2769,7 +2716,7 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1263
+#: ../src/guestfs.pod:1239

 msgid ""
 "This allows a guest which has been given a raw disk image to write some "
 "other header.  At next boot (or when the disk image is accessed by "
 msgid ""
 "This allows a guest which has been given a raw disk image to write some "
 "other header.  At next boot (or when the disk image is accessed by "


@@ -2779,7 +2726,7 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1268
+#: ../src/guestfs.pod:1244

 msgid ""
 "This in itself would not be a problem, but qcow2 offers many features, one "
 "of which is to allow a disk image to refer to another image (called the "
 msgid ""
 "This in itself would not be a problem, but qcow2 offers many features, one "
 "of which is to allow a disk image to refer to another image (called the "


@@ -2792,20 +2739,20 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1276
+#: ../src/guestfs.pod:1252

 msgid ""
 "In libguestfs this is rather hard to exploit except under two circumstances:"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgid ""
 "In libguestfs this is rather hard to exploit except under two circumstances:"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1283
+#: ../src/guestfs.pod:1259

 msgid "You have enabled the network or have opened the disk in write mode."
 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgid "You have enabled the network or have opened the disk in write mode."
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1287
+#: ../src/guestfs.pod:1263

 msgid ""
 "You are also running untrusted code from the guest (see L</RUNNING "
 "COMMANDS>)."
 msgid ""
 "You are also running untrusted code from the guest (see L</RUNNING "
 "COMMANDS>)."


@@ -2813,7 +2760,7 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1292
+#: ../src/guestfs.pod:1268

 msgid ""
 "The way to avoid this is to specify the expected disk format when adding "
 "disks (the optional C<format> option to L</guestfs_add_drive_opts>).  You "
 msgid ""
 "The way to avoid this is to specify the expected disk format when adding "
 "disks (the optional C<format> option to L</guestfs_add_drive_opts>).  You "


@@ -2823,7 +2770,7 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1297
+#: ../src/guestfs.pod:1273

 msgid ""
 "For disks added from libvirt using calls like L</guestfs_add_domain>, the "
 "format is fetched from libvirt and passed through."
 msgid ""
 "For disks added from libvirt using calls like L</guestfs_add_domain>, the "
 "format is fetched from libvirt and passed through."


@@ -2831,7 +2778,7 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1300
+#: ../src/guestfs.pod:1276

 msgid ""
 "For libguestfs tools, use the I<--format> command line parameter as "
 "appropriate."
 msgid ""
 "For libguestfs tools, use the I<--format> command line parameter as "
 "appropriate."


@@ -2839,42 +2786,41 @@ msgstr ""
 
 # type: =head1
 #. type: =head1
 
 # type: =head1
 #. type: =head1

-#: ../src/guestfs.pod:1303
+#: ../src/guestfs.pod:1279

 msgid "CONNECTION MANAGEMENT"
 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgid "CONNECTION MANAGEMENT"
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs.pod:1305
+#: ../src/guestfs.pod:1281

 msgid "guestfs_h *"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgid "guestfs_h *"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1307
+#: ../src/guestfs.pod:1283

 msgid ""
 "C<guestfs_h> is the opaque type representing a connection handle.  Create a "
 "handle by calling L</guestfs_create>.  Call L</guestfs_close> to free the "
 "handle and release all resources used."
 msgstr ""
 
 msgid ""
 "C<guestfs_h> is the opaque type representing a connection handle.  Create a "
 "handle by calling L</guestfs_create>.  Call L</guestfs_close> to free the "
 "handle and release all resources used."
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1311
+#: ../src/guestfs.pod:1287

 msgid ""
 "For information on using multiple handles and threads, see the section L</"
 msgid ""
 "For information on using multiple handles and threads, see the section L</"

-"MULTIPLE HANDLES AND MULTIPLE THREADS> below."
+"MULTIPLE HANDLES AND MULTIPLE THREADS> above."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs.pod:1314
+#: ../src/guestfs.pod:1290

 msgid "guestfs_create"
 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgid "guestfs_create"
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs.pod:1316
+#: ../src/guestfs.pod:1292

 #, no-wrap
 msgid ""
 " guestfs_h *guestfs_create (void);\n"
 #, no-wrap
 msgid ""
 " guestfs_h *guestfs_create (void);\n"


@@ -2883,49 +2829,47 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1318
+#: ../src/guestfs.pod:1294

 msgid "Create a connection handle."
 msgstr ""
 
 msgid "Create a connection handle."
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1320
+#: ../src/guestfs.pod:1296

 msgid ""
 msgid ""

-"You have to call L</guestfs_add_drive_opts> (or one of the equivalent calls) "
-"on the handle at least once."
+"On success this returns a non-NULL pointer to a handle.  On error it returns "
+"NULL."

 msgstr ""
 
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1323
+#: ../src/guestfs.pod:1299

 msgid ""
 msgid ""

-"This function returns a non-NULL pointer to a handle on success or NULL on "
-"error."
+"You have to \"configure\" the handle after creating it.  This includes "
+"calling L</guestfs_add_drive_opts> (or one of the equivalent calls) on the "
+"handle at least once."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1326
+#: ../src/guestfs.pod:1303

 msgid "After configuring the handle, you have to call L</guestfs_launch>."
 msgstr ""
 
 msgid "After configuring the handle, you have to call L</guestfs_launch>."
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1328
+#: ../src/guestfs.pod:1305

 msgid ""
 msgid ""

-"You may also want to configure error handling for the handle.  See L</ERROR "
-"HANDLING> section below."
+"You may also want to configure error handling for the handle.  See the L</"
+"ERROR HANDLING> section below."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs.pod:1331
+#: ../src/guestfs.pod:1308

 msgid "guestfs_close"
 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgid "guestfs_close"
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs.pod:1333
+#: ../src/guestfs.pod:1310

 #, no-wrap
 msgid ""
 " void guestfs_close (guestfs_h *g);\n"
 #, no-wrap
 msgid ""
 " void guestfs_close (guestfs_h *g);\n"


@@ -2934,19 +2878,32 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1335
+#: ../src/guestfs.pod:1312

 msgid "This closes the connection handle and frees up all resources used."
 msgstr ""
 
 msgid "This closes the connection handle and frees up all resources used."
 msgstr ""
 

+#. type: textblock
+#: ../src/guestfs.pod:1314
+msgid ""
+"If autosync was set on the handle and the handle was launched, then this "
+"implicitly calls various functions to unmount filesystems and sync the "
+"disk.  See L</guestfs_set_autosync> for more details."
+msgstr ""
+
+#. type: textblock
+#: ../src/guestfs.pod:1318
+msgid "If a close callback was set on the handle, then it is called."
+msgstr ""
+

 # type: =head1
 #. type: =head1
 # type: =head1
 #. type: =head1

-#: ../src/guestfs.pod:1337
+#: ../src/guestfs.pod:1320

 msgid "ERROR HANDLING"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgid "ERROR HANDLING"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1339
+#: ../src/guestfs.pod:1322

 msgid ""
 "API functions can return errors.  For example, almost all functions that "
 "return C<int> will return C<-1> to indicate an error."
 msgid ""
 "API functions can return errors.  For example, almost all functions that "
 "return C<int> will return C<-1> to indicate an error."


@@ -2954,7 +2911,7 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1342
+#: ../src/guestfs.pod:1325

 msgid ""
 "Additional information is available for errors: an error message string and "
 "optionally an error number (errno) if the thing that failed was a system "
 msgid ""
 "Additional information is available for errors: an error message string and "
 "optionally an error number (errno) if the thing that failed was a system "


@@ -2963,7 +2920,7 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1346
+#: ../src/guestfs.pod:1329

 msgid ""
 "You can get at the additional information about the last error on the handle "
 "by calling L</guestfs_last_error>, L</guestfs_last_errno>, and/or by setting "
 msgid ""
 "You can get at the additional information about the last error on the handle "
 "by calling L</guestfs_last_error>, L</guestfs_last_errno>, and/or by setting "


@@ -2972,7 +2929,7 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1351
+#: ../src/guestfs.pod:1334

 msgid ""
 "When the handle is created, a default error handler is installed which "
 "prints the error message string to C<stderr>.  For small short-running "
 msgid ""
 "When the handle is created, a default error handler is installed which "
 "prints the error message string to C<stderr>.  For small short-running "


@@ -2981,7 +2938,7 @@ msgstr ""
 
 # type: verbatim
 #. type: verbatim
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs.pod:1355
+#: ../src/guestfs.pod:1338

 #, no-wrap
 msgid ""
 " if (guestfs_launch (g) == -1)\n"
 #, no-wrap
 msgid ""
 " if (guestfs_launch (g) == -1)\n"


@@ -2991,7 +2948,7 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1358
+#: ../src/guestfs.pod:1341

 msgid ""
 "since the default error handler will ensure that an error message has been "
 "printed to C<stderr> before the program exits."
 msgid ""
 "since the default error handler will ensure that an error message has been "
 "printed to C<stderr> before the program exits."


@@ -2999,7 +2956,7 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1361
+#: ../src/guestfs.pod:1344

 msgid ""
 "For other programs the caller will almost certainly want to install an "
 "alternate error handler or do error handling in-line like this:"
 msgid ""
 "For other programs the caller will almost certainly want to install an "
 "alternate error handler or do error handling in-line like this:"


@@ -3007,7 +2964,7 @@ msgstr ""
 
 # type: verbatim
 #. type: verbatim
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs.pod:1364
+#: ../src/guestfs.pod:1347

 #, no-wrap
 msgid ""
 " g = guestfs_create ();\n"
 #, no-wrap
 msgid ""
 " g = guestfs_create ();\n"


@@ -3016,7 +2973,7 @@ msgstr ""
 
 # type: verbatim
 #. type: verbatim
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs.pod:1366
+#: ../src/guestfs.pod:1349

 #, no-wrap
 msgid ""
 " /* This disables the default behaviour of printing errors\n"
 #, no-wrap
 msgid ""
 " /* This disables the default behaviour of printing errors\n"


@@ -3027,7 +2984,7 @@ msgstr ""
 
 # type: verbatim
 #. type: verbatim
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs.pod:1370
+#: ../src/guestfs.pod:1353

 #, no-wrap
 msgid ""
 " if (guestfs_launch (g) == -1) {\n"
 #, no-wrap
 msgid ""
 " if (guestfs_launch (g) == -1) {\n"


@@ -3042,7 +2999,7 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1378
+#: ../src/guestfs.pod:1361

 msgid ""
 "Out of memory errors are handled differently.  The default action is to call "
 "L<abort(3)>.  If this is undesirable, then you can set a handler using L</"
 msgid ""
 "Out of memory errors are handled differently.  The default action is to call "
 "L<abort(3)>.  If this is undesirable, then you can set a handler using L</"


@@ -3051,7 +3008,7 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1382
+#: ../src/guestfs.pod:1365

 msgid ""
 "L</guestfs_create> returns C<NULL> if the handle cannot be created, and "
 "because there is no handle if this happens there is no way to get additional "
 msgid ""
 "L</guestfs_create> returns C<NULL> if the handle cannot be created, and "
 "because there is no handle if this happens there is no way to get additional "


@@ -3062,13 +3019,13 @@ msgstr ""
 
 # type: =head2
 #. type: =head2
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs.pod:1388
+#: ../src/guestfs.pod:1371

 msgid "guestfs_last_error"
 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgid "guestfs_last_error"
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs.pod:1390
+#: ../src/guestfs.pod:1373

 #, no-wrap
 msgid ""
 " const char *guestfs_last_error (guestfs_h *g);\n"
 #, no-wrap
 msgid ""
 " const char *guestfs_last_error (guestfs_h *g);\n"


@@ -3077,7 +3034,7 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1392
+#: ../src/guestfs.pod:1375

 msgid ""
 "This returns the last error message that happened on C<g>.  If there has not "
 "been an error since the handle was created, then this returns C<NULL>."
 msgid ""
 "This returns the last error message that happened on C<g>.  If there has not "
 "been an error since the handle was created, then this returns C<NULL>."


@@ -3085,7 +3042,7 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1396
+#: ../src/guestfs.pod:1379

 msgid ""
 "The lifetime of the returned string is until the next error occurs, or L</"
 "guestfs_close> is called."
 msgid ""
 "The lifetime of the returned string is until the next error occurs, or L</"
 "guestfs_close> is called."


@@ -3093,13 +3050,13 @@ msgstr ""
 
 # type: =head2
 #. type: =head2
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs.pod:1399
+#: ../src/guestfs.pod:1382

 msgid "guestfs_last_errno"
 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgid "guestfs_last_errno"
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs.pod:1401
+#: ../src/guestfs.pod:1384

 #, no-wrap
 msgid ""
 " int guestfs_last_errno (guestfs_h *g);\n"
 #, no-wrap
 msgid ""
 " int guestfs_last_errno (guestfs_h *g);\n"


@@ -3108,32 +3065,32 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1403
+#: ../src/guestfs.pod:1386

 msgid "This returns the last error number (errno) that happened on C<g>."
 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgid "This returns the last error number (errno) that happened on C<g>."
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1405
+#: ../src/guestfs.pod:1388

 msgid "If successful, an errno integer not equal to zero is returned."
 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgid "If successful, an errno integer not equal to zero is returned."
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1407
+#: ../src/guestfs.pod:1390

 msgid ""
 "If no error, this returns 0.  This call can return 0 in three situations:"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgid ""
 "If no error, this returns 0.  This call can return 0 in three situations:"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1414
+#: ../src/guestfs.pod:1397

 msgid "There has not been any error on the handle."
 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgid "There has not been any error on the handle."
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1418
+#: ../src/guestfs.pod:1401

 msgid ""
 "There has been an error but the errno was meaningless.  This corresponds to "
 "the case where the error did not come from a failed system call, but for "
 msgid ""
 "There has been an error but the errno was meaningless.  This corresponds to "
 "the case where the error did not come from a failed system call, but for "


@@ -3142,7 +3099,7 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1424
+#: ../src/guestfs.pod:1407

 msgid ""
 "There was an error from a failed system call, but for some reason the errno "
 "was not captured and returned.  This usually indicates a bug in libguestfs."
 msgid ""
 "There was an error from a failed system call, but for some reason the errno "
 "was not captured and returned.  This usually indicates a bug in libguestfs."


@@ -3150,7 +3107,7 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1430
+#: ../src/guestfs.pod:1413

 msgid ""
 "Libguestfs tries to convert the errno from inside the applicance into a "
 "corresponding errno for the caller (not entirely trivial: the appliance "
 msgid ""
 "Libguestfs tries to convert the errno from inside the applicance into a "
 "corresponding errno for the caller (not entirely trivial: the appliance "


@@ -3162,13 +3119,13 @@ msgstr ""
 
 # type: =head2
 #. type: =head2
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs.pod:1438
+#: ../src/guestfs.pod:1421

 msgid "guestfs_set_error_handler"
 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgid "guestfs_set_error_handler"
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs.pod:1440
+#: ../src/guestfs.pod:1423

 #, no-wrap
 msgid ""
 " typedef void (*guestfs_error_handler_cb) (guestfs_h *g,\n"
 #, no-wrap
 msgid ""
 " typedef void (*guestfs_error_handler_cb) (guestfs_h *g,\n"


@@ -3182,7 +3139,7 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1447
+#: ../src/guestfs.pod:1430

 msgid ""
 "The callback C<cb> will be called if there is an error.  The parameters "
 "passed to the callback are an opaque data pointer and the error message "
 msgid ""
 "The callback C<cb> will be called if there is an error.  The parameters "
 "passed to the callback are an opaque data pointer and the error message "


@@ -3191,7 +3148,7 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1451
+#: ../src/guestfs.pod:1434

 msgid ""
 "C<errno> is not passed to the callback.  To get that the callback must call "
 "L</guestfs_last_errno>."
 msgid ""
 "C<errno> is not passed to the callback.  To get that the callback must call "
 "L</guestfs_last_errno>."


@@ -3199,7 +3156,7 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1454
+#: ../src/guestfs.pod:1437

 msgid ""
 "Note that the message string C<msg> is freed as soon as the callback "
 "function returns, so if you want to stash it somewhere you must make your "
 msgid ""
 "Note that the message string C<msg> is freed as soon as the callback "
 "function returns, so if you want to stash it somewhere you must make your "


@@ -3208,25 +3165,25 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1458
+#: ../src/guestfs.pod:1441

 msgid "The default handler prints messages on C<stderr>."
 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgid "The default handler prints messages on C<stderr>."
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1460
+#: ../src/guestfs.pod:1443

 msgid "If you set C<cb> to C<NULL> then I<no> handler is called."
 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgid "If you set C<cb> to C<NULL> then I<no> handler is called."
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs.pod:1462
+#: ../src/guestfs.pod:1445

 msgid "guestfs_get_error_handler"
 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgid "guestfs_get_error_handler"
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs.pod:1464
+#: ../src/guestfs.pod:1447

 #, no-wrap
 msgid ""
 " guestfs_error_handler_cb guestfs_get_error_handler (guestfs_h *g,\n"
 #, no-wrap
 msgid ""
 " guestfs_error_handler_cb guestfs_get_error_handler (guestfs_h *g,\n"


@@ -3236,30 +3193,29 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1467
+#: ../src/guestfs.pod:1450

 msgid "Returns the current error handler callback."
 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgid "Returns the current error handler callback."
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs.pod:1469
+#: ../src/guestfs.pod:1452

 msgid "guestfs_set_out_of_memory_handler"
 msgstr ""
 
 msgid "guestfs_set_out_of_memory_handler"
 msgstr ""
 

-# type: verbatim

 #. type: verbatim
 #. type: verbatim

-#: ../src/guestfs.pod:1471
+#: ../src/guestfs.pod:1454

 #, no-wrap
 msgid ""
 " typedef void (*guestfs_abort_cb) (void);\n"
 #, no-wrap
 msgid ""
 " typedef void (*guestfs_abort_cb) (void);\n"

-" int guestfs_set_out_of_memory_handler (guestfs_h *g,\n"
-"                                        guestfs_abort_cb);\n"
+" void guestfs_set_out_of_memory_handler (guestfs_h *g,\n"
+"                                         guestfs_abort_cb);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1475
+#: ../src/guestfs.pod:1458

 msgid ""
 "The callback C<cb> will be called if there is an out of memory situation.  "
 "I<Note this callback must not return>."
 msgid ""
 "The callback C<cb> will be called if there is an out of memory situation.  "
 "I<Note this callback must not return>."


@@ -3267,26 +3223,26 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1478
+#: ../src/guestfs.pod:1461

 msgid "The default is to call L<abort(3)>."
 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgid "The default is to call L<abort(3)>."
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1480
+#: ../src/guestfs.pod:1463

 msgid ""
 "You cannot set C<cb> to C<NULL>.  You can't ignore out of memory situations."
 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgid ""
 "You cannot set C<cb> to C<NULL>.  You can't ignore out of memory situations."
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs.pod:1483
+#: ../src/guestfs.pod:1466

 msgid "guestfs_get_out_of_memory_handler"
 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgid "guestfs_get_out_of_memory_handler"
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs.pod:1485
+#: ../src/guestfs.pod:1468

 #, no-wrap
 msgid ""
 " guestfs_abort_fn guestfs_get_out_of_memory_handler (guestfs_h *g);\n"
 #, no-wrap
 msgid ""
 " guestfs_abort_fn guestfs_get_out_of_memory_handler (guestfs_h *g);\n"


@@ -3295,49 +3251,49 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1487
+#: ../src/guestfs.pod:1470

 msgid "This returns the current out of memory handler."
 msgstr ""
 
 # type: =head1
 #. type: =head1
 msgid "This returns the current out of memory handler."
 msgstr ""
 
 # type: =head1
 #. type: =head1

-#: ../src/guestfs.pod:1489
+#: ../src/guestfs.pod:1472

 msgid "API CALLS"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgid "API CALLS"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1491 ../fish/guestfish.pod:989
+#: ../src/guestfs.pod:1474 ../fish/guestfish.pod:1008

 msgid "@ACTIONS@"
 msgstr ""
 
 # type: =head1
 #. type: =head1
 msgid "@ACTIONS@"
 msgstr ""
 
 # type: =head1
 #. type: =head1

-#: ../src/guestfs.pod:1493
+#: ../src/guestfs.pod:1476

 msgid "STRUCTURES"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgid "STRUCTURES"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1495
+#: ../src/guestfs.pod:1478

 msgid "@STRUCTS@"
 msgstr ""
 
 # type: =head1
 #. type: =head1
 msgid "@STRUCTS@"
 msgstr ""
 
 # type: =head1
 #. type: =head1

-#: ../src/guestfs.pod:1497
+#: ../src/guestfs.pod:1480

 msgid "AVAILABILITY"
 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgid "AVAILABILITY"
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs.pod:1499
+#: ../src/guestfs.pod:1482

 msgid "GROUPS OF FUNCTIONALITY IN THE APPLIANCE"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgid "GROUPS OF FUNCTIONALITY IN THE APPLIANCE"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1501
+#: ../src/guestfs.pod:1484

 msgid ""
 "Using L</guestfs_available> you can test availability of the following "
 "groups of functions.  This test queries the appliance to see if the "
 msgid ""
 "Using L</guestfs_available> you can test availability of the following "
 "groups of functions.  This test queries the appliance to see if the "


@@ -3346,19 +3302,19 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1506
+#: ../src/guestfs.pod:1489

 msgid "@AVAILABILITY@"
 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgid "@AVAILABILITY@"
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs.pod:1508
+#: ../src/guestfs.pod:1491

 msgid "GUESTFISH supported COMMAND"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgid "GUESTFISH supported COMMAND"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1510
+#: ../src/guestfs.pod:1493

 msgid ""
 "In L<guestfish(3)> there is a handy interactive command C<supported> which "
 "prints out the available groups and whether they are supported by this build "
 msgid ""
 "In L<guestfish(3)> there is a handy interactive command C<supported> which "
 "prints out the available groups and whether they are supported by this build "


@@ -3367,13 +3323,13 @@ msgstr ""
 
 # type: =head2
 #. type: =head2
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs.pod:1515
+#: ../src/guestfs.pod:1498

 msgid "SINGLE CALLS AT COMPILE TIME"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgid "SINGLE CALLS AT COMPILE TIME"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1517
+#: ../src/guestfs.pod:1500

 msgid ""
 "Since version 1.5.8, C<E<lt>guestfs.hE<gt>> defines symbols for each C API "
 "function, such as:"
 msgid ""
 "Since version 1.5.8, C<E<lt>guestfs.hE<gt>> defines symbols for each C API "
 "function, such as:"


@@ -3381,7 +3337,7 @@ msgstr ""
 
 # type: verbatim
 #. type: verbatim
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs.pod:1520
+#: ../src/guestfs.pod:1503

 #, no-wrap
 msgid ""
 " #define LIBGUESTFS_HAVE_DD 1\n"
 #, no-wrap
 msgid ""
 " #define LIBGUESTFS_HAVE_DD 1\n"


@@ -3390,13 +3346,13 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1522
+#: ../src/guestfs.pod:1505

 msgid "if L</guestfs_dd> is available."
 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgid "if L</guestfs_dd> is available."
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1524
+#: ../src/guestfs.pod:1507

 msgid ""
 "Before version 1.5.8, if you needed to test whether a single libguestfs "
 "function is available at compile time, we recommended using build tools such "
 msgid ""
 "Before version 1.5.8, if you needed to test whether a single libguestfs "
 "function is available at compile time, we recommended using build tools such "


@@ -3405,7 +3361,7 @@ msgstr ""
 
 # type: verbatim
 #. type: verbatim
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs.pod:1529
+#: ../src/guestfs.pod:1512

 #, no-wrap
 msgid ""
 " AC_CHECK_LIB([guestfs],[guestfs_create])\n"
 #, no-wrap
 msgid ""
 " AC_CHECK_LIB([guestfs],[guestfs_create])\n"


@@ -3415,7 +3371,7 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1532
+#: ../src/guestfs.pod:1515

 msgid ""
 "which would result in C<HAVE_GUESTFS_DD> being either defined or not defined "
 "in your program."
 msgid ""
 "which would result in C<HAVE_GUESTFS_DD> being either defined or not defined "
 "in your program."


@@ -3423,13 +3379,13 @@ msgstr ""
 
 # type: =head2
 #. type: =head2
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs.pod:1535
+#: ../src/guestfs.pod:1518

 msgid "SINGLE CALLS AT RUN TIME"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgid "SINGLE CALLS AT RUN TIME"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1537
+#: ../src/guestfs.pod:1520

 msgid ""
 "Testing at compile time doesn't guarantee that a function really exists in "
 "the library.  The reason is that you might be dynamically linked against a "
 msgid ""
 "Testing at compile time doesn't guarantee that a function really exists in "
 "the library.  The reason is that you might be dynamically linked against a "


@@ -3440,7 +3396,7 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1544
+#: ../src/guestfs.pod:1527

 msgid ""
 "You can use L<dlopen(3)> to test if a function is available at run time, as "
 "in this example program (note that you still need the compile time check as "
 msgid ""
 "You can use L<dlopen(3)> to test if a function is available at run time, as "
 "in this example program (note that you still need the compile time check as "


@@ -3449,7 +3405,7 @@ msgstr ""
 
 # type: verbatim
 #. type: verbatim
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs.pod:1548
+#: ../src/guestfs.pod:1531

 #, no-wrap
 msgid ""
 " #include <stdio.h>\n"
 #, no-wrap
 msgid ""
 " #include <stdio.h>\n"


@@ -3462,7 +3418,7 @@ msgstr ""
 
 # type: verbatim
 #. type: verbatim
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs.pod:1554
+#: ../src/guestfs.pod:1537

 #, no-wrap
 msgid ""
 " main ()\n"
 #, no-wrap
 msgid ""
 " main ()\n"


@@ -3475,7 +3431,7 @@ msgstr ""
 
 # type: verbatim
 #. type: verbatim
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs.pod:1560
+#: ../src/guestfs.pod:1543

 #, no-wrap
 msgid ""
 "   /* Test if the function guestfs_dd is really available. */\n"
 #, no-wrap
 msgid ""
 "   /* Test if the function guestfs_dd is really available. */\n"


@@ -3491,7 +3447,7 @@ msgstr ""
 
 # type: verbatim
 #. type: verbatim
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs.pod:1569
+#: ../src/guestfs.pod:1552

 #, no-wrap
 msgid ""
 "   if (!has_function)\n"
 #, no-wrap
 msgid ""
 "   if (!has_function)\n"


@@ -3511,7 +3467,7 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1582
+#: ../src/guestfs.pod:1565

 msgid ""
 "You may think the above is an awful lot of hassle, and it is.  There are "
 "other ways outside of the C linking system to ensure that this kind of "
 msgid ""
 "You may think the above is an awful lot of hassle, and it is.  There are "
 "other ways outside of the C linking system to ensure that this kind of "


@@ -3520,7 +3476,7 @@ msgstr ""
 
 # type: verbatim
 #. type: verbatim
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs.pod:1587
+#: ../src/guestfs.pod:1570

 #, no-wrap
 msgid ""
 " Requires: libguestfs >= 1.0.80\n"
 #, no-wrap
 msgid ""
 " Requires: libguestfs >= 1.0.80\n"


@@ -3529,13 +3485,13 @@ msgstr ""
 
 # type: =head1
 #. type: =head1
 
 # type: =head1
 #. type: =head1

-#: ../src/guestfs.pod:1589
+#: ../src/guestfs.pod:1572

 msgid "CALLS WITH OPTIONAL ARGUMENTS"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgid "CALLS WITH OPTIONAL ARGUMENTS"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1591
+#: ../src/guestfs.pod:1574

 msgid ""
 "A recent feature of the API is the introduction of calls which take optional "
 "arguments.  In C these are declared 3 ways.  The main way is as a call which "
 msgid ""
 "A recent feature of the API is the introduction of calls which take optional "
 "arguments.  In C these are declared 3 ways.  The main way is as a call which "


@@ -3544,7 +3500,7 @@ msgstr ""
 
 # type: verbatim
 #. type: verbatim
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs.pod:1596
+#: ../src/guestfs.pod:1579

 #, no-wrap
 msgid ""
 " int guestfs_add_drive_opts (guestfs_h *g, const char *filename, ...);\n"
 #, no-wrap
 msgid ""
 " int guestfs_add_drive_opts (guestfs_h *g, const char *filename, ...);\n"


@@ -3553,7 +3509,7 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1598
+#: ../src/guestfs.pod:1581

 msgid ""
 "Call this with a list of optional arguments, terminated by C<-1>.  So to "
 "call with no optional arguments specified:"
 msgid ""
 "Call this with a list of optional arguments, terminated by C<-1>.  So to "
 "call with no optional arguments specified:"


@@ -3561,7 +3517,7 @@ msgstr ""
 
 # type: verbatim
 #. type: verbatim
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs.pod:1601
+#: ../src/guestfs.pod:1584

 #, no-wrap
 msgid ""
 " guestfs_add_drive_opts (g, filename, -1);\n"
 #, no-wrap
 msgid ""
 " guestfs_add_drive_opts (g, filename, -1);\n"


@@ -3570,13 +3526,13 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1603
+#: ../src/guestfs.pod:1586

 msgid "With a single optional argument:"
 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgid "With a single optional argument:"
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs.pod:1605
+#: ../src/guestfs.pod:1588

 #, no-wrap
 msgid ""
 " guestfs_add_drive_opts (g, filename,\n"
 #, no-wrap
 msgid ""
 " guestfs_add_drive_opts (g, filename,\n"


@@ -3587,13 +3543,13 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1609
+#: ../src/guestfs.pod:1592

 msgid "With two:"
 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgid "With two:"
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs.pod:1611
+#: ../src/guestfs.pod:1594

 #, no-wrap
 msgid ""
 " guestfs_add_drive_opts (g, filename,\n"
 #, no-wrap
 msgid ""
 " guestfs_add_drive_opts (g, filename,\n"


@@ -3605,7 +3561,7 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1616
+#: ../src/guestfs.pod:1599

 msgid ""
 "and so forth.  Don't forget the terminating C<-1> otherwise Bad Things will "
 "happen!"
 msgid ""
 "and so forth.  Don't forget the terminating C<-1> otherwise Bad Things will "
 "happen!"


@@ -3613,13 +3569,13 @@ msgstr ""
 
 # type: =head2
 #. type: =head2
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs.pod:1619
+#: ../src/guestfs.pod:1602

 msgid "USING va_list FOR OPTIONAL ARGUMENTS"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgid "USING va_list FOR OPTIONAL ARGUMENTS"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1621
+#: ../src/guestfs.pod:1604

 msgid ""
 "The second variant has the same name with the suffix C<_va>, which works the "
 "same way but takes a C<va_list>.  See the C manual for details.  For the "
 msgid ""
 "The second variant has the same name with the suffix C<_va>, which works the "
 "same way but takes a C<va_list>.  See the C manual for details.  For the "


@@ -3628,7 +3584,7 @@ msgstr ""
 
 # type: verbatim
 #. type: verbatim
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs.pod:1625
+#: ../src/guestfs.pod:1608

 #, no-wrap
 msgid ""
 " int guestfs_add_drive_opts_va (guestfs_h *g, const char *filename,\n"
 #, no-wrap
 msgid ""
 " int guestfs_add_drive_opts_va (guestfs_h *g, const char *filename,\n"


@@ -3638,13 +3594,13 @@ msgstr ""
 
 # type: =head2
 #. type: =head2
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs.pod:1628
+#: ../src/guestfs.pod:1611

 msgid "CONSTRUCTING OPTIONAL ARGUMENTS"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgid "CONSTRUCTING OPTIONAL ARGUMENTS"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1630
+#: ../src/guestfs.pod:1613

 msgid ""
 "The third variant is useful where you need to construct these calls.  You "
 "pass in a structure where you fill in the optional fields.  The structure "
 msgid ""
 "The third variant is useful where you need to construct these calls.  You "
 "pass in a structure where you fill in the optional fields.  The structure "


@@ -3655,7 +3611,7 @@ msgstr ""
 
 # type: verbatim
 #. type: verbatim
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs.pod:1636
+#: ../src/guestfs.pod:1619

 #, no-wrap
 msgid ""
 " struct guestfs_add_drive_opts_argv {\n"
 #, no-wrap
 msgid ""
 " struct guestfs_add_drive_opts_argv {\n"


@@ -3671,13 +3627,13 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1645
+#: ../src/guestfs.pod:1628

 msgid "You could call it like this:"
 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgid "You could call it like this:"
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs.pod:1647
+#: ../src/guestfs.pod:1630

 #, no-wrap
 msgid ""
 " struct guestfs_add_drive_opts_argv optargs = {\n"
 #, no-wrap
 msgid ""
 " struct guestfs_add_drive_opts_argv optargs = {\n"


@@ -3691,7 +3647,7 @@ msgstr ""
 
 # type: verbatim
 #. type: verbatim
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs.pod:1654
+#: ../src/guestfs.pod:1637

 #, no-wrap
 msgid ""
 " guestfs_add_drive_opts_argv (g, filename, &optargs);\n"
 #, no-wrap
 msgid ""
 " guestfs_add_drive_opts_argv (g, filename, &optargs);\n"


@@ -3700,27 +3656,27 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1656 ../src/guestfs-actions.pod:11
-#: ../src/guestfs-actions.pod:1850 ../fish/guestfish-actions.pod:9
-#: ../fish/guestfish-actions.pod:1260 ../tools/virt-win-reg.pl:532
+#: ../src/guestfs.pod:1639 ../src/guestfs-actions.pod:11
+#: ../src/guestfs-actions.pod:1852 ../fish/guestfish-actions.pod:9
+#: ../fish/guestfish-actions.pod:1257 ../tools/virt-win-reg.pl:532

 msgid "Notes:"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgid "Notes:"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1662
+#: ../src/guestfs.pod:1645

 msgid "The C<_BITMASK> suffix on each option name when specifying the bitmask."
 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgid "The C<_BITMASK> suffix on each option name when specifying the bitmask."
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1667
+#: ../src/guestfs.pod:1650

 msgid "You do not need to fill in all fields of the structure."
 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgid "You do not need to fill in all fields of the structure."
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1671
+#: ../src/guestfs.pod:1654

 msgid ""
 "There must be a one-to-one correspondence between fields of the structure "
 "that are filled in, and bits set in the bitmask."
 msgid ""
 "There must be a one-to-one correspondence between fields of the structure "
 "that are filled in, and bits set in the bitmask."


@@ -3728,13 +3684,13 @@ msgstr ""
 
 # type: =head2
 #. type: =head2
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs.pod:1676
+#: ../src/guestfs.pod:1659

 msgid "OPTIONAL ARGUMENTS IN OTHER LANGUAGES"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgid "OPTIONAL ARGUMENTS IN OTHER LANGUAGES"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1678
+#: ../src/guestfs.pod:1661

 msgid ""
 "In other languages, optional arguments are expressed in the way that is "
 "natural for that language.  We refer you to the language-specific "
 msgid ""
 "In other languages, optional arguments are expressed in the way that is "
 "natural for that language.  We refer you to the language-specific "


@@ -3743,225 +3699,163 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1682
+#: ../src/guestfs.pod:1665

 msgid "For guestfish, see L<guestfish(1)/OPTIONAL ARGUMENTS>."
 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgid "For guestfish, see L<guestfish(1)/OPTIONAL ARGUMENTS>."
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs.pod:1684
+#: ../src/guestfs.pod:1667

 msgid "SETTING CALLBACKS TO HANDLE EVENTS"
 msgstr ""
 
 msgid "SETTING CALLBACKS TO HANDLE EVENTS"
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1686
+#: ../src/guestfs.pod:1669

 msgid ""
 msgid ""

-"The child process generates events in some situations.  Current events "
-"include: receiving a log message, the child process exits."
+"B<Note:> This section documents the generic event mechanism introduced in "
+"libguestfs 1.10, which you should use in new code if possible.  The old "
+"functions C<guestfs_set_log_message_callback>, "
+"C<guestfs_set_subprocess_quit_callback>, "
+"C<guestfs_set_launch_done_callback>, C<guestfs_set_close_callback> and "
+"C<guestfs_set_progress_callback> are no longer documented in this manual "
+"page."

 msgstr ""
 
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1689
+#: ../src/guestfs.pod:1677

 msgid ""
 msgid ""

-"Use the C<guestfs_set_*_callback> functions to set a callback for different "
-"types of events."
+"Handles generate events when certain things happen, such as log messages "
+"being generated, progress messages during long-running operations, or the "
+"handle being closed.  The API calls described below let you register a "
+"callback to be called when events happen.  You can register multiple "
+"callbacks (for the same, different or overlapping sets of events), and "
+"individually remove callbacks.  If callbacks are not removed, then they "
+"remain in force until the handle is closed."

 msgstr ""
 
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1692
+#: ../src/guestfs.pod:1685

 msgid ""
 msgid ""

-"Only I<one callback of each type> can be registered for each handle.  "
-"Calling C<guestfs_set_*_callback> again overwrites the previous callback of "
-"that type.  Cancel all callbacks of this type by calling this function with "
-"C<cb> set to C<NULL>."
+"In the current implementation, events are only generated synchronously: that "
+"means that events (and hence callbacks) can only happen while you are in the "
+"middle of making another libguestfs call.  The callback is called in the "
+"same thread."

 msgstr ""
 
 msgstr ""
 

-# type: =head2
-#. type: =head2
-#: ../src/guestfs.pod:1697
-msgid "guestfs_set_log_message_callback"
+#. type: textblock
+#: ../src/guestfs.pod:1690
+msgid ""
+"Events may contain a payload, usually nothing (void), an array of 64 bit "
+"unsigned integers, or a message buffer.  Payloads are discussed later on."

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../src/guestfs.pod:1699
-#, no-wrap
-msgid ""
-" typedef void (*guestfs_log_message_cb) (guestfs_h *g, void *opaque,\n"
-"                                         char *buf, int len);\n"
-" void guestfs_set_log_message_callback (guestfs_h *g,\n"
-"                                        guestfs_log_message_cb cb,\n"
-"                                        void *opaque);\n"
-"\n"
+#. type: =head3
+#: ../src/guestfs.pod:1694
+msgid "CLASSES OF EVENTS"
+msgstr ""
+
+#. type: =item
+#: ../src/guestfs.pod:1698
+msgid "GUESTFS_EVENT_CLOSE (payload type: void)"

 msgstr ""
 
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1705
+#: ../src/guestfs.pod:1701

 msgid ""
 msgid ""

-"The callback function C<cb> will be called whenever qemu or the guest writes "
-"anything to the console."
+"The callback function will be called while the handle is being closed "
+"(synchronously from L</guestfs_close>)."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1708
-msgid "Use this function to capture kernel messages and similar."
+#: ../src/guestfs.pod:1704
+msgid ""
+"Note that libguestfs installs an L<atexit(3)> handler to try to clean up "
+"handles that are open when the program exits.  This means that this callback "
+"might be called indirectly from L<exit(3)>, which can cause unexpected "
+"problems in higher-level languages (eg. if your HLL interpreter has already "
+"been cleaned up by the time this is called, and if your callback then jumps "
+"into some HLL function)."

 msgstr ""
 
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1710
+#: ../src/guestfs.pod:1711

 msgid ""
 msgid ""

-"Normally there is no log message handler, and log messages are just "
-"discarded."
+"If no callback is registered: the handle is closed without any callback "
+"being invoked."

 msgstr ""
 
 msgstr ""
 

-# type: =head2
-#. type: =head2
-#: ../src/guestfs.pod:1713
-msgid "guestfs_set_subprocess_quit_callback"
+#. type: =item
+#: ../src/guestfs.pod:1714
+msgid "GUESTFS_EVENT_SUBPROCESS_QUIT (payload type: void)"

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../src/guestfs.pod:1715
-#, no-wrap
+#. type: textblock
+#: ../src/guestfs.pod:1717

 msgid ""
 msgid ""

-" typedef void (*guestfs_subprocess_quit_cb) (guestfs_h *g, void *opaque);\n"
-" void guestfs_set_subprocess_quit_callback (guestfs_h *g,\n"
-"                                            guestfs_subprocess_quit_cb cb,\n"
-"                                            void *opaque);\n"
-"\n"
+"The callback function will be called when the child process quits, either "
+"asynchronously or if killed by L</guestfs_kill_subprocess>.  (This "
+"corresponds to a transition from any state to the CONFIG state)."

 msgstr ""
 
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1720
-msgid ""
-"The callback function C<cb> will be called when the child process quits, "
-"either asynchronously or if killed by L</guestfs_kill_subprocess>.  (This "
-"corresponds to a transition from any state to the CONFIG state)."
+#: ../src/guestfs.pod:1721 ../src/guestfs.pod:1730
+msgid "If no callback is registered: the event is ignored."

 msgstr ""
 
 msgstr ""
 

-# type: =head2
-#. type: =head2
-#: ../src/guestfs.pod:1725
-msgid "guestfs_set_launch_done_callback"
+#. type: =item
+#: ../src/guestfs.pod:1723
+msgid "GUESTFS_EVENT_LAUNCH_DONE (payload type: void)"

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../src/guestfs.pod:1727
-#, no-wrap
+#. type: textblock
+#: ../src/guestfs.pod:1726

 msgid ""
 msgid ""

-" typedef void (*guestfs_launch_done_cb) (guestfs_h *g, void *opaque);\n"
-" void guestfs_set_launch_done_callback (guestfs_h *g,\n"
-"                                        guestfs_launch_done_cb cb,\n"
-"                                        void *opaque);\n"
-"\n"
+"The callback function will be called when the child process becomes ready "
+"first time after it has been launched.  (This corresponds to a transition "
+"from LAUNCHING to the READY state)."

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
+#. type: =item

 #: ../src/guestfs.pod:1732
 #: ../src/guestfs.pod:1732

-msgid ""
-"The callback function C<cb> will be called when the child process becomes "
-"ready first time after it has been launched.  (This corresponds to a "
-"transition from LAUNCHING to the READY state)."
+msgid "GUESTFS_EVENT_PROGRESS (payload type: array of 4 x uint64_t)"

 msgstr ""
 
 msgstr ""
 

-# type: =head2
-#. type: =head2
-#: ../src/guestfs.pod:1736
-msgid "guestfs_set_close_callback"
+# type: textblock
+#. type: textblock
+#: ../src/guestfs.pod:1735
+msgid ""
+"Some long-running operations can generate progress messages.  If this "
+"callback is registered, then it will be called each time a progress message "
+"is generated (usually two seconds after the operation started, and three "
+"times per second thereafter until it completes, although the frequency may "
+"change in future versions)."

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../src/guestfs.pod:1738
-#, no-wrap
+#. type: textblock
+#: ../src/guestfs.pod:1741

 msgid ""
 msgid ""

-" typedef void (*guestfs_close_cb) (guestfs_h *g, void *opaque);\n"
-" void guestfs_set_close_callback (guestfs_h *g,\n"
-"                                  guestfs_close_cb cb,\n"
-"                                  void *opaque);\n"
-"\n"
+"The callback receives in the payload four unsigned 64 bit numbers which are "
+"(in order): C<proc_nr>, C<serial>, C<position>, C<total>."

 msgstr ""
 
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1743
+#: ../src/guestfs.pod:1744

 msgid ""
 msgid ""

-"The callback function C<cb> will be called while the handle is being closed "
-"(synchronously from L</guestfs_close>)."
+"The units of C<total> are not defined, although for some operations C<total> "
+"may relate in some way to the amount of data to be transferred (eg. in bytes "
+"or megabytes), and C<position> may be the portion which has been transferred."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1746
-msgid ""
-"Note that libguestfs installs an L<atexit(3)> handler to try to clean up "
-"handles that are open when the program exits.  This means that this callback "
-"might be called indirectly from L<exit(3)>, which can cause unexpected "
-"problems in higher-level languages (eg. if your HLL interpreter has already "
-"been cleaned up by the time this is called, and if your callback then jumps "
-"into some HLL function)."
-msgstr ""
-
-# type: =head2
-#. type: =head2
-#: ../src/guestfs.pod:1754
-msgid "guestfs_set_progress_callback"
-msgstr ""
-
-# type: verbatim
-#. type: verbatim
-#: ../src/guestfs.pod:1756
-#, no-wrap
-msgid ""
-" typedef void (*guestfs_progress_cb) (guestfs_h *g, void *opaque,\n"
-"                                      int proc_nr, int serial,\n"
-"                                      uint64_t position, uint64_t total);\n"
-" void guestfs_set_progress_callback (guestfs_h *g,\n"
-"                                     guestfs_progress_cb cb,\n"
-"                                     void *opaque);\n"
-"\n"
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../src/guestfs.pod:1763
-msgid ""
-"Some long-running operations can generate progress messages.  If this "
-"callback is registered, then it will be called each time a progress message "
-"is generated (usually two seconds after the operation started, and three "
-"times per second thereafter until it completes, although the frequency may "
-"change in future versions)."
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../src/guestfs.pod:1769
-msgid ""
-"The callback receives two numbers: C<position> and C<total>.  The units of "
-"C<total> are not defined, although for some operations C<total> may relate "
-"in some way to the amount of data to be transferred (eg. in bytes or "
-"megabytes), and C<position> may be the portion which has been transferred."
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../src/guestfs.pod:1775
+#: ../src/guestfs.pod:1749

 msgid "The only defined and stable parts of the API are:"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgid "The only defined and stable parts of the API are:"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1781
+#: ../src/guestfs.pod:1755

 msgid ""
 "The callback can display to the user some type of progress bar or indicator "
 "which shows the ratio of C<position>:C<total>."
 msgid ""
 "The callback can display to the user some type of progress bar or indicator "
 "which shows the ratio of C<position>:C<total>."


@@ -3969,30004 +3863,30097 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1786
+#: ../src/guestfs.pod:1760

 msgid "0 E<lt>= C<position> E<lt>= C<total>"
 msgstr ""
 
 msgid "0 E<lt>= C<position> E<lt>= C<total>"
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1790
+#: ../src/guestfs.pod:1764

 msgid ""
 "If any progress notification is sent during a call, then a final progress "
 msgid ""
 "If any progress notification is sent during a call, then a final progress "

-"notification is always sent when C<position> = C<total>."
+"notification is always sent when C<position> = C<total> (I<unless> the call "
+"fails with an error)."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1793
+#: ../src/guestfs.pod:1768

 msgid ""
 "This is to simplify caller code, so callers can easily set the progress "
 "indicator to \"100%\" at the end of the operation, without requiring special "
 "code to detect this case."
 msgstr ""
 
 msgid ""
 "This is to simplify caller code, so callers can easily set the progress "
 "indicator to \"100%\" at the end of the operation, without requiring special "
 "code to detect this case."
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1799
+#: ../src/guestfs.pod:1774

 msgid ""
 msgid ""

-"The callback also receives the procedure number and serial number of the "
-"call.  These are only useful for debugging protocol issues, and the callback "
-"can normally ignore them.  The callback may want to print these numbers in "
-"error messages or debugging messages."
+"For some calls we are unable to estimate the progress of the call, but we "
+"can still generate progress messages to indicate activity.  This is known as "
+"\"pulse mode\", and is directly supported by certain progress bar "
+"implementations (eg. GtkProgressBar)."

 msgstr ""
 
 msgstr ""
 

-# type: =head1
-#. type: =head1
-#: ../src/guestfs.pod:1804
-msgid "PRIVATE DATA AREA"
+#. type: textblock
+#: ../src/guestfs.pod:1779
+msgid ""
+"For these calls, zero or more progress messages are generated with "
+"C<position = 0> and C<total = 1>, followed by a final message with "
+"C<position = total = 1>."

 msgstr ""
 
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1806
+#: ../src/guestfs.pod:1783

 msgid ""
 msgid ""

-"You can attach named pieces of private data to the libguestfs handle, and "
-"fetch them by name for the lifetime of the handle.  This is called the "
-"private data area and is only available from the C API."
+"As noted above, if the call fails with an error then the final message may "
+"not be generated."

 msgstr ""
 
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1810
-msgid "To attach a named piece of data, use the following call:"
+#: ../src/guestfs.pod:1788
+msgid ""
+"The callback also receives the procedure number (C<proc_nr>) and serial "
+"number (C<serial>) of the call.  These are only useful for debugging "
+"protocol issues, and the callback can normally ignore them.  The callback "
+"may want to print these numbers in error messages or debugging messages."

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../src/guestfs.pod:1812
-#, no-wrap
-msgid ""
-" void guestfs_set_private (guestfs_h *g, const char *key, void *data);\n"
-"\n"
+#. type: textblock
+#: ../src/guestfs.pod:1794
+msgid "If no callback is registered: progress messages are discarded."
+msgstr ""
+
+#. type: =item
+#: ../src/guestfs.pod:1796
+msgid "GUESTFS_EVENT_APPLIANCE (payload type: message buffer)"

 msgstr ""
 
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1814
+#: ../src/guestfs.pod:1799

 msgid ""
 msgid ""

-"C<key> is the name to associate with this data, and C<data> is an arbitrary "
-"pointer (which can be C<NULL>).  Any previous item with the same name is "
-"overwritten."
+"The callback function is called whenever a log message is generated by qemu, "
+"the appliance kernel, guestfsd (daemon), or utility programs."

 msgstr ""
 
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1818
+#: ../src/guestfs.pod:1802

 msgid ""
 msgid ""

-"You can use any C<key> you want, but names beginning with an underscore "
-"character are reserved for internal libguestfs purposes (for implementing "
-"language bindings).  It is recommended to prefix the name with some unique "
-"string to avoid collisions with other users."
+"If the verbose flag (L</guestfs_set_verbose>) is set before launch (L</"
+"guestfs_launch>) then additional debug messages are generated."

 msgstr ""
 
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1823
-msgid "To retrieve the pointer, use:"
+#: ../src/guestfs.pod:1805 ../src/guestfs.pod:1819
+msgid ""
+"If no callback is registered: the messages are discarded unless the verbose "
+"flag is set in which case they are sent to stderr.  You can override the "
+"printing of verbose messages to stderr by setting up a callback."

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../src/guestfs.pod:1825
-#, no-wrap
+#. type: =item
+#: ../src/guestfs.pod:1810
+msgid "GUESTFS_EVENT_LIBRARY (payload type: message buffer)"
+msgstr ""
+
+#. type: textblock
+#: ../src/guestfs.pod:1813

 msgid ""
 msgid ""

-" void *guestfs_get_private (guestfs_h *g, const char *key);\n"
-"\n"
+"The callback function is called whenever a log message is generated by the "
+"library part of libguestfs."

 msgstr ""
 
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1827
+#: ../src/guestfs.pod:1816

 msgid ""
 msgid ""

-"This function returns C<NULL> if either no data is found associated with "
-"C<key>, or if the user previously set the C<key>'s C<data> pointer to "
-"C<NULL>."
+"If the verbose flag (L</guestfs_set_verbose>) is set then additional debug "
+"messages are generated."
+msgstr ""
+
+#. type: =item
+#: ../src/guestfs.pod:1824
+msgid "GUESTFS_EVENT_TRACE (payload type: message buffer)"

 msgstr ""
 
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1831
+#: ../src/guestfs.pod:1827

 msgid ""
 msgid ""

-"Libguestfs does not try to look at or interpret the C<data> pointer in any "
-"way.  As far as libguestfs is concerned, it need not be a valid pointer at "
-"all.  In particular, libguestfs does I<not> try to free the data when the "
-"handle is closed.  If the data must be freed, then the caller must either "
-"free it before calling L</guestfs_close> or must set up a close callback to "
-"do it (see L</guestfs_set_close_callback>, and note that only one callback "
-"can be registered for a handle)."
+"The callback function is called whenever a trace message is generated.  This "
+"only applies if the trace flag (L</guestfs_set_trace>) is set."

 msgstr ""
 
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1839
+#: ../src/guestfs.pod:1830

 msgid ""
 msgid ""

-"The private data area is implemented using a hash table, and should be "
-"reasonably efficient for moderate numbers of keys."
+"If no callback is registered: the messages are sent to stderr.  You can "
+"override the printing of trace messages to stderr by setting up a callback."

 msgstr ""
 
 msgstr ""
 

-# type: =end
-#. type: =end
-#: ../src/guestfs.pod:1842 ../src/guestfs.pod:1847
-msgid "html"
+#. type: =head3
+#: ../src/guestfs.pod:1836
+msgid "guestfs_set_event_callback"
+msgstr ""
+
+#. type: verbatim
+#: ../src/guestfs.pod:1838
+#, no-wrap
+msgid ""
+" int guestfs_set_event_callback (guestfs_h *g,\n"
+"                                 guestfs_event_callback cb,\n"
+"                                 uint64_t event_bitmask,\n"
+"                                 int flags,\n"
+"                                 void *opaque);\n"
+"\n"

 msgstr ""
 
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #: ../src/guestfs.pod:1844
 msgid ""
 #. type: textblock
 #: ../src/guestfs.pod:1844
 msgid ""

-"<!-- old anchor for the next section --> <a name="
-"\"state_machine_and_low_level_event_api\"/>"
+"This function registers a callback (C<cb>) for all event classes in the "
+"C<event_bitmask>."

 msgstr ""
 
 msgstr ""
 

-# type: =head1
-#. type: =head1
-#: ../src/guestfs.pod:1849
-msgid "ARCHITECTURE"
+#. type: textblock
+#: ../src/guestfs.pod:1847
+msgid ""
+"For example, to register for all log message events, you could call this "
+"function with the bitmask C<GUESTFS_EVENT_APPLIANCE|GUESTFS_EVENT_LIBRARY>.  "
+"To register a single callback for all possible classes of events, use "
+"C<GUESTFS_EVENT_ALL>."

 msgstr ""
 
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1851
-msgid ""
-"Internally, libguestfs is implemented by running an appliance (a special "
-"type of small virtual machine) using L<qemu(1)>.  Qemu runs as a child "
-"process of the main program."
+#: ../src/guestfs.pod:1853
+msgid "C<flags> should always be passed as 0."

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
+#. type: textblock

 #: ../src/guestfs.pod:1855
 #: ../src/guestfs.pod:1855

-#, no-wrap

 msgid ""
 msgid ""

-"  ___________________\n"
-" /                   \\\n"
-" | main program      |\n"
-" |                   |\n"
-" |                   |           child process / appliance\n"
-" |                   |           __________________________\n"
-" |                   |          / qemu                     \\\n"
-" +-------------------+   RPC    |      +-----------------+ |\n"
-" | libguestfs     <--------------------> guestfsd        | |\n"
-" |                   |          |      +-----------------+ |\n"
-" \\___________________/          |      | Linux kernel    | |\n"
-"                                |      +--^--------------+ |\n"
-"                                \\_________|________________/\n"
-"                                          |\n"
-"                                   _______v______\n"
-"                                  /              \\\n"
-"                                  | Device or    |\n"
-"                                  | disk image   |\n"
-"                                  \\______________/\n"
-"\n"
+"C<opaque> is an opaque pointer which is passed to the callback.  You can use "
+"it for any purpose."

 msgstr ""
 
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1875
+#: ../src/guestfs.pod:1858

 msgid ""
 msgid ""

-"The library, linked to the main program, creates the child process and hence "
-"the appliance in the L</guestfs_launch> function."
+"The return value is the event handle (an integer) which you can use to "
+"delete the callback (see below)."

 msgstr ""
 
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1878
+#: ../src/guestfs.pod:1861

 msgid ""
 msgid ""

-"Inside the appliance is a Linux kernel and a complete stack of userspace "
-"tools (such as LVM and ext2 programs) and a small controlling daemon called "
-"L</guestfsd>.  The library talks to L</guestfsd> using remote procedure "
-"calls (RPC).  There is a mostly one-to-one correspondence between libguestfs "
-"API calls and RPC calls to the daemon.  Lastly the disk image(s) are "
-"attached to the qemu process which translates device access by the "
-"appliance's Linux kernel into accesses to the image."
+"If there is an error, this function returns C<-1>, and sets the error in the "
+"handle in the usual way (see L</guestfs_last_error> etc.)"

 msgstr ""
 
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1887
+#: ../src/guestfs.pod:1864

 msgid ""
 msgid ""

-"A common misunderstanding is that the appliance \"is\" the virtual machine.  "
-"Although the disk image you are attached to might also be used by some "
-"virtual machine, libguestfs doesn't know or care about this.  (But you will "
-"care if both libguestfs's qemu process and your virtual machine are trying "
-"to update the disk image at the same time, since these usually results in "
-"massive disk corruption)."
+"Callbacks remain in effect until they are deleted, or until the handle is "
+"closed."

 msgstr ""
 
 msgstr ""
 

-# type: =head1
-#. type: =head1
-#: ../src/guestfs.pod:1894
-msgid "STATE MACHINE"
+#. type: textblock
+#: ../src/guestfs.pod:1867
+msgid ""
+"In the case where multiple callbacks are registered for a particular event "
+"class, all of the callbacks are called.  The order in which multiple "
+"callbacks are called is not defined."

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../src/guestfs.pod:1896
-msgid "libguestfs uses a state machine to model the child process:"
+#. type: =head3
+#: ../src/guestfs.pod:1871
+msgid "guestfs_delete_event_callback"

 msgstr ""
 
 msgstr ""
 

-# type: verbatim

 #. type: verbatim
 #. type: verbatim

-#: ../src/guestfs.pod:1898
+#: ../src/guestfs.pod:1873

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-"                         |\n"
-"                    guestfs_create\n"
-"                         |\n"
-"                         |\n"
-"                     ____V_____\n"
-"                    /          \\\n"
-"                    |  CONFIG  |\n"
-"                    \\__________/\n"
-"                     ^ ^   ^  \\\n"
-"                    /  |    \\  \\ guestfs_launch\n"
-"                   /   |    _\\__V______\n"
-"                  /    |   /           \\\n"
-"                 /     |   | LAUNCHING |\n"
-"                /      |   \\___________/\n"
-"               /       |       /\n"
-"              /        |  guestfs_launch\n"
-"             /         |     /\n"
-"    ______  /        __|____V\n"
-"   /      \\ ------> /        \\\n"
-"   | BUSY |         | READY  |\n"
-"   \\______/ <------ \\________/\n"
+" void guestfs_delete_event_callback (guestfs_h *g, int event_handle);\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1920
+#: ../src/guestfs.pod:1875

 msgid ""
 msgid ""

-"The normal transitions are (1) CONFIG (when the handle is created, but there "
-"is no child process), (2) LAUNCHING (when the child process is booting up), "
-"(3) alternating between READY and BUSY as commands are issued to, and "
-"carried out by, the child process."
+"Delete a callback that was previously registered.  C<event_handle> should be "
+"the integer that was returned by a previous call to "
+"C<guestfs_set_event_callback> on the same handle."

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../src/guestfs.pod:1925
+#. type: =head3
+#: ../src/guestfs.pod:1879
+msgid "guestfs_event_callback"
+msgstr ""
+
+#. type: verbatim
+#: ../src/guestfs.pod:1881
+#, no-wrap

 msgid ""
 msgid ""

-"The guest may be killed by L</guestfs_kill_subprocess>, or may die "
-"asynchronously at any time (eg. due to some internal error), and that causes "
-"the state to transition back to CONFIG."
+" typedef void (*guestfs_event_callback) (\n"
+"                  guestfs_h *g,\n"
+"                  void *opaque,\n"
+"                  uint64_t event,\n"
+"                  int event_handle,\n"
+"                  int flags,\n"
+"                  const char *buf, size_t buf_len,\n"
+"                  const uint64_t *array, size_t array_len);\n"
+"\n"

 msgstr ""
 
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1929
+#: ../src/guestfs.pod:1890

 msgid ""
 msgid ""

-"Configuration commands for qemu such as L</guestfs_add_drive> can only be "
-"issued when in the CONFIG state."
+"This is the type of the event callback function that you have to provide."

 msgstr ""
 
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1932
+#: ../src/guestfs.pod:1893

 msgid ""
 msgid ""

-"The API offers one call that goes from CONFIG through LAUNCHING to READY.  "
-"L</guestfs_launch> blocks until the child process is READY to accept "
-"commands (or until some failure or timeout).  L</guestfs_launch> internally "
-"moves the state from CONFIG to LAUNCHING while it is running."
+"The basic parameters are: the handle (C<g>), the opaque user pointer "
+"(C<opaque>), the event class (eg. C<GUESTFS_EVENT_PROGRESS>), the event "
+"handle, and C<flags> which in the current API you should ignore."

 msgstr ""
 
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1938
+#: ../src/guestfs.pod:1897

 msgid ""
 msgid ""

-"API actions such as L</guestfs_mount> can only be issued when in the READY "
-"state.  These API calls block waiting for the command to be carried out (ie. "
-"the state to transition to BUSY and then back to READY).  There are no non-"
-"blocking versions, and no way to issue more than one command per handle at "
-"the same time."
+"The remaining parameters contain the event payload (if any).  Each event may "
+"contain a payload, which usually relates to the event class, but for future "
+"proofing your code should be written to handle any payload for any event "
+"class."

 msgstr ""
 
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1944
+#: ../src/guestfs.pod:1902

 msgid ""
 msgid ""

-"Finally, the child process sends asynchronous messages back to the main "
-"program, such as kernel log messages.  You can register a callback to "
-"receive these messages."
+"C<buf> and C<buf_len> contain a message buffer (if C<buf_len == 0>, then "
+"there is no message buffer).  Note that this message buffer can contain "
+"arbitrary 8 bit data, including NUL bytes."

 msgstr ""
 
 msgstr ""
 

-# type: =head1
-#. type: =head1
-#: ../src/guestfs.pod:1948
-msgid "INTERNALS"
+#. type: textblock
+#: ../src/guestfs.pod:1906
+msgid ""
+"C<array> and C<array_len> is an array of 64 bit unsigned integers.  At the "
+"moment this is only used for progress messages."

 msgstr ""
 
 msgstr ""
 

-# type: =head2
-#. type: =head2
-#: ../src/guestfs.pod:1950
-msgid "COMMUNICATION PROTOCOL"
+#. type: =head3
+#: ../src/guestfs.pod:1909
+msgid "EXAMPLE: CAPTURING LOG MESSAGES"

 msgstr ""
 
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1952
+#: ../src/guestfs.pod:1911

 msgid ""
 msgid ""

-"Don't rely on using this protocol directly.  This section documents how it "
-"currently works, but it may change at any time."
+"One motivation for the generic event API was to allow GUI programs to "
+"capture debug and other messages.  In libguestfs E<le> 1.8 these were sent "
+"unconditionally to C<stderr>."

 msgstr ""
 
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1955
+#: ../src/guestfs.pod:1915

 msgid ""
 msgid ""

-"The protocol used to talk between the library and the daemon running inside "
-"the qemu virtual machine is a simple RPC mechanism built on top of XDR (RFC "
-"1014, RFC 1832, RFC 4506)."
+"Events associated with log messages are: C<GUESTFS_EVENT_LIBRARY>, "
+"C<GUESTFS_EVENT_APPLIANCE> and C<GUESTFS_EVENT_TRACE>.  (Note that error "
+"messages are not events; you must capture error messages separately)."

 msgstr ""
 
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1959
+#: ../src/guestfs.pod:1920

 msgid ""
 msgid ""

-"The detailed format of structures is in C<src/guestfs_protocol.x> (note: "
-"this file is automatically generated)."
+"Programs have to set up a callback to capture the classes of events of "
+"interest:"

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../src/guestfs.pod:1962
+#. type: verbatim
+#: ../src/guestfs.pod:1923
+#, no-wrap

 msgid ""
 msgid ""

-"There are two broad cases, ordinary functions that don't have any C<FileIn> "
-"and C<FileOut> parameters, which are handled with very simple request/reply "
-"messages.  Then there are functions that have any C<FileIn> or C<FileOut> "
-"parameters, which use the same request and reply messages, but they may also "
-"be followed by files sent using a chunked encoding."
-msgstr ""
-
-# type: =head3
-#. type: =head3
-#: ../src/guestfs.pod:1969
-msgid "ORDINARY FUNCTIONS (NO FILEIN/FILEOUT PARAMS)"
+" int eh =\n"
+"   guestfs_set_event_callback\n"
+"     (g, message_callback,\n"
+"      GUESTFS_EVENT_LIBRARY|GUESTFS_EVENT_APPLIANCE|\n"
+"      GUESTFS_EVENT_TRACE,\n"
+"      0, NULL) == -1)\n"
+" if (eh == -1) {\n"
+"   // handle error in the usual way\n"
+" }\n"
+"\n"

 msgstr ""
 
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1971
-msgid "For ordinary functions, the request message is:"
+#: ../src/guestfs.pod:1933
+msgid ""
+"The callback can then direct messages to the appropriate place.  In this "
+"example, messages are directed to syslog:"

 msgstr ""
 
 msgstr ""
 

-# type: verbatim

 #. type: verbatim
 #. type: verbatim

-#: ../src/guestfs.pod:1973
+#: ../src/guestfs.pod:1936

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" total length (header + arguments,\n"
-"      but not including the length word itself)\n"
-" struct guestfs_message_header (encoded as XDR)\n"
-" struct guestfs_<foo>_args (encoded as XDR)\n"
+" static void\n"
+" message_callback (\n"
+"         guestfs_h *g,\n"
+"         void *opaque,\n"
+"         uint64_t event,\n"
+"         int event_handle,\n"
+"         int flags,\n"
+"         const char *buf, size_t buf_len,\n"
+"         const uint64_t *array, size_t array_len)\n"
+" {\n"
+"   const int priority = LOG_USER|LOG_INFO;\n"
+"   if (buf_len > 0)\n"
+"     syslog (priority, \"event 0x%lx: %s\", event, buf);\n"
+" }\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../src/guestfs.pod:1978
-msgid ""
-"The total length field allows the daemon to allocate a fixed size buffer "
-"into which it slurps the rest of the message.  As a result, the total length "
-"is limited to C<GUESTFS_MESSAGE_MAX> bytes (currently 4MB), which means the "
-"effective size of any request is limited to somewhere under this size."
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../src/guestfs.pod:1984
-msgid ""
-"Note also that many functions don't take any arguments, in which case the "
-"C<guestfs_I<foo>_args> is completely omitted."
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../src/guestfs.pod:1987
-msgid ""
-"The header contains the procedure number (C<guestfs_proc>) which is how the "
-"receiver knows what type of args structure to expect, or none at all."
+# type: =head1
+#. type: =head1
+#: ../src/guestfs.pod:1951
+msgid "PRIVATE DATA AREA"

 msgstr ""
 
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1991
+#: ../src/guestfs.pod:1953

 msgid ""
 msgid ""

-"For functions that take optional arguments, the optional arguments are "
-"encoded in the C<guestfs_I<foo>_args> structure in the same way as ordinary "
-"arguments.  A bitmask in the header indicates which optional arguments are "
-"meaningful.  The bitmask is also checked to see if it contains bits set "
-"which the daemon does not know about (eg. if more optional arguments were "
-"added in a later version of the library), and this causes the call to be "
-"rejected."
+"You can attach named pieces of private data to the libguestfs handle, fetch "
+"them by name, and walk over them, for the lifetime of the handle.  This is "
+"called the private data area and is only available from the C API."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:1999
-msgid "The reply message for ordinary functions is:"
+#: ../src/guestfs.pod:1958
+msgid "To attach a named piece of data, use the following call:"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs.pod:2001
+#: ../src/guestfs.pod:1960

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" total length (header + ret,\n"
-"      but not including the length word itself)\n"
-" struct guestfs_message_header (encoded as XDR)\n"
-" struct guestfs_<foo>_ret (encoded as XDR)\n"
+" void guestfs_set_private (guestfs_h *g, const char *key, void *data);\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:2006
+#: ../src/guestfs.pod:1962

 msgid ""
 msgid ""

-"As above the C<guestfs_I<foo>_ret> structure may be completely omitted for "
-"functions that return no formal return values."
+"C<key> is the name to associate with this data, and C<data> is an arbitrary "
+"pointer (which can be C<NULL>).  Any previous item with the same key is "
+"overwritten."

 msgstr ""
 
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:2009
+#: ../src/guestfs.pod:1966

 msgid ""
 msgid ""

-"As above the total length of the reply is limited to C<GUESTFS_MESSAGE_MAX>."
+"You can use any C<key> you want, but your key should I<not> start with an "
+"underscore character.  Keys beginning with an underscore character are "
+"reserved for internal libguestfs purposes (eg. for implementing language "
+"bindings).  It is recommended that you prefix the key with some unique "
+"string to avoid collisions with other users."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:2012
-msgid ""
-"In the case of an error, a flag is set in the header, and the reply message "
-"is slightly changed:"
+#: ../src/guestfs.pod:1972
+msgid "To retrieve the pointer, use:"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs.pod:2015
+#: ../src/guestfs.pod:1974

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" total length (header + error,\n"
-"      but not including the length word itself)\n"
-" struct guestfs_message_header (encoded as XDR)\n"
-" struct guestfs_message_error (encoded as XDR)\n"
+" void *guestfs_get_private (guestfs_h *g, const char *key);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:2020
+#: ../src/guestfs.pod:1976

 msgid ""
 msgid ""

-"The C<guestfs_message_error> structure contains the error message as a "
-"string."
+"This function returns C<NULL> if either no data is found associated with "
+"C<key>, or if the user previously set the C<key>'s C<data> pointer to "
+"C<NULL>."

 msgstr ""
 
 msgstr ""
 

-# type: =head3
-#. type: =head3
-#: ../src/guestfs.pod:2023
-msgid "FUNCTIONS THAT HAVE FILEIN PARAMETERS"
+#. type: textblock
+#: ../src/guestfs.pod:1980
+msgid ""
+"Libguestfs does not try to look at or interpret the C<data> pointer in any "
+"way.  As far as libguestfs is concerned, it need not be a valid pointer at "
+"all.  In particular, libguestfs does I<not> try to free the data when the "
+"handle is closed.  If the data must be freed, then the caller must either "
+"free it before calling L</guestfs_close> or must set up a close callback to "
+"do it (see L</GUESTFS_EVENT_CLOSE>)."

 msgstr ""
 
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:2025
-msgid ""
-"A C<FileIn> parameter indicates that we transfer a file I<into> the guest.  "
-"The normal request message is sent (see above).  However this is followed by "
-"a sequence of file chunks."
+#: ../src/guestfs.pod:1987
+msgid "To walk over all entries, use these two functions:"

 msgstr ""
 
 msgstr ""
 

-# type: verbatim

 #. type: verbatim
 #. type: verbatim

-#: ../src/guestfs.pod:2029
+#: ../src/guestfs.pod:1989

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" total length (header + arguments,\n"
-"      but not including the length word itself,\n"
-"      and not including the chunks)\n"
-" struct guestfs_message_header (encoded as XDR)\n"
-" struct guestfs_<foo>_args (encoded as XDR)\n"
-" sequence of chunks for FileIn param #0\n"
-" sequence of chunks for FileIn param #1 etc.\n"
+" void *guestfs_first_private (guestfs_h *g, const char **key_rtn);\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../src/guestfs.pod:2037
-msgid "The \"sequence of chunks\" is:"
-msgstr ""
-
-# type: verbatim

 #. type: verbatim
 #. type: verbatim

-#: ../src/guestfs.pod:2039
+#: ../src/guestfs.pod:1991

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" length of chunk (not including length word itself)\n"
-" struct guestfs_chunk (encoded as XDR)\n"
-" length of chunk\n"
-" struct guestfs_chunk (encoded as XDR)\n"
-"   ...\n"
-" length of chunk\n"
-" struct guestfs_chunk (with data.data_len == 0)\n"
+" void *guestfs_next_private (guestfs_h *g, const char **key_rtn);\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:2047
+#: ../src/guestfs.pod:1993

 msgid ""
 msgid ""

-"The final chunk has the C<data_len> field set to zero.  Additionally a flag "
-"is set in the final chunk to indicate either successful completion or early "
-"cancellation."
+"C<guestfs_first_private> returns the first key, pointer pair (\"first\" does "
+"not have any particular meaning -- keys are not returned in any defined "
+"order).  A pointer to the key is returned in C<*key_rtn> and the "
+"corresponding data pointer is returned from the function.  C<NULL> is "
+"returned if there are no keys stored in the handle."

 msgstr ""
 
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:2051
+#: ../src/guestfs.pod:1999

 msgid ""
 msgid ""

-"At time of writing there are no functions that have more than one FileIn "
-"parameter.  However this is (theoretically) supported, by sending the "
-"sequence of chunks for each FileIn parameter one after another (from left to "
-"right)."
+"C<guestfs_next_private> returns the next key, pointer pair.  The return "
+"value of this function is also C<NULL> is there are no further entries to "
+"return."

 msgstr ""
 
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:2056
-msgid ""
-"Both the library (sender) I<and> the daemon (receiver) may cancel the "
-"transfer.  The library does this by sending a chunk with a special flag set "
-"to indicate cancellation.  When the daemon sees this, it cancels the whole "
-"RPC, does I<not> send any reply, and goes back to reading the next request."
+#: ../src/guestfs.pod:2003
+msgid "Notes about walking over entries:"

 msgstr ""
 
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:2062
+#: ../src/guestfs.pod:2009

 msgid ""
 msgid ""

-"The daemon may also cancel.  It does this by writing a special word "
-"C<GUESTFS_CANCEL_FLAG> to the socket.  The library listens for this during "
-"the transfer, and if it gets it, it will cancel the transfer (it sends a "
-"cancel chunk).  The special word is chosen so that even if cancellation "
-"happens right at the end of the transfer (after the library has finished "
-"writing and has started listening for the reply), the \"spurious\" cancel "
-"flag will not be confused with the reply message."
+"You must not call C<guestfs_set_private> while walking over the entries."

 msgstr ""
 
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:2071
+#: ../src/guestfs.pod:2014

 msgid ""
 msgid ""

-"This protocol allows the transfer of arbitrary sized files (no 32 bit "
-"limit), and also files where the size is not known in advance (eg. from "
-"pipes or sockets).  However the chunks are rather small "
-"(C<GUESTFS_MAX_CHUNK_SIZE>), so that neither the library nor the daemon need "
-"to keep much in memory."
-msgstr ""
-
-# type: =head3
-#. type: =head3
-#: ../src/guestfs.pod:2077
-msgid "FUNCTIONS THAT HAVE FILEOUT PARAMETERS"
+"The handle maintains an internal iterator which is reset when you call "
+"C<guestfs_first_private>.  This internal iterator is invalidated when you "
+"call C<guestfs_set_private>."

 msgstr ""
 
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:2079
-msgid ""
-"The protocol for FileOut parameters is exactly the same as for FileIn "
-"parameters, but with the roles of daemon and library reversed."
+#: ../src/guestfs.pod:2020
+msgid "If you have set the data pointer associated with a key to C<NULL>, ie:"

 msgstr ""
 
 msgstr ""
 

-# type: verbatim

 #. type: verbatim
 #. type: verbatim

-#: ../src/guestfs.pod:2082
+#: ../src/guestfs.pod:2022

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" total length (header + ret,\n"
-"      but not including the length word itself,\n"
-"      and not including the chunks)\n"
-" struct guestfs_message_header (encoded as XDR)\n"
-" struct guestfs_<foo>_ret (encoded as XDR)\n"
-" sequence of chunks for FileOut param #0\n"
-" sequence of chunks for FileOut param #1 etc.\n"
+" guestfs_set_private (g, key, NULL);\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: =head3
-#. type: =head3
-#: ../src/guestfs.pod:2090
-msgid "INITIAL MESSAGE"
+#. type: textblock
+#: ../src/guestfs.pod:2024
+msgid "then that C<key> is not returned when walking."

 msgstr ""
 
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:2092
+#: ../src/guestfs.pod:2028

 msgid ""
 msgid ""

-"When the daemon launches it sends an initial word (C<GUESTFS_LAUNCH_FLAG>) "
-"which indicates that the guest and daemon is alive.  This is what L</"
-"guestfs_launch> waits for."
-msgstr ""
-
-# type: =head3
-#. type: =head3
-#: ../src/guestfs.pod:2096
-msgid "PROGRESS NOTIFICATION MESSAGES"
+"C<*key_rtn> is only valid until the next call to C<guestfs_first_private>, "
+"C<guestfs_next_private> or C<guestfs_set_private>."

 msgstr ""
 
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:2098
+#: ../src/guestfs.pod:2034

 msgid ""
 msgid ""

-"The daemon may send progress notification messages at any time.  These are "
-"distinguished by the normal length word being replaced by "
-"C<GUESTFS_PROGRESS_FLAG>, followed by a fixed size progress message."
+"The following example code shows how to print all keys and data pointers "
+"that are associated with the handle C<g>:"

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../src/guestfs.pod:2102
+#. type: verbatim
+#: ../src/guestfs.pod:2037
+#, no-wrap

 msgid ""
 msgid ""

-"The library turns them into progress callbacks (see "
-"C<guestfs_set_progress_callback>) if there is a callback registered, or "
-"discards them if not."
+" const char *key;\n"
+" void *data = guestfs_first_private (g, &key);\n"
+" while (data != NULL)\n"
+"   {\n"
+"     printf (\"key = %s, data = %p\\n\", key, data);\n"
+"     data = guestfs_next_private (g, &key);\n"
+"   }\n"
+"\n"

 msgstr ""
 
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:2106
+#: ../src/guestfs.pod:2045

 msgid ""
 msgid ""

-"The daemon self-limits the frequency of progress messages it sends (see "
-"C<daemon/proto.c:notify_progress>).  Not all calls generate progress "
-"messages."
+"More commonly you are only interested in keys that begin with an application-"
+"specific prefix C<foo_>.  Modify the loop like so:"

 msgstr ""
 
 msgstr ""
 

-# type: =head1
-#. type: =head1
-#: ../src/guestfs.pod:2110
-msgid "LIBGUESTFS VERSION NUMBERS"
+#. type: verbatim
+#: ../src/guestfs.pod:2048
+#, no-wrap
+msgid ""
+" const char *key;\n"
+" void *data = guestfs_first_private (g, &key);\n"
+" while (data != NULL)\n"
+"   {\n"
+"     if (strncmp (key, \"foo_\", strlen (\"foo_\")) == 0)\n"
+"       printf (\"key = %s, data = %p\\n\", key, data);\n"
+"     data = guestfs_next_private (g, &key);\n"
+"   }\n"
+"\n"

 msgstr ""
 
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:2112
+#: ../src/guestfs.pod:2057

 msgid ""
 msgid ""

-"Since April 2010, libguestfs has started to make separate development and "
-"stable releases, along with corresponding branches in our git repository.  "
-"These separate releases can be identified by version number:"
+"If you need to modify keys while walking, then you have to jump back to the "
+"beginning of the loop.  For example, to delete all keys prefixed with "
+"C<foo_>:"

 msgstr ""
 
 msgstr ""
 

-# type: verbatim

 #. type: verbatim
 #. type: verbatim

-#: ../src/guestfs.pod:2117
+#: ../src/guestfs.pod:2061

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-"                 even numbers for stable: 1.2.x, 1.4.x, ...\n"
-"       .-------- odd numbers for development: 1.3.x, 1.5.x, ...\n"
-"       |\n"
-"       v\n"
-" 1  .  3  .  5\n"
-" ^           ^\n"
-" |           |\n"
-" |           `-------- sub-version\n"
-" |\n"
-" `------ always '1' because we don't change the ABI\n"
+"  const char *key;\n"
+"  void *data;\n"
+" again:\n"
+"  data = guestfs_first_private (g, &key);\n"
+"  while (data != NULL)\n"
+"    {\n"
+"      if (strncmp (key, \"foo_\", strlen (\"foo_\")) == 0)\n"
+"        {\n"
+"          guestfs_set_private (g, key, NULL);\n"
+"          /* note that 'key' pointer is now invalid, and so is\n"
+"             the internal iterator */\n"
+"          goto again;\n"
+"        }\n"
+"      data = guestfs_next_private (g, &key);\n"
+"    }\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:2128
-msgid "Thus \"1.3.5\" is the 5th update to the development branch \"1.3\"."
+#: ../src/guestfs.pod:2077
+msgid ""
+"Note that the above loop is guaranteed to terminate because the keys are "
+"being deleted, but other manipulations of keys within the loop might not "
+"terminate unless you also maintain an indication of which keys have been "
+"visited."
+msgstr ""
+
+# type: =end
+#. type: =end
+#: ../src/guestfs.pod:2082 ../src/guestfs.pod:2087
+msgid "html"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:2130
+#: ../src/guestfs.pod:2084

 msgid ""
 msgid ""

-"As time passes we cherry pick fixes from the development branch and backport "
-"those into the stable branch, the effect being that the stable branch should "
-"get more stable and less buggy over time.  So the stable releases are ideal "
-"for people who don't need new features but would just like the software to "
-"work."
+"<!-- old anchor for the next section --> <a name="
+"\"state_machine_and_low_level_event_api\"/>"

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../src/guestfs.pod:2136
-msgid "Our criteria for backporting changes are:"
+# type: =head1
+#. type: =head1
+#: ../src/guestfs.pod:2089
+msgid "ARCHITECTURE"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:2142
+#: ../src/guestfs.pod:2091

 msgid ""
 msgid ""

-"Documentation changes which don't affect any code are backported unless the "
-"documentation refers to a future feature which is not in stable."
+"Internally, libguestfs is implemented by running an appliance (a special "
+"type of small virtual machine) using L<qemu(1)>.  Qemu runs as a child "
+"process of the main program."

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../src/guestfs.pod:2148
+# type: verbatim
+#. type: verbatim
+#: ../src/guestfs.pod:2095
+#, no-wrap

 msgid ""
 msgid ""

-"Bug fixes which are not controversial, fix obvious problems, and have been "
-"well tested are backported."
+"  ___________________\n"
+" /                   \\\n"
+" | main program      |\n"
+" |                   |\n"
+" |                   |           child process / appliance\n"
+" |                   |           __________________________\n"
+" |                   |          / qemu                     \\\n"
+" +-------------------+   RPC    |      +-----------------+ |\n"
+" | libguestfs     <--------------------> guestfsd        | |\n"
+" |                   |          |      +-----------------+ |\n"
+" \\___________________/          |      | Linux kernel    | |\n"
+"                                |      +--^--------------+ |\n"
+"                                \\_________|________________/\n"
+"                                          |\n"
+"                                   _______v______\n"
+"                                  /              \\\n"
+"                                  | Device or    |\n"
+"                                  | disk image   |\n"
+"                                  \\______________/\n"
+"\n"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:2153
+#: ../src/guestfs.pod:2115

 msgid ""
 msgid ""

-"Simple rearrangements of code which shouldn't affect how it works get "
-"backported.  This is so that the code in the two branches doesn't get too "
-"far out of step, allowing us to backport future fixes more easily."
+"The library, linked to the main program, creates the child process and hence "
+"the appliance in the L</guestfs_launch> function."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:2159
+#: ../src/guestfs.pod:2118

 msgid ""
 msgid ""

-"We I<don't> backport new features, new APIs, new tools etc, except in one "
-"exceptional case: the new feature is required in order to implement an "
-"important bug fix."
+"Inside the appliance is a Linux kernel and a complete stack of userspace "
+"tools (such as LVM and ext2 programs) and a small controlling daemon called "
+"L</guestfsd>.  The library talks to L</guestfsd> using remote procedure "
+"calls (RPC).  There is a mostly one-to-one correspondence between libguestfs "
+"API calls and RPC calls to the daemon.  Lastly the disk image(s) are "
+"attached to the qemu process which translates device access by the "
+"appliance's Linux kernel into accesses to the image."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:2165
+#: ../src/guestfs.pod:2127

 msgid ""
 msgid ""

-"A new stable branch starts when we think the new features in development are "
-"substantial and compelling enough over the current stable branch to warrant "
-"it.  When that happens we create new stable and development versions 1.N.0 "
-"and 1.(N+1).0 [N is even].  The new dot-oh release won't necessarily be so "
-"stable at this point, but by backporting fixes from development, that branch "
-"will stabilize over time."
+"A common misunderstanding is that the appliance \"is\" the virtual machine.  "
+"Although the disk image you are attached to might also be used by some "
+"virtual machine, libguestfs doesn't know or care about this.  (But you will "
+"care if both libguestfs's qemu process and your virtual machine are trying "
+"to update the disk image at the same time, since these usually results in "
+"massive disk corruption)."

 msgstr ""
 
 msgstr ""
 

+# type: =head1

 #. type: =head1
 #. type: =head1

-#: ../src/guestfs.pod:2173
-msgid "EXTENDING LIBGUESTFS"
-msgstr ""
-
-#. type: =head2
-#: ../src/guestfs.pod:2175
-msgid "ADDING A NEW API ACTION"
-msgstr ""
-
-#. type: textblock
-#: ../src/guestfs.pod:2177
-msgid ""
-"Large amounts of boilerplate code in libguestfs (RPC, bindings, "
-"documentation) are generated, and this makes it easy to extend the "
-"libguestfs API."
+#: ../src/guestfs.pod:2134
+msgid "STATE MACHINE"

 msgstr ""
 
 msgstr ""
 

+# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:2181
-msgid "To add a new API action there are two changes:"
+#: ../src/guestfs.pod:2136
+msgid "libguestfs uses a state machine to model the child process:"

 msgstr ""
 
 msgstr ""
 

-#. type: textblock
-#: ../src/guestfs.pod:2187
+# type: verbatim
+#. type: verbatim
+#: ../src/guestfs.pod:2138
+#, no-wrap

 msgid ""
 msgid ""

-"You need to add a description of the call (name, parameters, return type, "
-"tests, documentation) to C<generator/generator_actions.ml>."
+"                         |\n"
+"                    guestfs_create\n"
+"                         |\n"
+"                         |\n"
+"                     ____V_____\n"
+"                    /          \\\n"
+"                    |  CONFIG  |\n"
+"                    \\__________/\n"
+"                     ^ ^   ^  \\\n"
+"                    /  |    \\  \\ guestfs_launch\n"
+"                   /   |    _\\__V______\n"
+"                  /    |   /           \\\n"
+"                 /     |   | LAUNCHING |\n"
+"                /      |   \\___________/\n"
+"               /       |       /\n"
+"              /        |  guestfs_launch\n"
+"             /         |     /\n"
+"    ______  /        __|____V\n"
+"   /      \\ ------> /        \\\n"
+"   | BUSY |         | READY  |\n"
+"   \\______/ <------ \\________/\n"
+"\n"

 msgstr ""
 
 msgstr ""
 

+# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:2190
+#: ../src/guestfs.pod:2160

 msgid ""
 msgid ""

-"There are two sorts of API action, depending on whether the call goes "
-"through to the daemon in the appliance, or is serviced entirely by the "
-"library (see L</ARCHITECTURE> above).  L</guestfs_sync> is an example of the "
-"former, since the sync is done in the appliance.  L</guestfs_set_trace> is "
-"an example of the latter, since a trace flag is maintained in the handle and "
-"all tracing is done on the library side."
+"The normal transitions are (1) CONFIG (when the handle is created, but there "
+"is no child process), (2) LAUNCHING (when the child process is booting up), "
+"(3) alternating between READY and BUSY as commands are issued to, and "
+"carried out by, the child process."

 msgstr ""
 
 msgstr ""
 

+# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:2198
+#: ../src/guestfs.pod:2165

 msgid ""
 msgid ""

-"Most new actions are of the first type, and get added to the "
-"C<daemon_functions> list.  Each function has a unique procedure number used "
-"in the RPC protocol which is assigned to that action when we publish "
-"libguestfs and cannot be reused.  Take the latest procedure number and "
-"increment it."
+"The guest may be killed by L</guestfs_kill_subprocess>, or may die "
+"asynchronously at any time (eg. due to some internal error), and that causes "
+"the state to transition back to CONFIG."

 msgstr ""
 
 msgstr ""
 

+# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:2204
+#: ../src/guestfs.pod:2169

 msgid ""
 msgid ""

-"For library-only actions of the second type, add to the "
-"C<non_daemon_functions> list.  Since these functions are serviced by the "
-"library and do not travel over the RPC mechanism to the daemon, these "
-"functions do not need a procedure number, and so the procedure number is set "
-"to C<-1>."
+"Configuration commands for qemu such as L</guestfs_add_drive> can only be "
+"issued when in the CONFIG state."

 msgstr ""
 
 msgstr ""
 

+# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:2212
-msgid "Implement the action (in C):"
+#: ../src/guestfs.pod:2172
+msgid ""
+"The API offers one call that goes from CONFIG through LAUNCHING to READY.  "
+"L</guestfs_launch> blocks until the child process is READY to accept "
+"commands (or until some failure or timeout).  L</guestfs_launch> internally "
+"moves the state from CONFIG to LAUNCHING while it is running."

 msgstr ""
 
 msgstr ""
 

+# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:2214
+#: ../src/guestfs.pod:2178

 msgid ""
 msgid ""

-"For daemon actions, implement the function C<do_E<lt>nameE<gt>> in the "
-"C<daemon/> directory."
+"API actions such as L</guestfs_mount> can only be issued when in the READY "
+"state.  These API calls block waiting for the command to be carried out (ie. "
+"the state to transition to BUSY and then back to READY).  There are no non-"
+"blocking versions, and no way to issue more than one command per handle at "
+"the same time."

 msgstr ""
 
 msgstr ""
 

+# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:2217
+#: ../src/guestfs.pod:2184

 msgid ""
 msgid ""

-"For library actions, implement the function C<guestfs__E<lt>nameE<gt>> "
-"(note: double underscore) in the C<src/> directory."
+"Finally, the child process sends asynchronous messages back to the main "
+"program, such as kernel log messages.  You can register a callback to "
+"receive these messages."

 msgstr ""
 
 msgstr ""
 

-#. type: textblock
-#: ../src/guestfs.pod:2220
-msgid "In either case, use another function as an example of what to do."
+# type: =head1
+#. type: =head1
+#: ../src/guestfs.pod:2188
+msgid "INTERNALS"

 msgstr ""
 
 msgstr ""
 

-#. type: textblock
-#: ../src/guestfs.pod:2224
-msgid "After making these changes, use C<make> to compile."
+# type: =head2
+#. type: =head2
+#: ../src/guestfs.pod:2190
+msgid "COMMUNICATION PROTOCOL"

 msgstr ""
 
 msgstr ""
 

+# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:2226
+#: ../src/guestfs.pod:2192

 msgid ""
 msgid ""

-"Note that you don't need to implement the RPC, language bindings, manual "
-"pages or anything else.  It's all automatically generated from the OCaml "
-"description."
-msgstr ""
-
-#. type: =head2
-#: ../src/guestfs.pod:2230
-msgid "ADDING TESTS FOR AN API ACTION"
+"Don't rely on using this protocol directly.  This section documents how it "
+"currently works, but it may change at any time."

 msgstr ""
 
 msgstr ""
 

+# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:2232
+#: ../src/guestfs.pod:2195

 msgid ""
 msgid ""

-"You can supply zero or as many tests as you want per API call.  The tests "
-"can either be added as part of the API description (C<generator/"
-"generator_actions.ml>), or in some rarer cases you may want to drop a script "
-"into C<regressions/>.  Note that adding a script to C<regressions/> is "
-"slower, so if possible use the first method."
+"The protocol used to talk between the library and the daemon running inside "
+"the qemu virtual machine is a simple RPC mechanism built on top of XDR (RFC "
+"1014, RFC 1832, RFC 4506)."

 msgstr ""
 
 msgstr ""
 

+# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:2238
+#: ../src/guestfs.pod:2199

 msgid ""
 msgid ""

-"The following describes the test environment used when you add an API test "
-"in C<generator_actions.ml>."
+"The detailed format of structures is in C<src/guestfs_protocol.x> (note: "
+"this file is automatically generated)."

 msgstr ""
 
 msgstr ""
 

+# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:2241
-msgid "The test environment has 4 block devices:"
+#: ../src/guestfs.pod:2202
+msgid ""
+"There are two broad cases, ordinary functions that don't have any C<FileIn> "
+"and C<FileOut> parameters, which are handled with very simple request/reply "
+"messages.  Then there are functions that have any C<FileIn> or C<FileOut> "
+"parameters, which use the same request and reply messages, but they may also "
+"be followed by files sent using a chunked encoding."

 msgstr ""
 
 msgstr ""
 

-#. type: =item
-#: ../src/guestfs.pod:2245
-msgid "C</dev/sda> 500MB"
+# type: =head3
+#. type: =head3
+#: ../src/guestfs.pod:2209
+msgid "ORDINARY FUNCTIONS (NO FILEIN/FILEOUT PARAMS)"

 msgstr ""
 
 msgstr ""
 

+# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:2247
-msgid "General block device for testing."
+#: ../src/guestfs.pod:2211
+msgid "For ordinary functions, the request message is:"

 msgstr ""
 
 msgstr ""
 

-#. type: =item
-#: ../src/guestfs.pod:2249
-msgid "C</dev/sdb> 50MB"
+# type: verbatim
+#. type: verbatim
+#: ../src/guestfs.pod:2213
+#, no-wrap
+msgid ""
+" total length (header + arguments,\n"
+"      but not including the length word itself)\n"
+" struct guestfs_message_header (encoded as XDR)\n"
+" struct guestfs_<foo>_args (encoded as XDR)\n"
+"\n"

 msgstr ""
 
 msgstr ""
 

+# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:2251
+#: ../src/guestfs.pod:2218

 msgid ""
 msgid ""

-"C</dev/sdb1> is an ext2 filesystem used for testing filesystem write "
-"operations."
-msgstr ""
-
-#. type: =item
-#: ../src/guestfs.pod:2254
-msgid "C</dev/sdc> 10MB"
+"The total length field allows the daemon to allocate a fixed size buffer "
+"into which it slurps the rest of the message.  As a result, the total length "
+"is limited to C<GUESTFS_MESSAGE_MAX> bytes (currently 4MB), which means the "
+"effective size of any request is limited to somewhere under this size."

 msgstr ""
 
 msgstr ""
 

+# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:2256
-msgid "Used in a few tests where two block devices are needed."
-msgstr ""
-
-#. type: =item
-#: ../src/guestfs.pod:2258
-msgid "C</dev/sdd>"
+#: ../src/guestfs.pod:2224
+msgid ""
+"Note also that many functions don't take any arguments, in which case the "
+"C<guestfs_I<foo>_args> is completely omitted."

 msgstr ""
 
 msgstr ""
 

+# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:2260
-msgid "ISO with fixed content (see C<images/test.iso>)."
+#: ../src/guestfs.pod:2227
+msgid ""
+"The header contains the procedure number (C<guestfs_proc>) which is how the "
+"receiver knows what type of args structure to expect, or none at all."

 msgstr ""
 
 msgstr ""
 

+# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:2264
+#: ../src/guestfs.pod:2231

 msgid ""
 msgid ""

-"To be able to run the tests in a reasonable amount of time, the libguestfs "
-"appliance and block devices are reused between tests.  So don't try testing "
-"L</guestfs_kill_subprocess> :-x"
+"For functions that take optional arguments, the optional arguments are "
+"encoded in the C<guestfs_I<foo>_args> structure in the same way as ordinary "
+"arguments.  A bitmask in the header indicates which optional arguments are "
+"meaningful.  The bitmask is also checked to see if it contains bits set "
+"which the daemon does not know about (eg. if more optional arguments were "
+"added in a later version of the library), and this causes the call to be "
+"rejected."

 msgstr ""
 
 msgstr ""
 

+# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:2268
-msgid ""
-"Each test starts with an initial scenario, selected using one of the "
-"C<Init*> expressions, described in C<generator/generator_types.ml>.  These "
-"initialize the disks mentioned above in a particular way as documented in "
-"C<generator_types.ml>.  You should not assume anything about the previous "
-"contents of other disks that are not initialized."
-msgstr ""
-
-#. type: textblock
-#: ../src/guestfs.pod:2274
-msgid ""
-"You can add a prerequisite clause to any individual test.  This is a run-"
-"time check, which, if it fails, causes the test to be skipped.  Useful if "
-"testing a command which might not work on all variations of libguestfs "
-"builds.  A test that has prerequisite of C<Always> means to run "
-"unconditionally."
-msgstr ""
-
-#. type: textblock
-#: ../src/guestfs.pod:2280
-msgid ""
-"In addition, packagers can skip individual tests by setting environment "
-"variables before running C<make check>."
+#: ../src/guestfs.pod:2239
+msgid "The reply message for ordinary functions is:"

 msgstr ""
 
 msgstr ""
 

+# type: verbatim

 #. type: verbatim
 #. type: verbatim

-#: ../src/guestfs.pod:2283
+#: ../src/guestfs.pod:2241

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" SKIP_TEST_<CMD>_<NUM>=1\n"
+" total length (header + ret,\n"
+"      but not including the length word itself)\n"
+" struct guestfs_message_header (encoded as XDR)\n"
+" struct guestfs_<foo>_ret (encoded as XDR)\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

+# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:2285
-msgid "eg: C<SKIP_TEST_COMMAND_3=1> skips test #3 of L</guestfs_command>."
-msgstr ""
-
-#. type: textblock
-#: ../src/guestfs.pod:2287
-msgid "or:"
-msgstr ""
-
-#. type: verbatim
-#: ../src/guestfs.pod:2289
-#, no-wrap
+#: ../src/guestfs.pod:2246

 msgid ""
 msgid ""

-" SKIP_TEST_<CMD>=1\n"
-"\n"
+"As above the C<guestfs_I<foo>_ret> structure may be completely omitted for "
+"functions that return no formal return values."

 msgstr ""
 
 msgstr ""
 

+# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:2291
-msgid "eg: C<SKIP_TEST_ZEROFREE=1> skips all L</guestfs_zerofree> tests."
+#: ../src/guestfs.pod:2249
+msgid ""
+"As above the total length of the reply is limited to C<GUESTFS_MESSAGE_MAX>."

 msgstr ""
 
 msgstr ""
 

+# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:2293
-msgid "Packagers can run only certain tests by setting for example:"
+#: ../src/guestfs.pod:2252
+msgid ""
+"In the case of an error, a flag is set in the header, and the reply message "
+"is slightly changed:"

 msgstr ""
 
 msgstr ""
 

+# type: verbatim

 #. type: verbatim
 #. type: verbatim

-#: ../src/guestfs.pod:2295
+#: ../src/guestfs.pod:2255

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" TEST_ONLY=\"vfs_type zerofree\"\n"
+" total length (header + error,\n"
+"      but not including the length word itself)\n"
+" struct guestfs_message_header (encoded as XDR)\n"
+" struct guestfs_message_error (encoded as XDR)\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

+# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:2297
+#: ../src/guestfs.pod:2260

 msgid ""
 msgid ""

-"See C<capitests/tests.c> for more details of how these environment variables "
-"work."
+"The C<guestfs_message_error> structure contains the error message as a "
+"string."

 msgstr ""
 
 msgstr ""
 

-#. type: =head2
-#: ../src/guestfs.pod:2300
-msgid "DEBUGGING NEW API ACTIONS"
+# type: =head3
+#. type: =head3
+#: ../src/guestfs.pod:2263
+msgid "FUNCTIONS THAT HAVE FILEIN PARAMETERS"

 msgstr ""
 
 msgstr ""
 

+# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:2302
-msgid "Test new actions work before submitting them."
+#: ../src/guestfs.pod:2265
+msgid ""
+"A C<FileIn> parameter indicates that we transfer a file I<into> the guest.  "
+"The normal request message is sent (see above).  However this is followed by "
+"a sequence of file chunks."

 msgstr ""
 
 msgstr ""
 

-#. type: textblock
-#: ../src/guestfs.pod:2304
-msgid "You can use guestfish to try out new commands."
+# type: verbatim
+#. type: verbatim
+#: ../src/guestfs.pod:2269
+#, no-wrap
+msgid ""
+" total length (header + arguments,\n"
+"      but not including the length word itself,\n"
+"      and not including the chunks)\n"
+" struct guestfs_message_header (encoded as XDR)\n"
+" struct guestfs_<foo>_args (encoded as XDR)\n"
+" sequence of chunks for FileIn param #0\n"
+" sequence of chunks for FileIn param #1 etc.\n"
+"\n"

 msgstr ""
 
 msgstr ""
 

+# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:2306
-msgid ""
-"Debugging the daemon is a problem because it runs inside a minimal "
-"environment.  However you can fprintf messages in the daemon to stderr, and "
-"they will show up if you use C<guestfish -v>."
+#: ../src/guestfs.pod:2277
+msgid "The \"sequence of chunks\" is:"

 msgstr ""
 
 msgstr ""
 

-#. type: =head2
-#: ../src/guestfs.pod:2310
-msgid "FORMATTING CODE AND OTHER CONVENTIONS"
+# type: verbatim
+#. type: verbatim
+#: ../src/guestfs.pod:2279
+#, no-wrap
+msgid ""
+" length of chunk (not including length word itself)\n"
+" struct guestfs_chunk (encoded as XDR)\n"
+" length of chunk\n"
+" struct guestfs_chunk (encoded as XDR)\n"
+"   ...\n"
+" length of chunk\n"
+" struct guestfs_chunk (with data.data_len == 0)\n"
+"\n"

 msgstr ""
 
 msgstr ""
 

+# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:2312
+#: ../src/guestfs.pod:2287

 msgid ""
 msgid ""

-"Our C source code generally adheres to some basic code-formatting "
-"conventions.  The existing code base is not totally consistent on this "
-"front, but we do prefer that contributed code be formatted similarly.  In "
-"short, use spaces-not-TABs for indentation, use 2 spaces for each "
-"indentation level, and other than that, follow the K&R style."
+"The final chunk has the C<data_len> field set to zero.  Additionally a flag "
+"is set in the final chunk to indicate either successful completion or early "
+"cancellation."

 msgstr ""
 
 msgstr ""
 

+# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:2318
+#: ../src/guestfs.pod:2291

 msgid ""
 msgid ""

-"If you use Emacs, add the following to one of one of your start-up files (e."
-"g., ~/.emacs), to help ensure that you get indentation right:"
+"At time of writing there are no functions that have more than one FileIn "
+"parameter.  However this is (theoretically) supported, by sending the "
+"sequence of chunks for each FileIn parameter one after another (from left to "
+"right)."

 msgstr ""
 
 msgstr ""
 

-#. type: verbatim
-#: ../src/guestfs.pod:2321
-#, no-wrap
+# type: textblock
+#. type: textblock
+#: ../src/guestfs.pod:2296

 msgid ""
 msgid ""

-" ;;; In libguestfs, indent with spaces everywhere (not TABs).\n"
-" ;;; Exceptions: Makefile and ChangeLog modes.\n"
-" (add-hook 'find-file-hook\n"
-"     '(lambda () (if (and buffer-file-name\n"
-"                          (string-match \"/libguestfs\\\\>\"\n"
-"                              (buffer-file-name))\n"
-"                          (not (string-equal mode-name \"Change Log\"))\n"
-"                          (not (string-equal mode-name \"Makefile\")))\n"
-"                     (setq indent-tabs-mode nil))))\n"
-" \n"
+"Both the library (sender) I<and> the daemon (receiver) may cancel the "
+"transfer.  The library does this by sending a chunk with a special flag set "
+"to indicate cancellation.  When the daemon sees this, it cancels the whole "
+"RPC, does I<not> send any reply, and goes back to reading the next request."

 msgstr ""
 
 msgstr ""
 

-#. type: verbatim
-#: ../src/guestfs.pod:2331
-#, no-wrap
+# type: textblock
+#. type: textblock
+#: ../src/guestfs.pod:2302

 msgid ""
 msgid ""

-" ;;; When editing C sources in libguestfs, use this style.\n"
-" (defun libguestfs-c-mode ()\n"
-"   \"C mode with adjusted defaults for use with libguestfs.\"\n"
-"   (interactive)\n"
-"   (c-set-style \"K&R\")\n"
-"   (setq c-indent-level 2)\n"
-"   (setq c-basic-offset 2))\n"
-" (add-hook 'c-mode-hook\n"
-"           '(lambda () (if (string-match \"/libguestfs\\\\>\"\n"
-"                               (buffer-file-name))\n"
-"                           (libguestfs-c-mode))))\n"
-"\n"
+"The daemon may also cancel.  It does this by writing a special word "
+"C<GUESTFS_CANCEL_FLAG> to the socket.  The library listens for this during "
+"the transfer, and if it gets it, it will cancel the transfer (it sends a "
+"cancel chunk).  The special word is chosen so that even if cancellation "
+"happens right at the end of the transfer (after the library has finished "
+"writing and has started listening for the reply), the \"spurious\" cancel "
+"flag will not be confused with the reply message."

 msgstr ""
 
 msgstr ""
 

+# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:2343
-msgid "Enable warnings when compiling (and fix any problems this finds):"
+#: ../src/guestfs.pod:2311
+msgid ""
+"This protocol allows the transfer of arbitrary sized files (no 32 bit "
+"limit), and also files where the size is not known in advance (eg. from "
+"pipes or sockets).  However the chunks are rather small "
+"(C<GUESTFS_MAX_CHUNK_SIZE>), so that neither the library nor the daemon need "
+"to keep much in memory."

 msgstr ""
 
 msgstr ""
 

-#. type: verbatim
-#: ../src/guestfs.pod:2346
-#, no-wrap
-msgid ""
-" ./configure --enable-gcc-warnings\n"
-"\n"
+# type: =head3
+#. type: =head3
+#: ../src/guestfs.pod:2317
+msgid "FUNCTIONS THAT HAVE FILEOUT PARAMETERS"

 msgstr ""
 
 msgstr ""
 

+# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:2348
-msgid "Useful targets are:"
+#: ../src/guestfs.pod:2319
+msgid ""
+"The protocol for FileOut parameters is exactly the same as for FileIn "
+"parameters, but with the roles of daemon and library reversed."

 msgstr ""
 
 msgstr ""
 

+# type: verbatim

 #. type: verbatim
 #. type: verbatim

-#: ../src/guestfs.pod:2350
+#: ../src/guestfs.pod:2322

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" make syntax-check  # checks the syntax of the C code\n"
-" make check         # runs the test suite\n"
+" total length (header + ret,\n"
+"      but not including the length word itself,\n"
+"      and not including the chunks)\n"
+" struct guestfs_message_header (encoded as XDR)\n"
+" struct guestfs_<foo>_ret (encoded as XDR)\n"
+" sequence of chunks for FileOut param #0\n"
+" sequence of chunks for FileOut param #1 etc.\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-#. type: =head2
-#: ../src/guestfs.pod:2353
-msgid "DAEMON CUSTOM PRINTF FORMATTERS"
+# type: =head3
+#. type: =head3
+#: ../src/guestfs.pod:2330
+msgid "INITIAL MESSAGE"

 msgstr ""
 
 msgstr ""
 

+# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:2355
+#: ../src/guestfs.pod:2332

 msgid ""
 msgid ""

-"In the daemon code we have created custom printf formatters C<%Q> and C<%R>, "
-"which are used to do shell quoting."
+"When the daemon launches it sends an initial word (C<GUESTFS_LAUNCH_FLAG>) "
+"which indicates that the guest and daemon is alive.  This is what L</"
+"guestfs_launch> waits for."

 msgstr ""
 
 msgstr ""
 

-#. type: =item
-#: ../src/guestfs.pod:2360
-msgid "%Q"
+# type: =head3
+#. type: =head3
+#: ../src/guestfs.pod:2336
+msgid "PROGRESS NOTIFICATION MESSAGES"

 msgstr ""
 
 msgstr ""
 

+# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:2362
+#: ../src/guestfs.pod:2338

 msgid ""
 msgid ""

-"Simple shell quoted string.  Any spaces or other shell characters are "
-"escaped for you."
-msgstr ""
-
-#. type: =item
-#: ../src/guestfs.pod:2365
-msgid "%R"
+"The daemon may send progress notification messages at any time.  These are "
+"distinguished by the normal length word being replaced by "
+"C<GUESTFS_PROGRESS_FLAG>, followed by a fixed size progress message."

 msgstr ""
 
 #. type: textblock
 msgstr ""
 
 #. type: textblock

-#: ../src/guestfs.pod:2367
+#: ../src/guestfs.pod:2342

 msgid ""
 msgid ""

-"Same as C<%Q> except the string is treated as a path which is prefixed by "
-"the sysroot."
+"The library turns them into progress callbacks (see L</"
+"GUESTFS_EVENT_PROGRESS>) if there is a callback registered, or discards them "
+"if not."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:2372 ../fish/guestfish.pod:240 ../fish/guestfish.pod:599
-msgid "For example:"
-msgstr ""
-
-#. type: verbatim
-#: ../src/guestfs.pod:2374
-#, no-wrap
+#: ../src/guestfs.pod:2346

 msgid ""
 msgid ""

-" asprintf (&cmd, \"cat %R\", path);\n"
-"\n"
+"The daemon self-limits the frequency of progress messages it sends (see "
+"C<daemon/proto.c:notify_progress>).  Not all calls generate progress "
+"messages."

 msgstr ""
 
 msgstr ""
 

-#. type: textblock
-#: ../src/guestfs.pod:2376
-msgid "would produce C<cat /sysroot/some\\ path\\ with\\ spaces>"
+# type: =head1
+#. type: =head1
+#: ../src/guestfs.pod:2350
+msgid "LIBGUESTFS VERSION NUMBERS"

 msgstr ""
 
 msgstr ""
 

+# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:2378
+#: ../src/guestfs.pod:2352

 msgid ""
 msgid ""

-"I<Note:> Do I<not> use these when you are passing parameters to the C<command"
-"{,r,v,rv}()> functions.  These parameters do NOT need to be quoted because "
-"they are not passed via the shell (instead, straight to exec).  You probably "
-"want to use the C<sysroot_path()> function however."
-msgstr ""
-
-#. type: =head2
-#: ../src/guestfs.pod:2384
-msgid "SUBMITTING YOUR NEW API ACTIONS"
+"Since April 2010, libguestfs has started to make separate development and "
+"stable releases, along with corresponding branches in our git repository.  "
+"These separate releases can be identified by version number:"

 msgstr ""
 
 msgstr ""
 

-#. type: textblock
-#: ../src/guestfs.pod:2386
+# type: verbatim
+#. type: verbatim
+#: ../src/guestfs.pod:2357
+#, no-wrap

 msgid ""
 msgid ""

-"Submit patches to the mailing list: L<http://www.redhat.com/mailman/listinfo/"
-"libguestfs> and CC to L<rjones@redhat.com>."
+"                 even numbers for stable: 1.2.x, 1.4.x, ...\n"
+"       .-------- odd numbers for development: 1.3.x, 1.5.x, ...\n"
+"       |\n"
+"       v\n"
+" 1  .  3  .  5\n"
+" ^           ^\n"
+" |           |\n"
+" |           `-------- sub-version\n"
+" |\n"
+" `------ always '1' because we don't change the ABI\n"
+"\n"

 msgstr ""
 
 msgstr ""
 

-#. type: =head2
-#: ../src/guestfs.pod:2390
-msgid "INTERNATIONALIZATION (I18N) SUPPORT"
+# type: textblock
+#. type: textblock
+#: ../src/guestfs.pod:2368
+msgid "Thus \"1.3.5\" is the 5th update to the development branch \"1.3\"."

 msgstr ""
 
 msgstr ""
 

+# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:2392
-msgid "We support i18n (gettext anyhow) in the library."
+#: ../src/guestfs.pod:2370
+msgid ""
+"As time passes we cherry pick fixes from the development branch and backport "
+"those into the stable branch, the effect being that the stable branch should "
+"get more stable and less buggy over time.  So the stable releases are ideal "
+"for people who don't need new features but would just like the software to "
+"work."

 msgstr ""
 
 msgstr ""
 

+# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:2394
-msgid ""
-"However many messages come from the daemon, and we don't translate those at "
-"the moment.  One reason is that the appliance generally has all locale files "
-"removed from it, because they take up a lot of space.  So we'd have to readd "
-"some of those, as well as copying our PO files into the appliance."
+#: ../src/guestfs.pod:2376
+msgid "Our criteria for backporting changes are:"

 msgstr ""
 
 msgstr ""
 

+# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:2400
+#: ../src/guestfs.pod:2382

 msgid ""
 msgid ""

-"Debugging messages are never translated, since they are intended for the "
-"programmers."
+"Documentation changes which don't affect any code are backported unless the "
+"documentation refers to a future feature which is not in stable."

 msgstr ""
 
 msgstr ""
 

-#. type: =head2
-#: ../src/guestfs.pod:2403
-msgid "SOURCE CODE SUBDIRECTORIES"
+# type: textblock
+#. type: textblock
+#: ../src/guestfs.pod:2388
+msgid ""
+"Bug fixes which are not controversial, fix obvious problems, and have been "
+"well tested are backported."

 msgstr ""
 
 msgstr ""
 

-#. type: =item
-#: ../src/guestfs.pod:2407 ../src/guestfs-actions.pod:5686
-#: ../fish/guestfish-actions.pod:3808
-msgid "C<appliance>"
+# type: textblock
+#. type: textblock
+#: ../src/guestfs.pod:2393
+msgid ""
+"Simple rearrangements of code which shouldn't affect how it works get "
+"backported.  This is so that the code in the two branches doesn't get too "
+"far out of step, allowing us to backport future fixes more easily."

 msgstr ""
 
 msgstr ""
 

+# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:2409
-msgid "The libguestfs appliance, build scripts and so on."
+#: ../src/guestfs.pod:2399
+msgid ""
+"We I<don't> backport new features, new APIs, new tools etc, except in one "
+"exceptional case: the new feature is required in order to implement an "
+"important bug fix."

 msgstr ""
 
 msgstr ""
 

-#. type: =item
-#: ../src/guestfs.pod:2411
-msgid "C<capitests>"
+# type: textblock
+#. type: textblock
+#: ../src/guestfs.pod:2405
+msgid ""
+"A new stable branch starts when we think the new features in development are "
+"substantial and compelling enough over the current stable branch to warrant "
+"it.  When that happens we create new stable and development versions 1.N.0 "
+"and 1.(N+1).0 [N is even].  The new dot-oh release won't necessarily be so "
+"stable at this point, but by backporting fixes from development, that branch "
+"will stabilize over time."

 msgstr ""
 
 msgstr ""
 

-#. type: textblock
+#. type: =head1

 #: ../src/guestfs.pod:2413
 #: ../src/guestfs.pod:2413

-msgid "Automated tests of the C API."
+msgid "EXTENDING LIBGUESTFS"

 msgstr ""
 
 msgstr ""
 

-#. type: =item
+#. type: =head2

 #: ../src/guestfs.pod:2415
 #: ../src/guestfs.pod:2415

-msgid "C<cat>"
+msgid "ADDING A NEW API ACTION"

 msgstr ""
 
 #. type: textblock
 #: ../src/guestfs.pod:2417
 msgid ""
 msgstr ""
 
 #. type: textblock
 #: ../src/guestfs.pod:2417
 msgid ""

-"The L<virt-cat(1)>, L<virt-filesystems(1)> and L<virt-ls(1)> commands and "
-"documentation."
-msgstr ""
-
-#. type: =item
-#: ../src/guestfs.pod:2420
-msgid "C<contrib>"
+"Large amounts of boilerplate code in libguestfs (RPC, bindings, "
+"documentation) are generated, and this makes it easy to extend the "
+"libguestfs API."

 msgstr ""
 
 #. type: textblock
 msgstr ""
 
 #. type: textblock

-#: ../src/guestfs.pod:2422
-msgid "Outside contributions, experimental parts."
+#: ../src/guestfs.pod:2421
+msgid "To add a new API action there are two changes:"

 msgstr ""
 
 msgstr ""
 

-#. type: =item
-#: ../src/guestfs.pod:2424
-msgid "C<daemon>"
+#. type: textblock
+#: ../src/guestfs.pod:2427
+msgid ""
+"You need to add a description of the call (name, parameters, return type, "
+"tests, documentation) to C<generator/generator_actions.ml>."

 msgstr ""
 
 #. type: textblock
 msgstr ""
 
 #. type: textblock

-#: ../src/guestfs.pod:2426
+#: ../src/guestfs.pod:2430

 msgid ""
 msgid ""

-"The daemon that runs inside the libguestfs appliance and carries out actions."
+"There are two sorts of API action, depending on whether the call goes "
+"through to the daemon in the appliance, or is serviced entirely by the "
+"library (see L</ARCHITECTURE> above).  L</guestfs_sync> is an example of the "
+"former, since the sync is done in the appliance.  L</guestfs_set_trace> is "
+"an example of the latter, since a trace flag is maintained in the handle and "
+"all tracing is done on the library side."

 msgstr ""
 
 msgstr ""
 

-#. type: =item
-#: ../src/guestfs.pod:2429
-msgid "C<df>"
+#. type: textblock
+#: ../src/guestfs.pod:2438
+msgid ""
+"Most new actions are of the first type, and get added to the "
+"C<daemon_functions> list.  Each function has a unique procedure number used "
+"in the RPC protocol which is assigned to that action when we publish "
+"libguestfs and cannot be reused.  Take the latest procedure number and "
+"increment it."

 msgstr ""
 
 #. type: textblock
 msgstr ""
 
 #. type: textblock

-#: ../src/guestfs.pod:2431
-msgid "L<virt-df(1)> command and documentation."
+#: ../src/guestfs.pod:2444
+msgid ""
+"For library-only actions of the second type, add to the "
+"C<non_daemon_functions> list.  Since these functions are serviced by the "
+"library and do not travel over the RPC mechanism to the daemon, these "
+"functions do not need a procedure number, and so the procedure number is set "
+"to C<-1>."

 msgstr ""
 
 msgstr ""
 

-#. type: =item
-#: ../src/guestfs.pod:2433
-msgid "C<examples>"
+#. type: textblock
+#: ../src/guestfs.pod:2452
+msgid "Implement the action (in C):"

 msgstr ""
 
 #. type: textblock
 msgstr ""
 
 #. type: textblock

-#: ../src/guestfs.pod:2435
-msgid "C API example code."
+#: ../src/guestfs.pod:2454
+msgid ""
+"For daemon actions, implement the function C<do_E<lt>nameE<gt>> in the "
+"C<daemon/> directory."

 msgstr ""
 
 msgstr ""
 

-#. type: =item
-#: ../src/guestfs.pod:2437
-msgid "C<fish>"
+#. type: textblock
+#: ../src/guestfs.pod:2457
+msgid ""
+"For library actions, implement the function C<guestfs__E<lt>nameE<gt>> "
+"(note: double underscore) in the C<src/> directory."

 msgstr ""
 
 #. type: textblock
 msgstr ""
 
 #. type: textblock

-#: ../src/guestfs.pod:2439
-msgid ""
-"L<guestfish(1)>, the command-line shell, and various shell scripts built on "
-"top such as L<virt-copy-in(1)>, L<virt-copy-out(1)>, L<virt-tar-in(1)>, "
-"L<virt-tar-out(1)>."
+#: ../src/guestfs.pod:2460
+msgid "In either case, use another function as an example of what to do."

 msgstr ""
 
 msgstr ""
 

-#. type: =item
-#: ../src/guestfs.pod:2443
-msgid "C<fuse>"
+#. type: textblock
+#: ../src/guestfs.pod:2464
+msgid "After making these changes, use C<make> to compile."

 msgstr ""
 
 #. type: textblock
 msgstr ""
 
 #. type: textblock

-#: ../src/guestfs.pod:2445
+#: ../src/guestfs.pod:2466

 msgid ""
 msgid ""

-"L<guestmount(1)>, FUSE (userspace filesystem) built on top of libguestfs."
+"Note that you don't need to implement the RPC, language bindings, manual "
+"pages or anything else.  It's all automatically generated from the OCaml "
+"description."

 msgstr ""
 
 msgstr ""
 

-#. type: =item
-#: ../src/guestfs.pod:2447
-msgid "C<generator>"
+#. type: =head2
+#: ../src/guestfs.pod:2470
+msgid "ADDING TESTS FOR AN API ACTION"

 msgstr ""
 
 #. type: textblock
 msgstr ""
 
 #. type: textblock

-#: ../src/guestfs.pod:2449
+#: ../src/guestfs.pod:2472

 msgid ""
 msgid ""

-"The crucially important generator, used to automatically generate large "
-"amounts of boilerplate C code for things like RPC and bindings."
-msgstr ""
-
-#. type: =item
-#: ../src/guestfs.pod:2452
-msgid "C<images>"
+"You can supply zero or as many tests as you want per API call.  The tests "
+"can either be added as part of the API description (C<generator/"
+"generator_actions.ml>), or in some rarer cases you may want to drop a script "
+"into C<regressions/>.  Note that adding a script to C<regressions/> is "
+"slower, so if possible use the first method."

 msgstr ""
 
 #. type: textblock
 msgstr ""
 
 #. type: textblock

-#: ../src/guestfs.pod:2454
-msgid "Files used by the test suite."
+#: ../src/guestfs.pod:2478
+msgid ""
+"The following describes the test environment used when you add an API test "
+"in C<generator_actions.ml>."

 msgstr ""
 
 #. type: textblock
 msgstr ""
 
 #. type: textblock

-#: ../src/guestfs.pod:2456
-msgid "Some \"phony\" guest images which we test against."
+#: ../src/guestfs.pod:2481
+msgid "The test environment has 4 block devices:"

 msgstr ""
 
 #. type: =item
 msgstr ""
 
 #. type: =item

-#: ../src/guestfs.pod:2458
-msgid "C<inspector>"
+#: ../src/guestfs.pod:2485
+msgid "C</dev/sda> 500MB"

 msgstr ""
 
 #. type: textblock
 msgstr ""
 
 #. type: textblock

-#: ../src/guestfs.pod:2460
-msgid "L<virt-inspector(1)>, the virtual machine image inspector."
+#: ../src/guestfs.pod:2487
+msgid "General block device for testing."

 msgstr ""
 
 #. type: =item
 msgstr ""
 
 #. type: =item

-#: ../src/guestfs.pod:2462
-msgid "C<logo>"
+#: ../src/guestfs.pod:2489
+msgid "C</dev/sdb> 50MB"

 msgstr ""
 
 #. type: textblock
 msgstr ""
 
 #. type: textblock

-#: ../src/guestfs.pod:2464
-msgid "Logo used on the website.  The fish is called Arthur by the way."
+#: ../src/guestfs.pod:2491
+msgid ""
+"C</dev/sdb1> is an ext2 filesystem used for testing filesystem write "
+"operations."

 msgstr ""
 
 #. type: =item
 msgstr ""
 
 #. type: =item

-#: ../src/guestfs.pod:2466
-msgid "C<m4>"
+#: ../src/guestfs.pod:2494
+msgid "C</dev/sdc> 10MB"

 msgstr ""
 
 #. type: textblock
 msgstr ""
 
 #. type: textblock

-#: ../src/guestfs.pod:2468
-msgid "M4 macros used by autoconf."
+#: ../src/guestfs.pod:2496
+msgid "Used in a few tests where two block devices are needed."

 msgstr ""
 
 #. type: =item
 msgstr ""
 
 #. type: =item

-#: ../src/guestfs.pod:2470
-msgid "C<po>"
+#: ../src/guestfs.pod:2498
+msgid "C</dev/sdd>"

 msgstr ""
 
 #. type: textblock
 msgstr ""
 
 #. type: textblock

-#: ../src/guestfs.pod:2472
-msgid "Translations of simple gettext strings."
+#: ../src/guestfs.pod:2500
+msgid "ISO with fixed content (see C<images/test.iso>)."

 msgstr ""
 
 msgstr ""
 

-#. type: =item
-#: ../src/guestfs.pod:2474
-msgid "C<po-docs>"
+#. type: textblock
+#: ../src/guestfs.pod:2504
+msgid ""
+"To be able to run the tests in a reasonable amount of time, the libguestfs "
+"appliance and block devices are reused between tests.  So don't try testing "
+"L</guestfs_kill_subprocess> :-x"

 msgstr ""
 
 #. type: textblock
 msgstr ""
 
 #. type: textblock

-#: ../src/guestfs.pod:2476
+#: ../src/guestfs.pod:2508

 msgid ""
 msgid ""

-"The build infrastructure and PO files for translations of manpages and POD "
-"files.  Eventually this will be combined with the C<po> directory, but that "
-"is rather complicated."
+"Each test starts with an initial scenario, selected using one of the "
+"C<Init*> expressions, described in C<generator/generator_types.ml>.  These "
+"initialize the disks mentioned above in a particular way as documented in "
+"C<generator_types.ml>.  You should not assume anything about the previous "
+"contents of other disks that are not initialized."

 msgstr ""
 
 msgstr ""
 

-#. type: =item
-#: ../src/guestfs.pod:2480
-msgid "C<regressions>"
+#. type: textblock
+#: ../src/guestfs.pod:2514
+msgid ""
+"You can add a prerequisite clause to any individual test.  This is a run-"
+"time check, which, if it fails, causes the test to be skipped.  Useful if "
+"testing a command which might not work on all variations of libguestfs "
+"builds.  A test that has prerequisite of C<Always> means to run "
+"unconditionally."

 msgstr ""
 
 #. type: textblock
 msgstr ""
 
 #. type: textblock

-#: ../src/guestfs.pod:2482
-msgid "Regression tests."
+#: ../src/guestfs.pod:2520
+msgid ""
+"In addition, packagers can skip individual tests by setting environment "
+"variables before running C<make check>."

 msgstr ""
 
 msgstr ""
 

-#. type: =item
-#: ../src/guestfs.pod:2484
-msgid "C<rescue>"
+#. type: verbatim
+#: ../src/guestfs.pod:2523
+#, no-wrap
+msgid ""
+" SKIP_TEST_<CMD>_<NUM>=1\n"
+"\n"

 msgstr ""
 
 #. type: textblock
 msgstr ""
 
 #. type: textblock

-#: ../src/guestfs.pod:2486
-msgid "L<virt-rescue(1)> command and documentation."
-msgstr ""
-
-#. type: =item
-#: ../src/guestfs.pod:2488
-msgid "C<src>"
+#: ../src/guestfs.pod:2525
+msgid "eg: C<SKIP_TEST_COMMAND_3=1> skips test #3 of L</guestfs_command>."

 msgstr ""
 
 #. type: textblock
 msgstr ""
 
 #. type: textblock

-#: ../src/guestfs.pod:2490
-msgid "Source code to the C library."
+#: ../src/guestfs.pod:2527
+msgid "or:"

 msgstr ""
 
 msgstr ""
 

-#. type: =item
-#: ../src/guestfs.pod:2492
-msgid "C<tools>"
+#. type: verbatim
+#: ../src/guestfs.pod:2529
+#, no-wrap
+msgid ""
+" SKIP_TEST_<CMD>=1\n"
+"\n"

 msgstr ""
 
 #. type: textblock
 msgstr ""
 
 #. type: textblock

-#: ../src/guestfs.pod:2494
-msgid "Command line tools written in Perl (L<virt-resize(1)> and many others)."
-msgstr ""
-
-#. type: =item
-#: ../src/guestfs.pod:2496
-msgid "C<test-tool>"
+#: ../src/guestfs.pod:2531
+msgid "eg: C<SKIP_TEST_ZEROFREE=1> skips all L</guestfs_zerofree> tests."

 msgstr ""
 
 #. type: textblock
 msgstr ""
 
 #. type: textblock

-#: ../src/guestfs.pod:2498
-msgid ""
-"Test tool for end users to test if their qemu/kernel combination will work "
-"with libguestfs."
+#: ../src/guestfs.pod:2533
+msgid "Packagers can run only certain tests by setting for example:"

 msgstr ""
 
 msgstr ""
 

-#. type: =item
-#: ../src/guestfs.pod:2501
-msgid "C<csharp>"
+#. type: verbatim
+#: ../src/guestfs.pod:2535
+#, no-wrap
+msgid ""
+" TEST_ONLY=\"vfs_type zerofree\"\n"
+"\n"

 msgstr ""
 
 msgstr ""
 

-#. type: =item
-#: ../src/guestfs.pod:2503
-msgid "C<haskell>"
+#. type: textblock
+#: ../src/guestfs.pod:2537
+msgid ""
+"See C<capitests/tests.c> for more details of how these environment variables "
+"work."

 msgstr ""
 
 msgstr ""
 

-#. type: =item
-#: ../src/guestfs.pod:2505
-msgid "C<java>"
+#. type: =head2
+#: ../src/guestfs.pod:2540
+msgid "DEBUGGING NEW API ACTIONS"

 msgstr ""
 
 msgstr ""
 

-#. type: =item
-#: ../src/guestfs.pod:2507
-msgid "C<ocaml>"
+#. type: textblock
+#: ../src/guestfs.pod:2542
+msgid "Test new actions work before submitting them."

 msgstr ""
 
 msgstr ""
 

-#. type: =item
-#: ../src/guestfs.pod:2509
-msgid "C<php>"
+#. type: textblock
+#: ../src/guestfs.pod:2544
+msgid "You can use guestfish to try out new commands."

 msgstr ""
 
 msgstr ""
 

-#. type: =item
-#: ../src/guestfs.pod:2511
-msgid "C<perl>"
+#. type: textblock
+#: ../src/guestfs.pod:2546
+msgid ""
+"Debugging the daemon is a problem because it runs inside a minimal "
+"environment.  However you can fprintf messages in the daemon to stderr, and "
+"they will show up if you use C<guestfish -v>."

 msgstr ""
 
 msgstr ""
 

-#. type: =item
-#: ../src/guestfs.pod:2513
-msgid "C<python>"
+#. type: =head2
+#: ../src/guestfs.pod:2550
+msgid "FORMATTING CODE AND OTHER CONVENTIONS"

 msgstr ""
 
 msgstr ""
 

-#. type: =item
-#: ../src/guestfs.pod:2515
-msgid "C<ruby>"
+#. type: textblock
+#: ../src/guestfs.pod:2552
+msgid ""
+"Our C source code generally adheres to some basic code-formatting "
+"conventions.  The existing code base is not totally consistent on this "
+"front, but we do prefer that contributed code be formatted similarly.  In "
+"short, use spaces-not-TABs for indentation, use 2 spaces for each "
+"indentation level, and other than that, follow the K&R style."

 msgstr ""
 
 #. type: textblock
 msgstr ""
 
 #. type: textblock

-#: ../src/guestfs.pod:2517
-msgid "Language bindings."
+#: ../src/guestfs.pod:2558
+msgid ""
+"If you use Emacs, add the following to one of one of your start-up files (e."
+"g., ~/.emacs), to help ensure that you get indentation right:"

 msgstr ""
 
 msgstr ""
 

-# type: =head1
-#. type: =head1
-#: ../src/guestfs.pod:2521 ../fish/guestfish.pod:996
-#: ../test-tool/libguestfs-test-tool.pod:104 ../tools/virt-edit.pl:330
-msgid "ENVIRONMENT VARIABLES"
+#. type: verbatim
+#: ../src/guestfs.pod:2561
+#, no-wrap
+msgid ""
+" ;;; In libguestfs, indent with spaces everywhere (not TABs).\n"
+" ;;; Exceptions: Makefile and ChangeLog modes.\n"
+" (add-hook 'find-file-hook\n"
+"     '(lambda () (if (and buffer-file-name\n"
+"                          (string-match \"/libguestfs\\\\>\"\n"
+"                              (buffer-file-name))\n"
+"                          (not (string-equal mode-name \"Change Log\"))\n"
+"                          (not (string-equal mode-name \"Makefile\")))\n"
+"                     (setq indent-tabs-mode nil))))\n"
+" \n"

 msgstr ""
 
 msgstr ""
 

-# type: =item
-#. type: =item
-#: ../src/guestfs.pod:2525 ../fish/guestfish.pod:1022
-msgid "LIBGUESTFS_APPEND"
+#. type: verbatim
+#: ../src/guestfs.pod:2571
+#, no-wrap
+msgid ""
+" ;;; When editing C sources in libguestfs, use this style.\n"
+" (defun libguestfs-c-mode ()\n"
+"   \"C mode with adjusted defaults for use with libguestfs.\"\n"
+"   (interactive)\n"
+"   (c-set-style \"K&R\")\n"
+"   (setq c-indent-level 2)\n"
+"   (setq c-basic-offset 2))\n"
+" (add-hook 'c-mode-hook\n"
+"           '(lambda () (if (string-match \"/libguestfs\\\\>\"\n"
+"                               (buffer-file-name))\n"
+"                           (libguestfs-c-mode))))\n"
+"\n"

 msgstr ""
 
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:2527 ../fish/guestfish.pod:1024
-msgid "Pass additional options to the guest kernel."
-msgstr ""
-
-# type: =item
-#. type: =item
-#: ../src/guestfs.pod:2529 ../fish/guestfish.pod:1026
-msgid "LIBGUESTFS_DEBUG"
+#: ../src/guestfs.pod:2583
+msgid "Enable warnings when compiling (and fix any problems this finds):"

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../src/guestfs.pod:2531
+#. type: verbatim
+#: ../src/guestfs.pod:2586
+#, no-wrap

 msgid ""
 msgid ""

-"Set C<LIBGUESTFS_DEBUG=1> to enable verbose messages.  This has the same "
-"effect as calling C<guestfs_set_verbose (g, 1)>."
-msgstr ""
-
-# type: =item
-#. type: =item
-#: ../src/guestfs.pod:2534 ../fish/guestfish.pod:1031
-msgid "LIBGUESTFS_MEMSIZE"
+" ./configure --enable-gcc-warnings\n"
+"\n"

 msgstr ""
 
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:2536 ../fish/guestfish.pod:1033
-msgid ""
-"Set the memory allocated to the qemu process, in megabytes.  For example:"
+#: ../src/guestfs.pod:2588
+msgid "Useful targets are:"

 msgstr ""
 
 msgstr ""
 

-# type: verbatim

 #. type: verbatim
 #. type: verbatim

-#: ../src/guestfs.pod:2539 ../fish/guestfish.pod:1036
+#: ../src/guestfs.pod:2590

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" LIBGUESTFS_MEMSIZE=700\n"
+" make syntax-check  # checks the syntax of the C code\n"
+" make check         # runs the test suite\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: =item
-#. type: =item
-#: ../src/guestfs.pod:2541 ../fish/guestfish.pod:1038
-msgid "LIBGUESTFS_PATH"
+#. type: =head2
+#: ../src/guestfs.pod:2593
+msgid "DAEMON CUSTOM PRINTF FORMATTERS"

 msgstr ""
 
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:2543
+#: ../src/guestfs.pod:2595

 msgid ""
 msgid ""

-"Set the path that libguestfs uses to search for kernel and initrd.img.  See "
-"the discussion of paths in section PATH above."
+"In the daemon code we have created custom printf formatters C<%Q> and C<%R>, "
+"which are used to do shell quoting."

 msgstr ""
 
 msgstr ""
 

-# type: =item

 #. type: =item
 #. type: =item

-#: ../src/guestfs.pod:2546 ../fish/guestfish.pod:1043
-msgid "LIBGUESTFS_QEMU"
+#: ../src/guestfs.pod:2600
+msgid "%Q"

 msgstr ""
 
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:2548 ../fish/guestfish.pod:1045
+#: ../src/guestfs.pod:2602

 msgid ""
 msgid ""

-"Set the default qemu binary that libguestfs uses.  If not set, then the qemu "
-"which was found at compile time by the configure script is used."
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../src/guestfs.pod:2552
-msgid "See also L</QEMU WRAPPERS> above."
+"Simple shell quoted string.  Any spaces or other shell characters are "
+"escaped for you."

 msgstr ""
 
 msgstr ""
 

-# type: =item

 #. type: =item
 #. type: =item

-#: ../src/guestfs.pod:2554 ../fish/guestfish.pod:1049
-msgid "LIBGUESTFS_TRACE"
+#: ../src/guestfs.pod:2605
+msgid "%R"

 msgstr ""
 
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:2556
+#: ../src/guestfs.pod:2607

 msgid ""
 msgid ""

-"Set C<LIBGUESTFS_TRACE=1> to enable command traces.  This has the same "
-"effect as calling C<guestfs_set_trace (g, 1)>."
-msgstr ""
-
-# type: =item
-#. type: =item
-#: ../src/guestfs.pod:2559 ../fish/guestfish.pod:1058
-msgid "TMPDIR"
+"Same as C<%Q> except the string is treated as a path which is prefixed by "
+"the sysroot."

 msgstr ""
 
 msgstr ""
 

+# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:2561 ../fish/guestfish.pod:1060
-msgid ""
-"Location of temporary directory, defaults to C</tmp> except for the cached "
-"supermin appliance which defaults to C</var/tmp>."
+#: ../src/guestfs.pod:2612 ../fish/guestfish.pod:240 ../fish/guestfish.pod:613
+msgid "For example:"

 msgstr ""
 
 msgstr ""
 

-#. type: textblock
-#: ../src/guestfs.pod:2564 ../fish/guestfish.pod:1063
+#. type: verbatim
+#: ../src/guestfs.pod:2614
+#, no-wrap

 msgid ""
 msgid ""

-"If libguestfs was compiled to use the supermin appliance then the real "
-"appliance is cached in this directory, shared between all handles belonging "
-"to the same EUID.  You can use C<$TMPDIR> to configure another directory to "
-"use in case C</var/tmp> is not large enough."
+" asprintf (&cmd, \"cat %R\", path);\n"
+"\n"

 msgstr ""
 
 msgstr ""
 

-# type: =head1
-#. type: =head1
-#: ../src/guestfs.pod:2572 ../fish/guestfish.pod:1121
-#: ../test-tool/libguestfs-test-tool.pod:109 ../fuse/guestmount.pod:238
-#: ../tools/virt-edit.pl:350 ../tools/virt-win-reg.pl:572
-#: ../tools/virt-resize.pl:1483 ../tools/virt-list-filesystems.pl:189
-#: ../tools/virt-tar.pl:286 ../tools/virt-make-fs.pl:539
-#: ../tools/virt-list-partitions.pl:257
-msgid "SEE ALSO"
+#. type: textblock
+#: ../src/guestfs.pod:2616
+msgid "would produce C<cat /sysroot/some\\ path\\ with\\ spaces>"

 msgstr ""
 
 #. type: textblock
 msgstr ""
 
 #. type: textblock

-#: ../src/guestfs.pod:2574
+#: ../src/guestfs.pod:2618

 msgid ""
 msgid ""

-"L<guestfs-examples(3)>, L<guestfs-ocaml(3)>, L<guestfs-python(3)>, L<guestfs-"
-"ruby(3)>, L<guestfish(1)>, L<guestmount(1)>, L<virt-cat(1)>, L<virt-copy-in"
-"(1)>, L<virt-copy-out(1)>, L<virt-df(1)>, L<virt-edit(1)>, L<virt-filesystems"
-"(1)>, L<virt-inspector(1)>, L<virt-list-filesystems(1)>, L<virt-list-"
-"partitions(1)>, L<virt-ls(1)>, L<virt-make-fs(1)>, L<virt-rescue(1)>, L<virt-"
-"tar(1)>, L<virt-tar-in(1)>, L<virt-tar-out(1)>, L<virt-win-reg(1)>, L<qemu(1)"
-">, L<febootstrap(1)>, L<hivex(3)>, L<http://libguestfs.org/>."
+"I<Note:> Do I<not> use these when you are passing parameters to the C<command"
+"{,r,v,rv}()> functions.  These parameters do NOT need to be quoted because "
+"they are not passed via the shell (instead, straight to exec).  You probably "
+"want to use the C<sysroot_path()> function however."
+msgstr ""
+
+#. type: =head2
+#: ../src/guestfs.pod:2624
+msgid "SUBMITTING YOUR NEW API ACTIONS"

 msgstr ""
 
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:2601
+#: ../src/guestfs.pod:2626

 msgid ""
 msgid ""

-"Tools with a similar purpose: L<fdisk(8)>, L<parted(8)>, L<kpartx(8)>, L<lvm"
-"(8)>, L<disktype(1)>."
+"Submit patches to the mailing list: L<http://www.redhat.com/mailman/listinfo/"
+"libguestfs> and CC to L<rjones@redhat.com>."

 msgstr ""
 
 msgstr ""
 

-# type: =head1
-#. type: =head1
-#: ../src/guestfs.pod:2608 ../tools/virt-win-reg.pl:587
-#: ../tools/virt-make-fs.pl:553
-msgid "BUGS"
+#. type: =head2
+#: ../src/guestfs.pod:2630
+msgid "INTERNATIONALIZATION (I18N) SUPPORT"

 msgstr ""
 
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:2610
-msgid "To get a list of bugs against libguestfs use this link:"
+#: ../src/guestfs.pod:2632
+msgid "We support i18n (gettext anyhow) in the library."

 msgstr ""
 
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:2612
+#: ../src/guestfs.pod:2634

 msgid ""
 msgid ""

-"L<https://bugzilla.redhat.com/buglist.cgi?"
-"component=libguestfs&product=Virtualization+Tools>"
+"However many messages come from the daemon, and we don't translate those at "
+"the moment.  One reason is that the appliance generally has all locale files "
+"removed from it, because they take up a lot of space.  So we'd have to readd "
+"some of those, as well as copying our PO files into the appliance."

 msgstr ""
 
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:2614
-msgid "To report a new bug against libguestfs use this link:"
+#: ../src/guestfs.pod:2640
+msgid ""
+"Debugging messages are never translated, since they are intended for the "
+"programmers."

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../src/guestfs.pod:2616
-msgid ""
-"L<https://bugzilla.redhat.com/enter_bug.cgi?"
-"component=libguestfs&product=Virtualization+Tools>"
+#. type: =head2
+#: ../src/guestfs.pod:2643
+msgid "SOURCE CODE SUBDIRECTORIES"

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../src/guestfs.pod:2618
-msgid "When reporting a bug, please check:"
+#. type: =item
+#: ../src/guestfs.pod:2647 ../src/guestfs-actions.pod:5827
+#: ../fish/guestfish-actions.pod:3921
+msgid "C<appliance>"

 msgstr ""
 
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:2624
-msgid "That the bug hasn't been reported already."
+#: ../src/guestfs.pod:2649
+msgid "The libguestfs appliance, build scripts and so on."

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../src/guestfs.pod:2628
-msgid "That you are testing a recent version."
+#. type: =item
+#: ../src/guestfs.pod:2651
+msgid "C<capitests>"

 msgstr ""
 
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:2632
-msgid "Describe the bug accurately, and give a way to reproduce it."
+#: ../src/guestfs.pod:2653
+msgid "Automated tests of the C API."
+msgstr ""
+
+#. type: =item
+#: ../src/guestfs.pod:2655
+msgid "C<cat>"

 msgstr ""
 
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:2636
+#: ../src/guestfs.pod:2657

 msgid ""
 msgid ""

-"Run libguestfs-test-tool and paste the B<complete, unedited> output into the "
-"bug report."
+"The L<virt-cat(1)>, L<virt-filesystems(1)> and L<virt-ls(1)> commands and "
+"documentation."

 msgstr ""
 
 msgstr ""
 

-# type: =head1
-#. type: =head1
-#: ../src/guestfs.pod:2641 ../fish/guestfish.pod:1144
-#: ../test-tool/libguestfs-test-tool.pod:115 ../fuse/guestmount.pod:249
-msgid "AUTHORS"
+#. type: =item
+#: ../src/guestfs.pod:2660
+msgid "C<caution>"

 msgstr ""
 
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:2643 ../fish/guestfish.pod:1146
-#: ../test-tool/libguestfs-test-tool.pod:117 ../fuse/guestmount.pod:251
-msgid "Richard W.M. Jones (C<rjones at redhat dot com>)"
+#: ../src/guestfs.pod:2662
+msgid ""
+"Safety and liveness tests of components that libguestfs depends upon (not of "
+"libguestfs itself).  Mainly this is for qemu and the kernel."

 msgstr ""
 
 msgstr ""
 

-# type: =head1
-#. type: =head1
-#: ../src/guestfs.pod:2645 ../fish/guestfish.pod:1148
-#: ../test-tool/libguestfs-test-tool.pod:119 ../fuse/guestmount.pod:253
-#: ../tools/virt-edit.pl:368 ../tools/virt-win-reg.pl:602
-#: ../tools/virt-resize.pl:1508 ../tools/virt-list-filesystems.pl:206
-#: ../tools/virt-tar.pl:305 ../tools/virt-make-fs.pl:568
-#: ../tools/virt-list-partitions.pl:273
-msgid "COPYRIGHT"
+#. type: =item
+#: ../src/guestfs.pod:2665
+msgid "C<contrib>"

 msgstr ""
 
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:2647 ../fish/guestfish.pod:1150
-#: ../fuse/guestmount.pod:255
-msgid "Copyright (C) 2009-2010 Red Hat Inc.  L<http://libguestfs.org/>"
+#: ../src/guestfs.pod:2667
+msgid "Outside contributions, experimental parts."

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../src/guestfs.pod:2650
-msgid ""
-"This library is free software; you can redistribute it and/or modify it "
-"under the terms of the GNU Lesser General Public License as published by the "
-"Free Software Foundation; either version 2 of the License, or (at your "
-"option) any later version."
+#. type: =item
+#: ../src/guestfs.pod:2669
+msgid "C<daemon>"

 msgstr ""
 
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs.pod:2655
+#: ../src/guestfs.pod:2671

 msgid ""
 msgid ""

-"This library is distributed in the hope that it will be useful, but WITHOUT "
-"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
-"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License "
-"for more details."
+"The daemon that runs inside the libguestfs appliance and carries out actions."

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../src/guestfs.pod:2660
-msgid ""
-"You should have received a copy of the GNU Lesser General Public License "
-"along with this library; if not, write to the Free Software Foundation, "
-"Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA"
+#. type: =item
+#: ../src/guestfs.pod:2674
+msgid "C<df>"

 msgstr ""
 
 msgstr ""
 

-# type: =head2
-#. type: =head2
-#: ../src/guestfs-actions.pod:1
-msgid "guestfs_add_cdrom"
+#. type: textblock
+#: ../src/guestfs.pod:2676
+msgid "L<virt-df(1)> command and documentation."

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../src/guestfs-actions.pod:3
-#, no-wrap
-msgid ""
-" int\n"
-" guestfs_add_cdrom (guestfs_h *g,\n"
-"                    const char *filename);\n"
-"\n"
+#. type: =item
+#: ../src/guestfs.pod:2678
+msgid "C<examples>"

 msgstr ""
 
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:7 ../fish/guestfish-actions.pod:5
-msgid "This function adds a virtual CD-ROM disk image to the guest."
+#: ../src/guestfs.pod:2680
+msgid "C API example code."

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:9 ../fish/guestfish-actions.pod:7
-msgid "This is equivalent to the qemu parameter C<-cdrom filename>."
+#. type: =item
+#: ../src/guestfs.pod:2682
+msgid "C<fish>"

 msgstr ""
 
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:17
+#: ../src/guestfs.pod:2684

 msgid ""
 msgid ""

-"This call checks for the existence of C<filename>.  This stops you from "
-"specifying other types of drive which are supported by qemu such as C<nbd:> "
-"and C<http:> URLs.  To specify those, use the general C<guestfs_config> call "
-"instead."
+"L<guestfish(1)>, the command-line shell, and various shell scripts built on "
+"top such as L<virt-copy-in(1)>, L<virt-copy-out(1)>, L<virt-tar-in(1)>, "
+"L<virt-tar-out(1)>."
+msgstr ""
+
+#. type: =item
+#: ../src/guestfs.pod:2688
+msgid "C<fuse>"

 msgstr ""
 
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:24
+#: ../src/guestfs.pod:2690

 msgid ""
 msgid ""

-"If you just want to add an ISO file (often you use this as an efficient way "
-"to transfer large files into the guest), then you should probably use "
-"C<guestfs_add_drive_ro> instead."
+"L<guestmount(1)>, FUSE (userspace filesystem) built on top of libguestfs."

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:30 ../src/guestfs-actions.pod:134
-#: ../src/guestfs-actions.pod:195 ../src/guestfs-actions.pod:232
-#: ../src/guestfs-actions.pod:246 ../src/guestfs-actions.pod:267
-#: ../src/guestfs-actions.pod:287 ../src/guestfs-actions.pod:301
-#: ../src/guestfs-actions.pod:416 ../src/guestfs-actions.pod:436
-#: ../src/guestfs-actions.pod:450 ../src/guestfs-actions.pod:495
-#: ../src/guestfs-actions.pod:523 ../src/guestfs-actions.pod:541
-#: ../src/guestfs-actions.pod:608 ../src/guestfs-actions.pod:641
-#: ../src/guestfs-actions.pod:655 ../src/guestfs-actions.pod:670
-#: ../src/guestfs-actions.pod:769 ../src/guestfs-actions.pod:787
-#: ../src/guestfs-actions.pod:801 ../src/guestfs-actions.pod:815
-#: ../src/guestfs-actions.pod:976 ../src/guestfs-actions.pod:996
-#: ../src/guestfs-actions.pod:1014 ../src/guestfs-actions.pod:1098
-#: ../src/guestfs-actions.pod:1116 ../src/guestfs-actions.pod:1135
-#: ../src/guestfs-actions.pod:1149 ../src/guestfs-actions.pod:1169
-#: ../src/guestfs-actions.pod:1239 ../src/guestfs-actions.pod:1270
-#: ../src/guestfs-actions.pod:1295 ../src/guestfs-actions.pod:1332
-#: ../src/guestfs-actions.pod:1438 ../src/guestfs-actions.pod:1472
-#: ../src/guestfs-actions.pod:1690 ../src/guestfs-actions.pod:1712
-#: ../src/guestfs-actions.pod:1799 ../src/guestfs-actions.pod:2261
-#: ../src/guestfs-actions.pod:2405 ../src/guestfs-actions.pod:2466
-#: ../src/guestfs-actions.pod:2501 ../src/guestfs-actions.pod:3336
-#: ../src/guestfs-actions.pod:3351 ../src/guestfs-actions.pod:3371
-#: ../src/guestfs-actions.pod:3526 ../src/guestfs-actions.pod:3540
-#: ../src/guestfs-actions.pod:3553 ../src/guestfs-actions.pod:3567
-#: ../src/guestfs-actions.pod:3582 ../src/guestfs-actions.pod:3618
-#: ../src/guestfs-actions.pod:3690 ../src/guestfs-actions.pod:3710
-#: ../src/guestfs-actions.pod:3727 ../src/guestfs-actions.pod:3750
-#: ../src/guestfs-actions.pod:3773 ../src/guestfs-actions.pod:3805
-#: ../src/guestfs-actions.pod:3824 ../src/guestfs-actions.pod:3843
-#: ../src/guestfs-actions.pod:3878 ../src/guestfs-actions.pod:3890
-#: ../src/guestfs-actions.pod:3926 ../src/guestfs-actions.pod:3942
-#: ../src/guestfs-actions.pod:3955 ../src/guestfs-actions.pod:3970
-#: ../src/guestfs-actions.pod:3987 ../src/guestfs-actions.pod:4080
-#: ../src/guestfs-actions.pod:4100 ../src/guestfs-actions.pod:4113
-#: ../src/guestfs-actions.pod:4164 ../src/guestfs-actions.pod:4182
-#: ../src/guestfs-actions.pod:4200 ../src/guestfs-actions.pod:4216
-#: ../src/guestfs-actions.pod:4230 ../src/guestfs-actions.pod:4244
-#: ../src/guestfs-actions.pod:4261 ../src/guestfs-actions.pod:4276
-#: ../src/guestfs-actions.pod:4296 ../src/guestfs-actions.pod:4354
-#: ../src/guestfs-actions.pod:4427 ../src/guestfs-actions.pod:4458
-#: ../src/guestfs-actions.pod:4477 ../src/guestfs-actions.pod:4496
-#: ../src/guestfs-actions.pod:4508 ../src/guestfs-actions.pod:4525
-#: ../src/guestfs-actions.pod:4538 ../src/guestfs-actions.pod:4553
-#: ../src/guestfs-actions.pod:4568 ../src/guestfs-actions.pod:4603
-#: ../src/guestfs-actions.pod:4618 ../src/guestfs-actions.pod:4638
-#: ../src/guestfs-actions.pod:4652 ../src/guestfs-actions.pod:4669
-#: ../src/guestfs-actions.pod:4718 ../src/guestfs-actions.pod:4755
-#: ../src/guestfs-actions.pod:4769 ../src/guestfs-actions.pod:4797
-#: ../src/guestfs-actions.pod:4814 ../src/guestfs-actions.pod:4832
-#: ../src/guestfs-actions.pod:4966 ../src/guestfs-actions.pod:5023
-#: ../src/guestfs-actions.pod:5045 ../src/guestfs-actions.pod:5063
-#: ../src/guestfs-actions.pod:5095 ../src/guestfs-actions.pod:5161
-#: ../src/guestfs-actions.pod:5178 ../src/guestfs-actions.pod:5191
-#: ../src/guestfs-actions.pod:5205 ../src/guestfs-actions.pod:5494
-#: ../src/guestfs-actions.pod:5513 ../src/guestfs-actions.pod:5532
-#: ../src/guestfs-actions.pod:5544 ../src/guestfs-actions.pod:5556
-#: ../src/guestfs-actions.pod:5570 ../src/guestfs-actions.pod:5582
-#: ../src/guestfs-actions.pod:5596 ../src/guestfs-actions.pod:5612
-#: ../src/guestfs-actions.pod:5633 ../src/guestfs-actions.pod:5652
-#: ../src/guestfs-actions.pod:5671 ../src/guestfs-actions.pod:5701
-#: ../src/guestfs-actions.pod:5717 ../src/guestfs-actions.pod:5740
-#: ../src/guestfs-actions.pod:5758 ../src/guestfs-actions.pod:5777
-#: ../src/guestfs-actions.pod:5798 ../src/guestfs-actions.pod:5817
-#: ../src/guestfs-actions.pod:5834 ../src/guestfs-actions.pod:5862
-#: ../src/guestfs-actions.pod:5886 ../src/guestfs-actions.pod:5905
-#: ../src/guestfs-actions.pod:5929 ../src/guestfs-actions.pod:5944
-#: ../src/guestfs-actions.pod:5959 ../src/guestfs-actions.pod:5978
-#: ../src/guestfs-actions.pod:6015 ../src/guestfs-actions.pod:6038
-#: ../src/guestfs-actions.pod:6064 ../src/guestfs-actions.pod:6172
-#: ../src/guestfs-actions.pod:6293 ../src/guestfs-actions.pod:6305
-#: ../src/guestfs-actions.pod:6318 ../src/guestfs-actions.pod:6331
-#: ../src/guestfs-actions.pod:6353 ../src/guestfs-actions.pod:6366
-#: ../src/guestfs-actions.pod:6379 ../src/guestfs-actions.pod:6392
-#: ../src/guestfs-actions.pod:6407 ../src/guestfs-actions.pod:6466
-#: ../src/guestfs-actions.pod:6483 ../src/guestfs-actions.pod:6499
-#: ../src/guestfs-actions.pod:6515 ../src/guestfs-actions.pod:6532
-#: ../src/guestfs-actions.pod:6545 ../src/guestfs-actions.pod:6565
-#: ../src/guestfs-actions.pod:6601 ../src/guestfs-actions.pod:6615
-#: ../src/guestfs-actions.pod:6656 ../src/guestfs-actions.pod:6669
-#: ../src/guestfs-actions.pod:6687 ../src/guestfs-actions.pod:6721
-#: ../src/guestfs-actions.pod:6757 ../src/guestfs-actions.pod:6876
-#: ../src/guestfs-actions.pod:6894 ../src/guestfs-actions.pod:6908
-#: ../src/guestfs-actions.pod:6963 ../src/guestfs-actions.pod:6976
-#: ../src/guestfs-actions.pod:7021 ../src/guestfs-actions.pod:7054
-#: ../src/guestfs-actions.pod:7108 ../src/guestfs-actions.pod:7134
-#: ../src/guestfs-actions.pod:7200 ../src/guestfs-actions.pod:7219
-#: ../src/guestfs-actions.pod:7248
-msgid "This function returns 0 on success or -1 on error."
+#. type: =item
+#: ../src/guestfs.pod:2692
+msgid "C<generator>"

 msgstr ""
 
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:32 ../src/guestfs-actions.pod:248
-#: ../src/guestfs-actions.pod:269 ../fish/guestfish-actions.pod:28
-#: ../fish/guestfish-actions.pod:158 ../fish/guestfish-actions.pod:172
+#: ../src/guestfs.pod:2694

 msgid ""
 msgid ""

-"This function is deprecated.  In new code, use the C<add_drive_opts> call "
-"instead."
+"The crucially important generator, used to automatically generate large "
+"amounts of boilerplate C code for things like RPC and bindings."

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:35 ../src/guestfs-actions.pod:251
-#: ../src/guestfs-actions.pod:272 ../src/guestfs-actions.pod:1443
-#: ../src/guestfs-actions.pod:1939 ../src/guestfs-actions.pod:1960
-#: ../src/guestfs-actions.pod:4301 ../src/guestfs-actions.pod:7142
-#: ../src/guestfs-actions.pod:7311 ../fish/guestfish-actions.pod:31
-#: ../fish/guestfish-actions.pod:161 ../fish/guestfish-actions.pod:175
-#: ../fish/guestfish-actions.pod:956 ../fish/guestfish-actions.pod:1319
-#: ../fish/guestfish-actions.pod:1333 ../fish/guestfish-actions.pod:2908
-#: ../fish/guestfish-actions.pod:4762 ../fish/guestfish-actions.pod:4859
-msgid ""
-"Deprecated functions will not be removed from the API, but the fact that "
-"they are deprecated indicates that there are problems with correct use of "
-"these functions."
+#. type: =item
+#: ../src/guestfs.pod:2697
+msgid "C<images>"

 msgstr ""
 
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:39 ../src/guestfs-actions.pod:136
-#: ../src/guestfs-actions.pod:1100 ../src/guestfs-actions.pod:1911
-#: ../src/guestfs-actions.pod:2009 ../src/guestfs-actions.pod:2112
-#: ../src/guestfs-actions.pod:3338 ../src/guestfs-actions.pod:3353
-#: ../src/guestfs-actions.pod:4605 ../src/guestfs-actions.pod:5719
-#: ../src/guestfs-actions.pod:5836 ../src/guestfs-actions.pod:5946
-#: ../src/guestfs-actions.pod:6409 ../src/guestfs-actions.pod:6534
-#: ../src/guestfs-actions.pod:7056
-msgid "(Added in 0.3)"
+#: ../src/guestfs.pod:2699
+msgid "Files used by the test suite."

 msgstr ""
 
 msgstr ""
 

-# type: =head2
-#. type: =head2
-#: ../src/guestfs-actions.pod:41
-msgid "guestfs_add_domain"
+#. type: textblock
+#: ../src/guestfs.pod:2701
+msgid "Some \"phony\" guest images which we test against."

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../src/guestfs-actions.pod:43
-#, no-wrap
-msgid ""
-" int\n"
-" guestfs_add_domain (guestfs_h *g,\n"
-"                     const char *dom,\n"
-"                     ...);\n"
-"\n"
+#. type: =item
+#: ../src/guestfs.pod:2703
+msgid "C<inspector>"

 msgstr ""
 
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:48 ../src/guestfs-actions.pod:145
-#: ../src/guestfs-actions.pod:4315
-msgid ""
-"You may supply a list of optional arguments to this call.  Use zero or more "
-"of the following pairs of parameters, and terminate the list with C<-1> on "
-"its own.  See L</CALLS WITH OPTIONAL ARGUMENTS>."
+#: ../src/guestfs.pod:2705
+msgid "L<virt-inspector(1)>, the virtual machine image inspector."

 msgstr ""
 
 msgstr ""
 

-#. type: verbatim
-#: ../src/guestfs-actions.pod:53
-#, no-wrap
-msgid ""
-" GUESTFS_ADD_DOMAIN_LIBVIRTURI, const char *libvirturi,\n"
-" GUESTFS_ADD_DOMAIN_READONLY, int readonly,\n"
-" GUESTFS_ADD_DOMAIN_IFACE, const char *iface,\n"
-" GUESTFS_ADD_DOMAIN_LIVE, int live,\n"
-"\n"
+#. type: =item
+#: ../src/guestfs.pod:2707
+msgid "C<logo>"

 msgstr ""
 
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:58
-msgid ""
-"This function adds the disk(s) attached to the named libvirt domain C<dom>.  "
-"It works by connecting to libvirt, requesting the domain and domain XML from "
-"libvirt, parsing it for disks, and calling C<guestfs_add_drive_opts> on each "
-"one."
+#: ../src/guestfs.pod:2709
+msgid "Logo used on the website.  The fish is called Arthur by the way."

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:63 ../fish/guestfish-actions.pod:46
-msgid ""
-"The number of disks added is returned.  This operation is atomic: if an "
-"error is returned, then no disks are added."
+#. type: =item
+#: ../src/guestfs.pod:2711
+msgid "C<m4>"

 msgstr ""
 
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:66 ../fish/guestfish-actions.pod:49
-msgid ""
-"This function does some minimal checks to make sure the libvirt domain is "
-"not running (unless C<readonly> is true).  In a future version we will try "
-"to acquire the libvirt lock on each disk."
+#: ../src/guestfs.pod:2713
+msgid "M4 macros used by autoconf."

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:70 ../fish/guestfish-actions.pod:53
-msgid ""
-"Disks must be accessible locally.  This often means that adding disks from a "
-"remote libvirt connection (see L<http://libvirt.org/remote.html>)  will fail "
-"unless those disks are accessible via the same device path locally too."
+#. type: =item
+#: ../src/guestfs.pod:2715
+msgid "C<po>"

 msgstr ""
 
 #. type: textblock
 msgstr ""
 
 #. type: textblock

-#: ../src/guestfs-actions.pod:75 ../fish/guestfish-actions.pod:58
-msgid ""
-"The optional C<libvirturi> parameter sets the libvirt URI (see L<http://"
-"libvirt.org/uri.html>).  If this is not set then we connect to the default "
-"libvirt URI (or one set through an environment variable, see the libvirt "
-"documentation for full details)."
+#: ../src/guestfs.pod:2717
+msgid "Translations of simple gettext strings."

 msgstr ""
 
 msgstr ""
 

-#. type: textblock
-#: ../src/guestfs-actions.pod:81 ../fish/guestfish-actions.pod:64
-msgid ""
-"The optional C<live> flag controls whether this call will try to connect to "
-"a running virtual machine C<guestfsd> process if it sees a suitable "
-"E<lt>channelE<gt> element in the libvirt XML definition.  The default (if "
-"the flag is omitted) is never to try.  See L<guestfs(3)/ATTACHING TO RUNNING "
-"DAEMONS> for more information."
+#. type: =item
+#: ../src/guestfs.pod:2719
+msgid "C<po-docs>"

 msgstr ""
 
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:88
+#: ../src/guestfs.pod:2721

 msgid ""
 msgid ""

-"The other optional parameters are passed directly through to "
-"C<guestfs_add_drive_opts>."
+"The build infrastructure and PO files for translations of manpages and POD "
+"files.  Eventually this will be combined with the C<po> directory, but that "
+"is rather complicated."
+msgstr ""
+
+#. type: =item
+#: ../src/guestfs.pod:2725
+msgid "C<regressions>"

 msgstr ""
 
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:91 ../src/guestfs-actions.pod:344
-#: ../src/guestfs-actions.pod:509 ../src/guestfs-actions.pod:687
-#: ../src/guestfs-actions.pod:718 ../src/guestfs-actions.pod:736
-#: ../src/guestfs-actions.pod:755 ../src/guestfs-actions.pod:1315
-#: ../src/guestfs-actions.pod:1669 ../src/guestfs-actions.pod:1872
-#: ../src/guestfs-actions.pod:1981 ../src/guestfs-actions.pod:2021
-#: ../src/guestfs-actions.pod:2076 ../src/guestfs-actions.pod:2099
-#: ../src/guestfs-actions.pod:2392 ../src/guestfs-actions.pod:2719
-#: ../src/guestfs-actions.pod:2740 ../src/guestfs-actions.pod:4741
-#: ../src/guestfs-actions.pod:4869 ../src/guestfs-actions.pod:5275
-#: ../src/guestfs-actions.pod:5301 ../src/guestfs-actions.pod:6642
-#: ../src/guestfs-actions.pod:7067 ../src/guestfs-actions.pod:7080
-#: ../src/guestfs-actions.pod:7093
-msgid "On error this function returns -1."
+#: ../src/guestfs.pod:2727
+msgid "Regression tests."
+msgstr ""
+
+#. type: =item
+#: ../src/guestfs.pod:2729
+msgid "C<rescue>"

 msgstr ""
 
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:93
-msgid "(Added in 1.7.4)"
+#: ../src/guestfs.pod:2731
+msgid "L<virt-rescue(1)> command and documentation."

 msgstr ""
 
 msgstr ""
 

-# type: =head2
-#. type: =head2
-#: ../src/guestfs-actions.pod:95
-msgid "guestfs_add_domain_va"
+#. type: =item
+#: ../src/guestfs.pod:2733
+msgid "C<src>"

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../src/guestfs-actions.pod:97
-#, no-wrap
-msgid ""
-" int\n"
-" guestfs_add_domain_va (guestfs_h *g,\n"
-"                        const char *dom,\n"
-"                        va_list args);\n"
-"\n"
+#. type: textblock
+#: ../src/guestfs.pod:2735
+msgid "Source code to the C library."

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:102
-msgid "This is the \"va_list variant\" of L</guestfs_add_domain>."
+#. type: =item
+#: ../src/guestfs.pod:2737
+msgid "C<tools>"

 msgstr ""
 
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:104 ../src/guestfs-actions.pod:115
-#: ../src/guestfs-actions.pod:208 ../src/guestfs-actions.pod:219
-#: ../src/guestfs-actions.pod:4368 ../src/guestfs-actions.pod:4380
-msgid "See L</CALLS WITH OPTIONAL ARGUMENTS>."
+#: ../src/guestfs.pod:2739
+msgid "Command line tools written in Perl (L<virt-resize(1)> and many others)."

 msgstr ""
 
 msgstr ""
 

-# type: =head2
-#. type: =head2
-#: ../src/guestfs-actions.pod:106
-msgid "guestfs_add_domain_argv"
+#. type: =item
+#: ../src/guestfs.pod:2741
+msgid "C<test-tool>"

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../src/guestfs-actions.pod:108
-#, no-wrap
+#. type: textblock
+#: ../src/guestfs.pod:2743

 msgid ""
 msgid ""

-" int\n"
-" guestfs_add_domain_argv (guestfs_h *g,\n"
-"                          const char *dom,\n"
-"                          const struct guestfs_add_domain_argv *optargs);\n"
-"\n"
+"Test tool for end users to test if their qemu/kernel combination will work "
+"with libguestfs."
+msgstr ""
+
+#. type: =item
+#: ../src/guestfs.pod:2746
+msgid "C<csharp>"
+msgstr ""
+
+#. type: =item
+#: ../src/guestfs.pod:2748
+msgid "C<haskell>"
+msgstr ""
+
+#. type: =item
+#: ../src/guestfs.pod:2750
+msgid "C<java>"
+msgstr ""
+
+#. type: =item
+#: ../src/guestfs.pod:2752
+msgid "C<ocaml>"
+msgstr ""
+
+#. type: =item
+#: ../src/guestfs.pod:2754
+msgid "C<php>"
+msgstr ""
+
+#. type: =item
+#: ../src/guestfs.pod:2756
+msgid "C<perl>"
+msgstr ""
+
+#. type: =item
+#: ../src/guestfs.pod:2758
+msgid "C<python>"
+msgstr ""
+
+#. type: =item
+#: ../src/guestfs.pod:2760
+msgid "C<ruby>"

 msgstr ""
 
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:113
-msgid "This is the \"argv variant\" of L</guestfs_add_domain>."
+#: ../src/guestfs.pod:2762
+msgid "Language bindings."
+msgstr ""
+
+#. type: =head1
+#: ../src/guestfs.pod:2766
+msgid "LIMITS"

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:117
-msgid "guestfs_add_drive"
+#: ../src/guestfs.pod:2768
+msgid "PROTOCOL LIMITS"

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../src/guestfs-actions.pod:119
-#, no-wrap
+# type: textblock
+#. type: textblock
+#: ../src/guestfs.pod:2770

 msgid ""
 msgid ""

-" int\n"
-" guestfs_add_drive (guestfs_h *g,\n"
-"                    const char *filename);\n"
-"\n"
+"Internally libguestfs uses a message-based protocol to pass API calls and "
+"their responses to and from a small \"appliance\" (see L</INTERNALS> for "
+"plenty more detail about this).  The maximum message size used by the "
+"protocol is slightly less than 4 MB.  For some API calls you may need to be "
+"aware of this limit.  The API calls which may be affected are individually "
+"documented, with a link back to this section of the documentation."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:123
+#: ../src/guestfs.pod:2778

 msgid ""
 msgid ""

-"This function is the equivalent of calling C<guestfs_add_drive_opts> with no "
-"optional parameters, so the disk is added writable, with the format being "
-"detected automatically."
+"A simple call such as L</guestfs_cat> returns its result (the file data) in "
+"a simple string.  Because this string is at some point internally encoded as "
+"a message, the maximum size that it can return is slightly under 4 MB.  If "
+"the requested file is larger than this then you will get an error."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:127
+#: ../src/guestfs.pod:2784

 msgid ""
 msgid ""

-"Automatic detection of the format opens you up to a potential security hole "
-"when dealing with untrusted raw-format images.  See CVE-2010-3851 and "
-"RHBZ#642934.  Specifying the format closes this security hole.  Therefore "
-"you should think about replacing calls to this function with calls to "
-"C<guestfs_add_drive_opts>, and specifying the format."
+"In order to transfer large files into and out of the guest filesystem, you "
+"need to use particular calls that support this.  The sections L</UPLOADING> "
+"and L</DOWNLOADING> document how to do this."
+msgstr ""
+
+# type: textblock
+#. type: textblock
+#: ../src/guestfs.pod:2788
+msgid ""
+"You might also consider mounting the disk image using our FUSE filesystem "
+"support (L<guestmount(1)>)."

 msgstr ""
 
 msgstr ""
 

-# type: =head2

 #. type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:138
-msgid "guestfs_add_drive_opts"
+#: ../src/guestfs.pod:2791
+msgid "MAXIMUM NUMBER OF DISKS"

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../src/guestfs-actions.pod:140
-#, no-wrap
-msgid ""
-" int\n"
-" guestfs_add_drive_opts (guestfs_h *g,\n"
-"                         const char *filename,\n"
-"                         ...);\n"
-"\n"
+#. type: textblock
+#: ../src/guestfs.pod:2793
+msgid "When using virtio disks (the default) the current limit is B<25> disks."

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../src/guestfs-actions.pod:150
-#, no-wrap
+#. type: textblock
+#: ../src/guestfs.pod:2796

 msgid ""
 msgid ""

-" GUESTFS_ADD_DRIVE_OPTS_READONLY, int readonly,\n"
-" GUESTFS_ADD_DRIVE_OPTS_FORMAT, const char *format,\n"
-" GUESTFS_ADD_DRIVE_OPTS_IFACE, const char *iface,\n"
-"\n"
+"Virtio itself consumes 1 virtual PCI slot per disk, and PCI is limited to 31 "
+"slots.  However febootstrap only understands disks with names C</dev/vda> "
+"through C</dev/vdz> (26 letters) and it reserves one disk for its own "
+"purposes."

 msgstr ""
 
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:154 ../fish/guestfish-actions.pod:97
+#: ../src/guestfs.pod:2801

 msgid ""
 msgid ""

-"This function adds a virtual machine disk image C<filename> to libguestfs.  "
-"The first time you call this function, the disk appears as C</dev/sda>, the "
-"second time as C</dev/sdb>, and so on."
+"We are working to substantially raise this limit in future versions but it "
+"requires complex changes to qemu."

 msgstr ""
 
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:159 ../fish/guestfish-actions.pod:102
+#: ../src/guestfs.pod:2804

 msgid ""
 msgid ""

-"You don't necessarily need to be root when using libguestfs.  However you "
-"obviously do need sufficient permissions to access the filename for whatever "
-"operations you want to perform (ie. read access if you just want to read the "
-"image or write access if you want to modify the image)."
+"In future versions of libguestfs it should also be possible to \"hot plug\" "
+"disks (add and remove disks after calling L</guestfs_launch>).  This also "
+"requires changes to qemu."

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:165 ../fish/guestfish-actions.pod:108
-msgid "This call checks that C<filename> exists."
+#. type: =head2
+#: ../src/guestfs.pod:2808
+msgid "MAXIMUM NUMBER OF PARTITIONS PER DISK"

 msgstr ""
 
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:167 ../src/guestfs-actions.pod:4326
-#: ../fish/guestfish-actions.pod:110 ../fish/guestfish-actions.pod:2919
-msgid "The optional arguments are:"
+#: ../src/guestfs.pod:2810
+msgid "Virtio limits the maximum number of partitions per disk to B<15>."

 msgstr ""
 
 msgstr ""
 

-# type: =item
-#. type: =item
-#: ../src/guestfs-actions.pod:171 ../fish/guestfish-actions.pod:114
-msgid "C<readonly>"
+#. type: textblock
+#: ../src/guestfs.pod:2812
+msgid ""
+"This is because it reserves 4 bits for the minor device number (thus C</dev/"
+"vda>, and C</dev/vda1> through C</dev/vda15>)."

 msgstr ""
 
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:173 ../fish/guestfish-actions.pod:116
+#: ../src/guestfs.pod:2815

 msgid ""
 msgid ""

-"If true then the image is treated as read-only.  Writes are still allowed, "
-"but they are stored in a temporary snapshot overlay which is discarded at "
-"the end.  The disk that you add is not modified."
+"If you attach a disk with more than 15 partitions, the extra partitions are "
+"ignored by libguestfs."

 msgstr ""
 
 msgstr ""
 

-# type: =item
-#. type: =item
-#: ../src/guestfs-actions.pod:177 ../fish/guestfish-actions.pod:120
-msgid "C<format>"
+#. type: =head2
+#: ../src/guestfs.pod:2818
+msgid "MAXIMUM SIZE OF A DISK"

 msgstr ""
 
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:179
-msgid ""
-"This forces the image format.  If you omit this (or use C<guestfs_add_drive> "
-"or C<guestfs_add_drive_ro>) then the format is automatically detected.  "
-"Possible formats include C<raw> and C<qcow2>."
+#: ../src/guestfs.pod:2820
+msgid "Probably the limit is between 2**63-1 and 2**64-1 bytes."

 msgstr ""
 
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:183 ../fish/guestfish-actions.pod:126
+#: ../src/guestfs.pod:2822

 msgid ""
 msgid ""

-"Automatic detection of the format opens you up to a potential security hole "
-"when dealing with untrusted raw-format images.  See CVE-2010-3851 and "
-"RHBZ#642934.  Specifying the format closes this security hole."
-msgstr ""
-
-# type: =item
-#. type: =item
-#: ../src/guestfs-actions.pod:188 ../fish/guestfish-actions.pod:131
-msgid "C<iface>"
+"We have tested block devices up to 1 exabyte (2**60 or "
+"1,152,921,504,606,846,976 bytes) using sparse files backed by an XFS host "
+"filesystem."

 msgstr ""
 
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:190
+#: ../src/guestfs.pod:2826

 msgid ""
 msgid ""

-"This rarely-used option lets you emulate the behaviour of the deprecated "
-"C<guestfs_add_drive_with_if> call (q.v.)"
+"Although libguestfs probably does not impose any limit, the underlying host "
+"storage will.  If you store disk images on a host ext4 filesystem, then the "
+"maximum size will be limited by the maximum ext4 file size (currently 16 "
+"TB).  If you store disk images as host logical volumes then you are limited "
+"by the maximum size of an LV."

 msgstr ""
 
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:197
-msgid "(Added in 1.5.23)"
+#: ../src/guestfs.pod:2832
+msgid ""
+"For the hugest disk image files, we recommend using XFS on the host for "
+"storage."

 msgstr ""
 
 msgstr ""
 

-# type: =head2

 #. type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:199
-msgid "guestfs_add_drive_opts_va"
+#: ../src/guestfs.pod:2835
+msgid "MAXIMUM SIZE OF A PARTITION"

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../src/guestfs-actions.pod:201
-#, no-wrap
+#. type: textblock
+#: ../src/guestfs.pod:2837

 msgid ""
 msgid ""

-" int\n"
-" guestfs_add_drive_opts_va (guestfs_h *g,\n"
-"                            const char *filename,\n"
-"                            va_list args);\n"
-"\n"
+"The MBR (ie. classic MS-DOS) partitioning scheme uses 32 bit sector "
+"numbers.  Assuming a 512 byte sector size, this means that MBR cannot "
+"address a partition located beyond 2 TB on the disk."

 msgstr ""
 
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:206
-msgid "This is the \"va_list variant\" of L</guestfs_add_drive_opts>."
+#: ../src/guestfs.pod:2841
+msgid ""
+"It is recommended that you use GPT partitions on disks which are larger than "
+"this size.  GPT uses 64 bit sector numbers and so can address partitions "
+"which are theoretically larger than the largest disk we could support."

 msgstr ""
 
 msgstr ""
 

-# type: =head2

 #. type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:210
-msgid "guestfs_add_drive_opts_argv"
+#: ../src/guestfs.pod:2846
+msgid "MAXIMUM SIZE OF A FILESYSTEM, FILES, DIRECTORIES"

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../src/guestfs-actions.pod:212
-#, no-wrap
+#. type: textblock
+#: ../src/guestfs.pod:2848

 msgid ""
 msgid ""

-" int\n"
-" guestfs_add_drive_opts_argv (guestfs_h *g,\n"
-"                              const char *filename,\n"
-"                              const struct guestfs_add_drive_opts_argv *optargs);\n"
-"\n"
+"This depends on the filesystem type.  libguestfs itself does not impose any "
+"known limit.  Consult Wikipedia or the filesystem documentation to find out "
+"what these limits are."
+msgstr ""
+
+#. type: =head2
+#: ../src/guestfs.pod:2852
+msgid "MAXIMUM UPLOAD AND DOWNLOAD"

 msgstr ""
 
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:217
-msgid "This is the \"argv variant\" of L</guestfs_add_drive_opts>."
+#: ../src/guestfs.pod:2854
+msgid ""
+"The API functions L</guestfs_upload>, L</guestfs_download>, L</"
+"guestfs_tar_in>, L</guestfs_tar_out> and the like allow unlimited sized "
+"uploads and downloads."

 msgstr ""
 
 msgstr ""
 

-# type: =head2

 #. type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:221
-msgid "guestfs_add_drive_ro"
+#: ../src/guestfs.pod:2858
+msgid "INSPECTION LIMITS"

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../src/guestfs-actions.pod:223
-#, no-wrap
+#. type: textblock
+#: ../src/guestfs.pod:2860

 msgid ""
 msgid ""

-" int\n"
-" guestfs_add_drive_ro (guestfs_h *g,\n"
-"                       const char *filename);\n"
-"\n"
+"The inspection code has several arbitrary limits on things like the size of "
+"Windows Registry hive it will read, and the length of product name.  These "
+"are intended to stop a malicious guest from consuming arbitrary amounts of "
+"memory and disk space on the host, and should not be reached in practice.  "
+"See the source code for more information."

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:227
-msgid ""
-"This function is the equivalent of calling C<guestfs_add_drive_opts> with "
-"the optional parameter C<GUESTFS_ADD_DRIVE_OPTS_READONLY> set to 1, so the "
-"disk is added read-only, with the format being detected automatically."
+# type: =head1
+#. type: =head1
+#: ../src/guestfs.pod:2866 ../fish/guestfish.pod:1015
+#: ../test-tool/libguestfs-test-tool.pod:82 ../tools/virt-edit.pl:476
+msgid "ENVIRONMENT VARIABLES"

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:234
-msgid "(Added in 1.0.38)"
+# type: =item
+#. type: =item
+#: ../src/guestfs.pod:2870 ../fish/guestfish.pod:1041
+msgid "LIBGUESTFS_APPEND"

 msgstr ""
 
 msgstr ""
 

-# type: =head2
-#. type: =head2
-#: ../src/guestfs-actions.pod:236
-msgid "guestfs_add_drive_ro_with_if"
+# type: textblock
+#. type: textblock
+#: ../src/guestfs.pod:2872 ../fish/guestfish.pod:1043
+msgid "Pass additional options to the guest kernel."

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../src/guestfs-actions.pod:238
-#, no-wrap
-msgid ""
-" int\n"
-" guestfs_add_drive_ro_with_if (guestfs_h *g,\n"
-"                               const char *filename,\n"
-"                               const char *iface);\n"
-"\n"
+# type: =item
+#. type: =item
+#: ../src/guestfs.pod:2874 ../fish/guestfish.pod:1045
+msgid "LIBGUESTFS_DEBUG"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:243
+#: ../src/guestfs.pod:2876

 msgid ""
 msgid ""

-"This is the same as C<guestfs_add_drive_ro> but it allows you to specify the "
-"QEMU interface emulation to use at run time."
+"Set C<LIBGUESTFS_DEBUG=1> to enable verbose messages.  This has the same "
+"effect as calling C<guestfs_set_verbose (g, 1)>."

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:255 ../src/guestfs-actions.pod:276
-#: ../src/guestfs-actions.pod:2351
-msgid "(Added in 1.0.84)"
+# type: =item
+#. type: =item
+#: ../src/guestfs.pod:2879 ../fish/guestfish.pod:1050
+msgid "LIBGUESTFS_MEMSIZE"

 msgstr ""
 
 msgstr ""
 

-# type: =head2
-#. type: =head2
-#: ../src/guestfs-actions.pod:257
-msgid "guestfs_add_drive_with_if"
+# type: textblock
+#. type: textblock
+#: ../src/guestfs.pod:2881 ../fish/guestfish.pod:1052
+msgid ""
+"Set the memory allocated to the qemu process, in megabytes.  For example:"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:259
+#: ../src/guestfs.pod:2884 ../fish/guestfish.pod:1055

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" int\n"
-" guestfs_add_drive_with_if (guestfs_h *g,\n"
-"                            const char *filename,\n"
-"                            const char *iface);\n"
+" LIBGUESTFS_MEMSIZE=700\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:264
-msgid ""
-"This is the same as C<guestfs_add_drive> but it allows you to specify the "
-"QEMU interface emulation to use at run time."
+# type: =item
+#. type: =item
+#: ../src/guestfs.pod:2886 ../fish/guestfish.pod:1057
+msgid "LIBGUESTFS_PATH"

 msgstr ""
 
 msgstr ""
 

-# type: =head2
-#. type: =head2
-#: ../src/guestfs-actions.pod:278
-msgid "guestfs_aug_clear"
+#. type: textblock
+#: ../src/guestfs.pod:2888
+msgid ""
+"Set the path that libguestfs uses to search for a supermin appliance.  See "
+"the discussion of paths in section L</PATH> above."

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../src/guestfs-actions.pod:280
-#, no-wrap
-msgid ""
-" int\n"
-" guestfs_aug_clear (guestfs_h *g,\n"
-"                    const char *augpath);\n"
-"\n"
+# type: =item
+#. type: =item
+#: ../src/guestfs.pod:2891 ../fish/guestfish.pod:1062
+msgid "LIBGUESTFS_QEMU"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:284 ../fish/guestfish-actions.pod:183
+#: ../src/guestfs.pod:2893 ../fish/guestfish.pod:1064

 msgid ""
 msgid ""

-"Set the value associated with C<path> to C<NULL>.  This is the same as the "
-"L<augtool(1)> C<clear> command."
+"Set the default qemu binary that libguestfs uses.  If not set, then the qemu "
+"which was found at compile time by the configure script is used."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:289 ../src/guestfs-actions.pod:2101
-msgid "(Added in 1.3.4)"
+#: ../src/guestfs.pod:2897
+msgid "See also L</QEMU WRAPPERS> above."

 msgstr ""
 
 msgstr ""
 

-# type: =head2
-#. type: =head2
-#: ../src/guestfs-actions.pod:291
-msgid "guestfs_aug_close"
+# type: =item
+#. type: =item
+#: ../src/guestfs.pod:2899 ../fish/guestfish.pod:1068
+msgid "LIBGUESTFS_TRACE"

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../src/guestfs-actions.pod:293
-#, no-wrap
+# type: textblock
+#. type: textblock
+#: ../src/guestfs.pod:2901

 msgid ""
 msgid ""

-" int\n"
-" guestfs_aug_close (guestfs_h *g);\n"
-"\n"
+"Set C<LIBGUESTFS_TRACE=1> to enable command traces.  This has the same "
+"effect as calling C<guestfs_set_trace (g, 1)>."
+msgstr ""
+
+# type: =item
+#. type: =item
+#: ../src/guestfs.pod:2904 ../fish/guestfish.pod:1077
+msgid "TMPDIR"

 msgstr ""
 
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:296
+#: ../src/guestfs.pod:2906 ../fish/guestfish.pod:1079

 msgid ""
 msgid ""

-"Close the current Augeas handle and free up any resources used by it.  After "
-"calling this, you have to call C<guestfs_aug_init> again before you can use "
-"any other Augeas functions."
+"Location of temporary directory, defaults to C</tmp> except for the cached "
+"supermin appliance which defaults to C</var/tmp>."

 msgstr ""
 
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:303 ../src/guestfs-actions.pod:328
-#: ../src/guestfs-actions.pod:346 ../src/guestfs-actions.pod:360
-#: ../src/guestfs-actions.pod:418 ../src/guestfs-actions.pod:438
-#: ../src/guestfs-actions.pod:452 ../src/guestfs-actions.pod:483
-#: ../src/guestfs-actions.pod:497 ../src/guestfs-actions.pod:511
-#: ../src/guestfs-actions.pod:525 ../src/guestfs-actions.pod:543
-#: ../src/guestfs-actions.pod:5352
-msgid "(Added in 0.7)"
+#: ../src/guestfs.pod:2909 ../fish/guestfish.pod:1082
+msgid ""
+"If libguestfs was compiled to use the supermin appliance then the real "
+"appliance is cached in this directory, shared between all handles belonging "
+"to the same EUID.  You can use C<$TMPDIR> to configure another directory to "
+"use in case C</var/tmp> is not large enough."

 msgstr ""
 
 msgstr ""
 

-# type: =head2
-#. type: =head2
-#: ../src/guestfs-actions.pod:305
-msgid "guestfs_aug_defnode"
+# type: =head1
+#. type: =head1
+#: ../src/guestfs.pod:2917 ../fish/guestfish.pod:1149
+#: ../test-tool/libguestfs-test-tool.pod:87 ../fuse/guestmount.pod:277
+#: ../tools/virt-edit.pl:496 ../tools/virt-win-reg.pl:572
+#: ../tools/virt-list-filesystems.pl:189 ../tools/virt-tar.pl:286
+#: ../tools/virt-make-fs.pl:539 ../tools/virt-list-partitions.pl:257
+msgid "SEE ALSO"

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../src/guestfs-actions.pod:307
-#, no-wrap
+#. type: textblock
+#: ../src/guestfs.pod:2919

 msgid ""
 msgid ""

-" struct guestfs_int_bool *\n"
-" guestfs_aug_defnode (guestfs_h *g,\n"
-"                      const char *name,\n"
-"                      const char *expr,\n"
-"                      const char *val);\n"
-"\n"
+"L<guestfs-examples(3)>, L<guestfs-ocaml(3)>, L<guestfs-perl(3)>, L<guestfs-"
+"python(3)>, L<guestfs-ruby(3)>, L<guestfish(1)>, L<guestmount(1)>, L<virt-cat"
+"(1)>, L<virt-copy-in(1)>, L<virt-copy-out(1)>, L<virt-df(1)>, L<virt-edit(1)"
+">, L<virt-filesystems(1)>, L<virt-inspector(1)>, L<virt-list-filesystems(1)"
+">, L<virt-list-partitions(1)>, L<virt-ls(1)>, L<virt-make-fs(1)>, L<virt-"
+"rescue(1)>, L<virt-tar(1)>, L<virt-tar-in(1)>, L<virt-tar-out(1)>, L<virt-"
+"win-reg(1)>, L<qemu(1)>, L<febootstrap(1)>, L<hivex(3)>, L<http://libguestfs."
+"org/>."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:313 ../fish/guestfish-actions.pod:199
+#: ../src/guestfs.pod:2947

 msgid ""
 msgid ""

-"Defines a variable C<name> whose value is the result of evaluating C<expr>."
+"Tools with a similar purpose: L<fdisk(8)>, L<parted(8)>, L<kpartx(8)>, L<lvm"
+"(8)>, L<disktype(1)>."

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:316
-msgid ""
-"If C<expr> evaluates to an empty nodeset, a node is created, equivalent to "
-"calling C<guestfs_aug_set> C<expr>, C<value>.  C<name> will be the nodeset "
-"containing that single node."
+# type: =head1
+#. type: =head1
+#: ../src/guestfs.pod:2954 ../tools/virt-win-reg.pl:587
+#: ../tools/virt-make-fs.pl:553
+msgid "BUGS"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:320 ../fish/guestfish-actions.pod:206
-msgid ""
-"On success this returns a pair containing the number of nodes in the "
-"nodeset, and a boolean flag if a node was created."
+#: ../src/guestfs.pod:2956
+msgid "To get a list of bugs against libguestfs use this link:"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:324
+#: ../src/guestfs.pod:2958

 msgid ""
 msgid ""

-"This function returns a C<struct guestfs_int_bool *>, or NULL if there was "
-"an error.  I<The caller must call C<guestfs_free_int_bool> after use>."
+"L<https://bugzilla.redhat.com/buglist.cgi?"
+"component=libguestfs&product=Virtualization+Tools>"

 msgstr ""
 
 msgstr ""
 

-# type: =head2
-#. type: =head2
-#: ../src/guestfs-actions.pod:330
-msgid "guestfs_aug_defvar"
+# type: textblock
+#. type: textblock
+#: ../src/guestfs.pod:2960
+msgid "To report a new bug against libguestfs use this link:"

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../src/guestfs-actions.pod:332
-#, no-wrap
+# type: textblock
+#. type: textblock
+#: ../src/guestfs.pod:2962

 msgid ""
 msgid ""

-" int\n"
-" guestfs_aug_defvar (guestfs_h *g,\n"
-"                     const char *name,\n"
-"                     const char *expr);\n"
-"\n"
+"L<https://bugzilla.redhat.com/enter_bug.cgi?"
+"component=libguestfs&product=Virtualization+Tools>"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:337 ../fish/guestfish-actions.pod:214
-msgid ""
-"Defines an Augeas variable C<name> whose value is the result of evaluating "
-"C<expr>.  If C<expr> is NULL, then C<name> is undefined."
+#: ../src/guestfs.pod:2964
+msgid "When reporting a bug, please check:"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:341 ../fish/guestfish-actions.pod:218
-msgid ""
-"On success this returns the number of nodes in C<expr>, or C<0> if C<expr> "
-"evaluates to something which is not a nodeset."
+#: ../src/guestfs.pod:2970
+msgid "That the bug hasn't been reported already."

 msgstr ""
 
 msgstr ""
 

-# type: =head2
-#. type: =head2
-#: ../src/guestfs-actions.pod:348
-msgid "guestfs_aug_get"
+# type: textblock
+#. type: textblock
+#: ../src/guestfs.pod:2974
+msgid "That you are testing a recent version."

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../src/guestfs-actions.pod:350
-#, no-wrap
-msgid ""
-" char *\n"
-" guestfs_aug_get (guestfs_h *g,\n"
-"                  const char *augpath);\n"
-"\n"
+# type: textblock
+#. type: textblock
+#: ../src/guestfs.pod:2978
+msgid "Describe the bug accurately, and give a way to reproduce it."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:354 ../fish/guestfish-actions.pod:225
+#: ../src/guestfs.pod:2982

 msgid ""
 msgid ""

-"Look up the value associated with C<path>.  If C<path> matches exactly one "
-"node, the C<value> is returned."
+"Run libguestfs-test-tool and paste the B<complete, unedited> output into the "
+"bug report."
+msgstr ""
+
+# type: =head1
+#. type: =head1
+#: ../src/guestfs.pod:2987 ../fish/guestfish.pod:1172
+#: ../test-tool/libguestfs-test-tool.pod:93 ../fuse/guestmount.pod:288
+msgid "AUTHORS"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:357 ../src/guestfs-actions.pod:857
-#: ../src/guestfs-actions.pod:875 ../src/guestfs-actions.pod:935
-#: ../src/guestfs-actions.pod:951 ../src/guestfs-actions.pod:1054
-#: ../src/guestfs-actions.pod:1184 ../src/guestfs-actions.pod:1201
-#: ../src/guestfs-actions.pod:1220 ../src/guestfs-actions.pod:1349
-#: ../src/guestfs-actions.pod:1540 ../src/guestfs-actions.pod:1652
-#: ../src/guestfs-actions.pod:1815 ../src/guestfs-actions.pod:1832
-#: ../src/guestfs-actions.pod:1899 ../src/guestfs-actions.pod:1933
-#: ../src/guestfs-actions.pod:1954 ../src/guestfs-actions.pod:2124
-#: ../src/guestfs-actions.pod:2316 ../src/guestfs-actions.pod:2523
-#: ../src/guestfs-actions.pod:2604 ../src/guestfs-actions.pod:2671
-#: ../src/guestfs-actions.pod:2691 ../src/guestfs-actions.pod:2805
-#: ../src/guestfs-actions.pod:2836 ../src/guestfs-actions.pod:2860
-#: ../src/guestfs-actions.pod:2922 ../src/guestfs-actions.pod:2945
-#: ../src/guestfs-actions.pod:3512 ../src/guestfs-actions.pod:3862
-#: ../src/guestfs-actions.pod:4032 ../src/guestfs-actions.pod:4142
-#: ../src/guestfs-actions.pod:4887 ../src/guestfs-actions.pod:5080
-#: ../src/guestfs-actions.pod:5250 ../src/guestfs-actions.pod:5428
-#: ../src/guestfs-actions.pod:5477 ../src/guestfs-actions.pod:6085
-#: ../src/guestfs-actions.pod:6101 ../src/guestfs-actions.pod:6118
-#: ../src/guestfs-actions.pod:6142 ../src/guestfs-actions.pod:6816
-#: ../src/guestfs-actions.pod:6835 ../src/guestfs-actions.pod:6853
-#: ../src/guestfs-actions.pod:7033 ../src/guestfs-actions.pod:7305
-msgid ""
-"This function returns a string, or NULL on error.  I<The caller must free "
-"the returned string after use>."
+#: ../src/guestfs.pod:2989 ../fish/guestfish.pod:1174
+#: ../test-tool/libguestfs-test-tool.pod:95 ../fuse/guestmount.pod:290
+msgid "Richard W.M. Jones (C<rjones at redhat dot com>)"

 msgstr ""
 
 msgstr ""
 

-# type: =head2
-#. type: =head2
-#: ../src/guestfs-actions.pod:362
-msgid "guestfs_aug_init"
+# type: =head1
+#. type: =head1
+#: ../src/guestfs.pod:2991 ../fish/guestfish.pod:1176
+#: ../test-tool/libguestfs-test-tool.pod:97 ../fuse/guestmount.pod:292
+#: ../tools/virt-edit.pl:514 ../tools/virt-win-reg.pl:602
+#: ../tools/virt-list-filesystems.pl:206 ../tools/virt-tar.pl:305
+#: ../tools/virt-make-fs.pl:568 ../tools/virt-list-partitions.pl:273
+msgid "COPYRIGHT"

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../src/guestfs-actions.pod:364
-#, no-wrap
-msgid ""
-" int\n"
-" guestfs_aug_init (guestfs_h *g,\n"
-"                   const char *root,\n"
-"                   int flags);\n"
-"\n"
-msgstr ""
-
-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:369 ../fish/guestfish-actions.pod:232
-msgid ""
-"Create a new Augeas handle for editing configuration files.  If there was "
-"any previous Augeas handle associated with this guestfs session, then it is "
-"closed."
+#: ../src/guestfs.pod:2993 ../fish/guestfish.pod:1178
+#: ../test-tool/libguestfs-test-tool.pod:99
+msgid "Copyright (C) 2009-2011 Red Hat Inc.  L<http://libguestfs.org/>"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:373
-msgid "You must call this before using any other C<guestfs_aug_*> commands."
+#: ../src/guestfs.pod:2996
+msgid ""
+"This library is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU Lesser General Public License as published by the "
+"Free Software Foundation; either version 2 of the License, or (at your "
+"option) any later version."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:376 ../fish/guestfish-actions.pod:239
+#: ../src/guestfs.pod:3001

 msgid ""
 msgid ""

-"C<root> is the filesystem root.  C<root> must not be NULL, use C</> instead."
+"This library is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License "
+"for more details."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:379 ../fish/guestfish-actions.pod:242
+#: ../src/guestfs.pod:3006

 msgid ""
 msgid ""

-"The flags are the same as the flags defined in E<lt>augeas.hE<gt>, the "
-"logical I<or> of the following integers:"
-msgstr ""
-
-# type: =item
-#. type: =item
-#: ../src/guestfs-actions.pod:385 ../fish/guestfish-actions.pod:248
-msgid "C<AUG_SAVE_BACKUP> = 1"
+"You should have received a copy of the GNU Lesser General Public License "
+"along with this library; if not, write to the Free Software Foundation, "
+"Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA"

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:387 ../fish/guestfish-actions.pod:250
-msgid "Keep the original file with a C<.augsave> extension."
+# type: =head2
+#. type: =head2
+#: ../src/guestfs-actions.pod:1
+msgid "guestfs_add_cdrom"

 msgstr ""
 
 msgstr ""
 

-# type: =item
-#. type: =item
-#: ../src/guestfs-actions.pod:389 ../fish/guestfish-actions.pod:252
-msgid "C<AUG_SAVE_NEWFILE> = 2"
+# type: verbatim
+#. type: verbatim
+#: ../src/guestfs-actions.pod:3
+#, no-wrap
+msgid ""
+" int\n"
+" guestfs_add_cdrom (guestfs_h *g,\n"
+"                    const char *filename);\n"
+"\n"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:391 ../fish/guestfish-actions.pod:254
-msgid ""
-"Save changes into a file with extension C<.augnew>, and do not overwrite "
-"original.  Overrides C<AUG_SAVE_BACKUP>."
+#: ../src/guestfs-actions.pod:7 ../fish/guestfish-actions.pod:5
+msgid "This function adds a virtual CD-ROM disk image to the guest."

 msgstr ""
 
 msgstr ""
 

-# type: =item
-#. type: =item
-#: ../src/guestfs-actions.pod:394 ../fish/guestfish-actions.pod:257
-msgid "C<AUG_TYPE_CHECK> = 4"
+#. type: textblock
+#: ../src/guestfs-actions.pod:9 ../fish/guestfish-actions.pod:7
+msgid "This is equivalent to the qemu parameter I<-cdrom filename>."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:396 ../fish/guestfish-actions.pod:259
-msgid "Typecheck lenses (can be expensive)."
-msgstr ""
-
-# type: =item
-#. type: =item
-#: ../src/guestfs-actions.pod:398 ../fish/guestfish-actions.pod:261
-msgid "C<AUG_NO_STDINC> = 8"
+#: ../src/guestfs-actions.pod:17
+msgid ""
+"This call checks for the existence of C<filename>.  This stops you from "
+"specifying other types of drive which are supported by qemu such as C<nbd:> "
+"and C<http:> URLs.  To specify those, use the general C<guestfs_config> call "
+"instead."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:400 ../fish/guestfish-actions.pod:263
-msgid "Do not use standard load path for modules."
-msgstr ""
-
-# type: =item
-#. type: =item
-#: ../src/guestfs-actions.pod:402 ../fish/guestfish-actions.pod:265
-msgid "C<AUG_SAVE_NOOP> = 16"
+#: ../src/guestfs-actions.pod:24
+msgid ""
+"If you just want to add an ISO file (often you use this as an efficient way "
+"to transfer large files into the guest), then you should probably use "
+"C<guestfs_add_drive_ro> instead."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:404 ../fish/guestfish-actions.pod:267
-msgid "Make save a no-op, just record what would have been changed."
-msgstr ""
-
-# type: =item
-#. type: =item
-#: ../src/guestfs-actions.pod:406 ../fish/guestfish-actions.pod:269
-msgid "C<AUG_NO_LOAD> = 32"
+#: ../src/guestfs-actions.pod:30 ../src/guestfs-actions.pod:134
+#: ../src/guestfs-actions.pod:195 ../src/guestfs-actions.pod:232
+#: ../src/guestfs-actions.pod:246 ../src/guestfs-actions.pod:267
+#: ../src/guestfs-actions.pod:287 ../src/guestfs-actions.pod:301
+#: ../src/guestfs-actions.pod:416 ../src/guestfs-actions.pod:436
+#: ../src/guestfs-actions.pod:450 ../src/guestfs-actions.pod:495
+#: ../src/guestfs-actions.pod:523 ../src/guestfs-actions.pod:541
+#: ../src/guestfs-actions.pod:608 ../src/guestfs-actions.pod:641
+#: ../src/guestfs-actions.pod:655 ../src/guestfs-actions.pod:670
+#: ../src/guestfs-actions.pod:769 ../src/guestfs-actions.pod:787
+#: ../src/guestfs-actions.pod:801 ../src/guestfs-actions.pod:815
+#: ../src/guestfs-actions.pod:976 ../src/guestfs-actions.pod:996
+#: ../src/guestfs-actions.pod:1014 ../src/guestfs-actions.pod:1098
+#: ../src/guestfs-actions.pod:1116 ../src/guestfs-actions.pod:1135
+#: ../src/guestfs-actions.pod:1149 ../src/guestfs-actions.pod:1169
+#: ../src/guestfs-actions.pod:1239 ../src/guestfs-actions.pod:1270
+#: ../src/guestfs-actions.pod:1295 ../src/guestfs-actions.pod:1337
+#: ../src/guestfs-actions.pod:1443 ../src/guestfs-actions.pod:1477
+#: ../src/guestfs-actions.pod:1692 ../src/guestfs-actions.pod:1714
+#: ../src/guestfs-actions.pod:1801 ../src/guestfs-actions.pod:2263
+#: ../src/guestfs-actions.pod:2407 ../src/guestfs-actions.pod:2468
+#: ../src/guestfs-actions.pod:2503 ../src/guestfs-actions.pod:3456
+#: ../src/guestfs-actions.pod:3471 ../src/guestfs-actions.pod:3496
+#: ../src/guestfs-actions.pod:3651 ../src/guestfs-actions.pod:3665
+#: ../src/guestfs-actions.pod:3678 ../src/guestfs-actions.pod:3692
+#: ../src/guestfs-actions.pod:3707 ../src/guestfs-actions.pod:3743
+#: ../src/guestfs-actions.pod:3815 ../src/guestfs-actions.pod:3835
+#: ../src/guestfs-actions.pod:3852 ../src/guestfs-actions.pod:3875
+#: ../src/guestfs-actions.pod:3898 ../src/guestfs-actions.pod:3930
+#: ../src/guestfs-actions.pod:3949 ../src/guestfs-actions.pod:3968
+#: ../src/guestfs-actions.pod:4003 ../src/guestfs-actions.pod:4015
+#: ../src/guestfs-actions.pod:4051 ../src/guestfs-actions.pod:4067
+#: ../src/guestfs-actions.pod:4080 ../src/guestfs-actions.pod:4095
+#: ../src/guestfs-actions.pod:4112 ../src/guestfs-actions.pod:4205
+#: ../src/guestfs-actions.pod:4225 ../src/guestfs-actions.pod:4238
+#: ../src/guestfs-actions.pod:4289 ../src/guestfs-actions.pod:4307
+#: ../src/guestfs-actions.pod:4325 ../src/guestfs-actions.pod:4341
+#: ../src/guestfs-actions.pod:4355 ../src/guestfs-actions.pod:4369
+#: ../src/guestfs-actions.pod:4386 ../src/guestfs-actions.pod:4401
+#: ../src/guestfs-actions.pod:4421 ../src/guestfs-actions.pod:4479
+#: ../src/guestfs-actions.pod:4552 ../src/guestfs-actions.pod:4583
+#: ../src/guestfs-actions.pod:4602 ../src/guestfs-actions.pod:4621
+#: ../src/guestfs-actions.pod:4633 ../src/guestfs-actions.pod:4650
+#: ../src/guestfs-actions.pod:4663 ../src/guestfs-actions.pod:4678
+#: ../src/guestfs-actions.pod:4693 ../src/guestfs-actions.pod:4728
+#: ../src/guestfs-actions.pod:4750 ../src/guestfs-actions.pod:4770
+#: ../src/guestfs-actions.pod:4784 ../src/guestfs-actions.pod:4801
+#: ../src/guestfs-actions.pod:4850 ../src/guestfs-actions.pod:4896
+#: ../src/guestfs-actions.pod:4910 ../src/guestfs-actions.pod:4938
+#: ../src/guestfs-actions.pod:4955 ../src/guestfs-actions.pod:4973
+#: ../src/guestfs-actions.pod:5107 ../src/guestfs-actions.pod:5164
+#: ../src/guestfs-actions.pod:5186 ../src/guestfs-actions.pod:5204
+#: ../src/guestfs-actions.pod:5236 ../src/guestfs-actions.pod:5302
+#: ../src/guestfs-actions.pod:5319 ../src/guestfs-actions.pod:5332
+#: ../src/guestfs-actions.pod:5346 ../src/guestfs-actions.pod:5635
+#: ../src/guestfs-actions.pod:5654 ../src/guestfs-actions.pod:5673
+#: ../src/guestfs-actions.pod:5685 ../src/guestfs-actions.pod:5697
+#: ../src/guestfs-actions.pod:5711 ../src/guestfs-actions.pod:5723
+#: ../src/guestfs-actions.pod:5737 ../src/guestfs-actions.pod:5753
+#: ../src/guestfs-actions.pod:5774 ../src/guestfs-actions.pod:5793
+#: ../src/guestfs-actions.pod:5812 ../src/guestfs-actions.pod:5842
+#: ../src/guestfs-actions.pod:5858 ../src/guestfs-actions.pod:5881
+#: ../src/guestfs-actions.pod:5899 ../src/guestfs-actions.pod:5918
+#: ../src/guestfs-actions.pod:5939 ../src/guestfs-actions.pod:5958
+#: ../src/guestfs-actions.pod:5975 ../src/guestfs-actions.pod:6003
+#: ../src/guestfs-actions.pod:6027 ../src/guestfs-actions.pod:6046
+#: ../src/guestfs-actions.pod:6070 ../src/guestfs-actions.pod:6089
+#: ../src/guestfs-actions.pod:6104 ../src/guestfs-actions.pod:6123
+#: ../src/guestfs-actions.pod:6160 ../src/guestfs-actions.pod:6190
+#: ../src/guestfs-actions.pod:6223 ../src/guestfs-actions.pod:6345
+#: ../src/guestfs-actions.pod:6466 ../src/guestfs-actions.pod:6478
+#: ../src/guestfs-actions.pod:6491 ../src/guestfs-actions.pod:6504
+#: ../src/guestfs-actions.pod:6526 ../src/guestfs-actions.pod:6539
+#: ../src/guestfs-actions.pod:6552 ../src/guestfs-actions.pod:6565
+#: ../src/guestfs-actions.pod:6580 ../src/guestfs-actions.pod:6639
+#: ../src/guestfs-actions.pod:6656 ../src/guestfs-actions.pod:6672
+#: ../src/guestfs-actions.pod:6688 ../src/guestfs-actions.pod:6705
+#: ../src/guestfs-actions.pod:6718 ../src/guestfs-actions.pod:6738
+#: ../src/guestfs-actions.pod:6774 ../src/guestfs-actions.pod:6788
+#: ../src/guestfs-actions.pod:6829 ../src/guestfs-actions.pod:6842
+#: ../src/guestfs-actions.pod:6860 ../src/guestfs-actions.pod:6894
+#: ../src/guestfs-actions.pod:6930 ../src/guestfs-actions.pod:7049
+#: ../src/guestfs-actions.pod:7067 ../src/guestfs-actions.pod:7081
+#: ../src/guestfs-actions.pod:7136 ../src/guestfs-actions.pod:7149
+#: ../src/guestfs-actions.pod:7194 ../src/guestfs-actions.pod:7227
+#: ../src/guestfs-actions.pod:7288 ../src/guestfs-actions.pod:7314
+#: ../src/guestfs-actions.pod:7380 ../src/guestfs-actions.pod:7399
+#: ../src/guestfs-actions.pod:7428
+msgid "This function returns 0 on success or -1 on error."

 msgstr ""
 
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:408
-msgid "Do not load the tree in C<guestfs_aug_init>."
+#: ../src/guestfs-actions.pod:32 ../src/guestfs-actions.pod:248
+#: ../src/guestfs-actions.pod:269
+msgid ""
+"This function is deprecated.  In new code, use the L</"
+"guestfs_add_drive_opts> call instead."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:412
-msgid "To close the handle, you can call C<guestfs_aug_close>."
+#: ../src/guestfs-actions.pod:35 ../src/guestfs-actions.pod:251
+#: ../src/guestfs-actions.pod:272 ../src/guestfs-actions.pod:1448
+#: ../src/guestfs-actions.pod:1941 ../src/guestfs-actions.pod:1962
+#: ../src/guestfs-actions.pod:4426 ../src/guestfs-actions.pod:4733
+#: ../src/guestfs-actions.pod:6168 ../src/guestfs-actions.pod:6198
+#: ../src/guestfs-actions.pod:6231 ../src/guestfs-actions.pod:6290
+#: ../src/guestfs-actions.pod:7232 ../src/guestfs-actions.pod:7322
+#: ../src/guestfs-actions.pod:7491 ../fish/guestfish-actions.pod:31
+#: ../fish/guestfish-actions.pod:161 ../fish/guestfish-actions.pod:175
+#: ../fish/guestfish-actions.pod:956 ../fish/guestfish-actions.pod:1316
+#: ../fish/guestfish-actions.pod:1330 ../fish/guestfish-actions.pod:3005
+#: ../fish/guestfish-actions.pod:3202 ../fish/guestfish-actions.pod:4183
+#: ../fish/guestfish-actions.pod:4206 ../fish/guestfish-actions.pod:4228
+#: ../fish/guestfish-actions.pod:4266 ../fish/guestfish-actions.pod:4907
+#: ../fish/guestfish-actions.pod:5004
+msgid ""
+"Deprecated functions will not be removed from the API, but the fact that "
+"they are deprecated indicates that there are problems with correct use of "
+"these functions."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:414 ../fish/guestfish-actions.pod:277
-msgid "To find out more about Augeas, see L<http://augeas.net/>."
+#: ../src/guestfs-actions.pod:39 ../src/guestfs-actions.pod:136
+#: ../src/guestfs-actions.pod:1100 ../src/guestfs-actions.pod:1913
+#: ../src/guestfs-actions.pod:2011 ../src/guestfs-actions.pod:2114
+#: ../src/guestfs-actions.pod:3458 ../src/guestfs-actions.pod:3478
+#: ../src/guestfs-actions.pod:4737 ../src/guestfs-actions.pod:5860
+#: ../src/guestfs-actions.pod:5977 ../src/guestfs-actions.pod:6091
+#: ../src/guestfs-actions.pod:6582 ../src/guestfs-actions.pod:6707
+#: ../src/guestfs-actions.pod:7236
+msgid "(Added in 0.3)"

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:420
-msgid "guestfs_aug_insert"
+#: ../src/guestfs-actions.pod:41
+msgid "guestfs_add_domain"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:422
+#: ../src/guestfs-actions.pod:43

 #, no-wrap
 msgid ""
 " int\n"
 #, no-wrap
 msgid ""
 " int\n"

-" guestfs_aug_insert (guestfs_h *g,\n"
-"                     const char *augpath,\n"
-"                     const char *label,\n"
-"                     int before);\n"
+" guestfs_add_domain (guestfs_h *g,\n"
+"                     const char *dom,\n"
+"                     ...);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:428 ../fish/guestfish-actions.pod:283
-msgid ""
-"Create a new sibling C<label> for C<path>, inserting it into the tree before "
-"or after C<path> (depending on the boolean flag C<before>)."
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:432 ../fish/guestfish-actions.pod:287
+#: ../src/guestfs-actions.pod:48 ../src/guestfs-actions.pod:145
+#: ../src/guestfs-actions.pod:4440

 msgid ""
 msgid ""

-"C<path> must match exactly one existing node in the tree, and C<label> must "
-"be a label, ie. not contain C</>, C<*> or end with a bracketed index C<[N]>."
-msgstr ""
-
-# type: =head2
-#. type: =head2
-#: ../src/guestfs-actions.pod:440
-msgid "guestfs_aug_load"
+"You may supply a list of optional arguments to this call.  Use zero or more "
+"of the following pairs of parameters, and terminate the list with C<-1> on "
+"its own.  See L</CALLS WITH OPTIONAL ARGUMENTS>."

 msgstr ""
 
 msgstr ""
 

-# type: verbatim

 #. type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:442
+#: ../src/guestfs-actions.pod:53

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" int\n"
-" guestfs_aug_load (guestfs_h *g);\n"
+" GUESTFS_ADD_DOMAIN_LIBVIRTURI, const char *libvirturi,\n"
+" GUESTFS_ADD_DOMAIN_READONLY, int readonly,\n"
+" GUESTFS_ADD_DOMAIN_IFACE, const char *iface,\n"
+" GUESTFS_ADD_DOMAIN_LIVE, int live,\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:445 ../fish/guestfish-actions.pod:295
-msgid "Load files into the tree."
+#: ../src/guestfs-actions.pod:58
+msgid ""
+"This function adds the disk(s) attached to the named libvirt domain C<dom>.  "
+"It works by connecting to libvirt, requesting the domain and domain XML from "
+"libvirt, parsing it for disks, and calling C<guestfs_add_drive_opts> on each "
+"one."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:447 ../fish/guestfish-actions.pod:297
-msgid "See C<aug_load> in the Augeas documentation for the full gory details."
+#: ../src/guestfs-actions.pod:63 ../fish/guestfish-actions.pod:46
+msgid ""
+"The number of disks added is returned.  This operation is atomic: if an "
+"error is returned, then no disks are added."

 msgstr ""
 
 msgstr ""
 

-# type: =head2
-#. type: =head2
-#: ../src/guestfs-actions.pod:454
-msgid "guestfs_aug_ls"
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:66 ../fish/guestfish-actions.pod:49
+msgid ""
+"This function does some minimal checks to make sure the libvirt domain is "
+"not running (unless C<readonly> is true).  In a future version we will try "
+"to acquire the libvirt lock on each disk."

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../src/guestfs-actions.pod:456
-#, no-wrap
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:70 ../fish/guestfish-actions.pod:53

 msgid ""
 msgid ""

-" char **\n"
-" guestfs_aug_ls (guestfs_h *g,\n"
-"                 const char *augpath);\n"
-"\n"
+"Disks must be accessible locally.  This often means that adding disks from a "
+"remote libvirt connection (see L<http://libvirt.org/remote.html>)  will fail "
+"unless those disks are accessible via the same device path locally too."

 msgstr ""
 
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:460
+#: ../src/guestfs-actions.pod:75 ../fish/guestfish-actions.pod:58

 msgid ""
 msgid ""

-"This is just a shortcut for listing C<guestfs_aug_match> C<path/*> and "
-"sorting the resulting nodes into alphabetical order."
+"The optional C<libvirturi> parameter sets the libvirt URI (see L<http://"
+"libvirt.org/uri.html>).  If this is not set then we connect to the default "
+"libvirt URI (or one set through an environment variable, see the libvirt "
+"documentation for full details)."

 msgstr ""
 
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:463 ../src/guestfs-actions.pod:479
-#: ../src/guestfs-actions.pod:625 ../src/guestfs-actions.pod:1073
-#: ../src/guestfs-actions.pod:1364 ../src/guestfs-actions.pod:1383
-#: ../src/guestfs-actions.pod:1486 ../src/guestfs-actions.pod:1505
-#: ../src/guestfs-actions.pod:1754 ../src/guestfs-actions.pod:2196
-#: ../src/guestfs-actions.pod:2212 ../src/guestfs-actions.pod:2231
-#: ../src/guestfs-actions.pod:2274 ../src/guestfs-actions.pod:2298
-#: ../src/guestfs-actions.pod:2369 ../src/guestfs-actions.pod:2418
-#: ../src/guestfs-actions.pod:2629 ../src/guestfs-actions.pod:2879
-#: ../src/guestfs-actions.pod:3147 ../src/guestfs-actions.pod:3432
-#: ../src/guestfs-actions.pod:3494 ../src/guestfs-actions.pod:3599
-#: ../src/guestfs-actions.pod:4004 ../src/guestfs-actions.pod:4702
-#: ../src/guestfs-actions.pod:5222 ../src/guestfs-actions.pod:5348
-#: ../src/guestfs-actions.pod:5462 ../src/guestfs-actions.pod:6158
-#: ../src/guestfs-actions.pod:6219 ../src/guestfs-actions.pod:6274
-#: ../src/guestfs-actions.pod:6420 ../src/guestfs-actions.pod:6444
-#: ../src/guestfs-actions.pod:6926 ../src/guestfs-actions.pod:6946
-#: ../src/guestfs-actions.pod:6993 ../src/guestfs-actions.pod:7158
-#: ../src/guestfs-actions.pod:7177 ../src/guestfs-actions.pod:7262
-#: ../src/guestfs-actions.pod:7281 ../src/guestfs-actions.pod:7327
-#: ../src/guestfs-actions.pod:7346
+#: ../src/guestfs-actions.pod:81 ../fish/guestfish-actions.pod:64

 msgid ""
 msgid ""

-"This function returns a NULL-terminated array of strings (like L<environ(3)"
-">), or NULL if there was an error.  I<The caller must free the strings and "
-"the array after use>."
+"The optional C<live> flag controls whether this call will try to connect to "
+"a running virtual machine C<guestfsd> process if it sees a suitable "
+"E<lt>channelE<gt> element in the libvirt XML definition.  The default (if "
+"the flag is omitted) is never to try.  See L<guestfs(3)/ATTACHING TO RUNNING "
+"DAEMONS> for more information."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:467 ../src/guestfs-actions.pod:998
-#: ../src/guestfs-actions.pod:1016 ../src/guestfs-actions.pod:1421
-#: ../src/guestfs-actions.pod:3225 ../src/guestfs-actions.pod:3256
-#: ../src/guestfs-actions.pod:3845 ../src/guestfs-actions.pod:3895
-#: ../src/guestfs-actions.pod:4082 ../src/guestfs-actions.pod:4115
-#: ../src/guestfs-actions.pod:4278 ../src/guestfs-actions.pod:4706
-#: ../src/guestfs-actions.pod:5163 ../src/guestfs-actions.pod:5558
-#: ../src/guestfs-actions.pod:5572 ../src/guestfs-actions.pod:5584
-#: ../src/guestfs-actions.pod:6020 ../src/guestfs-actions.pod:6658
-#: ../src/guestfs-actions.pod:6671 ../src/guestfs-actions.pod:6910
-#: ../src/guestfs-actions.pod:7146
-msgid "(Added in 0.8)"
-msgstr ""
-
-# type: =head2
-#. type: =head2
-#: ../src/guestfs-actions.pod:469
-msgid "guestfs_aug_match"
-msgstr ""
-
-# type: verbatim
-#. type: verbatim
-#: ../src/guestfs-actions.pod:471
-#, no-wrap
-msgid ""
-" char **\n"
-" guestfs_aug_match (guestfs_h *g,\n"
-"                    const char *augpath);\n"
-"\n"
+#: ../src/guestfs-actions.pod:88
+msgid ""
+"The other optional parameters are passed directly through to "
+"C<guestfs_add_drive_opts>."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:475 ../fish/guestfish-actions.pod:311
-msgid ""
-"Returns a list of paths which match the path expression C<path>.  The "
-"returned paths are sufficiently qualified so that they match exactly one "
-"node in the current tree."
-msgstr ""
-
-# type: =head2
-#. type: =head2
-#: ../src/guestfs-actions.pod:485
-msgid "guestfs_aug_mv"
-msgstr ""
-
-# type: verbatim
-#. type: verbatim
-#: ../src/guestfs-actions.pod:487
-#, no-wrap
-msgid ""
-" int\n"
-" guestfs_aug_mv (guestfs_h *g,\n"
-"                 const char *src,\n"
-"                 const char *dest);\n"
-"\n"
+#: ../src/guestfs-actions.pod:91 ../src/guestfs-actions.pod:344
+#: ../src/guestfs-actions.pod:509 ../src/guestfs-actions.pod:687
+#: ../src/guestfs-actions.pod:718 ../src/guestfs-actions.pod:736
+#: ../src/guestfs-actions.pod:755 ../src/guestfs-actions.pod:1315
+#: ../src/guestfs-actions.pod:1671 ../src/guestfs-actions.pod:1874
+#: ../src/guestfs-actions.pod:1983 ../src/guestfs-actions.pod:2023
+#: ../src/guestfs-actions.pod:2078 ../src/guestfs-actions.pod:2101
+#: ../src/guestfs-actions.pod:2394 ../src/guestfs-actions.pod:2777
+#: ../src/guestfs-actions.pod:2798 ../src/guestfs-actions.pod:4873
+#: ../src/guestfs-actions.pod:5010 ../src/guestfs-actions.pod:5416
+#: ../src/guestfs-actions.pod:5442 ../src/guestfs-actions.pod:6815
+#: ../src/guestfs-actions.pod:7247 ../src/guestfs-actions.pod:7260
+#: ../src/guestfs-actions.pod:7273
+msgid "On error this function returns -1."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:492 ../fish/guestfish-actions.pod:319
-msgid ""
-"Move the node C<src> to C<dest>.  C<src> must match exactly one node.  "
-"C<dest> is overwritten if it exists."
+#: ../src/guestfs-actions.pod:93
+msgid "(Added in 1.7.4)"

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:499
-msgid "guestfs_aug_rm"
+#: ../src/guestfs-actions.pod:95
+msgid "guestfs_add_domain_va"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:501
+#: ../src/guestfs-actions.pod:97

 #, no-wrap
 msgid ""
 " int\n"
 #, no-wrap
 msgid ""
 " int\n"

-" guestfs_aug_rm (guestfs_h *g,\n"
-"                 const char *augpath);\n"
+" guestfs_add_domain_va (guestfs_h *g,\n"
+"                        const char *dom,\n"
+"                        va_list args);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:505 ../fish/guestfish-actions.pod:326
-msgid "Remove C<path> and all of its children."
+#: ../src/guestfs-actions.pod:102
+msgid "This is the \"va_list variant\" of L</guestfs_add_domain>."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:507 ../fish/guestfish-actions.pod:328
-msgid "On success this returns the number of entries which were removed."
+#: ../src/guestfs-actions.pod:104 ../src/guestfs-actions.pod:115
+#: ../src/guestfs-actions.pod:208 ../src/guestfs-actions.pod:219
+#: ../src/guestfs-actions.pod:4493 ../src/guestfs-actions.pod:4505
+msgid "See L</CALLS WITH OPTIONAL ARGUMENTS>."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:513
-msgid "guestfs_aug_save"
+#: ../src/guestfs-actions.pod:106
+msgid "guestfs_add_domain_argv"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:515
+#: ../src/guestfs-actions.pod:108

 #, no-wrap
 msgid ""
 " int\n"
 #, no-wrap
 msgid ""
 " int\n"

-" guestfs_aug_save (guestfs_h *g);\n"
+" guestfs_add_domain_argv (guestfs_h *g,\n"
+"                          const char *dom,\n"
+"                          const struct guestfs_add_domain_argv *optargs);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:518 ../fish/guestfish-actions.pod:334
-msgid "This writes all pending changes to disk."
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:520
-msgid ""
-"The flags which were passed to C<guestfs_aug_init> affect exactly how files "
-"are saved."
+#: ../src/guestfs-actions.pod:113
+msgid "This is the \"argv variant\" of L</guestfs_add_domain>."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:527
-msgid "guestfs_aug_set"
+#: ../src/guestfs-actions.pod:117
+msgid "guestfs_add_drive"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:529
+#: ../src/guestfs-actions.pod:119

 #, no-wrap
 msgid ""
 " int\n"
 #, no-wrap
 msgid ""
 " int\n"

-" guestfs_aug_set (guestfs_h *g,\n"
-"                  const char *augpath,\n"
-"                  const char *val);\n"
+" guestfs_add_drive (guestfs_h *g,\n"
+"                    const char *filename);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:534 ../fish/guestfish-actions.pod:343
-msgid "Set the value associated with C<path> to C<val>."
+#: ../src/guestfs-actions.pod:123
+msgid ""
+"This function is the equivalent of calling C<guestfs_add_drive_opts> with no "
+"optional parameters, so the disk is added writable, with the format being "
+"detected automatically."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:536
+#: ../src/guestfs-actions.pod:127

 msgid ""
 msgid ""

-"In the Augeas API, it is possible to clear a node by setting the value to "
-"NULL.  Due to an oversight in the libguestfs API you cannot do that with "
-"this call.  Instead you must use the C<guestfs_aug_clear> call."
+"Automatic detection of the format opens you up to a potential security hole "
+"when dealing with untrusted raw-format images.  See CVE-2010-3851 and "
+"RHBZ#642934.  Specifying the format closes this security hole.  Therefore "
+"you should think about replacing calls to this function with calls to "
+"C<guestfs_add_drive_opts>, and specifying the format."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:545
-msgid "guestfs_available"
+#: ../src/guestfs-actions.pod:138
+msgid "guestfs_add_drive_opts"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:547
+#: ../src/guestfs-actions.pod:140

 #, no-wrap
 msgid ""
 " int\n"
 #, no-wrap
 msgid ""
 " int\n"

-" guestfs_available (guestfs_h *g,\n"
-"                    char *const *groups);\n"
+" guestfs_add_drive_opts (guestfs_h *g,\n"
+"                         const char *filename,\n"
+"                         ...);\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:551 ../fish/guestfish-actions.pod:354
+# type: verbatim
+#. type: verbatim
+#: ../src/guestfs-actions.pod:150
+#, no-wrap

 msgid ""
 msgid ""

-"This command is used to check the availability of some groups of "
-"functionality in the appliance, which not all builds of the libguestfs "
-"appliance will be able to provide."
+" GUESTFS_ADD_DRIVE_OPTS_READONLY, int readonly,\n"
+" GUESTFS_ADD_DRIVE_OPTS_FORMAT, const char *format,\n"
+" GUESTFS_ADD_DRIVE_OPTS_IFACE, const char *iface,\n"
+"\n"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:555
+#: ../src/guestfs-actions.pod:154 ../fish/guestfish-actions.pod:97

 msgid ""
 msgid ""

-"The libguestfs groups, and the functions that those groups correspond to, "
-"are listed in L<guestfs(3)/AVAILABILITY>.  You can also fetch this list at "
-"runtime by calling C<guestfs_available_all_groups>."
+"This function adds a virtual machine disk image C<filename> to libguestfs.  "
+"The first time you call this function, the disk appears as C</dev/sda>, the "
+"second time as C</dev/sdb>, and so on."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:560 ../fish/guestfish-actions.pod:363
+#: ../src/guestfs-actions.pod:159 ../fish/guestfish-actions.pod:102

 msgid ""
 msgid ""

-"The argument C<groups> is a list of group names, eg: C<[\"inotify\", \"augeas"
-"\"]> would check for the availability of the Linux inotify functions and "
-"Augeas (configuration file editing) functions."
+"You don't necessarily need to be root when using libguestfs.  However you "
+"obviously do need sufficient permissions to access the filename for whatever "
+"operations you want to perform (ie. read access if you just want to read the "
+"image or write access if you want to modify the image)."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:565 ../fish/guestfish-actions.pod:368
-msgid "The command returns no error if I<all> requested groups are available."
+#: ../src/guestfs-actions.pod:165 ../fish/guestfish-actions.pod:108
+msgid "This call checks that C<filename> exists."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:567 ../fish/guestfish-actions.pod:370
-msgid ""
-"It fails with an error if one or more of the requested groups is unavailable "
-"in the appliance."
+#: ../src/guestfs-actions.pod:167 ../src/guestfs-actions.pod:4451
+#: ../fish/guestfish-actions.pod:110 ../fish/guestfish-actions.pod:3016
+msgid "The optional arguments are:"

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:570 ../fish/guestfish-actions.pod:373
-msgid ""
-"If an unknown group name is included in the list of groups then an error is "
-"always returned."
+# type: =item
+#. type: =item
+#: ../src/guestfs-actions.pod:171 ../fish/guestfish-actions.pod:114
+msgid "C<readonly>"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:573 ../fish/guestfish-actions.pod:376
-msgid "I<Notes:>"
+#: ../src/guestfs-actions.pod:173 ../fish/guestfish-actions.pod:116
+msgid ""
+"If true then the image is treated as read-only.  Writes are still allowed, "
+"but they are stored in a temporary snapshot overlay which is discarded at "
+"the end.  The disk that you add is not modified."

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:579
-msgid "You must call C<guestfs_launch> before calling this function."
+# type: =item
+#. type: =item
+#: ../src/guestfs-actions.pod:177 ../fish/guestfish-actions.pod:120
+msgid "C<format>"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:581 ../fish/guestfish-actions.pod:384
+#: ../src/guestfs-actions.pod:179

 msgid ""
 msgid ""

-"The reason is because we don't know what groups are supported by the "
-"appliance/daemon until it is running and can be queried."
+"This forces the image format.  If you omit this (or use C<guestfs_add_drive> "
+"or C<guestfs_add_drive_ro>) then the format is automatically detected.  "
+"Possible formats include C<raw> and C<qcow2>."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:587 ../fish/guestfish-actions.pod:390
+#: ../src/guestfs-actions.pod:183 ../fish/guestfish-actions.pod:126

 msgid ""
 msgid ""

-"If a group of functions is available, this does not necessarily mean that "
-"they will work.  You still have to check for errors when calling individual "
-"API functions even if they are available."
+"Automatic detection of the format opens you up to a potential security hole "
+"when dealing with untrusted raw-format images.  See CVE-2010-3851 and "
+"RHBZ#642934.  Specifying the format closes this security hole."

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:594 ../fish/guestfish-actions.pod:397
-msgid ""
-"It is usually the job of distro packagers to build complete functionality "
-"into the libguestfs appliance.  Upstream libguestfs, if built from source "
-"with all requirements satisfied, will support everything."
+# type: =item
+#. type: =item
+#: ../src/guestfs-actions.pod:188 ../fish/guestfish-actions.pod:131
+msgid "C<iface>"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:601
+#: ../src/guestfs-actions.pod:190

 msgid ""
 msgid ""

-"This call was added in version C<1.0.80>.  In previous versions of "
-"libguestfs all you could do would be to speculatively execute a command to "
-"find out if the daemon implemented it.  See also C<guestfs_version>."
+"This rarely-used option lets you emulate the behaviour of the deprecated "
+"C<guestfs_add_drive_with_if> call (q.v.)"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:610 ../src/guestfs-actions.pod:1171
-msgid "(Added in 1.0.80)"
+#: ../src/guestfs-actions.pod:197
+msgid "(Added in 1.5.23)"

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:612
-msgid "guestfs_available_all_groups"
+#: ../src/guestfs-actions.pod:199
+msgid "guestfs_add_drive_opts_va"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:614
+#: ../src/guestfs-actions.pod:201

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" char **\n"
-" guestfs_available_all_groups (guestfs_h *g);\n"
+" int\n"
+" guestfs_add_drive_opts_va (guestfs_h *g,\n"
+"                            const char *filename,\n"
+"                            va_list args);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:617
-msgid ""
-"This command returns a list of all optional groups that this daemon knows "
-"about.  Note this returns both supported and unsupported groups.  To find "
-"out which ones the daemon can actually support you have to call "
-"C<guestfs_available> on each member of the returned list."
+#: ../src/guestfs-actions.pod:206
+msgid "This is the \"va_list variant\" of L</guestfs_add_drive_opts>."

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:623
-msgid "See also C<guestfs_available> and L<guestfs(3)/AVAILABILITY>."
+# type: =head2
+#. type: =head2
+#: ../src/guestfs-actions.pod:210
+msgid "guestfs_add_drive_opts_argv"
+msgstr ""
+
+# type: verbatim
+#. type: verbatim
+#: ../src/guestfs-actions.pod:212
+#, no-wrap
+msgid ""
+" int\n"
+" guestfs_add_drive_opts_argv (guestfs_h *g,\n"
+"                              const char *filename,\n"
+"                              const struct guestfs_add_drive_opts_argv *optargs);\n"
+"\n"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:629
-msgid "(Added in 1.3.15)"
+#: ../src/guestfs-actions.pod:217
+msgid "This is the \"argv variant\" of L</guestfs_add_drive_opts>."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:631
-msgid "guestfs_base64_in"
+#: ../src/guestfs-actions.pod:221
+msgid "guestfs_add_drive_ro"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:633
+#: ../src/guestfs-actions.pod:223

 #, no-wrap
 msgid ""
 " int\n"
 #, no-wrap
 msgid ""
 " int\n"

-" guestfs_base64_in (guestfs_h *g,\n"
-"                    const char *base64file,\n"
-"                    const char *filename);\n"
+" guestfs_add_drive_ro (guestfs_h *g,\n"
+"                       const char *filename);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:638 ../fish/guestfish-actions.pod:427
+#: ../src/guestfs-actions.pod:227

 msgid ""
 msgid ""

-"This command uploads base64-encoded data from C<base64file> to C<filename>."
+"This function is the equivalent of calling C<guestfs_add_drive_opts> with "
+"the optional parameter C<GUESTFS_ADD_DRIVE_OPTS_READONLY> set to 1, so the "
+"disk is added read-only, with the format being detected automatically."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:643 ../src/guestfs-actions.pod:657
-msgid "(Added in 1.3.5)"
+#: ../src/guestfs-actions.pod:234
+msgid "(Added in 1.0.38)"

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:645
-msgid "guestfs_base64_out"
+#: ../src/guestfs-actions.pod:236
+msgid "guestfs_add_drive_ro_with_if"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:647
+#: ../src/guestfs-actions.pod:238

 #, no-wrap
 msgid ""
 " int\n"
 #, no-wrap
 msgid ""
 " int\n"

-" guestfs_base64_out (guestfs_h *g,\n"
-"                     const char *filename,\n"
-"                     const char *base64file);\n"
+" guestfs_add_drive_ro_with_if (guestfs_h *g,\n"
+"                               const char *filename,\n"
+"                               const char *iface);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:652 ../fish/guestfish-actions.pod:436
+#: ../src/guestfs-actions.pod:243

 msgid ""
 msgid ""

-"This command downloads the contents of C<filename>, writing it out to local "
-"file C<base64file> encoded as base64."
+"This is the same as C<guestfs_add_drive_ro> but it allows you to specify the "
+"QEMU interface emulation to use at run time."
+msgstr ""
+
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:255 ../src/guestfs-actions.pod:276
+#: ../src/guestfs-actions.pod:2353
+msgid "(Added in 1.0.84)"

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:659
-msgid "guestfs_blockdev_flushbufs"
+#: ../src/guestfs-actions.pod:257
+msgid "guestfs_add_drive_with_if"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:661
+#: ../src/guestfs-actions.pod:259

 #, no-wrap
 msgid ""
 " int\n"
 #, no-wrap
 msgid ""
 " int\n"

-" guestfs_blockdev_flushbufs (guestfs_h *g,\n"
-"                             const char *device);\n"
+" guestfs_add_drive_with_if (guestfs_h *g,\n"
+"                            const char *filename,\n"
+"                            const char *iface);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:665 ../fish/guestfish-actions.pod:445
+#: ../src/guestfs-actions.pod:264

 msgid ""
 msgid ""

-"This tells the kernel to flush internal buffers associated with C<device>."
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:668 ../src/guestfs-actions.pod:685
-#: ../src/guestfs-actions.pod:700 ../src/guestfs-actions.pod:716
-#: ../src/guestfs-actions.pod:734 ../src/guestfs-actions.pod:753
-#: ../src/guestfs-actions.pod:767 ../src/guestfs-actions.pod:785
-#: ../src/guestfs-actions.pod:799 ../src/guestfs-actions.pod:813
-#: ../fish/guestfish-actions.pod:448 ../fish/guestfish-actions.pod:459
-#: ../fish/guestfish-actions.pod:468 ../fish/guestfish-actions.pod:478
-#: ../fish/guestfish-actions.pod:490 ../fish/guestfish-actions.pod:503
-#: ../fish/guestfish-actions.pod:511 ../fish/guestfish-actions.pod:522
-#: ../fish/guestfish-actions.pod:530 ../fish/guestfish-actions.pod:538
-msgid "This uses the L<blockdev(8)> command."
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:672 ../src/guestfs-actions.pod:689
-#: ../src/guestfs-actions.pod:704 ../src/guestfs-actions.pod:720
-#: ../src/guestfs-actions.pod:738 ../src/guestfs-actions.pod:757
-#: ../src/guestfs-actions.pod:771 ../src/guestfs-actions.pod:789
-#: ../src/guestfs-actions.pod:803 ../src/guestfs-actions.pod:817
-msgid "(Added in 0.9.3)"
+"This is the same as C<guestfs_add_drive> but it allows you to specify the "
+"QEMU interface emulation to use at run time."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:674
-msgid "guestfs_blockdev_getbsz"
+#: ../src/guestfs-actions.pod:278
+msgid "guestfs_aug_clear"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:676
+#: ../src/guestfs-actions.pod:280

 #, no-wrap
 msgid ""
 " int\n"
 #, no-wrap
 msgid ""
 " int\n"

-" guestfs_blockdev_getbsz (guestfs_h *g,\n"
-"                          const char *device);\n"
+" guestfs_aug_clear (guestfs_h *g,\n"
+"                    const char *augpath);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:680 ../fish/guestfish-actions.pod:454
-msgid "This returns the block size of a device."
+#: ../src/guestfs-actions.pod:284 ../fish/guestfish-actions.pod:183
+msgid ""
+"Set the value associated with C<path> to C<NULL>.  This is the same as the "
+"L<augtool(1)> C<clear> command."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:682 ../src/guestfs-actions.pod:782
-#: ../fish/guestfish-actions.pod:456 ../fish/guestfish-actions.pod:519
-msgid ""
-"(Note this is different from both I<size in blocks> and I<filesystem block "
-"size>)."
+#: ../src/guestfs-actions.pod:289 ../src/guestfs-actions.pod:2103
+msgid "(Added in 1.3.4)"

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:691
-msgid "guestfs_blockdev_getro"
+#: ../src/guestfs-actions.pod:291
+msgid "guestfs_aug_close"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:693
+#: ../src/guestfs-actions.pod:293

 #, no-wrap
 msgid ""
 " int\n"
 #, no-wrap
 msgid ""
 " int\n"

-" guestfs_blockdev_getro (guestfs_h *g,\n"
-"                         const char *device);\n"
+" guestfs_aug_close (guestfs_h *g);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:697 ../fish/guestfish-actions.pod:465
+#: ../src/guestfs-actions.pod:296

 msgid ""
 msgid ""

-"Returns a boolean indicating if the block device is read-only (true if read-"
-"only, false if not)."
+"Close the current Augeas handle and free up any resources used by it.  After "
+"calling this, you have to call C<guestfs_aug_init> again before you can use "
+"any other Augeas functions."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:702 ../src/guestfs-actions.pod:1404
-#: ../src/guestfs-actions.pod:1419 ../src/guestfs-actions.pod:1909
-#: ../src/guestfs-actions.pod:1920 ../src/guestfs-actions.pod:1992
-#: ../src/guestfs-actions.pod:2047 ../src/guestfs-actions.pod:2062
-#: ../src/guestfs-actions.pod:2087 ../src/guestfs-actions.pod:2110
-#: ../src/guestfs-actions.pod:2965 ../src/guestfs-actions.pod:2982
-#: ../src/guestfs-actions.pod:3001 ../src/guestfs-actions.pod:3164
-#: ../src/guestfs-actions.pod:3178 ../src/guestfs-actions.pod:3193
-#: ../src/guestfs-actions.pod:3207 ../src/guestfs-actions.pod:3223
-#: ../src/guestfs-actions.pod:3238 ../src/guestfs-actions.pod:3254
-#: ../src/guestfs-actions.pod:3268 ../src/guestfs-actions.pod:3281
-#: ../src/guestfs-actions.pod:3295 ../src/guestfs-actions.pod:3310
-#: ../src/guestfs-actions.pod:3325 ../src/guestfs-actions.pod:4851
-msgid "This function returns a C truth value on success or -1 on error."
+#: ../src/guestfs-actions.pod:303 ../src/guestfs-actions.pod:328
+#: ../src/guestfs-actions.pod:346 ../src/guestfs-actions.pod:360
+#: ../src/guestfs-actions.pod:418 ../src/guestfs-actions.pod:438
+#: ../src/guestfs-actions.pod:452 ../src/guestfs-actions.pod:483
+#: ../src/guestfs-actions.pod:497 ../src/guestfs-actions.pod:511
+#: ../src/guestfs-actions.pod:525 ../src/guestfs-actions.pod:543
+#: ../src/guestfs-actions.pod:5493
+msgid "(Added in 0.7)"

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:706
-msgid "guestfs_blockdev_getsize64"
+#: ../src/guestfs-actions.pod:305
+msgid "guestfs_aug_defnode"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:708
+#: ../src/guestfs-actions.pod:307

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" int64_t\n"
-" guestfs_blockdev_getsize64 (guestfs_h *g,\n"
-"                             const char *device);\n"
+" struct guestfs_int_bool *\n"
+" guestfs_aug_defnode (guestfs_h *g,\n"
+"                      const char *name,\n"
+"                      const char *expr,\n"
+"                      const char *val);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:712 ../fish/guestfish-actions.pod:474
-msgid "This returns the size of the device in bytes."
+#: ../src/guestfs-actions.pod:313 ../fish/guestfish-actions.pod:199
+msgid ""
+"Defines a variable C<name> whose value is the result of evaluating C<expr>."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:714
-msgid "See also C<guestfs_blockdev_getsz>."
+#: ../src/guestfs-actions.pod:316
+msgid ""
+"If C<expr> evaluates to an empty nodeset, a node is created, equivalent to "
+"calling C<guestfs_aug_set> C<expr>, C<value>.  C<name> will be the nodeset "
+"containing that single node."
+msgstr ""
+
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:320 ../fish/guestfish-actions.pod:206
+msgid ""
+"On success this returns a pair containing the number of nodes in the "
+"nodeset, and a boolean flag if a node was created."
+msgstr ""
+
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:324
+msgid ""
+"This function returns a C<struct guestfs_int_bool *>, or NULL if there was "
+"an error.  I<The caller must call C<guestfs_free_int_bool> after use>."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:722
-msgid "guestfs_blockdev_getss"
+#: ../src/guestfs-actions.pod:330
+msgid "guestfs_aug_defvar"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:724
+#: ../src/guestfs-actions.pod:332

 #, no-wrap
 msgid ""
 " int\n"
 #, no-wrap
 msgid ""
 " int\n"

-" guestfs_blockdev_getss (guestfs_h *g,\n"
-"                         const char *device);\n"
+" guestfs_aug_defvar (guestfs_h *g,\n"
+"                     const char *name,\n"
+"                     const char *expr);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:728 ../fish/guestfish-actions.pod:484
+#: ../src/guestfs-actions.pod:337 ../fish/guestfish-actions.pod:214

 msgid ""
 msgid ""

-"This returns the size of sectors on a block device.  Usually 512, but can be "
-"larger for modern devices."
+"Defines an Augeas variable C<name> whose value is the result of evaluating "
+"C<expr>.  If C<expr> is NULL, then C<name> is undefined."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:731
+#: ../src/guestfs-actions.pod:341 ../fish/guestfish-actions.pod:218

 msgid ""
 msgid ""

-"(Note, this is not the size in sectors, use C<guestfs_blockdev_getsz> for "
-"that)."
+"On success this returns the number of nodes in C<expr>, or C<0> if C<expr> "
+"evaluates to something which is not a nodeset."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:740
-msgid "guestfs_blockdev_getsz"
+#: ../src/guestfs-actions.pod:348
+msgid "guestfs_aug_get"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:742
+#: ../src/guestfs-actions.pod:350

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" int64_t\n"
-" guestfs_blockdev_getsz (guestfs_h *g,\n"
-"                         const char *device);\n"
+" char *\n"
+" guestfs_aug_get (guestfs_h *g,\n"
+"                  const char *augpath);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:746 ../fish/guestfish-actions.pod:496
+#: ../src/guestfs-actions.pod:354 ../fish/guestfish-actions.pod:225

 msgid ""
 msgid ""

-"This returns the size of the device in units of 512-byte sectors (even if "
-"the sectorsize isn't 512 bytes ... weird)."
+"Look up the value associated with C<path>.  If C<path> matches exactly one "
+"node, the C<value> is returned."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:749
+#: ../src/guestfs-actions.pod:357 ../src/guestfs-actions.pod:857
+#: ../src/guestfs-actions.pod:875 ../src/guestfs-actions.pod:935
+#: ../src/guestfs-actions.pod:951 ../src/guestfs-actions.pod:1054
+#: ../src/guestfs-actions.pod:1184 ../src/guestfs-actions.pod:1201
+#: ../src/guestfs-actions.pod:1220 ../src/guestfs-actions.pod:1354
+#: ../src/guestfs-actions.pod:1542 ../src/guestfs-actions.pod:1654
+#: ../src/guestfs-actions.pod:1817 ../src/guestfs-actions.pod:1834
+#: ../src/guestfs-actions.pod:1901 ../src/guestfs-actions.pod:1935
+#: ../src/guestfs-actions.pod:1956 ../src/guestfs-actions.pod:2126
+#: ../src/guestfs-actions.pod:2318 ../src/guestfs-actions.pod:2525
+#: ../src/guestfs-actions.pod:2618 ../src/guestfs-actions.pod:2729
+#: ../src/guestfs-actions.pod:2749 ../src/guestfs-actions.pod:2869
+#: ../src/guestfs-actions.pod:2900 ../src/guestfs-actions.pod:2924
+#: ../src/guestfs-actions.pod:2961 ../src/guestfs-actions.pod:3021
+#: ../src/guestfs-actions.pod:3044 ../src/guestfs-actions.pod:3065
+#: ../src/guestfs-actions.pod:3637 ../src/guestfs-actions.pod:3987
+#: ../src/guestfs-actions.pod:4157 ../src/guestfs-actions.pod:4267
+#: ../src/guestfs-actions.pod:5028 ../src/guestfs-actions.pod:5221
+#: ../src/guestfs-actions.pod:5391 ../src/guestfs-actions.pod:5569
+#: ../src/guestfs-actions.pod:5618 ../src/guestfs-actions.pod:6251
+#: ../src/guestfs-actions.pod:6267 ../src/guestfs-actions.pod:6284
+#: ../src/guestfs-actions.pod:6315 ../src/guestfs-actions.pod:6989
+#: ../src/guestfs-actions.pod:7008 ../src/guestfs-actions.pod:7026
+#: ../src/guestfs-actions.pod:7206 ../src/guestfs-actions.pod:7485

 msgid ""
 msgid ""

-"See also C<guestfs_blockdev_getss> for the real sector size of the device, "
-"and C<guestfs_blockdev_getsize64> for the more useful I<size in bytes>."
+"This function returns a string, or NULL on error.  I<The caller must free "
+"the returned string after use>."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:759
-msgid "guestfs_blockdev_rereadpt"
+#: ../src/guestfs-actions.pod:362
+msgid "guestfs_aug_init"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:761
+#: ../src/guestfs-actions.pod:364

 #, no-wrap
 msgid ""
 " int\n"
 #, no-wrap
 msgid ""
 " int\n"

-" guestfs_blockdev_rereadpt (guestfs_h *g,\n"
-"                            const char *device);\n"
+" guestfs_aug_init (guestfs_h *g,\n"
+"                   const char *root,\n"
+"                   int flags);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:765 ../fish/guestfish-actions.pod:509
-msgid "Reread the partition table on C<device>."
-msgstr ""
-
-# type: =head2
-#. type: =head2
-#: ../src/guestfs-actions.pod:773
-msgid "guestfs_blockdev_setbsz"
-msgstr ""
-
-# type: verbatim
-#. type: verbatim
-#: ../src/guestfs-actions.pod:775
-#, no-wrap
+#: ../src/guestfs-actions.pod:369 ../fish/guestfish-actions.pod:232

 msgid ""
 msgid ""

-" int\n"
-" guestfs_blockdev_setbsz (guestfs_h *g,\n"
-"                          const char *device,\n"
-"                          int blocksize);\n"
-"\n"
+"Create a new Augeas handle for editing configuration files.  If there was "
+"any previous Augeas handle associated with this guestfs session, then it is "
+"closed."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:780 ../fish/guestfish-actions.pod:517
-msgid "This sets the block size of a device."
-msgstr ""
-
-# type: =head2
-#. type: =head2
-#: ../src/guestfs-actions.pod:791
-msgid "guestfs_blockdev_setro"
+#: ../src/guestfs-actions.pod:373
+msgid "You must call this before using any other C<guestfs_aug_*> commands."

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../src/guestfs-actions.pod:793
-#, no-wrap
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:376 ../fish/guestfish-actions.pod:239

 msgid ""
 msgid ""

-" int\n"
-" guestfs_blockdev_setro (guestfs_h *g,\n"
-"                         const char *device);\n"
-"\n"
+"C<root> is the filesystem root.  C<root> must not be NULL, use C</> instead."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:797 ../fish/guestfish-actions.pod:528
-msgid "Sets the block device named C<device> to read-only."
-msgstr ""
-
-# type: =head2
-#. type: =head2
-#: ../src/guestfs-actions.pod:805
-msgid "guestfs_blockdev_setrw"
+#: ../src/guestfs-actions.pod:379 ../fish/guestfish-actions.pod:242
+msgid ""
+"The flags are the same as the flags defined in E<lt>augeas.hE<gt>, the "
+"logical I<or> of the following integers:"

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../src/guestfs-actions.pod:807
-#, no-wrap
-msgid ""
-" int\n"
-" guestfs_blockdev_setrw (guestfs_h *g,\n"
-"                         const char *device);\n"
-"\n"
+# type: =item
+#. type: =item
+#: ../src/guestfs-actions.pod:385 ../fish/guestfish-actions.pod:248
+msgid "C<AUG_SAVE_BACKUP> = 1"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:811 ../fish/guestfish-actions.pod:536
-msgid "Sets the block device named C<device> to read-write."
-msgstr ""
-
-# type: =head2
-#. type: =head2
-#: ../src/guestfs-actions.pod:819
-msgid "guestfs_case_sensitive_path"
+#: ../src/guestfs-actions.pod:387 ../fish/guestfish-actions.pod:250
+msgid "Keep the original file with a C<.augsave> extension."

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../src/guestfs-actions.pod:821
-#, no-wrap
-msgid ""
-" char *\n"
-" guestfs_case_sensitive_path (guestfs_h *g,\n"
-"                              const char *path);\n"
-"\n"
+# type: =item
+#. type: =item
+#: ../src/guestfs-actions.pod:389 ../fish/guestfish-actions.pod:252
+msgid "C<AUG_SAVE_NEWFILE> = 2"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:825 ../fish/guestfish-actions.pod:544
+#: ../src/guestfs-actions.pod:391 ../fish/guestfish-actions.pod:254

 msgid ""
 msgid ""

-"This can be used to resolve case insensitive paths on a filesystem which is "
-"case sensitive.  The use case is to resolve paths which you have read from "
-"Windows configuration files or the Windows Registry, to the true path."
+"Save changes into a file with extension C<.augnew>, and do not overwrite "
+"original.  Overrides C<AUG_SAVE_BACKUP>."

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:830 ../fish/guestfish-actions.pod:549
-msgid ""
-"The command handles a peculiarity of the Linux ntfs-3g filesystem driver "
-"(and probably others), which is that although the underlying filesystem is "
-"case-insensitive, the driver exports the filesystem to Linux as case-"
-"sensitive."
+# type: =item
+#. type: =item
+#: ../src/guestfs-actions.pod:394 ../fish/guestfish-actions.pod:257
+msgid "C<AUG_TYPE_CHECK> = 4"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:835 ../fish/guestfish-actions.pod:554
-msgid ""
-"One consequence of this is that special directories such as C<c:\\windows> "
-"may appear as C</WINDOWS> or C</windows> (or other things) depending on the "
-"precise details of how they were created.  In Windows itself this would not "
-"be a problem."
+#: ../src/guestfs-actions.pod:396 ../fish/guestfish-actions.pod:259
+msgid "Typecheck lenses (can be expensive)."

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:841 ../fish/guestfish-actions.pod:560
-msgid ""
-"Bug or feature? You decide: L<http://www.tuxera.com/community/ntfs-3g-faq/"
-"#posixfilenames1>"
+# type: =item
+#. type: =item
+#: ../src/guestfs-actions.pod:398 ../fish/guestfish-actions.pod:261
+msgid "C<AUG_NO_STDINC> = 8"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:844 ../fish/guestfish-actions.pod:563
-msgid ""
-"This function resolves the true case of each element in the path and returns "
-"the case-sensitive path."
+#: ../src/guestfs-actions.pod:400 ../fish/guestfish-actions.pod:263
+msgid "Do not use standard load path for modules."
+msgstr ""
+
+# type: =item
+#. type: =item
+#: ../src/guestfs-actions.pod:402 ../fish/guestfish-actions.pod:265
+msgid "C<AUG_SAVE_NOOP> = 16"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:847
-msgid ""
-"Thus C<guestfs_case_sensitive_path> (\"/Windows/System32\")  might return C<"
-"\"/WINDOWS/system32\"> (the exact return value would depend on details of "
-"how the directories were originally created under Windows)."
+#: ../src/guestfs-actions.pod:404 ../fish/guestfish-actions.pod:267
+msgid "Make save a no-op, just record what would have been changed."
+msgstr ""
+
+# type: =item
+#. type: =item
+#: ../src/guestfs-actions.pod:406 ../fish/guestfish-actions.pod:269
+msgid "C<AUG_NO_LOAD> = 32"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:852 ../fish/guestfish-actions.pod:571
-msgid "I<Note>: This function does not handle drive names, backslashes etc."
+#: ../src/guestfs-actions.pod:408
+msgid "Do not load the tree in C<guestfs_aug_init>."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:855
-msgid "See also C<guestfs_realpath>."
+#: ../src/guestfs-actions.pod:412
+msgid "To close the handle, you can call C<guestfs_aug_close>."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:860 ../src/guestfs-actions.pod:6838
-msgid "(Added in 1.0.75)"
+#: ../src/guestfs-actions.pod:414 ../fish/guestfish-actions.pod:277
+msgid "To find out more about Augeas, see L<http://augeas.net/>."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:862
-msgid "guestfs_cat"
+#: ../src/guestfs-actions.pod:420
+msgid "guestfs_aug_insert"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:864
+#: ../src/guestfs-actions.pod:422

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" char *\n"
-" guestfs_cat (guestfs_h *g,\n"
-"              const char *path);\n"
+" int\n"
+" guestfs_aug_insert (guestfs_h *g,\n"
+"                     const char *augpath,\n"
+"                     const char *label,\n"
+"                     int before);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:868 ../src/guestfs-actions.pod:5338
-#: ../fish/guestfish-actions.pod:580 ../fish/guestfish-actions.pod:3567
-msgid "Return the contents of the file named C<path>."
+#: ../src/guestfs-actions.pod:428 ../fish/guestfish-actions.pod:283
+msgid ""
+"Create a new sibling C<label> for C<path>, inserting it into the tree before "
+"or after C<path> (depending on the boolean flag C<before>)."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:870
+#: ../src/guestfs-actions.pod:432 ../fish/guestfish-actions.pod:287

 msgid ""
 msgid ""

-"Note that this function cannot correctly handle binary files (specifically, "
-"files containing C<\\0> character which is treated as end of string).  For "
-"those you need to use the C<guestfs_read_file> or C<guestfs_download> "
-"functions which have a more complex interface."
+"C<path> must match exactly one existing node in the tree, and C<label> must "
+"be a label, ie. not contain C</>, C<*> or end with a bracketed index C<[N]>."
+msgstr ""
+
+# type: =head2
+#. type: =head2
+#: ../src/guestfs-actions.pod:440
+msgid "guestfs_aug_load"
+msgstr ""
+
+# type: verbatim
+#. type: verbatim
+#: ../src/guestfs-actions.pod:442
+#, no-wrap
+msgid ""
+" int\n"
+" guestfs_aug_load (guestfs_h *g);\n"
+"\n"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:878 ../src/guestfs-actions.pod:1057
-#: ../src/guestfs-actions.pod:1077 ../src/guestfs-actions.pod:1368
-#: ../src/guestfs-actions.pod:1387 ../src/guestfs-actions.pod:1490
-#: ../src/guestfs-actions.pod:1509 ../src/guestfs-actions.pod:1758
-#: ../src/guestfs-actions.pod:2216 ../src/guestfs-actions.pod:2235
-#: ../src/guestfs-actions.pod:2278 ../src/guestfs-actions.pod:2302
-#: ../src/guestfs-actions.pod:2319 ../src/guestfs-actions.pod:2348
-#: ../src/guestfs-actions.pod:5120 ../src/guestfs-actions.pod:5146
-#: ../src/guestfs-actions.pod:5277 ../src/guestfs-actions.pod:5303
-#: ../src/guestfs-actions.pod:5327 ../src/guestfs-actions.pod:6223
-#: ../src/guestfs-actions.pod:6278 ../src/guestfs-actions.pod:6424
-#: ../src/guestfs-actions.pod:6448 ../src/guestfs-actions.pod:7110
-#: ../src/guestfs-actions.pod:7136 ../src/guestfs-actions.pod:7162
-#: ../src/guestfs-actions.pod:7181 ../src/guestfs-actions.pod:7266
-#: ../src/guestfs-actions.pod:7285 ../src/guestfs-actions.pod:7331
-#: ../src/guestfs-actions.pod:7350 ../fish/guestfish-actions.pod:587
-#: ../fish/guestfish-actions.pod:722 ../fish/guestfish-actions.pod:734
-#: ../fish/guestfish-actions.pod:910 ../fish/guestfish-actions.pod:920
-#: ../fish/guestfish-actions.pod:987 ../fish/guestfish-actions.pod:997
-#: ../fish/guestfish-actions.pod:1192 ../fish/guestfish-actions.pod:1493
-#: ../fish/guestfish-actions.pod:1503 ../fish/guestfish-actions.pod:1531
-#: ../fish/guestfish-actions.pod:1546 ../fish/guestfish-actions.pod:1556
-#: ../fish/guestfish-actions.pod:1575 ../fish/guestfish-actions.pod:3437
-#: ../fish/guestfish-actions.pod:3452 ../fish/guestfish-actions.pod:3528
-#: ../fish/guestfish-actions.pod:3545 ../fish/guestfish-actions.pod:3560
-#: ../fish/guestfish-actions.pod:4182 ../fish/guestfish-actions.pod:4228
-#: ../fish/guestfish-actions.pod:4313 ../fish/guestfish-actions.pod:4328
-#: ../fish/guestfish-actions.pod:4738 ../fish/guestfish-actions.pod:4756
-#: ../fish/guestfish-actions.pod:4773 ../fish/guestfish-actions.pod:4783
-#: ../fish/guestfish-actions.pod:4831 ../fish/guestfish-actions.pod:4841
-#: ../fish/guestfish-actions.pod:4870 ../fish/guestfish-actions.pod:4880
-msgid ""
-"Because of the message protocol, there is a transfer limit of somewhere "
-"between 2MB and 4MB.  See L<guestfs(3)/PROTOCOL LIMITS>."
+#: ../src/guestfs-actions.pod:445 ../fish/guestfish-actions.pod:295
+msgid "Load files into the tree."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:881 ../src/guestfs-actions.pod:3436
-#: ../src/guestfs-actions.pod:3498 ../src/guestfs-actions.pod:3515
-#: ../src/guestfs-actions.pod:3603 ../src/guestfs-actions.pod:4008
-#: ../src/guestfs-actions.pod:4022 ../src/guestfs-actions.pod:5226
-#: ../src/guestfs-actions.pod:5240 ../src/guestfs-actions.pod:6997
-#: ../src/guestfs-actions.pod:7011
-msgid "(Added in 0.4)"
+#: ../src/guestfs-actions.pod:447 ../fish/guestfish-actions.pod:297
+msgid "See C<aug_load> in the Augeas documentation for the full gory details."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:883
-msgid "guestfs_checksum"
+#: ../src/guestfs-actions.pod:454
+msgid "guestfs_aug_ls"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:885
+#: ../src/guestfs-actions.pod:456

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" char *\n"
-" guestfs_checksum (guestfs_h *g,\n"
-"                   const char *csumtype,\n"
-"                   const char *path);\n"
+" char **\n"
+" guestfs_aug_ls (guestfs_h *g,\n"
+"                 const char *augpath);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:890 ../fish/guestfish-actions.pod:594
+#: ../src/guestfs-actions.pod:460

 msgid ""
 msgid ""

-"This call computes the MD5, SHAx or CRC checksum of the file named C<path>."
+"This is just a shortcut for listing C<guestfs_aug_match> C<path/*> and "
+"sorting the resulting nodes into alphabetical order."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:893 ../fish/guestfish-actions.pod:597
+#: ../src/guestfs-actions.pod:463 ../src/guestfs-actions.pod:479
+#: ../src/guestfs-actions.pod:625 ../src/guestfs-actions.pod:1073
+#: ../src/guestfs-actions.pod:1369 ../src/guestfs-actions.pod:1388
+#: ../src/guestfs-actions.pod:1491 ../src/guestfs-actions.pod:1510
+#: ../src/guestfs-actions.pod:1756 ../src/guestfs-actions.pod:2198
+#: ../src/guestfs-actions.pod:2214 ../src/guestfs-actions.pod:2233
+#: ../src/guestfs-actions.pod:2276 ../src/guestfs-actions.pod:2300
+#: ../src/guestfs-actions.pod:2371 ../src/guestfs-actions.pod:2420
+#: ../src/guestfs-actions.pod:2687 ../src/guestfs-actions.pod:2978
+#: ../src/guestfs-actions.pod:3267 ../src/guestfs-actions.pod:3557
+#: ../src/guestfs-actions.pod:3619 ../src/guestfs-actions.pod:3724
+#: ../src/guestfs-actions.pod:4129 ../src/guestfs-actions.pod:4834
+#: ../src/guestfs-actions.pod:5363 ../src/guestfs-actions.pod:5489
+#: ../src/guestfs-actions.pod:5603 ../src/guestfs-actions.pod:6331
+#: ../src/guestfs-actions.pod:6392 ../src/guestfs-actions.pod:6447
+#: ../src/guestfs-actions.pod:6593 ../src/guestfs-actions.pod:6617
+#: ../src/guestfs-actions.pod:7099 ../src/guestfs-actions.pod:7119
+#: ../src/guestfs-actions.pod:7166 ../src/guestfs-actions.pod:7338
+#: ../src/guestfs-actions.pod:7357 ../src/guestfs-actions.pod:7442
+#: ../src/guestfs-actions.pod:7461 ../src/guestfs-actions.pod:7507
+#: ../src/guestfs-actions.pod:7526

 msgid ""
 msgid ""

-"The type of checksum to compute is given by the C<csumtype> parameter which "
-"must have one of the following values:"
-msgstr ""
-
-# type: =item
-#. type: =item
-#: ../src/guestfs-actions.pod:898 ../fish/guestfish-actions.pod:602
-msgid "C<crc>"
+"This function returns a NULL-terminated array of strings (like L<environ(3)"
+">), or NULL if there was an error.  I<The caller must free the strings and "
+"the array after use>."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:900 ../fish/guestfish-actions.pod:604
-msgid ""
-"Compute the cyclic redundancy check (CRC) specified by POSIX for the "
-"C<cksum> command."
-msgstr ""
-
-# type: =item
-#. type: =item
-#: ../src/guestfs-actions.pod:903 ../fish/guestfish-actions.pod:607
-msgid "C<md5>"
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:905 ../fish/guestfish-actions.pod:609
-msgid "Compute the MD5 hash (using the C<md5sum> program)."
-msgstr ""
-
-# type: =item
-#. type: =item
-#: ../src/guestfs-actions.pod:907 ../fish/guestfish-actions.pod:611
-msgid "C<sha1>"
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:909 ../fish/guestfish-actions.pod:613
-msgid "Compute the SHA1 hash (using the C<sha1sum> program)."
-msgstr ""
-
-# type: =item
-#. type: =item
-#: ../src/guestfs-actions.pod:911 ../fish/guestfish-actions.pod:615
-msgid "C<sha224>"
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:913 ../fish/guestfish-actions.pod:617
-msgid "Compute the SHA224 hash (using the C<sha224sum> program)."
-msgstr ""
-
-# type: =item
-#. type: =item
-#: ../src/guestfs-actions.pod:915 ../fish/guestfish-actions.pod:619
-msgid "C<sha256>"
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:917 ../fish/guestfish-actions.pod:621
-msgid "Compute the SHA256 hash (using the C<sha256sum> program)."
-msgstr ""
-
-# type: =item
-#. type: =item
-#: ../src/guestfs-actions.pod:919 ../fish/guestfish-actions.pod:623
-msgid "C<sha384>"
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:921 ../fish/guestfish-actions.pod:625
-msgid "Compute the SHA384 hash (using the C<sha384sum> program)."
-msgstr ""
-
-# type: =item
-#. type: =item
-#: ../src/guestfs-actions.pod:923 ../fish/guestfish-actions.pod:627
-msgid "C<sha512>"
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:925 ../fish/guestfish-actions.pod:629
-msgid "Compute the SHA512 hash (using the C<sha512sum> program)."
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:929 ../fish/guestfish-actions.pod:633
-msgid "The checksum is returned as a printable string."
+#: ../src/guestfs-actions.pod:467 ../src/guestfs-actions.pod:998
+#: ../src/guestfs-actions.pod:1016 ../src/guestfs-actions.pod:1426
+#: ../src/guestfs-actions.pod:3345 ../src/guestfs-actions.pod:3376
+#: ../src/guestfs-actions.pod:3970 ../src/guestfs-actions.pod:4020
+#: ../src/guestfs-actions.pod:4207 ../src/guestfs-actions.pod:4240
+#: ../src/guestfs-actions.pod:4403 ../src/guestfs-actions.pod:4838
+#: ../src/guestfs-actions.pod:5304 ../src/guestfs-actions.pod:5699
+#: ../src/guestfs-actions.pod:5713 ../src/guestfs-actions.pod:5725
+#: ../src/guestfs-actions.pod:6172 ../src/guestfs-actions.pod:6831
+#: ../src/guestfs-actions.pod:6844 ../src/guestfs-actions.pod:7083
+#: ../src/guestfs-actions.pod:7326
+msgid "(Added in 0.8)"

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:931
-msgid "To get the checksum for a device, use C<guestfs_checksum_device>."
+# type: =head2
+#. type: =head2
+#: ../src/guestfs-actions.pod:469
+msgid "guestfs_aug_match"

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:933
-msgid "To get the checksums for many files, use C<guestfs_checksums_out>."
+# type: verbatim
+#. type: verbatim
+#: ../src/guestfs-actions.pod:471
+#, no-wrap
+msgid ""
+" char **\n"
+" guestfs_aug_match (guestfs_h *g,\n"
+"                    const char *augpath);\n"
+"\n"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:938 ../src/guestfs-actions.pod:1246
-#: ../src/guestfs-actions.pod:2078 ../src/guestfs-actions.pod:3180
-#: ../src/guestfs-actions.pod:3209 ../src/guestfs-actions.pod:3270
-#: ../src/guestfs-actions.pod:3297 ../src/guestfs-actions.pod:6694
-msgid "(Added in 1.0.2)"
+#: ../src/guestfs-actions.pod:475 ../fish/guestfish-actions.pod:311
+msgid ""
+"Returns a list of paths which match the path expression C<path>.  The "
+"returned paths are sufficiently qualified so that they match exactly one "
+"node in the current tree."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:940
-msgid "guestfs_checksum_device"
+#: ../src/guestfs-actions.pod:485
+msgid "guestfs_aug_mv"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:942
+#: ../src/guestfs-actions.pod:487

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" char *\n"
-" guestfs_checksum_device (guestfs_h *g,\n"
-"                          const char *csumtype,\n"
-"                          const char *device);\n"
+" int\n"
+" guestfs_aug_mv (guestfs_h *g,\n"
+"                 const char *src,\n"
+"                 const char *dest);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:947
+#: ../src/guestfs-actions.pod:492 ../fish/guestfish-actions.pod:319

 msgid ""
 msgid ""

-"This call computes the MD5, SHAx or CRC checksum of the contents of the "
-"device named C<device>.  For the types of checksums supported see the "
-"C<guestfs_checksum> command."
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:954 ../src/guestfs-actions.pod:4757
-#: ../src/guestfs-actions.pod:4816 ../src/guestfs-actions.pod:4853
-#: ../src/guestfs-actions.pod:4871 ../src/guestfs-actions.pod:5047
-#: ../src/guestfs-actions.pod:6603 ../src/guestfs-actions.pod:6617
-#: ../src/guestfs-actions.pod:7023
-msgid "(Added in 1.3.2)"
+"Move the node C<src> to C<dest>.  C<src> must match exactly one node.  "
+"C<dest> is overwritten if it exists."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:956
-msgid "guestfs_checksums_out"
+#: ../src/guestfs-actions.pod:499
+msgid "guestfs_aug_rm"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:958
+#: ../src/guestfs-actions.pod:501

 #, no-wrap
 msgid ""
 " int\n"
 #, no-wrap
 msgid ""
 " int\n"

-" guestfs_checksums_out (guestfs_h *g,\n"
-"                        const char *csumtype,\n"
-"                        const char *directory,\n"
-"                        const char *sumsfile);\n"
+" guestfs_aug_rm (guestfs_h *g,\n"
+"                 const char *augpath);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:964 ../fish/guestfish-actions.pod:651
-msgid ""
-"This command computes the checksums of all regular files in C<directory> and "
-"then emits a list of those checksums to the local output file C<sumsfile>."
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:968 ../fish/guestfish-actions.pod:655
-msgid ""
-"This can be used for verifying the integrity of a virtual machine.  However "
-"to be properly secure you should pay attention to the output of the checksum "
-"command (it uses the ones from GNU coreutils).  In particular when the "
-"filename is not printable, coreutils uses a special backslash syntax.  For "
-"more information, see the GNU coreutils info file."
+#: ../src/guestfs-actions.pod:505 ../fish/guestfish-actions.pod:326
+msgid "Remove C<path> and all of its children."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:978
-msgid "(Added in 1.3.7)"
+#: ../src/guestfs-actions.pod:507 ../fish/guestfish-actions.pod:328
+msgid "On success this returns the number of entries which were removed."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:980
-msgid "guestfs_chmod"
+#: ../src/guestfs-actions.pod:513
+msgid "guestfs_aug_save"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:982
+#: ../src/guestfs-actions.pod:515

 #, no-wrap
 msgid ""
 " int\n"
 #, no-wrap
 msgid ""
 " int\n"

-" guestfs_chmod (guestfs_h *g,\n"
-"                int mode,\n"
-"                const char *path);\n"
+" guestfs_aug_save (guestfs_h *g);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:987 ../fish/guestfish-actions.pod:669
-msgid ""
-"Change the mode (permissions) of C<path> to C<mode>.  Only numeric modes are "
-"supported."
+#: ../src/guestfs-actions.pod:518 ../fish/guestfish-actions.pod:334
+msgid "This writes all pending changes to disk."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:990 ../fish/guestfish-actions.pod:672
+#: ../src/guestfs-actions.pod:520

 msgid ""
 msgid ""

-"I<Note>: When using this command from guestfish, C<mode> by default would be "
-"decimal, unless you prefix it with C<0> to get octal, ie. use C<0700> not "
-"C<700>."
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:994 ../src/guestfs-actions.pod:4259
-#: ../src/guestfs-actions.pod:4456 ../src/guestfs-actions.pod:4475
-#: ../src/guestfs-actions.pod:4494 ../fish/guestfish-actions.pod:676
-#: ../fish/guestfish-actions.pod:2883 ../fish/guestfish-actions.pod:3012
-#: ../fish/guestfish-actions.pod:3022 ../fish/guestfish-actions.pod:3032
-msgid "The mode actually set is affected by the umask."
+"The flags which were passed to C<guestfs_aug_init> affect exactly how files "
+"are saved."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:1000
-msgid "guestfs_chown"
+#: ../src/guestfs-actions.pod:527
+msgid "guestfs_aug_set"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:1002
+#: ../src/guestfs-actions.pod:529

 #, no-wrap
 msgid ""
 " int\n"
 #, no-wrap
 msgid ""
 " int\n"

-" guestfs_chown (guestfs_h *g,\n"
-"                int owner,\n"
-"                int group,\n"
-"                const char *path);\n"
+" guestfs_aug_set (guestfs_h *g,\n"
+"                  const char *augpath,\n"
+"                  const char *val);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:1008 ../fish/guestfish-actions.pod:682
-msgid "Change the file owner to C<owner> and group to C<group>."
+#: ../src/guestfs-actions.pod:534 ../fish/guestfish-actions.pod:343
+msgid "Set the value associated with C<path> to C<val>."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:1010 ../src/guestfs-actions.pod:3367
-#: ../fish/guestfish-actions.pod:684 ../fish/guestfish-actions.pod:2341
+#: ../src/guestfs-actions.pod:536

 msgid ""
 msgid ""

-"Only numeric uid and gid are supported.  If you want to use names, you will "
-"need to locate and parse the password file yourself (Augeas support makes "
-"this relatively easy)."
+"In the Augeas API, it is possible to clear a node by setting the value to "
+"NULL.  Due to an oversight in the libguestfs API you cannot do that with "
+"this call.  Instead you must use the C<guestfs_aug_clear> call."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:1018
-msgid "guestfs_command"
+#: ../src/guestfs-actions.pod:545
+msgid "guestfs_available"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:1020
+#: ../src/guestfs-actions.pod:547

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" char *\n"
-" guestfs_command (guestfs_h *g,\n"
-"                  char *const *arguments);\n"
+" int\n"
+" guestfs_available (guestfs_h *g,\n"
+"                    char *const *groups);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:1024 ../fish/guestfish-actions.pod:692
+#: ../src/guestfs-actions.pod:551 ../fish/guestfish-actions.pod:354

 msgid ""
 msgid ""

-"This call runs a command from the guest filesystem.  The filesystem must be "
-"mounted, and must contain a compatible operating system (ie. something "
-"Linux, with the same or compatible processor architecture)."
+"This command is used to check the availability of some groups of "
+"functionality in the appliance, which not all builds of the libguestfs "
+"appliance will be able to provide."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:1029
+#: ../src/guestfs-actions.pod:555

 msgid ""
 msgid ""

-"The single parameter is an argv-style list of arguments.  The first element "
-"is the name of the program to run.  Subsequent elements are parameters.  The "
-"list must be non-empty (ie. must contain a program name).  Note that the "
-"command runs directly, and is I<not> invoked via the shell (see "
-"C<guestfs_sh>)."
+"The libguestfs groups, and the functions that those groups correspond to, "
+"are listed in L<guestfs(3)/AVAILABILITY>.  You can also fetch this list at "
+"runtime by calling C<guestfs_available_all_groups>."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:1036 ../fish/guestfish-actions.pod:704
-msgid "The return value is anything printed to I<stdout> by the command."
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:1039 ../fish/guestfish-actions.pod:707
+#: ../src/guestfs-actions.pod:560 ../fish/guestfish-actions.pod:363

 msgid ""
 msgid ""

-"If the command returns a non-zero exit status, then this function returns an "
-"error message.  The error message string is the content of I<stderr> from "
-"the command."
+"The argument C<groups> is a list of group names, eg: C<[\"inotify\", \"augeas"
+"\"]> would check for the availability of the Linux inotify functions and "
+"Augeas (configuration file editing) functions."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:1043 ../fish/guestfish-actions.pod:711
-msgid ""
-"The C<$PATH> environment variable will contain at least C</usr/bin> and C</"
-"bin>.  If you require a program from another location, you should provide "
-"the full path in the first parameter."
+#: ../src/guestfs-actions.pod:565 ../fish/guestfish-actions.pod:368
+msgid "The command returns no error if I<all> requested groups are available."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:1048 ../fish/guestfish-actions.pod:716
+#: ../src/guestfs-actions.pod:567 ../fish/guestfish-actions.pod:370

 msgid ""
 msgid ""

-"Shared libraries and data files required by the program must be available on "
-"filesystems which are mounted in the correct places.  It is the caller's "
-"responsibility to ensure all filesystems that are needed are mounted at the "
-"right locations."
+"It fails with an error if one or more of the requested groups is unavailable "
+"in the appliance."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:1060 ../src/guestfs-actions.pod:1080
-#: ../src/guestfs-actions.pod:1543
-msgid "(Added in 0.9.1)"
-msgstr ""
-
-# type: =head2
-#. type: =head2
-#: ../src/guestfs-actions.pod:1062
-msgid "guestfs_command_lines"
-msgstr ""
-
-# type: verbatim
-#. type: verbatim
-#: ../src/guestfs-actions.pod:1064
-#, no-wrap
+#: ../src/guestfs-actions.pod:570 ../fish/guestfish-actions.pod:373

 msgid ""
 msgid ""

-" char **\n"
-" guestfs_command_lines (guestfs_h *g,\n"
-"                        char *const *arguments);\n"
-"\n"
+"If an unknown group name is included in the list of groups then an error is "
+"always returned."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:1068
-msgid ""
-"This is the same as C<guestfs_command>, but splits the result into a list of "
-"lines."
+#: ../src/guestfs-actions.pod:573 ../fish/guestfish-actions.pod:376
+msgid "I<Notes:>"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:1071
-msgid "See also: C<guestfs_sh_lines>"
+#: ../src/guestfs-actions.pod:579
+msgid "You must call C<guestfs_launch> before calling this function."

 msgstr ""
 
 msgstr ""
 

-# type: =head2
-#. type: =head2
-#: ../src/guestfs-actions.pod:1082
-msgid "guestfs_config"
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:581 ../fish/guestfish-actions.pod:384
+msgid ""
+"The reason is because we don't know what groups are supported by the "
+"appliance/daemon until it is running and can be queried."

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../src/guestfs-actions.pod:1084
-#, no-wrap
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:587 ../fish/guestfish-actions.pod:390

 msgid ""
 msgid ""

-" int\n"
-" guestfs_config (guestfs_h *g,\n"
-"                 const char *qemuparam,\n"
-"                 const char *qemuvalue);\n"
-"\n"
+"If a group of functions is available, this does not necessarily mean that "
+"they will work.  You still have to check for errors when calling individual "
+"API functions even if they are available."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:1089 ../fish/guestfish-actions.pod:741
+#: ../src/guestfs-actions.pod:594 ../fish/guestfish-actions.pod:397

 msgid ""
 msgid ""

-"This can be used to add arbitrary qemu command line parameters of the form "
-"C<-param value>.  Actually it's not quite arbitrary - we prevent you from "
-"setting some parameters which would interfere with parameters that we use."
+"It is usually the job of distro packagers to build complete functionality "
+"into the libguestfs appliance.  Upstream libguestfs, if built from source "
+"with all requirements satisfied, will support everything."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:1094 ../fish/guestfish-actions.pod:746
-msgid "The first character of C<param> string must be a C<-> (dash)."
+#: ../src/guestfs-actions.pod:601
+msgid ""
+"This call was added in version C<1.0.80>.  In previous versions of "
+"libguestfs all you could do would be to speculatively execute a command to "
+"find out if the daemon implemented it.  See also C<guestfs_version>."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:1096 ../fish/guestfish-actions.pod:748
-msgid "C<value> can be NULL."
+#: ../src/guestfs-actions.pod:610 ../src/guestfs-actions.pod:1171
+msgid "(Added in 1.0.80)"

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:1102
-msgid "guestfs_copy_size"
+#: ../src/guestfs-actions.pod:612
+msgid "guestfs_available_all_groups"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:1104
+#: ../src/guestfs-actions.pod:614

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" int\n"
-" guestfs_copy_size (guestfs_h *g,\n"
-"                    const char *src,\n"
-"                    const char *dest,\n"
-"                    int64_t size);\n"
+" char **\n"
+" guestfs_available_all_groups (guestfs_h *g);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:1110 ../fish/guestfish-actions.pod:754
-msgid ""
-"This command copies exactly C<size> bytes from one source device or file "
-"C<src> to another destination device or file C<dest>."
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:1113 ../fish/guestfish-actions.pod:757
+#: ../src/guestfs-actions.pod:617

 msgid ""
 msgid ""

-"Note this will fail if the source is too short or if the destination is not "
-"large enough."
+"This command returns a list of all optional groups that this daemon knows "
+"about.  Note this returns both supported and unsupported groups.  To find "
+"out which ones the daemon can actually support you have to call "
+"C<guestfs_available> on each member of the returned list."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:1118 ../src/guestfs-actions.pod:1241
-#: ../src/guestfs-actions.pod:1272 ../src/guestfs-actions.pod:1692
-#: ../src/guestfs-actions.pod:1714 ../src/guestfs-actions.pod:6689
-#: ../src/guestfs-actions.pod:6723 ../src/guestfs-actions.pod:7202
-#: ../src/guestfs-actions.pod:7221
-msgid ""
-"This long-running command can generate progress notification messages so "
-"that the caller can display a progress bar or indicator.  To receive these "
-"messages, the caller must register a progress callback.  See L<guestfs(3)/"
-"guestfs_set_progress_callback>."
+#: ../src/guestfs-actions.pod:623
+msgid "See also C<guestfs_available> and L<guestfs(3)/AVAILABILITY>."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:1123 ../src/guestfs-actions.pod:4035
-#: ../src/guestfs-actions.pod:5253 ../src/guestfs-actions.pod:6930
-#: ../src/guestfs-actions.pod:6950 ../src/guestfs-actions.pod:7036
-msgid "(Added in 1.0.87)"
+#: ../src/guestfs-actions.pod:629
+msgid "(Added in 1.3.15)"

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:1125
-msgid "guestfs_cp"
+#: ../src/guestfs-actions.pod:631
+msgid "guestfs_base64_in"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:1127
+#: ../src/guestfs-actions.pod:633

 #, no-wrap
 msgid ""
 " int\n"
 #, no-wrap
 msgid ""
 " int\n"

-" guestfs_cp (guestfs_h *g,\n"
-"             const char *src,\n"
-"             const char *dest);\n"
+" guestfs_base64_in (guestfs_h *g,\n"
+"                    const char *base64file,\n"
+"                    const char *filename);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:1132 ../fish/guestfish-actions.pod:764
+#: ../src/guestfs-actions.pod:638 ../fish/guestfish-actions.pod:427

 msgid ""
 msgid ""

-"This copies a file from C<src> to C<dest> where C<dest> is either a "
-"destination filename or destination directory."
+"This command uploads base64-encoded data from C<base64file> to C<filename>."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:1137 ../src/guestfs-actions.pod:1151
-#: ../src/guestfs-actions.pod:1223 ../src/guestfs-actions.pod:1297
-#: ../src/guestfs-actions.pod:1406 ../src/guestfs-actions.pod:4720
-#: ../src/guestfs-actions.pod:5097
-msgid "(Added in 1.0.18)"
+#: ../src/guestfs-actions.pod:643 ../src/guestfs-actions.pod:657
+msgid "(Added in 1.3.5)"

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:1139
-msgid "guestfs_cp_a"
+#: ../src/guestfs-actions.pod:645
+msgid "guestfs_base64_out"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:1141
+#: ../src/guestfs-actions.pod:647

 #, no-wrap
 msgid ""
 " int\n"
 #, no-wrap
 msgid ""
 " int\n"

-" guestfs_cp_a (guestfs_h *g,\n"
-"               const char *src,\n"
-"               const char *dest);\n"
+" guestfs_base64_out (guestfs_h *g,\n"
+"                     const char *filename,\n"
+"                     const char *base64file);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:1146 ../fish/guestfish-actions.pod:771
+#: ../src/guestfs-actions.pod:652 ../fish/guestfish-actions.pod:436

 msgid ""
 msgid ""

-"This copies a file or directory from C<src> to C<dest> recursively using the "
-"C<cp -a> command."
+"This command downloads the contents of C<filename>, writing it out to local "
+"file C<base64file> encoded as base64."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:1153
-msgid "guestfs_dd"
+#: ../src/guestfs-actions.pod:659
+msgid "guestfs_blockdev_flushbufs"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:1155
+#: ../src/guestfs-actions.pod:661

 #, no-wrap
 msgid ""
 " int\n"
 #, no-wrap
 msgid ""
 " int\n"

-" guestfs_dd (guestfs_h *g,\n"
-"             const char *src,\n"
-"             const char *dest);\n"
+" guestfs_blockdev_flushbufs (guestfs_h *g,\n"
+"                             const char *device);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:1160 ../fish/guestfish-actions.pod:778
+#: ../src/guestfs-actions.pod:665 ../fish/guestfish-actions.pod:445

 msgid ""
 msgid ""

-"This command copies from one source device or file C<src> to another "
-"destination device or file C<dest>.  Normally you would use this to copy to "
-"or from a device or partition, for example to duplicate a filesystem."
+"This tells the kernel to flush internal buffers associated with C<device>."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:1165
-msgid ""
-"If the destination is a device, it must be as large or larger than the "
-"source file or device, otherwise the copy will fail.  This command cannot do "
-"partial copies (see C<guestfs_copy_size>)."
+#: ../src/guestfs-actions.pod:668 ../src/guestfs-actions.pod:685
+#: ../src/guestfs-actions.pod:700 ../src/guestfs-actions.pod:716
+#: ../src/guestfs-actions.pod:734 ../src/guestfs-actions.pod:753
+#: ../src/guestfs-actions.pod:767 ../src/guestfs-actions.pod:785
+#: ../src/guestfs-actions.pod:799 ../src/guestfs-actions.pod:813
+#: ../fish/guestfish-actions.pod:448 ../fish/guestfish-actions.pod:459
+#: ../fish/guestfish-actions.pod:468 ../fish/guestfish-actions.pod:478
+#: ../fish/guestfish-actions.pod:490 ../fish/guestfish-actions.pod:503
+#: ../fish/guestfish-actions.pod:511 ../fish/guestfish-actions.pod:522
+#: ../fish/guestfish-actions.pod:530 ../fish/guestfish-actions.pod:538
+msgid "This uses the L<blockdev(8)> command."
+msgstr ""
+
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:672 ../src/guestfs-actions.pod:689
+#: ../src/guestfs-actions.pod:704 ../src/guestfs-actions.pod:720
+#: ../src/guestfs-actions.pod:738 ../src/guestfs-actions.pod:757
+#: ../src/guestfs-actions.pod:771 ../src/guestfs-actions.pod:789
+#: ../src/guestfs-actions.pod:803 ../src/guestfs-actions.pod:817
+msgid "(Added in 0.9.3)"

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:1173
-msgid "guestfs_df"
+#: ../src/guestfs-actions.pod:674
+msgid "guestfs_blockdev_getbsz"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:1175
+#: ../src/guestfs-actions.pod:676

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" char *\n"
-" guestfs_df (guestfs_h *g);\n"
+" int\n"
+" guestfs_blockdev_getbsz (guestfs_h *g,\n"
+"                          const char *device);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:1178 ../fish/guestfish-actions.pod:791
-msgid "This command runs the C<df> command to report disk space used."
+#: ../src/guestfs-actions.pod:680 ../fish/guestfish-actions.pod:454
+msgid "This returns the block size of a device."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:1180 ../src/guestfs-actions.pod:1197
+#: ../src/guestfs-actions.pod:682 ../src/guestfs-actions.pod:782
+#: ../fish/guestfish-actions.pod:456 ../fish/guestfish-actions.pod:519

 msgid ""
 msgid ""

-"This command is mostly useful for interactive sessions.  It is I<not> "
-"intended that you try to parse the output string.  Use C<guestfs_statvfs> "
-"from programs."
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:1187 ../src/guestfs-actions.pod:1204
-#: ../src/guestfs-actions.pod:1317 ../src/guestfs-actions.pod:2281
-#: ../src/guestfs-actions.pod:2305 ../src/guestfs-actions.pod:2373
-#: ../src/guestfs-actions.pod:4145 ../src/guestfs-actions.pod:4620
-#: ../src/guestfs-actions.pod:6427 ../src/guestfs-actions.pod:6451
-#: ../src/guestfs-actions.pod:7069 ../src/guestfs-actions.pod:7082
-#: ../src/guestfs-actions.pod:7095
-msgid "(Added in 1.0.54)"
+"(Note this is different from both I<size in blocks> and I<filesystem block "
+"size>)."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:1189
-msgid "guestfs_df_h"
+#: ../src/guestfs-actions.pod:691
+msgid "guestfs_blockdev_getro"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:1191
+#: ../src/guestfs-actions.pod:693

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" char *\n"
-" guestfs_df_h (guestfs_h *g);\n"
+" int\n"
+" guestfs_blockdev_getro (guestfs_h *g,\n"
+"                         const char *device);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:1194 ../fish/guestfish-actions.pod:801
+#: ../src/guestfs-actions.pod:697 ../fish/guestfish-actions.pod:465

 msgid ""
 msgid ""

-"This command runs the C<df -h> command to report disk space used in human-"
-"readable format."
+"Returns a boolean indicating if the block device is read-only (true if read-"
+"only, false if not)."
+msgstr ""
+
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:702 ../src/guestfs-actions.pod:1409
+#: ../src/guestfs-actions.pod:1424 ../src/guestfs-actions.pod:1911
+#: ../src/guestfs-actions.pod:1922 ../src/guestfs-actions.pod:1994
+#: ../src/guestfs-actions.pod:2049 ../src/guestfs-actions.pod:2064
+#: ../src/guestfs-actions.pod:2089 ../src/guestfs-actions.pod:2112
+#: ../src/guestfs-actions.pod:3085 ../src/guestfs-actions.pod:3102
+#: ../src/guestfs-actions.pod:3121 ../src/guestfs-actions.pod:3284
+#: ../src/guestfs-actions.pod:3298 ../src/guestfs-actions.pod:3313
+#: ../src/guestfs-actions.pod:3327 ../src/guestfs-actions.pod:3343
+#: ../src/guestfs-actions.pod:3358 ../src/guestfs-actions.pod:3374
+#: ../src/guestfs-actions.pod:3388 ../src/guestfs-actions.pod:3401
+#: ../src/guestfs-actions.pod:3415 ../src/guestfs-actions.pod:3430
+#: ../src/guestfs-actions.pod:3445 ../src/guestfs-actions.pod:4992
+msgid "This function returns a C truth value on success or -1 on error."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:1206
-msgid "guestfs_dmesg"
+#: ../src/guestfs-actions.pod:706
+msgid "guestfs_blockdev_getsize64"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:1208
+#: ../src/guestfs-actions.pod:708

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" char *\n"
-" guestfs_dmesg (guestfs_h *g);\n"
+" int64_t\n"
+" guestfs_blockdev_getsize64 (guestfs_h *g,\n"
+"                             const char *device);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:1211 ../fish/guestfish-actions.pod:812
-msgid ""
-"This returns the kernel messages (C<dmesg> output) from the guest kernel.  "
-"This is sometimes useful for extended debugging of problems."
+#: ../src/guestfs-actions.pod:712 ../fish/guestfish-actions.pod:474
+msgid "This returns the size of the device in bytes."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:1215
-msgid ""
-"Another way to get the same information is to enable verbose messages with "
-"C<guestfs_set_verbose> or by setting the environment variable "
-"C<LIBGUESTFS_DEBUG=1> before running the program."
+#: ../src/guestfs-actions.pod:714
+msgid "See also C<guestfs_blockdev_getsz>."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:1225
-msgid "guestfs_download"
+#: ../src/guestfs-actions.pod:722
+msgid "guestfs_blockdev_getss"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:1227
+#: ../src/guestfs-actions.pod:724

 #, no-wrap
 msgid ""
 " int\n"
 #, no-wrap
 msgid ""
 " int\n"

-" guestfs_download (guestfs_h *g,\n"
-"                   const char *remotefilename,\n"
-"                   const char *filename);\n"
+" guestfs_blockdev_getss (guestfs_h *g,\n"
+"                         const char *device);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:1232 ../src/guestfs-actions.pod:1257
-#: ../fish/guestfish-actions.pod:825 ../fish/guestfish-actions.pod:838
+#: ../src/guestfs-actions.pod:728 ../fish/guestfish-actions.pod:484

 msgid ""
 msgid ""

-"Download file C<remotefilename> and save it as C<filename> on the local "
-"machine."
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:1235 ../src/guestfs-actions.pod:6683
-#: ../fish/guestfish-actions.pod:828 ../fish/guestfish-actions.pod:4486
-msgid "C<filename> can also be a named pipe."
+"This returns the size of sectors on a block device.  Usually 512, but can be "
+"larger for modern devices."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:1237
-msgid "See also C<guestfs_upload>, C<guestfs_cat>."
+#: ../src/guestfs-actions.pod:731
+msgid ""
+"(Note, this is not the size in sectors, use C<guestfs_blockdev_getsz> for "
+"that)."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:1248
-msgid "guestfs_download_offset"
+#: ../src/guestfs-actions.pod:740
+msgid "guestfs_blockdev_getsz"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:1250
+#: ../src/guestfs-actions.pod:742

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" int\n"
-" guestfs_download_offset (guestfs_h *g,\n"
-"                          const char *remotefilename,\n"
-"                          const char *filename,\n"
-"                          int64_t offset,\n"
-"                          int64_t size);\n"
+" int64_t\n"
+" guestfs_blockdev_getsz (guestfs_h *g,\n"
+"                         const char *device);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:1260 ../fish/guestfish-actions.pod:841
+#: ../src/guestfs-actions.pod:746 ../fish/guestfish-actions.pod:496

 msgid ""
 msgid ""

-"C<remotefilename> is read for C<size> bytes starting at C<offset> (this "
-"region must be within the file or device)."
+"This returns the size of the device in units of 512-byte sectors (even if "
+"the sectorsize isn't 512 bytes ... weird)."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:1263
+#: ../src/guestfs-actions.pod:749

 msgid ""
 msgid ""

-"Note that there is no limit on the amount of data that can be downloaded "
-"with this call, unlike with C<guestfs_pread>, and this call always reads the "
-"full amount unless an error occurs."
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:1268
-msgid "See also C<guestfs_download>, C<guestfs_pread>."
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:1277 ../src/guestfs-actions.pod:6728
-msgid "(Added in 1.5.17)"
+"See also C<guestfs_blockdev_getss> for the real sector size of the device, "
+"and C<guestfs_blockdev_getsize64> for the more useful I<size in bytes>."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:1279
-msgid "guestfs_drop_caches"
+#: ../src/guestfs-actions.pod:759
+msgid "guestfs_blockdev_rereadpt"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:1281
+#: ../src/guestfs-actions.pod:761

 #, no-wrap
 msgid ""
 " int\n"
 #, no-wrap
 msgid ""
 " int\n"

-" guestfs_drop_caches (guestfs_h *g,\n"
-"                      int whattodrop);\n"
+" guestfs_blockdev_rereadpt (guestfs_h *g,\n"
+"                            const char *device);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:1285 ../fish/guestfish-actions.pod:857
-msgid ""
-"This instructs the guest kernel to drop its page cache, and/or dentries and "
-"inode caches.  The parameter C<whattodrop> tells the kernel what precisely "
-"to drop, see L<http://linux-mm.org/Drop_Caches>"
+#: ../src/guestfs-actions.pod:765 ../fish/guestfish-actions.pod:509
+msgid "Reread the partition table on C<device>."

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:1290 ../fish/guestfish-actions.pod:862
-msgid "Setting C<whattodrop> to 3 should drop everything."
+# type: =head2
+#. type: =head2
+#: ../src/guestfs-actions.pod:773
+msgid "guestfs_blockdev_setbsz"
+msgstr ""
+
+# type: verbatim
+#. type: verbatim
+#: ../src/guestfs-actions.pod:775
+#, no-wrap
+msgid ""
+" int\n"
+" guestfs_blockdev_setbsz (guestfs_h *g,\n"
+"                          const char *device,\n"
+"                          int blocksize);\n"
+"\n"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:1292 ../fish/guestfish-actions.pod:864
-msgid ""
-"This automatically calls L<sync(2)> before the operation, so that the "
-"maximum guest memory is freed."
+#: ../src/guestfs-actions.pod:780 ../fish/guestfish-actions.pod:517
+msgid "This sets the block size of a device."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:1299
-msgid "guestfs_du"
+#: ../src/guestfs-actions.pod:791
+msgid "guestfs_blockdev_setro"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:1301
+#: ../src/guestfs-actions.pod:793

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" int64_t\n"
-" guestfs_du (guestfs_h *g,\n"
-"             const char *path);\n"
+" int\n"
+" guestfs_blockdev_setro (guestfs_h *g,\n"
+"                         const char *device);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:1305 ../fish/guestfish-actions.pod:871
-msgid ""
-"This command runs the C<du -s> command to estimate file space usage for "
-"C<path>."
+#: ../src/guestfs-actions.pod:797 ../fish/guestfish-actions.pod:528
+msgid "Sets the block device named C<device> to read-only."

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:1308 ../fish/guestfish-actions.pod:874
+# type: =head2
+#. type: =head2
+#: ../src/guestfs-actions.pod:805
+msgid "guestfs_blockdev_setrw"
+msgstr ""
+
+# type: verbatim
+#. type: verbatim
+#: ../src/guestfs-actions.pod:807
+#, no-wrap

 msgid ""
 msgid ""

-"C<path> can be a file or a directory.  If C<path> is a directory then the "
-"estimate includes the contents of the directory and all subdirectories "
-"(recursively)."
+" int\n"
+" guestfs_blockdev_setrw (guestfs_h *g,\n"
+"                         const char *device);\n"
+"\n"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:1312 ../fish/guestfish-actions.pod:878
-msgid ""
-"The result is the estimated size in I<kilobytes> (ie. units of 1024 bytes)."
+#: ../src/guestfs-actions.pod:811 ../fish/guestfish-actions.pod:536
+msgid "Sets the block device named C<device> to read-write."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:1319
-msgid "guestfs_e2fsck_f"
+#: ../src/guestfs-actions.pod:819
+msgid "guestfs_case_sensitive_path"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:1321
+#: ../src/guestfs-actions.pod:821

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" int\n"
-" guestfs_e2fsck_f (guestfs_h *g,\n"
-"                   const char *device);\n"
+" char *\n"
+" guestfs_case_sensitive_path (guestfs_h *g,\n"
+"                              const char *path);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:1325 ../fish/guestfish-actions.pod:885
+#: ../src/guestfs-actions.pod:825 ../fish/guestfish-actions.pod:544

 msgid ""
 msgid ""

-"This runs C<e2fsck -p -f device>, ie. runs the ext2/ext3 filesystem checker "
-"on C<device>, noninteractively (C<-p>), even if the filesystem appears to be "
-"clean (C<-f>)."
+"This can be used to resolve case insensitive paths on a filesystem which is "
+"case sensitive.  The use case is to resolve paths which you have read from "
+"Windows configuration files or the Windows Registry, to the true path."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:1329
+#: ../src/guestfs-actions.pod:830 ../fish/guestfish-actions.pod:549

 msgid ""
 msgid ""

-"This command is only needed because of C<guestfs_resize2fs> (q.v.).  "
-"Normally you should use C<guestfs_fsck>."
+"The command handles a peculiarity of the Linux ntfs-3g filesystem driver "
+"(and probably others), which is that although the underlying filesystem is "
+"case-insensitive, the driver exports the filesystem to Linux as case-"
+"sensitive."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:1334
-msgid "(Added in 1.0.29)"
-msgstr ""
-
-# type: =head2
-#. type: =head2
-#: ../src/guestfs-actions.pod:1336
-msgid "guestfs_echo_daemon"
+#: ../src/guestfs-actions.pod:835 ../fish/guestfish-actions.pod:554
+msgid ""
+"One consequence of this is that special directories such as C<c:\\windows> "
+"may appear as C</WINDOWS> or C</windows> (or other things) depending on the "
+"precise details of how they were created.  In Windows itself this would not "
+"be a problem."

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../src/guestfs-actions.pod:1338
-#, no-wrap
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:841 ../fish/guestfish-actions.pod:560

 msgid ""
 msgid ""

-" char *\n"
-" guestfs_echo_daemon (guestfs_h *g,\n"
-"                      char *const *words);\n"
-"\n"
+"Bug or feature? You decide: L<http://www.tuxera.com/community/ntfs-3g-faq/"
+"#posixfilenames1>"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:1342 ../fish/guestfish-actions.pod:896
+#: ../src/guestfs-actions.pod:844 ../fish/guestfish-actions.pod:563

 msgid ""
 msgid ""

-"This command concatenates the list of C<words> passed with single spaces "
-"between them and returns the resulting string."
+"This function resolves the true case of each element in the path and returns "
+"the case-sensitive path."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:1345 ../fish/guestfish-actions.pod:899
-msgid "You can use this command to test the connection through to the daemon."
+#: ../src/guestfs-actions.pod:847
+msgid ""
+"Thus C<guestfs_case_sensitive_path> (\"/Windows/System32\")  might return C<"
+"\"/WINDOWS/system32\"> (the exact return value would depend on details of "
+"how the directories were originally created under Windows)."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:1347
-msgid "See also C<guestfs_ping_daemon>."
+#: ../src/guestfs-actions.pod:852 ../fish/guestfish-actions.pod:571
+msgid "I<Note>: This function does not handle drive names, backslashes etc."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:1352 ../src/guestfs-actions.pod:2089
-#: ../src/guestfs-actions.pod:5931
-msgid "(Added in 1.0.69)"
+#: ../src/guestfs-actions.pod:855
+msgid "See also C<guestfs_realpath>."
+msgstr ""
+
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:860 ../src/guestfs-actions.pod:7011
+msgid "(Added in 1.0.75)"

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:1354
-msgid "guestfs_egrep"
+#: ../src/guestfs-actions.pod:862
+msgid "guestfs_cat"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:1356
+#: ../src/guestfs-actions.pod:864

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" char **\n"
-" guestfs_egrep (guestfs_h *g,\n"
-"                const char *regex,\n"
-"                const char *path);\n"
+" char *\n"
+" guestfs_cat (guestfs_h *g,\n"
+"              const char *path);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:1361 ../fish/guestfish-actions.pod:907
-msgid ""
-"This calls the external C<egrep> program and returns the matching lines."
+#: ../src/guestfs-actions.pod:868 ../src/guestfs-actions.pod:5479
+#: ../fish/guestfish-actions.pod:580 ../fish/guestfish-actions.pod:3680
+msgid "Return the contents of the file named C<path>."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:1371 ../src/guestfs-actions.pod:1390
-#: ../src/guestfs-actions.pod:1447 ../src/guestfs-actions.pod:1493
-#: ../src/guestfs-actions.pod:1512 ../src/guestfs-actions.pod:2219
-#: ../src/guestfs-actions.pod:2238 ../src/guestfs-actions.pod:2394
-#: ../src/guestfs-actions.pod:2407 ../src/guestfs-actions.pod:2422
-#: ../src/guestfs-actions.pod:2468 ../src/guestfs-actions.pod:2490
-#: ../src/guestfs-actions.pod:2503 ../src/guestfs-actions.pod:3528
-#: ../src/guestfs-actions.pod:3542 ../src/guestfs-actions.pod:3555
-#: ../src/guestfs-actions.pod:3569 ../src/guestfs-actions.pod:4555
-#: ../src/guestfs-actions.pod:5431 ../src/guestfs-actions.pod:5480
-#: ../src/guestfs-actions.pod:6295 ../src/guestfs-actions.pod:6307
-#: ../src/guestfs-actions.pod:6320 ../src/guestfs-actions.pod:6333
-#: ../src/guestfs-actions.pod:6355 ../src/guestfs-actions.pod:6368
-#: ../src/guestfs-actions.pod:6381 ../src/guestfs-actions.pod:6394
-#: ../src/guestfs-actions.pod:7165 ../src/guestfs-actions.pod:7184
-#: ../src/guestfs-actions.pod:7269 ../src/guestfs-actions.pod:7288
-#: ../src/guestfs-actions.pod:7334 ../src/guestfs-actions.pod:7353
-msgid "(Added in 1.0.66)"
-msgstr ""
-
-# type: =head2
-#. type: =head2
-#: ../src/guestfs-actions.pod:1373
-msgid "guestfs_egrepi"
+#: ../src/guestfs-actions.pod:870
+msgid ""
+"Note that this function cannot correctly handle binary files (specifically, "
+"files containing C<\\0> character which is treated as end of string).  For "
+"those you need to use the C<guestfs_read_file> or C<guestfs_download> "
+"functions which have a more complex interface."

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../src/guestfs-actions.pod:1375
-#, no-wrap
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:878 ../src/guestfs-actions.pod:1057
+#: ../src/guestfs-actions.pod:1077 ../src/guestfs-actions.pod:1373
+#: ../src/guestfs-actions.pod:1392 ../src/guestfs-actions.pod:1495
+#: ../src/guestfs-actions.pod:1514 ../src/guestfs-actions.pod:1760
+#: ../src/guestfs-actions.pod:2218 ../src/guestfs-actions.pod:2237
+#: ../src/guestfs-actions.pod:2280 ../src/guestfs-actions.pod:2304
+#: ../src/guestfs-actions.pod:2321 ../src/guestfs-actions.pod:2350
+#: ../src/guestfs-actions.pod:5261 ../src/guestfs-actions.pod:5287
+#: ../src/guestfs-actions.pod:5418 ../src/guestfs-actions.pod:5444
+#: ../src/guestfs-actions.pod:5468 ../src/guestfs-actions.pod:6396
+#: ../src/guestfs-actions.pod:6451 ../src/guestfs-actions.pod:6597
+#: ../src/guestfs-actions.pod:6621 ../src/guestfs-actions.pod:7290
+#: ../src/guestfs-actions.pod:7316 ../src/guestfs-actions.pod:7342
+#: ../src/guestfs-actions.pod:7361 ../src/guestfs-actions.pod:7446
+#: ../src/guestfs-actions.pod:7465 ../src/guestfs-actions.pod:7511
+#: ../src/guestfs-actions.pod:7530 ../fish/guestfish-actions.pod:587
+#: ../fish/guestfish-actions.pod:722 ../fish/guestfish-actions.pod:734
+#: ../fish/guestfish-actions.pod:910 ../fish/guestfish-actions.pod:920
+#: ../fish/guestfish-actions.pod:987 ../fish/guestfish-actions.pod:997
+#: ../fish/guestfish-actions.pod:1189 ../fish/guestfish-actions.pod:1490
+#: ../fish/guestfish-actions.pod:1500 ../fish/guestfish-actions.pod:1528
+#: ../fish/guestfish-actions.pod:1543 ../fish/guestfish-actions.pod:1553
+#: ../fish/guestfish-actions.pod:1572 ../fish/guestfish-actions.pod:3550
+#: ../fish/guestfish-actions.pod:3565 ../fish/guestfish-actions.pod:3641
+#: ../fish/guestfish-actions.pod:3658 ../fish/guestfish-actions.pod:3673
+#: ../fish/guestfish-actions.pod:4327 ../fish/guestfish-actions.pod:4373
+#: ../fish/guestfish-actions.pod:4458 ../fish/guestfish-actions.pod:4473
+#: ../fish/guestfish-actions.pod:4883 ../fish/guestfish-actions.pod:4901
+#: ../fish/guestfish-actions.pod:4918 ../fish/guestfish-actions.pod:4928
+#: ../fish/guestfish-actions.pod:4976 ../fish/guestfish-actions.pod:4986
+#: ../fish/guestfish-actions.pod:5015 ../fish/guestfish-actions.pod:5025

 msgid ""
 msgid ""

-" char **\n"
-" guestfs_egrepi (guestfs_h *g,\n"
-"                 const char *regex,\n"
-"                 const char *path);\n"
-"\n"
+"Because of the message protocol, there is a transfer limit of somewhere "
+"between 2MB and 4MB.  See L<guestfs(3)/PROTOCOL LIMITS>."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:1380 ../fish/guestfish-actions.pod:917
-msgid ""
-"This calls the external C<egrep -i> program and returns the matching lines."
+#: ../src/guestfs-actions.pod:881 ../src/guestfs-actions.pod:3561
+#: ../src/guestfs-actions.pod:3623 ../src/guestfs-actions.pod:3640
+#: ../src/guestfs-actions.pod:3728 ../src/guestfs-actions.pod:4133
+#: ../src/guestfs-actions.pod:4147 ../src/guestfs-actions.pod:5367
+#: ../src/guestfs-actions.pod:5381 ../src/guestfs-actions.pod:7170
+#: ../src/guestfs-actions.pod:7184
+msgid "(Added in 0.4)"

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:1392
-msgid "guestfs_equal"
+#: ../src/guestfs-actions.pod:883
+msgid "guestfs_checksum"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:1394
+#: ../src/guestfs-actions.pod:885

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" int\n"
-" guestfs_equal (guestfs_h *g,\n"
-"                const char *file1,\n"
-"                const char *file2);\n"
+" char *\n"
+" guestfs_checksum (guestfs_h *g,\n"
+"                   const char *csumtype,\n"
+"                   const char *path);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:1399 ../fish/guestfish-actions.pod:927
+#: ../src/guestfs-actions.pod:890 ../fish/guestfish-actions.pod:594

 msgid ""
 msgid ""

-"This compares the two files C<file1> and C<file2> and returns true if their "
-"content is exactly equal, or false otherwise."
+"This call computes the MD5, SHAx or CRC checksum of the file named C<path>."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:1402 ../fish/guestfish-actions.pod:930
-msgid "The external L<cmp(1)> program is used for the comparison."
-msgstr ""
-
-# type: =head2
-#. type: =head2
-#: ../src/guestfs-actions.pod:1408
-msgid "guestfs_exists"
+#: ../src/guestfs-actions.pod:893 ../fish/guestfish-actions.pod:597
+msgid ""
+"The type of checksum to compute is given by the C<csumtype> parameter which "
+"must have one of the following values:"

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../src/guestfs-actions.pod:1410
-#, no-wrap
-msgid ""
-" int\n"
-" guestfs_exists (guestfs_h *g,\n"
-"                 const char *path);\n"
-"\n"
+# type: =item
+#. type: =item
+#: ../src/guestfs-actions.pod:898 ../fish/guestfish-actions.pod:602
+msgid "C<crc>"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:1414 ../fish/guestfish-actions.pod:936
+#: ../src/guestfs-actions.pod:900 ../fish/guestfish-actions.pod:604

 msgid ""
 msgid ""

-"This returns C<true> if and only if there is a file, directory (or anything) "
-"with the given C<path> name."
+"Compute the cyclic redundancy check (CRC) specified by POSIX for the "
+"C<cksum> command."
+msgstr ""
+
+# type: =item
+#. type: =item
+#: ../src/guestfs-actions.pod:903 ../fish/guestfish-actions.pod:607
+msgid "C<md5>"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:1417
-msgid "See also C<guestfs_is_file>, C<guestfs_is_dir>, C<guestfs_stat>."
+#: ../src/guestfs-actions.pod:905 ../fish/guestfish-actions.pod:609
+msgid "Compute the MD5 hash (using the C<md5sum> program)."

 msgstr ""
 
 msgstr ""
 

-# type: =head2
-#. type: =head2
-#: ../src/guestfs-actions.pod:1423
-msgid "guestfs_fallocate"
+# type: =item
+#. type: =item
+#: ../src/guestfs-actions.pod:907 ../fish/guestfish-actions.pod:611
+msgid "C<sha1>"

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../src/guestfs-actions.pod:1425
-#, no-wrap
-msgid ""
-" int\n"
-" guestfs_fallocate (guestfs_h *g,\n"
-"                    const char *path,\n"
-"                    int len);\n"
-"\n"
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:909 ../fish/guestfish-actions.pod:613
+msgid "Compute the SHA1 hash (using the C<sha1sum> program)."
+msgstr ""
+
+# type: =item
+#. type: =item
+#: ../src/guestfs-actions.pod:911 ../fish/guestfish-actions.pod:615
+msgid "C<sha224>"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:1430 ../src/guestfs-actions.pod:1456
-#: ../fish/guestfish-actions.pod:945 ../fish/guestfish-actions.pod:964
-msgid ""
-"This command preallocates a file (containing zero bytes) named C<path> of "
-"size C<len> bytes.  If the file exists already, it is overwritten."
+#: ../src/guestfs-actions.pod:913 ../fish/guestfish-actions.pod:617
+msgid "Compute the SHA224 hash (using the C<sha224sum> program)."
+msgstr ""
+
+# type: =item
+#. type: =item
+#: ../src/guestfs-actions.pod:915 ../fish/guestfish-actions.pod:619
+msgid "C<sha256>"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:1434 ../fish/guestfish-actions.pod:949
-msgid ""
-"Do not confuse this with the guestfish-specific C<alloc> command which "
-"allocates a file in the host and attaches it as a device."
+#: ../src/guestfs-actions.pod:917 ../fish/guestfish-actions.pod:621
+msgid "Compute the SHA256 hash (using the C<sha256sum> program)."
+msgstr ""
+
+# type: =item
+#. type: =item
+#: ../src/guestfs-actions.pod:919 ../fish/guestfish-actions.pod:623
+msgid "C<sha384>"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:1440 ../fish/guestfish-actions.pod:953
-msgid ""
-"This function is deprecated.  In new code, use the C<fallocate64> call "
-"instead."
+#: ../src/guestfs-actions.pod:921 ../fish/guestfish-actions.pod:625
+msgid "Compute the SHA384 hash (using the C<sha384sum> program)."

 msgstr ""
 
 msgstr ""
 

-# type: =head2
-#. type: =head2
-#: ../src/guestfs-actions.pod:1449
-msgid "guestfs_fallocate64"
+# type: =item
+#. type: =item
+#: ../src/guestfs-actions.pod:923 ../fish/guestfish-actions.pod:627
+msgid "C<sha512>"

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../src/guestfs-actions.pod:1451
-#, no-wrap
-msgid ""
-" int\n"
-" guestfs_fallocate64 (guestfs_h *g,\n"
-"                      const char *path,\n"
-"                      int64_t len);\n"
-"\n"
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:925 ../fish/guestfish-actions.pod:629
+msgid "Compute the SHA512 hash (using the C<sha512sum> program)."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:1460
-msgid ""
-"Note that this call allocates disk blocks for the file.  To create a sparse "
-"file use C<guestfs_truncate_size> instead."
+#: ../src/guestfs-actions.pod:929 ../fish/guestfish-actions.pod:633
+msgid "The checksum is returned as a printable string."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:1463
-msgid ""
-"The deprecated call C<guestfs_fallocate> does the same, but owing to an "
-"oversight it only allowed 30 bit lengths to be specified, effectively "
-"limiting the maximum size of files created through that call to 1GB."
+#: ../src/guestfs-actions.pod:931
+msgid "To get the checksum for a device, use C<guestfs_checksum_device>."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:1468 ../fish/guestfish-actions.pod:976
-msgid ""
-"Do not confuse this with the guestfish-specific C<alloc> and C<sparse> "
-"commands which create a file in the host and attach it as a device."
+#: ../src/guestfs-actions.pod:933
+msgid "To get the checksums for many files, use C<guestfs_checksums_out>."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:1474
-msgid "(Added in 1.3.17)"
+#: ../src/guestfs-actions.pod:938 ../src/guestfs-actions.pod:1246
+#: ../src/guestfs-actions.pod:2080 ../src/guestfs-actions.pod:3300
+#: ../src/guestfs-actions.pod:3329 ../src/guestfs-actions.pod:3390
+#: ../src/guestfs-actions.pod:3417 ../src/guestfs-actions.pod:6867
+msgid "(Added in 1.0.2)"

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:1476
-msgid "guestfs_fgrep"
+#: ../src/guestfs-actions.pod:940
+msgid "guestfs_checksum_device"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:1478
+#: ../src/guestfs-actions.pod:942

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" char **\n"
-" guestfs_fgrep (guestfs_h *g,\n"
-"                const char *pattern,\n"
-"                const char *path);\n"
+" char *\n"
+" guestfs_checksum_device (guestfs_h *g,\n"
+"                          const char *csumtype,\n"
+"                          const char *device);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:1483 ../fish/guestfish-actions.pod:984
-msgid ""
-"This calls the external C<fgrep> program and returns the matching lines."
-msgstr ""
-
-# type: =head2
-#. type: =head2
-#: ../src/guestfs-actions.pod:1495
-msgid "guestfs_fgrepi"
-msgstr ""
-
-# type: verbatim
-#. type: verbatim
-#: ../src/guestfs-actions.pod:1497
-#, no-wrap
+#: ../src/guestfs-actions.pod:947

 msgid ""
 msgid ""

-" char **\n"
-" guestfs_fgrepi (guestfs_h *g,\n"
-"                 const char *pattern,\n"
-"                 const char *path);\n"
-"\n"
+"This call computes the MD5, SHAx or CRC checksum of the contents of the "
+"device named C<device>.  For the types of checksums supported see the "
+"C<guestfs_checksum> command."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:1502 ../fish/guestfish-actions.pod:994
-msgid ""
-"This calls the external C<fgrep -i> program and returns the matching lines."
+#: ../src/guestfs-actions.pod:954 ../src/guestfs-actions.pod:4898
+#: ../src/guestfs-actions.pod:4957 ../src/guestfs-actions.pod:4994
+#: ../src/guestfs-actions.pod:5012 ../src/guestfs-actions.pod:5188
+#: ../src/guestfs-actions.pod:6776 ../src/guestfs-actions.pod:6790
+#: ../src/guestfs-actions.pod:7196
+msgid "(Added in 1.3.2)"

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:1514
-msgid "guestfs_file"
+#: ../src/guestfs-actions.pod:956
+msgid "guestfs_checksums_out"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:1516
+#: ../src/guestfs-actions.pod:958

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" char *\n"
-" guestfs_file (guestfs_h *g,\n"
-"               const char *path);\n"
+" int\n"
+" guestfs_checksums_out (guestfs_h *g,\n"
+"                        const char *csumtype,\n"
+"                        const char *directory,\n"
+"                        const char *sumsfile);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:1520 ../fish/guestfish-actions.pod:1004
+#: ../src/guestfs-actions.pod:964 ../fish/guestfish-actions.pod:651

 msgid ""
 msgid ""

-"This call uses the standard L<file(1)> command to determine the type or "
-"contents of the file."
+"This command computes the checksums of all regular files in C<directory> and "
+"then emits a list of those checksums to the local output file C<sumsfile>."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:1523 ../fish/guestfish-actions.pod:1007
+#: ../src/guestfs-actions.pod:968 ../fish/guestfish-actions.pod:655

 msgid ""
 msgid ""

-"This call will also transparently look inside various types of compressed "
-"file."
+"This can be used for verifying the integrity of a virtual machine.  However "
+"to be properly secure you should pay attention to the output of the checksum "
+"command (it uses the ones from GNU coreutils).  In particular when the "
+"filename is not printable, coreutils uses a special backslash syntax.  For "
+"more information, see the GNU coreutils info file."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:1526 ../fish/guestfish-actions.pod:1010
-msgid ""
-"The exact command which runs is C<file -zb path>.  Note in particular that "
-"the filename is not prepended to the output (the C<-b> option)."
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:1530
-msgid ""
-"This command can also be used on C</dev/> devices (and partitions, LV "
-"names).  You can for example use this to determine if a device contains a "
-"filesystem, although it's usually better to use C<guestfs_vfs_type>."
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:1535 ../fish/guestfish-actions.pod:1019
-msgid ""
-"If the C<path> does not begin with C</dev/> then this command only works for "
-"the content of regular files.  For other file types (directory, symbolic "
-"link etc) it will just return the string C<directory> etc."
+#: ../src/guestfs-actions.pod:978
+msgid "(Added in 1.3.7)"

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:1545
-msgid "guestfs_file_architecture"
+#: ../src/guestfs-actions.pod:980
+msgid "guestfs_chmod"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:1547
+#: ../src/guestfs-actions.pod:982

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" char *\n"
-" guestfs_file_architecture (guestfs_h *g,\n"
-"                            const char *filename);\n"
+" int\n"
+" guestfs_chmod (guestfs_h *g,\n"
+"                int mode,\n"
+"                const char *path);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:1551 ../fish/guestfish-actions.pod:1028
+#: ../src/guestfs-actions.pod:987 ../fish/guestfish-actions.pod:669

 msgid ""
 msgid ""

-"This detects the architecture of the binary C<filename>, and returns it if "
-"known."
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:1554 ../fish/guestfish-actions.pod:1031
-msgid "Currently defined architectures are:"
-msgstr ""
-
-# type: =item
-#. type: =item
-#: ../src/guestfs-actions.pod:1558 ../fish/guestfish-actions.pod:1035
-msgid "\"i386\""
+"Change the mode (permissions) of C<path> to C<mode>.  Only numeric modes are "
+"supported."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:1560 ../fish/guestfish-actions.pod:1037
+#: ../src/guestfs-actions.pod:990 ../fish/guestfish-actions.pod:672

 msgid ""
 msgid ""

-"This string is returned for all 32 bit i386, i486, i586, i686 binaries "
-"irrespective of the precise processor requirements of the binary."
-msgstr ""
-
-# type: =item
-#. type: =item
-#: ../src/guestfs-actions.pod:1563 ../fish/guestfish-actions.pod:1040
-msgid "\"x86_64\""
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:1565 ../fish/guestfish-actions.pod:1042
-msgid "64 bit x86-64."
-msgstr ""
-
-# type: =item
-#. type: =item
-#: ../src/guestfs-actions.pod:1567 ../fish/guestfish-actions.pod:1044
-msgid "\"sparc\""
+"I<Note>: When using this command from guestfish, C<mode> by default would be "
+"decimal, unless you prefix it with C<0> to get octal, ie. use C<0700> not "
+"C<700>."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:1569 ../fish/guestfish-actions.pod:1046
-msgid "32 bit SPARC."
-msgstr ""
-
-# type: =item
-#. type: =item
-#: ../src/guestfs-actions.pod:1571 ../fish/guestfish-actions.pod:1048
-msgid "\"sparc64\""
+#: ../src/guestfs-actions.pod:994 ../src/guestfs-actions.pod:4384
+#: ../src/guestfs-actions.pod:4581 ../src/guestfs-actions.pod:4600
+#: ../src/guestfs-actions.pod:4619 ../fish/guestfish-actions.pod:676
+#: ../fish/guestfish-actions.pod:2980 ../fish/guestfish-actions.pod:3109
+#: ../fish/guestfish-actions.pod:3119 ../fish/guestfish-actions.pod:3129
+msgid "The mode actually set is affected by the umask."

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:1573 ../fish/guestfish-actions.pod:1050
-msgid "64 bit SPARC V9 and above."
+# type: =head2
+#. type: =head2
+#: ../src/guestfs-actions.pod:1000
+msgid "guestfs_chown"

 msgstr ""
 
 msgstr ""
 

-# type: =item
-#. type: =item
-#: ../src/guestfs-actions.pod:1575 ../fish/guestfish-actions.pod:1052
-msgid "\"ia64\""
+# type: verbatim
+#. type: verbatim
+#: ../src/guestfs-actions.pod:1002
+#, no-wrap
+msgid ""
+" int\n"
+" guestfs_chown (guestfs_h *g,\n"
+"                int owner,\n"
+"                int group,\n"
+"                const char *path);\n"
+"\n"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:1577 ../fish/guestfish-actions.pod:1054
-msgid "Intel Itanium."
-msgstr ""
-
-# type: =item
-#. type: =item
-#: ../src/guestfs-actions.pod:1579 ../fish/guestfish-actions.pod:1056
-msgid "\"ppc\""
+#: ../src/guestfs-actions.pod:1008 ../fish/guestfish-actions.pod:682
+msgid "Change the file owner to C<owner> and group to C<group>."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:1581 ../fish/guestfish-actions.pod:1058
-msgid "32 bit Power PC."
-msgstr ""
-
-# type: =item
-#. type: =item
-#: ../src/guestfs-actions.pod:1583 ../fish/guestfish-actions.pod:1060
-msgid "\"ppc64\""
+#: ../src/guestfs-actions.pod:1010 ../src/guestfs-actions.pod:3492
+#: ../fish/guestfish-actions.pod:684 ../fish/guestfish-actions.pod:2438
+msgid ""
+"Only numeric uid and gid are supported.  If you want to use names, you will "
+"need to locate and parse the password file yourself (Augeas support makes "
+"this relatively easy)."

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:1585 ../fish/guestfish-actions.pod:1062
-msgid "64 bit Power PC."
+# type: =head2
+#. type: =head2
+#: ../src/guestfs-actions.pod:1018
+msgid "guestfs_command"

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:1589 ../fish/guestfish-actions.pod:1066
-msgid "Libguestfs may return other architecture strings in future."
+# type: verbatim
+#. type: verbatim
+#: ../src/guestfs-actions.pod:1020
+#, no-wrap
+msgid ""
+" char *\n"
+" guestfs_command (guestfs_h *g,\n"
+"                  char *const *arguments);\n"
+"\n"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:1591 ../fish/guestfish-actions.pod:1068
-msgid "The function works on at least the following types of files:"
+#: ../src/guestfs-actions.pod:1024 ../fish/guestfish-actions.pod:692
+msgid ""
+"This call runs a command from the guest filesystem.  The filesystem must be "
+"mounted, and must contain a compatible operating system (ie. something "
+"Linux, with the same or compatible processor architecture)."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:1597 ../fish/guestfish-actions.pod:1074
-msgid "many types of Un*x and Linux binary"
+#: ../src/guestfs-actions.pod:1029
+msgid ""
+"The single parameter is an argv-style list of arguments.  The first element "
+"is the name of the program to run.  Subsequent elements are parameters.  The "
+"list must be non-empty (ie. must contain a program name).  Note that the "
+"command runs directly, and is I<not> invoked via the shell (see "
+"C<guestfs_sh>)."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:1601 ../fish/guestfish-actions.pod:1078
-msgid "many types of Un*x and Linux shared library"
+#: ../src/guestfs-actions.pod:1036 ../fish/guestfish-actions.pod:704
+msgid "The return value is anything printed to I<stdout> by the command."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:1605 ../fish/guestfish-actions.pod:1082
-msgid "Windows Win32 and Win64 binaries"
+#: ../src/guestfs-actions.pod:1039 ../fish/guestfish-actions.pod:707
+msgid ""
+"If the command returns a non-zero exit status, then this function returns an "
+"error message.  The error message string is the content of I<stderr> from "
+"the command."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:1609 ../fish/guestfish-actions.pod:1086
-msgid "Windows Win32 and Win64 DLLs"
+#: ../src/guestfs-actions.pod:1043 ../fish/guestfish-actions.pod:711
+msgid ""
+"The C<$PATH> environment variable will contain at least C</usr/bin> and C</"
+"bin>.  If you require a program from another location, you should provide "
+"the full path in the first parameter."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:1611 ../fish/guestfish-actions.pod:1088
-msgid "Win32 binaries and DLLs return C<i386>."
+#: ../src/guestfs-actions.pod:1048 ../fish/guestfish-actions.pod:716
+msgid ""
+"Shared libraries and data files required by the program must be available on "
+"filesystems which are mounted in the correct places.  It is the caller's "
+"responsibility to ensure all filesystems that are needed are mounted at the "
+"right locations."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:1613 ../fish/guestfish-actions.pod:1090
-msgid "Win64 binaries and DLLs return C<x86_64>."
+#: ../src/guestfs-actions.pod:1060 ../src/guestfs-actions.pod:1080
+#: ../src/guestfs-actions.pod:1545
+msgid "(Added in 0.9.1)"

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:1617 ../fish/guestfish-actions.pod:1094
-msgid "Linux kernel modules"
+# type: =head2
+#. type: =head2
+#: ../src/guestfs-actions.pod:1062
+msgid "guestfs_command_lines"

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:1621 ../fish/guestfish-actions.pod:1098
-msgid "Linux new-style initrd images"
+# type: verbatim
+#. type: verbatim
+#: ../src/guestfs-actions.pod:1064
+#, no-wrap
+msgid ""
+" char **\n"
+" guestfs_command_lines (guestfs_h *g,\n"
+"                        char *const *arguments);\n"
+"\n"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:1625 ../fish/guestfish-actions.pod:1102
-msgid "some non-x86 Linux vmlinuz kernels"
+#: ../src/guestfs-actions.pod:1068
+msgid ""
+"This is the same as C<guestfs_command>, but splits the result into a list of "
+"lines."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:1629 ../fish/guestfish-actions.pod:1106
-msgid "What it can't do currently:"
+#: ../src/guestfs-actions.pod:1071
+msgid "See also: C<guestfs_sh_lines>"

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:1635 ../fish/guestfish-actions.pod:1112
-msgid "static libraries (libfoo.a)"
+# type: =head2
+#. type: =head2
+#: ../src/guestfs-actions.pod:1082
+msgid "guestfs_config"

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:1639 ../fish/guestfish-actions.pod:1116
-msgid "Linux old-style initrd as compressed ext2 filesystem (RHEL 3)"
+# type: verbatim
+#. type: verbatim
+#: ../src/guestfs-actions.pod:1084
+#, no-wrap
+msgid ""
+" int\n"
+" guestfs_config (guestfs_h *g,\n"
+"                 const char *qemuparam,\n"
+"                 const char *qemuvalue);\n"
+"\n"

 msgstr ""
 
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:1643 ../fish/guestfish-actions.pod:1120
-msgid "x86 Linux vmlinuz kernels"
+#: ../src/guestfs-actions.pod:1089 ../fish/guestfish-actions.pod:741
+msgid ""
+"This can be used to add arbitrary qemu command line parameters of the form "
+"I<-param value>.  Actually it's not quite arbitrary - we prevent you from "
+"setting some parameters which would interfere with parameters that we use."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:1645 ../fish/guestfish-actions.pod:1122
-msgid ""
-"x86 vmlinuz images (bzImage format) consist of a mix of 16-, 32- and "
-"compressed code, and are horribly hard to unpack.  If you want to find the "
-"architecture of a kernel, use the architecture of the associated initrd or "
-"kernel module(s) instead."
+#: ../src/guestfs-actions.pod:1094 ../fish/guestfish-actions.pod:746
+msgid "The first character of C<param> string must be a C<-> (dash)."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:1655 ../src/guestfs-actions.pod:1818
-#: ../src/guestfs-actions.pod:1835 ../src/guestfs-actions.pod:2526
-#: ../src/guestfs-actions.pod:2607 ../src/guestfs-actions.pod:2633
-#: ../src/guestfs-actions.pod:2721 ../src/guestfs-actions.pod:2742
-#: ../src/guestfs-actions.pod:2779 ../src/guestfs-actions.pod:2863
-#: ../src/guestfs-actions.pod:2925 ../src/guestfs-actions.pod:3151
-#: ../src/guestfs-actions.pod:3283
-msgid "(Added in 1.5.3)"
+#: ../src/guestfs-actions.pod:1096 ../fish/guestfish-actions.pod:748
+msgid "C<value> can be NULL."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:1657
-msgid "guestfs_filesize"
+#: ../src/guestfs-actions.pod:1102
+msgid "guestfs_copy_size"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:1659
+#: ../src/guestfs-actions.pod:1104

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" int64_t\n"
-" guestfs_filesize (guestfs_h *g,\n"
-"                   const char *file);\n"
+" int\n"
+" guestfs_copy_size (guestfs_h *g,\n"
+"                    const char *src,\n"
+"                    const char *dest,\n"
+"                    int64_t size);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:1663 ../fish/guestfish-actions.pod:1133
-msgid "This command returns the size of C<file> in bytes."
+#: ../src/guestfs-actions.pod:1110 ../fish/guestfish-actions.pod:754
+msgid ""
+"This command copies exactly C<size> bytes from one source device or file "
+"C<src> to another destination device or file C<dest>."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:1665
+#: ../src/guestfs-actions.pod:1113 ../fish/guestfish-actions.pod:757

 msgid ""
 msgid ""

-"To get other stats about a file, use C<guestfs_stat>, C<guestfs_lstat>, "
-"C<guestfs_is_dir>, C<guestfs_is_file> etc.  To get the size of block "
-"devices, use C<guestfs_blockdev_getsize64>."
+"Note this will fail if the source is too short or if the destination is not "
+"large enough."

 msgstr ""
 
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:1671
-msgid "(Added in 1.0.82)"
+#: ../src/guestfs-actions.pod:1118 ../src/guestfs-actions.pod:1241
+#: ../src/guestfs-actions.pod:1272 ../src/guestfs-actions.pod:1317
+#: ../src/guestfs-actions.pod:1694 ../src/guestfs-actions.pod:1716
+#: ../src/guestfs-actions.pod:3473 ../src/guestfs-actions.pod:6862
+#: ../src/guestfs-actions.pod:6896 ../src/guestfs-actions.pod:7382
+#: ../src/guestfs-actions.pod:7401
+msgid ""
+"This long-running command can generate progress notification messages so "
+"that the caller can display a progress bar or indicator.  To receive these "
+"messages, the caller must register a progress event callback.  See L<guestfs"
+"(3)/GUESTFS_EVENT_PROGRESS>."
+msgstr ""
+
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:1123 ../src/guestfs-actions.pod:4160
+#: ../src/guestfs-actions.pod:5394 ../src/guestfs-actions.pod:7103
+#: ../src/guestfs-actions.pod:7123 ../src/guestfs-actions.pod:7209
+msgid "(Added in 1.0.87)"

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:1673
-msgid "guestfs_fill"
+#: ../src/guestfs-actions.pod:1125
+msgid "guestfs_cp"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:1675
+#: ../src/guestfs-actions.pod:1127

 #, no-wrap
 msgid ""
 " int\n"
 #, no-wrap
 msgid ""
 " int\n"

-" guestfs_fill (guestfs_h *g,\n"
-"               int c,\n"
-"               int len,\n"
-"               const char *path);\n"
+" guestfs_cp (guestfs_h *g,\n"
+"             const char *src,\n"
+"             const char *dest);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:1681 ../fish/guestfish-actions.pod:1143
+#: ../src/guestfs-actions.pod:1132 ../fish/guestfish-actions.pod:764

 msgid ""
 msgid ""

-"This command creates a new file called C<path>.  The initial content of the "
-"file is C<len> octets of C<c>, where C<c> must be a number in the range C<"
-"[0..255]>."
+"This copies a file from C<src> to C<dest> where C<dest> is either a "
+"destination filename or destination directory."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:1685
+#: ../src/guestfs-actions.pod:1137 ../src/guestfs-actions.pod:1151
+#: ../src/guestfs-actions.pod:1223 ../src/guestfs-actions.pod:1297
+#: ../src/guestfs-actions.pod:1411 ../src/guestfs-actions.pod:4852
+#: ../src/guestfs-actions.pod:5238
+msgid "(Added in 1.0.18)"
+msgstr ""
+
+# type: =head2
+#. type: =head2
+#: ../src/guestfs-actions.pod:1139
+msgid "guestfs_cp_a"
+msgstr ""
+
+# type: verbatim
+#. type: verbatim
+#: ../src/guestfs-actions.pod:1141
+#, no-wrap

 msgid ""
 msgid ""

-"To fill a file with zero bytes (sparsely), it is much more efficient to use "
-"C<guestfs_truncate_size>.  To create a file with a pattern of repeating "
-"bytes use C<guestfs_fill_pattern>."
+" int\n"
+" guestfs_cp_a (guestfs_h *g,\n"
+"               const char *src,\n"
+"               const char *dest);\n"
+"\n"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:1697
-msgid "(Added in 1.0.79)"
+#: ../src/guestfs-actions.pod:1146 ../fish/guestfish-actions.pod:771
+msgid ""
+"This copies a file or directory from C<src> to C<dest> recursively using the "
+"C<cp -a> command."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:1699
-msgid "guestfs_fill_pattern"
+#: ../src/guestfs-actions.pod:1153
+msgid "guestfs_dd"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:1701
+#: ../src/guestfs-actions.pod:1155

 #, no-wrap
 msgid ""
 " int\n"
 #, no-wrap
 msgid ""
 " int\n"

-" guestfs_fill_pattern (guestfs_h *g,\n"
-"                       const char *pattern,\n"
-"                       int len,\n"
-"                       const char *path);\n"
+" guestfs_dd (guestfs_h *g,\n"
+"             const char *src,\n"
+"             const char *dest);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:1707
+#: ../src/guestfs-actions.pod:1160 ../fish/guestfish-actions.pod:778

 msgid ""
 msgid ""

-"This function is like C<guestfs_fill> except that it creates a new file of "
-"length C<len> containing the repeating pattern of bytes in C<pattern>.  The "
-"pattern is truncated if necessary to ensure the length of the file is "
-"exactly C<len> bytes."
+"This command copies from one source device or file C<src> to another "
+"destination device or file C<dest>.  Normally you would use this to copy to "
+"or from a device or partition, for example to duplicate a filesystem."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:1719
-msgid "(Added in 1.3.12)"
+#: ../src/guestfs-actions.pod:1165
+msgid ""
+"If the destination is a device, it must be as large or larger than the "
+"source file or device, otherwise the copy will fail.  This command cannot do "
+"partial copies (see C<guestfs_copy_size>)."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:1721
-msgid "guestfs_find"
+#: ../src/guestfs-actions.pod:1173
+msgid "guestfs_df"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:1723
+#: ../src/guestfs-actions.pod:1175

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" char **\n"
-" guestfs_find (guestfs_h *g,\n"
-"               const char *directory);\n"
+" char *\n"
+" guestfs_df (guestfs_h *g);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:1727 ../fish/guestfish-actions.pod:1165
-msgid ""
-"This command lists out all files and directories, recursively, starting at "
-"C<directory>.  It is essentially equivalent to running the shell command "
-"C<find directory -print> but some post-processing happens on the output, "
-"described below."
+#: ../src/guestfs-actions.pod:1178 ../fish/guestfish-actions.pod:791
+msgid "This command runs the C<df> command to report disk space used."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:1732 ../fish/guestfish-actions.pod:1170
+#: ../src/guestfs-actions.pod:1180 ../src/guestfs-actions.pod:1197

 msgid ""
 msgid ""

-"This returns a list of strings I<without any prefix>.  Thus if the directory "
-"structure was:"
+"This command is mostly useful for interactive sessions.  It is I<not> "
+"intended that you try to parse the output string.  Use C<guestfs_statvfs> "
+"from programs."
+msgstr ""
+
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:1187 ../src/guestfs-actions.pod:1204
+#: ../src/guestfs-actions.pod:1322 ../src/guestfs-actions.pod:2283
+#: ../src/guestfs-actions.pod:2307 ../src/guestfs-actions.pod:2375
+#: ../src/guestfs-actions.pod:4270 ../src/guestfs-actions.pod:4752
+#: ../src/guestfs-actions.pod:6600 ../src/guestfs-actions.pod:6624
+#: ../src/guestfs-actions.pod:7249 ../src/guestfs-actions.pod:7262
+#: ../src/guestfs-actions.pod:7275
+msgid "(Added in 1.0.54)"
+msgstr ""
+
+# type: =head2
+#. type: =head2
+#: ../src/guestfs-actions.pod:1189
+msgid "guestfs_df_h"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:1735 ../fish/guestfish-actions.pod:1173
+#: ../src/guestfs-actions.pod:1191

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" /tmp/a\n"
-" /tmp/b\n"
-" /tmp/c/d\n"
+" char *\n"
+" guestfs_df_h (guestfs_h *g);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:1739
+#: ../src/guestfs-actions.pod:1194 ../fish/guestfish-actions.pod:801

 msgid ""
 msgid ""

-"then the returned list from C<guestfs_find> C</tmp> would be 4 elements:"
+"This command runs the C<df -h> command to report disk space used in human-"
+"readable format."
+msgstr ""
+
+# type: =head2
+#. type: =head2
+#: ../src/guestfs-actions.pod:1206
+msgid "guestfs_dmesg"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:1742 ../fish/guestfish-actions.pod:1180
+#: ../src/guestfs-actions.pod:1208

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" a\n"
-" b\n"
-" c\n"
-" c/d\n"
+" char *\n"
+" guestfs_dmesg (guestfs_h *g);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:1747 ../fish/guestfish-actions.pod:1185
-msgid "If C<directory> is not a directory, then this command returns an error."
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:1750 ../fish/guestfish-actions.pod:1188
-msgid "The returned list is sorted."
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:1752
-msgid "See also C<guestfs_find0>."
+#: ../src/guestfs-actions.pod:1211 ../fish/guestfish-actions.pod:812
+msgid ""
+"This returns the kernel messages (C<dmesg> output) from the guest kernel.  "
+"This is sometimes useful for extended debugging of problems."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:1761 ../src/guestfs-actions.pod:3972
-#: ../src/guestfs-actions.pod:5515
-msgid "(Added in 1.0.27)"
+#: ../src/guestfs-actions.pod:1215
+msgid ""
+"Another way to get the same information is to enable verbose messages with "
+"C<guestfs_set_verbose> or by setting the environment variable "
+"C<LIBGUESTFS_DEBUG=1> before running the program."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:1763
-msgid "guestfs_find0"
+#: ../src/guestfs-actions.pod:1225
+msgid "guestfs_download"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:1765
+#: ../src/guestfs-actions.pod:1227

 #, no-wrap
 msgid ""
 " int\n"
 #, no-wrap
 msgid ""
 " int\n"

-" guestfs_find0 (guestfs_h *g,\n"
-"                const char *directory,\n"
-"                const char *files);\n"
+" guestfs_download (guestfs_h *g,\n"
+"                   const char *remotefilename,\n"
+"                   const char *filename);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:1770 ../fish/guestfish-actions.pod:1199
+#: ../src/guestfs-actions.pod:1232 ../src/guestfs-actions.pod:1257
+#: ../fish/guestfish-actions.pod:825 ../fish/guestfish-actions.pod:838

 msgid ""
 msgid ""

-"This command lists out all files and directories, recursively, starting at "
-"C<directory>, placing the resulting list in the external file called "
-"C<files>."
+"Download file C<remotefilename> and save it as C<filename> on the local "
+"machine."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:1774
-msgid ""
-"This command works the same way as C<guestfs_find> with the following "
-"exceptions:"
+#: ../src/guestfs-actions.pod:1235 ../src/guestfs-actions.pod:6856
+#: ../fish/guestfish-actions.pod:828 ../fish/guestfish-actions.pod:4631
+msgid "C<filename> can also be a named pipe."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:1781 ../fish/guestfish-actions.pod:1210
-msgid "The resulting list is written to an external file."
+#: ../src/guestfs-actions.pod:1237
+msgid "See also C<guestfs_upload>, C<guestfs_cat>."
+msgstr ""
+
+# type: =head2
+#. type: =head2
+#: ../src/guestfs-actions.pod:1248
+msgid "guestfs_download_offset"
+msgstr ""
+
+# type: verbatim
+#. type: verbatim
+#: ../src/guestfs-actions.pod:1250
+#, no-wrap
+msgid ""
+" int\n"
+" guestfs_download_offset (guestfs_h *g,\n"
+"                          const char *remotefilename,\n"
+"                          const char *filename,\n"
+"                          int64_t offset,\n"
+"                          int64_t size);\n"
+"\n"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:1785 ../fish/guestfish-actions.pod:1214
+#: ../src/guestfs-actions.pod:1260 ../fish/guestfish-actions.pod:841

 msgid ""
 msgid ""

-"Items (filenames) in the result are separated by C<\\0> characters.  See "
-"L<find(1)> option I<-print0>."
+"C<remotefilename> is read for C<size> bytes starting at C<offset> (this "
+"region must be within the file or device)."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:1790 ../fish/guestfish-actions.pod:1219
-msgid "This command is not limited in the number of names that it can return."
+#: ../src/guestfs-actions.pod:1263
+msgid ""
+"Note that there is no limit on the amount of data that can be downloaded "
+"with this call, unlike with C<guestfs_pread>, and this call always reads the "
+"full amount unless an error occurs."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:1795 ../fish/guestfish-actions.pod:1224
-msgid "The result list is not sorted."
+#: ../src/guestfs-actions.pod:1268
+msgid "See also C<guestfs_download>, C<guestfs_pread>."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:1801
-msgid "(Added in 1.0.74)"
+#: ../src/guestfs-actions.pod:1277 ../src/guestfs-actions.pod:6901
+msgid "(Added in 1.5.17)"

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:1803
-msgid "guestfs_findfs_label"
+#: ../src/guestfs-actions.pod:1279
+msgid "guestfs_drop_caches"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:1805
+#: ../src/guestfs-actions.pod:1281

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" char *\n"
-" guestfs_findfs_label (guestfs_h *g,\n"
-"                       const char *label);\n"
+" int\n"
+" guestfs_drop_caches (guestfs_h *g,\n"
+"                      int whattodrop);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:1809 ../fish/guestfish-actions.pod:1234
+#: ../src/guestfs-actions.pod:1285 ../fish/guestfish-actions.pod:857

 msgid ""
 msgid ""

-"This command searches the filesystems and returns the one which has the "
-"given label.  An error is returned if no such filesystem can be found."
+"This instructs the guest kernel to drop its page cache, and/or dentries and "
+"inode caches.  The parameter C<whattodrop> tells the kernel what precisely "
+"to drop, see L<http://linux-mm.org/Drop_Caches>"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:1813
-msgid "To find the label of a filesystem, use C<guestfs_vfs_label>."
+#: ../src/guestfs-actions.pod:1290 ../fish/guestfish-actions.pod:862
+msgid "Setting C<whattodrop> to 3 should drop everything."
+msgstr ""
+
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:1292 ../fish/guestfish-actions.pod:864
+msgid ""
+"This automatically calls L<sync(2)> before the operation, so that the "
+"maximum guest memory is freed."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:1820
-msgid "guestfs_findfs_uuid"
+#: ../src/guestfs-actions.pod:1299
+msgid "guestfs_du"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:1822
+#: ../src/guestfs-actions.pod:1301

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" char *\n"
-" guestfs_findfs_uuid (guestfs_h *g,\n"
-"                      const char *uuid);\n"
+" int64_t\n"
+" guestfs_du (guestfs_h *g,\n"
+"             const char *path);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:1826 ../fish/guestfish-actions.pod:1244
+#: ../src/guestfs-actions.pod:1305 ../fish/guestfish-actions.pod:871

 msgid ""
 msgid ""

-"This command searches the filesystems and returns the one which has the "
-"given UUID.  An error is returned if no such filesystem can be found."
+"This command runs the C<du -s> command to estimate file space usage for "
+"C<path>."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:1830
-msgid "To find the UUID of a filesystem, use C<guestfs_vfs_uuid>."
+#: ../src/guestfs-actions.pod:1308 ../fish/guestfish-actions.pod:874
+msgid ""
+"C<path> can be a file or a directory.  If C<path> is a directory then the "
+"estimate includes the contents of the directory and all subdirectories "
+"(recursively)."
+msgstr ""
+
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:1312 ../fish/guestfish-actions.pod:878
+msgid ""
+"The result is the estimated size in I<kilobytes> (ie. units of 1024 bytes)."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:1837
-msgid "guestfs_fsck"
+#: ../src/guestfs-actions.pod:1324
+msgid "guestfs_e2fsck_f"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:1839
+#: ../src/guestfs-actions.pod:1326

 #, no-wrap
 msgid ""
 " int\n"
 #, no-wrap
 msgid ""
 " int\n"

-" guestfs_fsck (guestfs_h *g,\n"
-"               const char *fstype,\n"
-"               const char *device);\n"
+" guestfs_e2fsck_f (guestfs_h *g,\n"
+"                   const char *device);\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:1844 ../fish/guestfish-actions.pod:1254
-msgid ""
-"This runs the filesystem checker (fsck) on C<device> which should have "
-"filesystem type C<fstype>."
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:1847 ../fish/guestfish-actions.pod:1257
-msgid ""
-"The returned integer is the status.  See L<fsck(8)> for the list of status "
-"codes from C<fsck>."
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:1856 ../fish/guestfish-actions.pod:1266
-msgid "Multiple status codes can be summed together."
-msgstr ""
-
-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:1860 ../fish/guestfish-actions.pod:1270
+#: ../src/guestfs-actions.pod:1330 ../fish/guestfish-actions.pod:885

 msgid ""
 msgid ""

-"A non-zero return code can mean \"success\", for example if errors have been "
-"corrected on the filesystem."
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:1865 ../fish/guestfish-actions.pod:1275
-msgid "Checking or repairing NTFS volumes is not supported (by linux-ntfs)."
+"This runs C<e2fsck -p -f device>, ie. runs the ext2/ext3 filesystem checker "
+"on C<device>, noninteractively (I<-p>), even if the filesystem appears to be "
+"clean (I<-f>)."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:1870 ../fish/guestfish-actions.pod:1280
+#: ../src/guestfs-actions.pod:1334

 msgid ""
 msgid ""

-"This command is entirely equivalent to running C<fsck -a -t fstype device>."
+"This command is only needed because of C<guestfs_resize2fs> (q.v.).  "
+"Normally you should use C<guestfs_fsck>."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:1874 ../src/guestfs-actions.pod:7207
-msgid "(Added in 1.0.16)"
+#: ../src/guestfs-actions.pod:1339
+msgid "(Added in 1.0.29)"

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:1876
-msgid "guestfs_get_append"
+#: ../src/guestfs-actions.pod:1341
+msgid "guestfs_echo_daemon"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:1878
+#: ../src/guestfs-actions.pod:1343

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" const char *\n"
-" guestfs_get_append (guestfs_h *g);\n"
+" char *\n"
+" guestfs_echo_daemon (guestfs_h *g,\n"
+"                      char *const *words);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:1881 ../fish/guestfish-actions.pod:1286
+#: ../src/guestfs-actions.pod:1347 ../fish/guestfish-actions.pod:896

 msgid ""
 msgid ""

-"Return the additional kernel options which are added to the guest kernel "
-"command line."
+"This command concatenates the list of C<words> passed with single spaces "
+"between them and returns the resulting string."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:1884 ../fish/guestfish-actions.pod:1289
-msgid "If C<NULL> then no options are added."
+#: ../src/guestfs-actions.pod:1350 ../fish/guestfish-actions.pod:899
+msgid "You can use this command to test the connection through to the daemon."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:1886
-msgid ""
-"This function returns a string which may be NULL.  There is no way to return "
-"an error from this function.  The string is owned by the guest handle and "
-"must I<not> be freed."
+#: ../src/guestfs-actions.pod:1352
+msgid "See also C<guestfs_ping_daemon>."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:1890 ../src/guestfs-actions.pod:5193
-#: ../src/guestfs-actions.pod:5673 ../src/guestfs-actions.pod:6069
-#: ../src/guestfs-actions.pod:6088 ../src/guestfs-actions.pod:6104
-#: ../src/guestfs-actions.pod:6121 ../src/guestfs-actions.pod:6878
-#: ../src/guestfs-actions.pod:6896 ../src/guestfs-actions.pod:7250
-msgid "(Added in 1.0.26)"
+#: ../src/guestfs-actions.pod:1357 ../src/guestfs-actions.pod:2091
+#: ../src/guestfs-actions.pod:6072
+msgid "(Added in 1.0.69)"

 msgstr ""
 
 msgstr ""
 

+# type: =head2

 #. type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:1892
-msgid "guestfs_get_attach_method"
+#: ../src/guestfs-actions.pod:1359
+msgid "guestfs_egrep"

 msgstr ""
 
 msgstr ""
 

+# type: verbatim

 #. type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:1894
+#: ../src/guestfs-actions.pod:1361

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" char *\n"
-" guestfs_get_attach_method (guestfs_h *g);\n"
+" char **\n"
+" guestfs_egrep (guestfs_h *g,\n"
+"                const char *regex,\n"
+"                const char *path);\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

+# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:1897
-msgid "Return the current attach method.  See C<guestfs_set_attach_method>."
+#: ../src/guestfs-actions.pod:1366 ../fish/guestfish-actions.pod:907
+msgid ""
+"This calls the external C<egrep> program and returns the matching lines."
+msgstr ""
+
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:1376 ../src/guestfs-actions.pod:1395
+#: ../src/guestfs-actions.pod:1452 ../src/guestfs-actions.pod:1498
+#: ../src/guestfs-actions.pod:1517 ../src/guestfs-actions.pod:2221
+#: ../src/guestfs-actions.pod:2240 ../src/guestfs-actions.pod:2396
+#: ../src/guestfs-actions.pod:2409 ../src/guestfs-actions.pod:2424
+#: ../src/guestfs-actions.pod:2470 ../src/guestfs-actions.pod:2492
+#: ../src/guestfs-actions.pod:2505 ../src/guestfs-actions.pod:3653
+#: ../src/guestfs-actions.pod:3667 ../src/guestfs-actions.pod:3680
+#: ../src/guestfs-actions.pod:3694 ../src/guestfs-actions.pod:4680
+#: ../src/guestfs-actions.pod:5572 ../src/guestfs-actions.pod:5621
+#: ../src/guestfs-actions.pod:6468 ../src/guestfs-actions.pod:6480
+#: ../src/guestfs-actions.pod:6493 ../src/guestfs-actions.pod:6506
+#: ../src/guestfs-actions.pod:6528 ../src/guestfs-actions.pod:6541
+#: ../src/guestfs-actions.pod:6554 ../src/guestfs-actions.pod:6567
+#: ../src/guestfs-actions.pod:7345 ../src/guestfs-actions.pod:7364
+#: ../src/guestfs-actions.pod:7449 ../src/guestfs-actions.pod:7468
+#: ../src/guestfs-actions.pod:7514 ../src/guestfs-actions.pod:7533
+msgid "(Added in 1.0.66)"

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:1902
-msgid "guestfs_get_autosync"
+#: ../src/guestfs-actions.pod:1378
+msgid "guestfs_egrepi"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:1904
+#: ../src/guestfs-actions.pod:1380

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" int\n"
-" guestfs_get_autosync (guestfs_h *g);\n"
+" char **\n"
+" guestfs_egrepi (guestfs_h *g,\n"
+"                 const char *regex,\n"
+"                 const char *path);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:1907 ../fish/guestfish-actions.pod:1301
-msgid "Get the autosync flag."
+#: ../src/guestfs-actions.pod:1385 ../fish/guestfish-actions.pod:917
+msgid ""
+"This calls the external C<egrep -i> program and returns the matching lines."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:1913
-msgid "guestfs_get_direct"
+#: ../src/guestfs-actions.pod:1397
+msgid "guestfs_equal"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:1915
+#: ../src/guestfs-actions.pod:1399

 #, no-wrap
 msgid ""
 " int\n"
 #, no-wrap
 msgid ""
 " int\n"

-" guestfs_get_direct (guestfs_h *g);\n"
+" guestfs_equal (guestfs_h *g,\n"
+"                const char *file1,\n"
+"                const char *file2);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:1918 ../fish/guestfish-actions.pod:1307
-msgid "Return the direct appliance mode flag."
+#: ../src/guestfs-actions.pod:1404 ../fish/guestfish-actions.pod:927
+msgid ""
+"This compares the two files C<file1> and C<file2> and returns true if their "
+"content is exactly equal, or false otherwise."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:1922 ../src/guestfs-actions.pod:5742
-msgid "(Added in 1.0.72)"
+#: ../src/guestfs-actions.pod:1407 ../fish/guestfish-actions.pod:930
+msgid "The external L<cmp(1)> program is used for the comparison."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:1924
-msgid "guestfs_get_e2label"
+#: ../src/guestfs-actions.pod:1413
+msgid "guestfs_exists"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:1926
+#: ../src/guestfs-actions.pod:1415

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" char *\n"
-" guestfs_get_e2label (guestfs_h *g,\n"
-"                      const char *device);\n"
+" int\n"
+" guestfs_exists (guestfs_h *g,\n"
+"                 const char *path);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:1930 ../fish/guestfish-actions.pod:1313
-msgid ""
-"This returns the ext2/3/4 filesystem label of the filesystem on C<device>."
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:1936 ../fish/guestfish-actions.pod:1316
+#: ../src/guestfs-actions.pod:1419 ../fish/guestfish-actions.pod:936

 msgid ""
 msgid ""

-"This function is deprecated.  In new code, use the C<vfs_label> call instead."
+"This returns C<true> if and only if there is a file, directory (or anything) "
+"with the given C<path> name."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:1943 ../src/guestfs-actions.pod:1964
-#: ../src/guestfs-actions.pod:5760 ../src/guestfs-actions.pod:5779
-msgid "(Added in 1.0.15)"
+#: ../src/guestfs-actions.pod:1422
+msgid "See also C<guestfs_is_file>, C<guestfs_is_dir>, C<guestfs_stat>."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:1945
-msgid "guestfs_get_e2uuid"
+#: ../src/guestfs-actions.pod:1428
+msgid "guestfs_fallocate"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:1947
+#: ../src/guestfs-actions.pod:1430

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" char *\n"
-" guestfs_get_e2uuid (guestfs_h *g,\n"
-"                     const char *device);\n"
+" int\n"
+" guestfs_fallocate (guestfs_h *g,\n"
+"                    const char *path,\n"
+"                    int len);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:1951 ../fish/guestfish-actions.pod:1327
+#: ../src/guestfs-actions.pod:1435 ../src/guestfs-actions.pod:1461
+#: ../fish/guestfish-actions.pod:945 ../fish/guestfish-actions.pod:964

 msgid ""
 msgid ""

-"This returns the ext2/3/4 filesystem UUID of the filesystem on C<device>."
+"This command preallocates a file (containing zero bytes) named C<path> of "
+"size C<len> bytes.  If the file exists already, it is overwritten."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:1957 ../fish/guestfish-actions.pod:1330
+#: ../src/guestfs-actions.pod:1439 ../fish/guestfish-actions.pod:949
+msgid ""
+"Do not confuse this with the guestfish-specific C<alloc> command which "
+"allocates a file in the host and attaches it as a device."
+msgstr ""
+
+#. type: textblock
+#: ../src/guestfs-actions.pod:1445

 msgid ""
 msgid ""

-"This function is deprecated.  In new code, use the C<vfs_uuid> call instead."
+"This function is deprecated.  In new code, use the L</guestfs_fallocate64> "
+"call instead."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:1966
-msgid "guestfs_get_memsize"
+#: ../src/guestfs-actions.pod:1454
+msgid "guestfs_fallocate64"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:1968
+#: ../src/guestfs-actions.pod:1456

 #, no-wrap
 msgid ""
 " int\n"
 #, no-wrap
 msgid ""
 " int\n"

-" guestfs_get_memsize (guestfs_h *g);\n"
+" guestfs_fallocate64 (guestfs_h *g,\n"
+"                      const char *path,\n"
+"                      int64_t len);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:1971 ../fish/guestfish-actions.pod:1341
+#: ../src/guestfs-actions.pod:1465

 msgid ""
 msgid ""

-"This gets the memory size in megabytes allocated to the qemu subprocess."
+"Note that this call allocates disk blocks for the file.  To create a sparse "
+"file use C<guestfs_truncate_size> instead."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:1974
+#: ../src/guestfs-actions.pod:1468

 msgid ""
 msgid ""

-"If C<guestfs_set_memsize> was not called on this handle, and if "
-"C<LIBGUESTFS_MEMSIZE> was not set, then this returns the compiled-in default "
-"value for memsize."
+"The deprecated call C<guestfs_fallocate> does the same, but owing to an "
+"oversight it only allowed 30 bit lengths to be specified, effectively "
+"limiting the maximum size of files created through that call to 1GB."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:1978 ../src/guestfs-actions.pod:2059
-#: ../src/guestfs-actions.pod:5795 ../src/guestfs-actions.pod:5902
-#: ../fish/guestfish-actions.pod:1348 ../fish/guestfish-actions.pod:1399
-#: ../fish/guestfish-actions.pod:3893 ../fish/guestfish-actions.pod:3980
+#: ../src/guestfs-actions.pod:1473 ../fish/guestfish-actions.pod:976

 msgid ""
 msgid ""

-"For more information on the architecture of libguestfs, see L<guestfs(3)>."
+"Do not confuse this with the guestfish-specific C<alloc> and C<sparse> "
+"commands which create a file in the host and attach it as a device."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:1983 ../src/guestfs-actions.pod:4263
-#: ../src/guestfs-actions.pod:4460 ../src/guestfs-actions.pod:4479
-#: ../src/guestfs-actions.pod:4498 ../src/guestfs-actions.pod:4510
-#: ../src/guestfs-actions.pod:4527 ../src/guestfs-actions.pod:4540
-#: ../src/guestfs-actions.pod:5418 ../src/guestfs-actions.pod:5800
-#: ../src/guestfs-actions.pod:6043 ../src/guestfs-actions.pod:6644
-msgid "(Added in 1.0.55)"
+#: ../src/guestfs-actions.pod:1479
+msgid "(Added in 1.3.17)"

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:1985
-msgid "guestfs_get_network"
+#: ../src/guestfs-actions.pod:1481
+msgid "guestfs_fgrep"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:1987
+#: ../src/guestfs-actions.pod:1483

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" int\n"
-" guestfs_get_network (guestfs_h *g);\n"
+" char **\n"
+" guestfs_fgrep (guestfs_h *g,\n"
+"                const char *pattern,\n"
+"                const char *path);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:1990 ../fish/guestfish-actions.pod:1355
-msgid "This returns the enable network flag."
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:1994 ../src/guestfs-actions.pod:5819
-msgid "(Added in 1.5.4)"
+#: ../src/guestfs-actions.pod:1488 ../fish/guestfish-actions.pod:984
+msgid ""
+"This calls the external C<fgrep> program and returns the matching lines."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:1996
-msgid "guestfs_get_path"
+#: ../src/guestfs-actions.pod:1500
+msgid "guestfs_fgrepi"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:1998
+#: ../src/guestfs-actions.pod:1502

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" const char *\n"
-" guestfs_get_path (guestfs_h *g);\n"
+" char **\n"
+" guestfs_fgrepi (guestfs_h *g,\n"
+"                 const char *pattern,\n"
+"                 const char *path);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:2001 ../fish/guestfish-actions.pod:1361
-msgid "Return the current search path."
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:2003 ../fish/guestfish-actions.pod:1363
-msgid ""
-"This is always non-NULL.  If it wasn't set already, then this will return "
-"the default path."
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:2006 ../src/guestfs-actions.pod:2035
+#: ../src/guestfs-actions.pod:1507 ../fish/guestfish-actions.pod:994

 msgid ""
 msgid ""

-"This function returns a string, or NULL on error.  The string is owned by "
-"the guest handle and must I<not> be freed."
+"This calls the external C<fgrep -i> program and returns the matching lines."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:2011
-msgid "guestfs_get_pid"
+#: ../src/guestfs-actions.pod:1519
+msgid "guestfs_file"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:2013
+#: ../src/guestfs-actions.pod:1521

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" int\n"
-" guestfs_get_pid (guestfs_h *g);\n"
+" char *\n"
+" guestfs_file (guestfs_h *g,\n"
+"               const char *path);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:2016 ../fish/guestfish-actions.pod:1372
+#: ../src/guestfs-actions.pod:1525 ../fish/guestfish-actions.pod:1004

 msgid ""
 msgid ""

-"Return the process ID of the qemu subprocess.  If there is no qemu "
-"subprocess, then this will return an error."
+"This call uses the standard L<file(1)> command to determine the type or "
+"contents of the file."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:2019 ../fish/guestfish-actions.pod:1375
-msgid "This is an internal call used for debugging and testing."
+#: ../src/guestfs-actions.pod:1528 ../fish/guestfish-actions.pod:1007
+msgid ""
+"This call will also transparently look inside various types of compressed "
+"file."

 msgstr ""
 
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:2023
-msgid "(Added in 1.0.56)"
+#: ../src/guestfs-actions.pod:1531 ../fish/guestfish-actions.pod:1010
+msgid ""
+"The exact command which runs is C<file -zb path>.  Note in particular that "
+"the filename is not prepended to the output (the I<-b> option)."

 msgstr ""
 
 msgstr ""
 

-# type: =head2
-#. type: =head2
-#: ../src/guestfs-actions.pod:2025
-msgid "guestfs_get_qemu"
-msgstr ""
-
-# type: verbatim
-#. type: verbatim
-#: ../src/guestfs-actions.pod:2027
-#, no-wrap
-msgid ""
-" const char *\n"
-" guestfs_get_qemu (guestfs_h *g);\n"
-"\n"
-msgstr ""
-
-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:2030 ../fish/guestfish-actions.pod:1381
-msgid "Return the current qemu binary."
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:2032 ../fish/guestfish-actions.pod:1383
+#: ../src/guestfs-actions.pod:1535 ../fish/guestfish-actions.pod:1014

 msgid ""
 msgid ""

-"This is always non-NULL.  If it wasn't set already, then this will return "
-"the default qemu binary name."
+"The output depends on the output of the underlying L<file(1)> command and it "
+"can change in future in ways beyond our control.  In other words, the output "
+"is not guaranteed by the ABI."

 msgstr ""
 
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:2038 ../src/guestfs-actions.pod:5864
-msgid "(Added in 1.0.6)"
+#: ../src/guestfs-actions.pod:1539
+msgid ""
+"See also: L<file(1)>, C<guestfs_vfs_type>, C<guestfs_lstat>, "
+"C<guestfs_is_file>, C<guestfs_is_blockdev> (etc)."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:2040
-msgid "guestfs_get_recovery_proc"
+#: ../src/guestfs-actions.pod:1547
+msgid "guestfs_file_architecture"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:2042
+#: ../src/guestfs-actions.pod:1549

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" int\n"
-" guestfs_get_recovery_proc (guestfs_h *g);\n"
+" char *\n"
+" guestfs_file_architecture (guestfs_h *g,\n"
+"                            const char *filename);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:2045 ../fish/guestfish-actions.pod:1390
-msgid "Return the recovery process enabled flag."
+#: ../src/guestfs-actions.pod:1553 ../fish/guestfish-actions.pod:1025
+msgid ""
+"This detects the architecture of the binary C<filename>, and returns it if "
+"known."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:2049 ../src/guestfs-actions.pod:3373
-#: ../src/guestfs-actions.pod:3670 ../src/guestfs-actions.pod:4070
-#: ../src/guestfs-actions.pod:4102 ../src/guestfs-actions.pod:5123
-#: ../src/guestfs-actions.pod:5466 ../src/guestfs-actions.pod:5888
-#: ../src/guestfs-actions.pod:6547 ../src/guestfs-actions.pod:6567
-#: ../src/guestfs-actions.pod:6759
-msgid "(Added in 1.0.77)"
-msgstr ""
-
-# type: =head2
-#. type: =head2
-#: ../src/guestfs-actions.pod:2051
-msgid "guestfs_get_selinux"
+#: ../src/guestfs-actions.pod:1556 ../fish/guestfish-actions.pod:1028
+msgid "Currently defined architectures are:"

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../src/guestfs-actions.pod:2053
-#, no-wrap
-msgid ""
-" int\n"
-" guestfs_get_selinux (guestfs_h *g);\n"
-"\n"
+# type: =item
+#. type: =item
+#: ../src/guestfs-actions.pod:1560 ../fish/guestfish-actions.pod:1032
+msgid "\"i386\""

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:2056
+#: ../src/guestfs-actions.pod:1562 ../fish/guestfish-actions.pod:1034

 msgid ""
 msgid ""

-"This returns the current setting of the selinux flag which is passed to the "
-"appliance at boot time.  See C<guestfs_set_selinux>."
+"This string is returned for all 32 bit i386, i486, i586, i686 binaries "
+"irrespective of the precise processor requirements of the binary."

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:2064 ../src/guestfs-actions.pod:2127
-#: ../src/guestfs-actions.pod:5907 ../src/guestfs-actions.pod:5961
-msgid "(Added in 1.0.67)"
+# type: =item
+#. type: =item
+#: ../src/guestfs-actions.pod:1565 ../fish/guestfish-actions.pod:1037
+msgid "\"x86_64\""

 msgstr ""
 
 msgstr ""
 

-# type: =head2
-#. type: =head2
-#: ../src/guestfs-actions.pod:2066
-msgid "guestfs_get_state"
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:1567 ../fish/guestfish-actions.pod:1039
+msgid "64 bit x86-64."

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../src/guestfs-actions.pod:2068
-#, no-wrap
-msgid ""
-" int\n"
-" guestfs_get_state (guestfs_h *g);\n"
-"\n"
+# type: =item
+#. type: =item
+#: ../src/guestfs-actions.pod:1569 ../fish/guestfish-actions.pod:1041
+msgid "\"sparc\""

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:2071 ../fish/guestfish-actions.pod:1406
-msgid ""
-"This returns the current state as an opaque integer.  This is only useful "
-"for printing debug and internal error messages."
+#: ../src/guestfs-actions.pod:1571 ../fish/guestfish-actions.pod:1043
+msgid "32 bit SPARC."
+msgstr ""
+
+# type: =item
+#. type: =item
+#: ../src/guestfs-actions.pod:1573 ../fish/guestfish-actions.pod:1045
+msgid "\"sparc64\""

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:2074 ../src/guestfs-actions.pod:3176
-#: ../src/guestfs-actions.pod:3205 ../src/guestfs-actions.pod:3266
-#: ../src/guestfs-actions.pod:3293 ../fish/guestfish-actions.pod:1409
-#: ../fish/guestfish-actions.pod:2223 ../fish/guestfish-actions.pod:2241
-#: ../fish/guestfish-actions.pod:2279 ../fish/guestfish-actions.pod:2295
-msgid "For more information on states, see L<guestfs(3)>."
+#: ../src/guestfs-actions.pod:1575 ../fish/guestfish-actions.pod:1047
+msgid "64 bit SPARC V9 and above."

 msgstr ""
 
 msgstr ""
 

-# type: =head2
-#. type: =head2
-#: ../src/guestfs-actions.pod:2080
-msgid "guestfs_get_trace"
+# type: =item
+#. type: =item
+#: ../src/guestfs-actions.pod:1577 ../fish/guestfish-actions.pod:1049
+msgid "\"ia64\""

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../src/guestfs-actions.pod:2082
-#, no-wrap
-msgid ""
-" int\n"
-" guestfs_get_trace (guestfs_h *g);\n"
-"\n"
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:1579 ../fish/guestfish-actions.pod:1051
+msgid "Intel Itanium."
+msgstr ""
+
+# type: =item
+#. type: =item
+#: ../src/guestfs-actions.pod:1581 ../fish/guestfish-actions.pod:1053
+msgid "\"ppc\""

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:2085 ../fish/guestfish-actions.pod:1415
-msgid "Return the command trace flag."
+#: ../src/guestfs-actions.pod:1583 ../fish/guestfish-actions.pod:1055
+msgid "32 bit Power PC."

 msgstr ""
 
 msgstr ""
 

-# type: =head2
-#. type: =head2
-#: ../src/guestfs-actions.pod:2091
-msgid "guestfs_get_umask"
+# type: =item
+#. type: =item
+#: ../src/guestfs-actions.pod:1585 ../fish/guestfish-actions.pod:1057
+msgid "\"ppc64\""

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../src/guestfs-actions.pod:2093
-#, no-wrap
-msgid ""
-" int\n"
-" guestfs_get_umask (guestfs_h *g);\n"
-"\n"
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:1587 ../fish/guestfish-actions.pod:1059
+msgid "64 bit Power PC."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:2096
-msgid ""
-"Return the current umask.  By default the umask is C<022> unless it has been "
-"set by calling C<guestfs_umask>."
+#: ../src/guestfs-actions.pod:1591 ../fish/guestfish-actions.pod:1063
+msgid "Libguestfs may return other architecture strings in future."

 msgstr ""
 
 msgstr ""
 

-# type: =head2
-#. type: =head2
-#: ../src/guestfs-actions.pod:2103
-msgid "guestfs_get_verbose"
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:1593 ../fish/guestfish-actions.pod:1065
+msgid "The function works on at least the following types of files:"

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../src/guestfs-actions.pod:2105
-#, no-wrap
-msgid ""
-" int\n"
-" guestfs_get_verbose (guestfs_h *g);\n"
-"\n"
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:1599 ../fish/guestfish-actions.pod:1071
+msgid "many types of Un*x and Linux binary"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:2108 ../fish/guestfish-actions.pod:1428
-msgid "This returns the verbose messages flag."
+#: ../src/guestfs-actions.pod:1603 ../fish/guestfish-actions.pod:1075
+msgid "many types of Un*x and Linux shared library"

 msgstr ""
 
 msgstr ""
 

-# type: =head2
-#. type: =head2
-#: ../src/guestfs-actions.pod:2114
-msgid "guestfs_getcon"
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:1607 ../fish/guestfish-actions.pod:1079
+msgid "Windows Win32 and Win64 binaries"

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../src/guestfs-actions.pod:2116
-#, no-wrap
-msgid ""
-" char *\n"
-" guestfs_getcon (guestfs_h *g);\n"
-"\n"
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:1611 ../fish/guestfish-actions.pod:1083
+msgid "Windows Win32 and Win64 DLLs"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:2119 ../fish/guestfish-actions.pod:1434
-msgid "This gets the SELinux security context of the daemon."
+#: ../src/guestfs-actions.pod:1613 ../fish/guestfish-actions.pod:1085
+msgid "Win32 binaries and DLLs return C<i386>."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:2121
-msgid ""
-"See the documentation about SELINUX in L<guestfs(3)>, and C<guestfs_setcon>"
+#: ../src/guestfs-actions.pod:1615 ../fish/guestfish-actions.pod:1087
+msgid "Win64 binaries and DLLs return C<x86_64>."

 msgstr ""
 
 msgstr ""
 

-# type: =head2
-#. type: =head2
-#: ../src/guestfs-actions.pod:2129
-msgid "guestfs_getxattr"
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:1619 ../fish/guestfish-actions.pod:1091
+msgid "Linux kernel modules"

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../src/guestfs-actions.pod:2131
-#, no-wrap
-msgid ""
-" char *\n"
-" guestfs_getxattr (guestfs_h *g,\n"
-"                   const char *path,\n"
-"                   const char *name,\n"
-"                   size_t *size_r);\n"
-"\n"
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:1623 ../fish/guestfish-actions.pod:1095
+msgid "Linux new-style initrd images"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:2137
-msgid ""
-"Get a single extended attribute from file C<path> named C<name>.  This call "
-"follows symlinks.  If you want to lookup an extended attribute for the "
-"symlink itself, use C<guestfs_lgetxattr>."
+#: ../src/guestfs-actions.pod:1627 ../fish/guestfish-actions.pod:1099
+msgid "some non-x86 Linux vmlinuz kernels"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:2141 ../src/guestfs-actions.pod:3387
-msgid ""
-"Normally it is better to get all extended attributes from a file in one go "
-"by calling C<guestfs_getxattrs>.  However some Linux filesystem "
-"implementations are buggy and do not provide a way to list out attributes.  "
-"For these filesystems (notably ntfs-3g)  you have to know the names of the "
-"extended attributes you want in advance and call this function."
+#: ../src/guestfs-actions.pod:1631 ../fish/guestfish-actions.pod:1103
+msgid "What it can't do currently:"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:2148 ../src/guestfs-actions.pod:3394
-#: ../fish/guestfish-actions.pod:1454 ../fish/guestfish-actions.pod:2360
-msgid ""
-"Extended attribute values are blobs of binary data.  If there is no extended "
-"attribute named C<name>, this returns an error."
+#: ../src/guestfs-actions.pod:1637 ../fish/guestfish-actions.pod:1109
+msgid "static libraries (libfoo.a)"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:2151
-msgid "See also: C<guestfs_getxattrs>, C<guestfs_lgetxattr>, L<attr(5)>."
+#: ../src/guestfs-actions.pod:1641 ../fish/guestfish-actions.pod:1113
+msgid "Linux old-style initrd as compressed ext2 filesystem (RHEL 3)"
+msgstr ""
+
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:1645 ../fish/guestfish-actions.pod:1117
+msgid "x86 Linux vmlinuz kernels"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:2153 ../src/guestfs-actions.pod:2344
-#: ../src/guestfs-actions.pod:3399 ../src/guestfs-actions.pod:5116
-#: ../src/guestfs-actions.pod:5142 ../src/guestfs-actions.pod:5323
+#: ../src/guestfs-actions.pod:1647 ../fish/guestfish-actions.pod:1119

 msgid ""
 msgid ""

-"This function returns a buffer, or NULL on error.  The size of the returned "
-"buffer is written to C<*size_r>.  I<The caller must free the returned buffer "
-"after use>."
+"x86 vmlinuz images (bzImage format) consist of a mix of 16-, 32- and "
+"compressed code, and are horribly hard to unpack.  If you want to find the "
+"architecture of a kernel, use the architecture of the associated initrd or "
+"kernel module(s) instead."

 msgstr ""
 
 msgstr ""
 

+# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:2157 ../src/guestfs-actions.pod:3403
-msgid "(Added in 1.7.24)"
+#: ../src/guestfs-actions.pod:1657 ../src/guestfs-actions.pod:1820
+#: ../src/guestfs-actions.pod:1837 ../src/guestfs-actions.pod:2528
+#: ../src/guestfs-actions.pod:2621 ../src/guestfs-actions.pod:2691
+#: ../src/guestfs-actions.pod:2779 ../src/guestfs-actions.pod:2800
+#: ../src/guestfs-actions.pod:2843 ../src/guestfs-actions.pod:2927
+#: ../src/guestfs-actions.pod:3024 ../src/guestfs-actions.pod:3271
+#: ../src/guestfs-actions.pod:3403
+msgid "(Added in 1.5.3)"

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:2159
-msgid "guestfs_getxattrs"
+#: ../src/guestfs-actions.pod:1659
+msgid "guestfs_filesize"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:2161
+#: ../src/guestfs-actions.pod:1661

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" struct guestfs_xattr_list *\n"
-" guestfs_getxattrs (guestfs_h *g,\n"
-"                    const char *path);\n"
+" int64_t\n"
+" guestfs_filesize (guestfs_h *g,\n"
+"                   const char *file);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:2165 ../fish/guestfish-actions.pod:1463
-msgid ""
-"This call lists the extended attributes of the file or directory C<path>."
+#: ../src/guestfs-actions.pod:1665 ../fish/guestfish-actions.pod:1130
+msgid "This command returns the size of C<file> in bytes."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:2168 ../fish/guestfish-actions.pod:1466
+#: ../src/guestfs-actions.pod:1667

 msgid ""
 msgid ""

-"At the system call level, this is a combination of the L<listxattr(2)> and "
-"L<getxattr(2)> calls."
+"To get other stats about a file, use C<guestfs_stat>, C<guestfs_lstat>, "
+"C<guestfs_is_dir>, C<guestfs_is_file> etc.  To get the size of block "
+"devices, use C<guestfs_blockdev_getsize64>."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:2171
-msgid "See also: C<guestfs_lgetxattrs>, L<attr(5)>."
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:2173 ../src/guestfs-actions.pod:3415
-#: ../src/guestfs-actions.pod:4066
-msgid ""
-"This function returns a C<struct guestfs_xattr_list *>, or NULL if there was "
-"an error.  I<The caller must call C<guestfs_free_xattr_list> after use>."
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:2177 ../src/guestfs-actions.pod:3419
-#: ../src/guestfs-actions.pod:3584 ../src/guestfs-actions.pod:3620
-#: ../src/guestfs-actions.pod:5496 ../src/guestfs-actions.pod:5980
-#: ../src/guestfs-actions.pod:7315
-msgid "(Added in 1.0.59)"
+#: ../src/guestfs-actions.pod:1673
+msgid "(Added in 1.0.82)"

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:2179
-msgid "guestfs_glob_expand"
+#: ../src/guestfs-actions.pod:1675
+msgid "guestfs_fill"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:2181
+#: ../src/guestfs-actions.pod:1677

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" char **\n"
-" guestfs_glob_expand (guestfs_h *g,\n"
-"                      const char *pattern);\n"
+" int\n"
+" guestfs_fill (guestfs_h *g,\n"
+"               int c,\n"
+"               int len,\n"
+"               const char *path);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:2185 ../fish/guestfish-actions.pod:1475
-msgid ""
-"This command searches for all the pathnames matching C<pattern> according to "
-"the wildcard expansion rules used by the shell."
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:2189 ../fish/guestfish-actions.pod:1479
+#: ../src/guestfs-actions.pod:1683 ../fish/guestfish-actions.pod:1140

 msgid ""
 msgid ""

-"If no paths match, then this returns an empty list (note: not an error)."
+"This command creates a new file called C<path>.  The initial content of the "
+"file is C<len> octets of C<c>, where C<c> must be a number in the range C<"
+"[0..255]>."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:2192 ../fish/guestfish-actions.pod:1482
+#: ../src/guestfs-actions.pod:1687

 msgid ""
 msgid ""

-"It is just a wrapper around the C L<glob(3)> function with flags C<GLOB_MARK|"
-"GLOB_BRACE>.  See that manual page for more details."
+"To fill a file with zero bytes (sparsely), it is much more efficient to use "
+"C<guestfs_truncate_size>.  To create a file with a pattern of repeating "
+"bytes use C<guestfs_fill_pattern>."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:2200 ../src/guestfs-actions.pod:6145
-#: ../src/guestfs-actions.pod:6162
-msgid "(Added in 1.0.50)"
+#: ../src/guestfs-actions.pod:1699
+msgid "(Added in 1.0.79)"

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:2202
-msgid "guestfs_grep"
+#: ../src/guestfs-actions.pod:1701
+msgid "guestfs_fill_pattern"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:2204
+#: ../src/guestfs-actions.pod:1703

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" char **\n"
-" guestfs_grep (guestfs_h *g,\n"
-"               const char *regex,\n"
-"               const char *path);\n"
+" int\n"
+" guestfs_fill_pattern (guestfs_h *g,\n"
+"                       const char *pattern,\n"
+"                       int len,\n"
+"                       const char *path);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:2209 ../fish/guestfish-actions.pod:1490
-msgid "This calls the external C<grep> program and returns the matching lines."
+#: ../src/guestfs-actions.pod:1709
+msgid ""
+"This function is like C<guestfs_fill> except that it creates a new file of "
+"length C<len> containing the repeating pattern of bytes in C<pattern>.  The "
+"pattern is truncated if necessary to ensure the length of the file is "
+"exactly C<len> bytes."
+msgstr ""
+
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:1721
+msgid "(Added in 1.3.12)"

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:2221
-msgid "guestfs_grepi"
+#: ../src/guestfs-actions.pod:1723
+msgid "guestfs_find"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:2223
+#: ../src/guestfs-actions.pod:1725

 #, no-wrap
 msgid ""
 " char **\n"
 #, no-wrap
 msgid ""
 " char **\n"

-" guestfs_grepi (guestfs_h *g,\n"
-"                const char *regex,\n"
-"                const char *path);\n"
+" guestfs_find (guestfs_h *g,\n"
+"               const char *directory);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:2228 ../fish/guestfish-actions.pod:1500
+#: ../src/guestfs-actions.pod:1729 ../fish/guestfish-actions.pod:1162

 msgid ""
 msgid ""

-"This calls the external C<grep -i> program and returns the matching lines."
+"This command lists out all files and directories, recursively, starting at "
+"C<directory>.  It is essentially equivalent to running the shell command "
+"C<find directory -print> but some post-processing happens on the output, "
+"described below."

 msgstr ""
 
 msgstr ""
 

-# type: =head2
-#. type: =head2
-#: ../src/guestfs-actions.pod:2240
-msgid "guestfs_grub_install"
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:1734 ../fish/guestfish-actions.pod:1167
+msgid ""
+"This returns a list of strings I<without any prefix>.  Thus if the directory "
+"structure was:"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:2242
+#: ../src/guestfs-actions.pod:1737 ../fish/guestfish-actions.pod:1170

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" int\n"
-" guestfs_grub_install (guestfs_h *g,\n"
-"                       const char *root,\n"
-"                       const char *device);\n"
+" /tmp/a\n"
+" /tmp/b\n"
+" /tmp/c/d\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:2247 ../fish/guestfish-actions.pod:1510
-msgid ""
-"This command installs GRUB (the Grand Unified Bootloader) on C<device>, with "
-"the root directory being C<root>."
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:2250 ../fish/guestfish-actions.pod:1513
+#: ../src/guestfs-actions.pod:1741

 msgid ""
 msgid ""

-"Note: If grub-install reports the error \"No suitable drive was found in the "
-"generated device map.\" it may be that you need to create a C</boot/grub/"
-"device.map> file first that contains the mapping between grub device names "
-"and Linux device names.  It is usually sufficient to create a file "
-"containing:"
+"then the returned list from C<guestfs_find> C</tmp> would be 4 elements:"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:2257 ../fish/guestfish-actions.pod:1520
+#: ../src/guestfs-actions.pod:1744 ../fish/guestfish-actions.pod:1177

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" (hd0) /dev/vda\n"
+" a\n"
+" b\n"
+" c\n"
+" c/d\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:2259 ../fish/guestfish-actions.pod:1522
-msgid "replacing C</dev/vda> with the name of the installation device."
+#: ../src/guestfs-actions.pod:1749 ../fish/guestfish-actions.pod:1182
+msgid "If C<directory> is not a directory, then this command returns an error."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:2263
-msgid "(Added in 1.0.17)"
-msgstr ""
-
-# type: =head2
-#. type: =head2
-#: ../src/guestfs-actions.pod:2265
-msgid "guestfs_head"
+#: ../src/guestfs-actions.pod:1752 ../fish/guestfish-actions.pod:1185
+msgid "The returned list is sorted."

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../src/guestfs-actions.pod:2267
-#, no-wrap
-msgid ""
-" char **\n"
-" guestfs_head (guestfs_h *g,\n"
-"               const char *path);\n"
-"\n"
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:1754
+msgid "See also C<guestfs_find0>."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:2271 ../fish/guestfish-actions.pod:1528
-msgid ""
-"This command returns up to the first 10 lines of a file as a list of strings."
+#: ../src/guestfs-actions.pod:1763 ../src/guestfs-actions.pod:4097
+#: ../src/guestfs-actions.pod:5656
+msgid "(Added in 1.0.27)"

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:2283
-msgid "guestfs_head_n"
+#: ../src/guestfs-actions.pod:1765
+msgid "guestfs_find0"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:2285
+#: ../src/guestfs-actions.pod:1767

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" char **\n"
-" guestfs_head_n (guestfs_h *g,\n"
-"                 int nrlines,\n"
-"                 const char *path);\n"
+" int\n"
+" guestfs_find0 (guestfs_h *g,\n"
+"                const char *directory,\n"
+"                const char *files);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:2290 ../fish/guestfish-actions.pod:1538
+#: ../src/guestfs-actions.pod:1772 ../fish/guestfish-actions.pod:1196

 msgid ""
 msgid ""

-"If the parameter C<nrlines> is a positive number, this returns the first "
-"C<nrlines> lines of the file C<path>."
+"This command lists out all files and directories, recursively, starting at "
+"C<directory>, placing the resulting list in the external file called "
+"C<files>."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:2293 ../fish/guestfish-actions.pod:1541
+#: ../src/guestfs-actions.pod:1776

 msgid ""
 msgid ""

-"If the parameter C<nrlines> is a negative number, this returns lines from "
-"the file C<path>, excluding the last C<nrlines> lines."
+"This command works the same way as C<guestfs_find> with the following "
+"exceptions:"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:2296 ../src/guestfs-actions.pod:6442
-#: ../fish/guestfish-actions.pod:1544 ../fish/guestfish-actions.pod:4326
-msgid "If the parameter C<nrlines> is zero, this returns an empty list."
+#: ../src/guestfs-actions.pod:1783 ../fish/guestfish-actions.pod:1207
+msgid "The resulting list is written to an external file."

 msgstr ""
 
 msgstr ""
 

-# type: =head2
-#. type: =head2
-#: ../src/guestfs-actions.pod:2307
-msgid "guestfs_hexdump"
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:1787 ../fish/guestfish-actions.pod:1211
+msgid ""
+"Items (filenames) in the result are separated by C<\\0> characters.  See "
+"L<find(1)> option I<-print0>."

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../src/guestfs-actions.pod:2309
-#, no-wrap
-msgid ""
-" char *\n"
-" guestfs_hexdump (guestfs_h *g,\n"
-"                  const char *path);\n"
-"\n"
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:1792 ../fish/guestfish-actions.pod:1216
+msgid "This command is not limited in the number of names that it can return."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:2313 ../fish/guestfish-actions.pod:1553
-msgid ""
-"This runs C<hexdump -C> on the given C<path>.  The result is the human-"
-"readable, canonical hex dump of the file."
+#: ../src/guestfs-actions.pod:1797 ../fish/guestfish-actions.pod:1221
+msgid "The result list is not sorted."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:2322 ../src/guestfs-actions.pod:6226
-#: ../src/guestfs-actions.pod:6281
-msgid "(Added in 1.0.22)"
+#: ../src/guestfs-actions.pod:1803
+msgid "(Added in 1.0.74)"

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:2324
-msgid "guestfs_initrd_cat"
+#: ../src/guestfs-actions.pod:1805
+msgid "guestfs_findfs_label"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:2326
+#: ../src/guestfs-actions.pod:1807

 #, no-wrap
 msgid ""
 " char *\n"
 #, no-wrap
 msgid ""
 " char *\n"

-" guestfs_initrd_cat (guestfs_h *g,\n"
-"                     const char *initrdpath,\n"
-"                     const char *filename,\n"
-"                     size_t *size_r);\n"
+" guestfs_findfs_label (guestfs_h *g,\n"
+"                       const char *label);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:2332 ../fish/guestfish-actions.pod:1563
+#: ../src/guestfs-actions.pod:1811 ../fish/guestfish-actions.pod:1231

 msgid ""
 msgid ""

-"This command unpacks the file C<filename> from the initrd file called "
-"C<initrdpath>.  The filename must be given I<without> the initial C</> "
-"character."
+"This command searches the filesystems and returns the one which has the "
+"given label.  An error is returned if no such filesystem can be found."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:2336 ../fish/guestfish-actions.pod:1567
-msgid ""
-"For example, in guestfish you could use the following command to examine the "
-"boot script (usually called C</init>)  contained in a Linux initrd or "
-"initramfs image:"
+#: ../src/guestfs-actions.pod:1815
+msgid "To find the label of a filesystem, use C<guestfs_vfs_label>."
+msgstr ""
+
+# type: =head2
+#. type: =head2
+#: ../src/guestfs-actions.pod:1822
+msgid "guestfs_findfs_uuid"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:2340 ../fish/guestfish-actions.pod:1571
+#: ../src/guestfs-actions.pod:1824

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" initrd-cat /boot/initrd-<version>.img init\n"
+" char *\n"
+" guestfs_findfs_uuid (guestfs_h *g,\n"
+"                      const char *uuid);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:2342
-msgid "See also C<guestfs_initrd_list>."
+#: ../src/guestfs-actions.pod:1828 ../fish/guestfish-actions.pod:1241
+msgid ""
+"This command searches the filesystems and returns the one which has the "
+"given UUID.  An error is returned if no such filesystem can be found."
+msgstr ""
+
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:1832
+msgid "To find the UUID of a filesystem, use C<guestfs_vfs_uuid>."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:2353
-msgid "guestfs_initrd_list"
+#: ../src/guestfs-actions.pod:1839
+msgid "guestfs_fsck"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:2355
+#: ../src/guestfs-actions.pod:1841

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" char **\n"
-" guestfs_initrd_list (guestfs_h *g,\n"
-"                      const char *path);\n"
+" int\n"
+" guestfs_fsck (guestfs_h *g,\n"
+"               const char *fstype,\n"
+"               const char *device);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:2359 ../fish/guestfish-actions.pod:1582
-msgid "This command lists out files contained in an initrd."
+#: ../src/guestfs-actions.pod:1846 ../fish/guestfish-actions.pod:1251
+msgid ""
+"This runs the filesystem checker (fsck) on C<device> which should have "
+"filesystem type C<fstype>."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:2361 ../fish/guestfish-actions.pod:1584
+#: ../src/guestfs-actions.pod:1849 ../fish/guestfish-actions.pod:1254

 msgid ""
 msgid ""

-"The files are listed without any initial C</> character.  The files are "
-"listed in the order they appear (not necessarily alphabetical).  Directory "
-"names are listed as separate items."
+"The returned integer is the status.  See L<fsck(8)> for the list of status "
+"codes from C<fsck>."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:2365 ../fish/guestfish-actions.pod:1588
-msgid ""
-"Old Linux kernels (2.4 and earlier) used a compressed ext2 filesystem as "
-"initrd.  We I<only> support the newer initramfs format (compressed cpio "
-"files)."
+#: ../src/guestfs-actions.pod:1858 ../fish/guestfish-actions.pod:1263
+msgid "Multiple status codes can be summed together."
+msgstr ""
+
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:1862 ../fish/guestfish-actions.pod:1267
+msgid ""
+"A non-zero return code can mean \"success\", for example if errors have been "
+"corrected on the filesystem."
+msgstr ""
+
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:1867 ../fish/guestfish-actions.pod:1272
+msgid "Checking or repairing NTFS volumes is not supported (by linux-ntfs)."
+msgstr ""
+
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:1872 ../fish/guestfish-actions.pod:1277
+msgid ""
+"This command is entirely equivalent to running C<fsck -a -t fstype device>."
+msgstr ""
+
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:1876 ../src/guestfs-actions.pod:7387
+msgid "(Added in 1.0.16)"

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:2375
-msgid "guestfs_inotify_add_watch"
+#: ../src/guestfs-actions.pod:1878
+msgid "guestfs_get_append"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:2377
+#: ../src/guestfs-actions.pod:1880

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" int64_t\n"
-" guestfs_inotify_add_watch (guestfs_h *g,\n"
-"                            const char *path,\n"
-"                            int mask);\n"
+" const char *\n"
+" guestfs_get_append (guestfs_h *g);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:2382 ../fish/guestfish-actions.pod:1596
-msgid "Watch C<path> for the events listed in C<mask>."
+#: ../src/guestfs-actions.pod:1883 ../fish/guestfish-actions.pod:1283
+msgid ""
+"Return the additional kernel options which are added to the guest kernel "
+"command line."
+msgstr ""
+
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:1886 ../fish/guestfish-actions.pod:1286
+msgid "If C<NULL> then no options are added."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:2384 ../fish/guestfish-actions.pod:1598
+#: ../src/guestfs-actions.pod:1888

 msgid ""
 msgid ""

-"Note that if C<path> is a directory then events within that directory are "
-"watched, but this does I<not> happen recursively (in subdirectories)."
+"This function returns a string which may be NULL.  There is no way to return "
+"an error from this function.  The string is owned by the guest handle and "
+"must I<not> be freed."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:2388 ../fish/guestfish-actions.pod:1602
+#: ../src/guestfs-actions.pod:1892 ../src/guestfs-actions.pod:5334
+#: ../src/guestfs-actions.pod:5814 ../src/guestfs-actions.pod:6235
+#: ../src/guestfs-actions.pod:6254 ../src/guestfs-actions.pod:6270
+#: ../src/guestfs-actions.pod:6294 ../src/guestfs-actions.pod:7051
+#: ../src/guestfs-actions.pod:7069 ../src/guestfs-actions.pod:7430
+msgid "(Added in 1.0.26)"
+msgstr ""
+
+#. type: =head2
+#: ../src/guestfs-actions.pod:1894
+msgid "guestfs_get_attach_method"
+msgstr ""
+
+#. type: verbatim
+#: ../src/guestfs-actions.pod:1896
+#, no-wrap

 msgid ""
 msgid ""

-"Note for non-C or non-Linux callers: the inotify events are defined by the "
-"Linux kernel ABI and are listed in C</usr/include/sys/inotify.h>."
+" char *\n"
+" guestfs_get_attach_method (guestfs_h *g);\n"
+"\n"
+msgstr ""
+
+#. type: textblock
+#: ../src/guestfs-actions.pod:1899
+msgid "Return the current attach method.  See C<guestfs_set_attach_method>."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:2396
-msgid "guestfs_inotify_close"
+#: ../src/guestfs-actions.pod:1904
+msgid "guestfs_get_autosync"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:2398
+#: ../src/guestfs-actions.pod:1906

 #, no-wrap
 msgid ""
 " int\n"
 #, no-wrap
 msgid ""
 " int\n"

-" guestfs_inotify_close (guestfs_h *g);\n"
+" guestfs_get_autosync (guestfs_h *g);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:2401 ../fish/guestfish-actions.pod:1610
-msgid ""
-"This closes the inotify handle which was previously opened by inotify_init.  "
-"It removes all watches, throws away any pending events, and deallocates all "
-"resources."
+#: ../src/guestfs-actions.pod:1909 ../fish/guestfish-actions.pod:1298
+msgid "Get the autosync flag."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:2409
-msgid "guestfs_inotify_files"
+#: ../src/guestfs-actions.pod:1915
+msgid "guestfs_get_direct"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:2411
+#: ../src/guestfs-actions.pod:1917

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" char **\n"
-" guestfs_inotify_files (guestfs_h *g);\n"
+" int\n"
+" guestfs_get_direct (guestfs_h *g);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:2414
-msgid ""
-"This function is a helpful wrapper around C<guestfs_inotify_read> which just "
-"returns a list of pathnames of objects that were touched.  The returned "
-"pathnames are sorted and deduplicated."
+#: ../src/guestfs-actions.pod:1920 ../fish/guestfish-actions.pod:1304
+msgid "Return the direct appliance mode flag."
+msgstr ""
+
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:1924 ../src/guestfs-actions.pod:5883
+msgid "(Added in 1.0.72)"

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:2424
-msgid "guestfs_inotify_init"
+#: ../src/guestfs-actions.pod:1926
+msgid "guestfs_get_e2label"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:2426
+#: ../src/guestfs-actions.pod:1928

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" int\n"
-" guestfs_inotify_init (guestfs_h *g,\n"
-"                       int maxevents);\n"
+" char *\n"
+" guestfs_get_e2label (guestfs_h *g,\n"
+"                      const char *device);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:2430 ../fish/guestfish-actions.pod:1626
+#: ../src/guestfs-actions.pod:1932 ../fish/guestfish-actions.pod:1310

 msgid ""
 msgid ""

-"This command creates a new inotify handle.  The inotify subsystem can be "
-"used to notify events which happen to objects in the guest filesystem."
+"This returns the ext2/3/4 filesystem label of the filesystem on C<device>."

 msgstr ""
 
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:2434
+#: ../src/guestfs-actions.pod:1938

 msgid ""
 msgid ""

-"C<maxevents> is the maximum number of events which will be queued up between "
-"calls to C<guestfs_inotify_read> or C<guestfs_inotify_files>.  If this is "
-"passed as C<0>, then the kernel (or previously set)  default is used.  For "
-"Linux 2.6.29 the default was 16384 events.  Beyond this limit, the kernel "
-"throws away events, but records the fact that it threw them away by setting "
-"a flag C<IN_Q_OVERFLOW> in the returned structure list (see "
-"C<guestfs_inotify_read>)."
+"This function is deprecated.  In new code, use the L</guestfs_vfs_label> "
+"call instead."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:2444
-msgid ""
-"Before any events are generated, you have to add some watches to the "
-"internal watch list.  See: C<guestfs_inotify_add_watch>, "
-"C<guestfs_inotify_rm_watch> and C<guestfs_inotify_watch_all>."
+#: ../src/guestfs-actions.pod:1945 ../src/guestfs-actions.pod:1966
+#: ../src/guestfs-actions.pod:5901 ../src/guestfs-actions.pod:5920
+msgid "(Added in 1.0.15)"

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:2450
+# type: =head2
+#. type: =head2
+#: ../src/guestfs-actions.pod:1947
+msgid "guestfs_get_e2uuid"
+msgstr ""
+
+# type: verbatim
+#. type: verbatim
+#: ../src/guestfs-actions.pod:1949
+#, no-wrap

 msgid ""
 msgid ""

-"Queued up events should be read periodically by calling "
-"C<guestfs_inotify_read> (or C<guestfs_inotify_files> which is just a helpful "
-"wrapper around C<guestfs_inotify_read>).  If you don't read the events out "
-"often enough then you risk the internal queue overflowing."
+" char *\n"
+" guestfs_get_e2uuid (guestfs_h *g,\n"
+"                     const char *device);\n"
+"\n"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:2457
+#: ../src/guestfs-actions.pod:1953 ../fish/guestfish-actions.pod:1324

 msgid ""
 msgid ""

-"The handle should be closed after use by calling C<guestfs_inotify_close>.  "
-"This also removes any watches automatically."
+"This returns the ext2/3/4 filesystem UUID of the filesystem on C<device>."

 msgstr ""
 
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:2461 ../fish/guestfish-actions.pod:1657
+#: ../src/guestfs-actions.pod:1959

 msgid ""
 msgid ""

-"See also L<inotify(7)> for an overview of the inotify interface as exposed "
-"by the Linux kernel, which is roughly what we expose via libguestfs.  Note "
-"that there is one global inotify handle per libguestfs instance."
+"This function is deprecated.  In new code, use the L</guestfs_vfs_uuid> call "
+"instead."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:2470
-msgid "guestfs_inotify_read"
+#: ../src/guestfs-actions.pod:1968
+msgid "guestfs_get_memsize"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:2472
+#: ../src/guestfs-actions.pod:1970

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" struct guestfs_inotify_event_list *\n"
-" guestfs_inotify_read (guestfs_h *g);\n"
+" int\n"
+" guestfs_get_memsize (guestfs_h *g);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:2475 ../fish/guestfish-actions.pod:1666
+#: ../src/guestfs-actions.pod:1973 ../fish/guestfish-actions.pod:1338

 msgid ""
 msgid ""

-"Return the complete queue of events that have happened since the previous "
-"read call."
+"This gets the memory size in megabytes allocated to the qemu subprocess."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:2478 ../fish/guestfish-actions.pod:1669
-msgid "If no events have happened, this returns an empty list."
+#: ../src/guestfs-actions.pod:1976
+msgid ""
+"If C<guestfs_set_memsize> was not called on this handle, and if "
+"C<LIBGUESTFS_MEMSIZE> was not set, then this returns the compiled-in default "
+"value for memsize."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:2480 ../fish/guestfish-actions.pod:1671
+#: ../src/guestfs-actions.pod:1980 ../src/guestfs-actions.pod:2061
+#: ../src/guestfs-actions.pod:5936 ../src/guestfs-actions.pod:6043
+#: ../fish/guestfish-actions.pod:1345 ../fish/guestfish-actions.pod:1396
+#: ../fish/guestfish-actions.pod:4006 ../fish/guestfish-actions.pod:4093

 msgid ""
 msgid ""

-"I<Note>: In order to make sure that all events have been read, you must call "
-"this function repeatedly until it returns an empty list.  The reason is that "
-"the call will read events up to the maximum appliance-to-host message size "
-"and leave remaining events in the queue."
+"For more information on the architecture of libguestfs, see L<guestfs(3)>."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:2486
-msgid ""
-"This function returns a C<struct guestfs_inotify_event_list *>, or NULL if "
-"there was an error.  I<The caller must call "
-"C<guestfs_free_inotify_event_list> after use>."
+#: ../src/guestfs-actions.pod:1985 ../src/guestfs-actions.pod:4388
+#: ../src/guestfs-actions.pod:4585 ../src/guestfs-actions.pod:4604
+#: ../src/guestfs-actions.pod:4623 ../src/guestfs-actions.pod:4635
+#: ../src/guestfs-actions.pod:4652 ../src/guestfs-actions.pod:4665
+#: ../src/guestfs-actions.pod:5559 ../src/guestfs-actions.pod:5941
+#: ../src/guestfs-actions.pod:6202 ../src/guestfs-actions.pod:6817
+msgid "(Added in 1.0.55)"

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:2492
-msgid "guestfs_inotify_rm_watch"
+#: ../src/guestfs-actions.pod:1987
+msgid "guestfs_get_network"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:2494
+#: ../src/guestfs-actions.pod:1989

 #, no-wrap
 msgid ""
 " int\n"
 #, no-wrap
 msgid ""
 " int\n"

-" guestfs_inotify_rm_watch (guestfs_h *g,\n"
-"                           int wd);\n"
+" guestfs_get_network (guestfs_h *g);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:2498
-msgid ""
-"Remove a previously defined inotify watch.  See C<guestfs_inotify_add_watch>."
+#: ../src/guestfs-actions.pod:1992 ../fish/guestfish-actions.pod:1352
+msgid "This returns the enable network flag."
+msgstr ""
+
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:1996 ../src/guestfs-actions.pod:5960
+msgid "(Added in 1.5.4)"

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:2505
-msgid "guestfs_inspect_get_arch"
+#: ../src/guestfs-actions.pod:1998
+msgid "guestfs_get_path"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:2507
+#: ../src/guestfs-actions.pod:2000

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" char *\n"
-" guestfs_inspect_get_arch (guestfs_h *g,\n"
-"                           const char *root);\n"
+" const char *\n"
+" guestfs_get_path (guestfs_h *g);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:2511 ../src/guestfs-actions.pod:2534
-#: ../src/guestfs-actions.pod:2615 ../src/guestfs-actions.pod:2641
-#: ../src/guestfs-actions.pod:2680 ../src/guestfs-actions.pod:2702
-#: ../src/guestfs-actions.pod:2729 ../src/guestfs-actions.pod:2750
-#: ../src/guestfs-actions.pod:2787 ../src/guestfs-actions.pod:2816
-#: ../src/guestfs-actions.pod:2847 ../src/guestfs-actions.pod:2891
-#: ../src/guestfs-actions.pod:2933 ../src/guestfs-actions.pod:2956
-#: ../src/guestfs-actions.pod:2973 ../src/guestfs-actions.pod:2990
-#: ../src/guestfs-actions.pod:3009
-msgid ""
-"This function should only be called with a root device string as returned by "
-"C<guestfs_inspect_os>."
+#: ../src/guestfs-actions.pod:2003 ../fish/guestfish-actions.pod:1358
+msgid "Return the current search path."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:2514
+#: ../src/guestfs-actions.pod:2005 ../fish/guestfish-actions.pod:1360

 msgid ""
 msgid ""

-"This returns the architecture of the inspected operating system.  The "
-"possible return values are listed under C<guestfs_file_architecture>."
+"This is always non-NULL.  If it wasn't set already, then this will return "
+"the default path."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:2518 ../fish/guestfish-actions.pod:1695
+#: ../src/guestfs-actions.pod:2008 ../src/guestfs-actions.pod:2037

 msgid ""
 msgid ""

-"If the architecture could not be determined, then the string C<unknown> is "
-"returned."
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:2521 ../src/guestfs-actions.pod:2602
-#: ../src/guestfs-actions.pod:2669 ../src/guestfs-actions.pod:2689
-#: ../src/guestfs-actions.pod:2717 ../src/guestfs-actions.pod:2803
-#: ../src/guestfs-actions.pod:2834 ../src/guestfs-actions.pod:2858
-#: ../src/guestfs-actions.pod:2877 ../src/guestfs-actions.pod:2920
-#: ../src/guestfs-actions.pod:2943 ../src/guestfs-actions.pod:2963
-#: ../src/guestfs-actions.pod:2980 ../src/guestfs-actions.pod:2999
-#: ../src/guestfs-actions.pod:3102 ../src/guestfs-actions.pod:3143
-#: ../fish/guestfish-actions.pod:1698 ../fish/guestfish-actions.pod:1772
-#: ../fish/guestfish-actions.pod:1824 ../fish/guestfish-actions.pod:1839
-#: ../fish/guestfish-actions.pod:1860 ../fish/guestfish-actions.pod:1924
-#: ../fish/guestfish-actions.pod:1948 ../fish/guestfish-actions.pod:1965
-#: ../fish/guestfish-actions.pod:1978 ../fish/guestfish-actions.pod:2013
-#: ../fish/guestfish-actions.pod:2029 ../fish/guestfish-actions.pod:2042
-#: ../fish/guestfish-actions.pod:2055 ../fish/guestfish-actions.pod:2070
-#: ../fish/guestfish-actions.pod:2169 ../fish/guestfish-actions.pod:2203
-msgid "Please read L<guestfs(3)/INSPECTION> for more details."
+"This function returns a string, or NULL on error.  The string is owned by "
+"the guest handle and must I<not> be freed."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:2528
-msgid "guestfs_inspect_get_distro"
+#: ../src/guestfs-actions.pod:2013
+msgid "guestfs_get_pid"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:2530
+#: ../src/guestfs-actions.pod:2015

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" char *\n"
-" guestfs_inspect_get_distro (guestfs_h *g,\n"
-"                             const char *root);\n"
+" int\n"
+" guestfs_get_pid (guestfs_h *g);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:2537 ../fish/guestfish-actions.pod:1707
+#: ../src/guestfs-actions.pod:2018 ../fish/guestfish-actions.pod:1369

 msgid ""
 msgid ""

-"This returns the distro (distribution) of the inspected operating system."
+"Return the process ID of the qemu subprocess.  If there is no qemu "
+"subprocess, then this will return an error."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:2540 ../fish/guestfish-actions.pod:1710
-msgid "Currently defined distros are:"
-msgstr ""
-
-# type: =item
-#. type: =item
-#: ../src/guestfs-actions.pod:2544 ../fish/guestfish-actions.pod:1714
-msgid "\"archlinux\""
+#: ../src/guestfs-actions.pod:2021 ../fish/guestfish-actions.pod:1372
+msgid "This is an internal call used for debugging and testing."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:2546 ../fish/guestfish-actions.pod:1716
-msgid "Arch Linux."
+#: ../src/guestfs-actions.pod:2025
+msgid "(Added in 1.0.56)"

 msgstr ""
 
 msgstr ""
 

-# type: =item
-#. type: =item
-#: ../src/guestfs-actions.pod:2548 ../fish/guestfish-actions.pod:1718
-msgid "\"debian\""
+# type: =head2
+#. type: =head2
+#: ../src/guestfs-actions.pod:2027
+msgid "guestfs_get_qemu"
+msgstr ""
+
+# type: verbatim
+#. type: verbatim
+#: ../src/guestfs-actions.pod:2029
+#, no-wrap
+msgid ""
+" const char *\n"
+" guestfs_get_qemu (guestfs_h *g);\n"
+"\n"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:2550 ../fish/guestfish-actions.pod:1720
-msgid "Debian."
-msgstr ""
-
-# type: =item
-#. type: =item
-#: ../src/guestfs-actions.pod:2552 ../fish/guestfish-actions.pod:1722
-msgid "\"fedora\""
+#: ../src/guestfs-actions.pod:2032 ../fish/guestfish-actions.pod:1378
+msgid "Return the current qemu binary."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:2554 ../fish/guestfish-actions.pod:1724
-msgid "Fedora."
-msgstr ""
-
-# type: =item
-#. type: =item
-#: ../src/guestfs-actions.pod:2556 ../fish/guestfish-actions.pod:1726
-msgid "\"gentoo\""
+#: ../src/guestfs-actions.pod:2034 ../fish/guestfish-actions.pod:1380
+msgid ""
+"This is always non-NULL.  If it wasn't set already, then this will return "
+"the default qemu binary name."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:2558 ../fish/guestfish-actions.pod:1728
-msgid "Gentoo."
-msgstr ""
-
-# type: =item
-#. type: =item
-#: ../src/guestfs-actions.pod:2560 ../fish/guestfish-actions.pod:1730
-msgid "\"linuxmint\""
+#: ../src/guestfs-actions.pod:2040 ../src/guestfs-actions.pod:6005
+msgid "(Added in 1.0.6)"

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:2562 ../fish/guestfish-actions.pod:1732
-msgid "Linux Mint."
+# type: =head2
+#. type: =head2
+#: ../src/guestfs-actions.pod:2042
+msgid "guestfs_get_recovery_proc"

 msgstr ""
 
 msgstr ""
 

-# type: =item
-#. type: =item
-#: ../src/guestfs-actions.pod:2564 ../fish/guestfish-actions.pod:1734
-msgid "\"mandriva\""
+# type: verbatim
+#. type: verbatim
+#: ../src/guestfs-actions.pod:2044
+#, no-wrap
+msgid ""
+" int\n"
+" guestfs_get_recovery_proc (guestfs_h *g);\n"
+"\n"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:2566 ../fish/guestfish-actions.pod:1736
-msgid "Mandriva."
-msgstr ""
-
-# type: =item
-#. type: =item
-#: ../src/guestfs-actions.pod:2568 ../fish/guestfish-actions.pod:1738
-msgid "\"meego\""
+#: ../src/guestfs-actions.pod:2047 ../fish/guestfish-actions.pod:1387
+msgid "Return the recovery process enabled flag."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:2570 ../fish/guestfish-actions.pod:1740
-msgid "MeeGo."
+#: ../src/guestfs-actions.pod:2051 ../src/guestfs-actions.pod:3498
+#: ../src/guestfs-actions.pod:3795 ../src/guestfs-actions.pod:4195
+#: ../src/guestfs-actions.pod:4227 ../src/guestfs-actions.pod:5264
+#: ../src/guestfs-actions.pod:5607 ../src/guestfs-actions.pod:6029
+#: ../src/guestfs-actions.pod:6720 ../src/guestfs-actions.pod:6740
+#: ../src/guestfs-actions.pod:6932
+msgid "(Added in 1.0.77)"

 msgstr ""
 
 msgstr ""
 

-# type: =item
-#. type: =item
-#: ../src/guestfs-actions.pod:2572 ../fish/guestfish-actions.pod:1742
-msgid "\"pardus\""
+# type: =head2
+#. type: =head2
+#: ../src/guestfs-actions.pod:2053
+msgid "guestfs_get_selinux"

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:2574 ../fish/guestfish-actions.pod:1744
-msgid "Pardus."
+# type: verbatim
+#. type: verbatim
+#: ../src/guestfs-actions.pod:2055
+#, no-wrap
+msgid ""
+" int\n"
+" guestfs_get_selinux (guestfs_h *g);\n"
+"\n"

 msgstr ""
 
 msgstr ""
 

-# type: =item
-#. type: =item
-#: ../src/guestfs-actions.pod:2576 ../fish/guestfish-actions.pod:1746
-msgid "\"redhat-based\""
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:2058
+msgid ""
+"This returns the current setting of the selinux flag which is passed to the "
+"appliance at boot time.  See C<guestfs_set_selinux>."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:2578 ../fish/guestfish-actions.pod:1748
-msgid "Some Red Hat-derived distro."
+#: ../src/guestfs-actions.pod:2066 ../src/guestfs-actions.pod:2129
+#: ../src/guestfs-actions.pod:6048 ../src/guestfs-actions.pod:6106
+msgid "(Added in 1.0.67)"

 msgstr ""
 
 msgstr ""
 

-# type: =item
-#. type: =item
-#: ../src/guestfs-actions.pod:2580 ../fish/guestfish-actions.pod:1750
-msgid "\"rhel\""
+# type: =head2
+#. type: =head2
+#: ../src/guestfs-actions.pod:2068
+msgid "guestfs_get_state"

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:2582 ../fish/guestfish-actions.pod:1752
-msgid "Red Hat Enterprise Linux and some derivatives."
+# type: verbatim
+#. type: verbatim
+#: ../src/guestfs-actions.pod:2070
+#, no-wrap
+msgid ""
+" int\n"
+" guestfs_get_state (guestfs_h *g);\n"
+"\n"

 msgstr ""
 
 msgstr ""
 

-# type: =item
-#. type: =item
-#: ../src/guestfs-actions.pod:2584 ../fish/guestfish-actions.pod:1754
-msgid "\"ubuntu\""
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:2073 ../fish/guestfish-actions.pod:1403
+msgid ""
+"This returns the current state as an opaque integer.  This is only useful "
+"for printing debug and internal error messages."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:2586 ../fish/guestfish-actions.pod:1756
-msgid "Ubuntu."
+#: ../src/guestfs-actions.pod:2076 ../src/guestfs-actions.pod:3296
+#: ../src/guestfs-actions.pod:3325 ../src/guestfs-actions.pod:3386
+#: ../src/guestfs-actions.pod:3413 ../fish/guestfish-actions.pod:1406
+#: ../fish/guestfish-actions.pod:2320 ../fish/guestfish-actions.pod:2338
+#: ../fish/guestfish-actions.pod:2376 ../fish/guestfish-actions.pod:2392
+msgid "For more information on states, see L<guestfs(3)>."

 msgstr ""
 
 msgstr ""
 

-# type: =item
-#. type: =item
-#: ../src/guestfs-actions.pod:2588 ../src/guestfs-actions.pod:2660
-#: ../src/guestfs-actions.pod:2911 ../fish/guestfish-actions.pod:1758
-#: ../fish/guestfish-actions.pod:1815 ../fish/guestfish-actions.pod:2004
-msgid "\"unknown\""
+# type: =head2
+#. type: =head2
+#: ../src/guestfs-actions.pod:2082
+msgid "guestfs_get_trace"
+msgstr ""
+
+# type: verbatim
+#. type: verbatim
+#: ../src/guestfs-actions.pod:2084
+#, no-wrap
+msgid ""
+" int\n"
+" guestfs_get_trace (guestfs_h *g);\n"
+"\n"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:2590 ../fish/guestfish-actions.pod:1760
-msgid "The distro could not be determined."
+#: ../src/guestfs-actions.pod:2087 ../fish/guestfish-actions.pod:1412
+msgid "Return the command trace flag."

 msgstr ""
 
 msgstr ""
 

-# type: =item
-#. type: =item
-#: ../src/guestfs-actions.pod:2592 ../src/guestfs-actions.pod:2903
-#: ../fish/guestfish-actions.pod:1762 ../fish/guestfish-actions.pod:1996
-msgid "\"windows\""
+# type: =head2
+#. type: =head2
+#: ../src/guestfs-actions.pod:2093
+msgid "guestfs_get_umask"

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:2594 ../fish/guestfish-actions.pod:1764
+# type: verbatim
+#. type: verbatim
+#: ../src/guestfs-actions.pod:2095
+#, no-wrap

 msgid ""
 msgid ""

-"Windows does not have distributions.  This string is returned if the OS type "
-"is Windows."
+" int\n"
+" guestfs_get_umask (guestfs_h *g);\n"
+"\n"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:2599 ../src/guestfs-actions.pod:2666
-#: ../src/guestfs-actions.pod:2917 ../fish/guestfish-actions.pod:1769
-#: ../fish/guestfish-actions.pod:1821 ../fish/guestfish-actions.pod:2010
+#: ../src/guestfs-actions.pod:2098

 msgid ""
 msgid ""

-"Future versions of libguestfs may return other strings here.  The caller "
-"should be prepared to handle any string."
+"Return the current umask.  By default the umask is C<022> unless it has been "
+"set by calling C<guestfs_umask>."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:2609
-msgid "guestfs_inspect_get_filesystems"
+#: ../src/guestfs-actions.pod:2105
+msgid "guestfs_get_verbose"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:2611
+#: ../src/guestfs-actions.pod:2107

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" char **\n"
-" guestfs_inspect_get_filesystems (guestfs_h *g,\n"
-"                                  const char *root);\n"
+" int\n"
+" guestfs_get_verbose (guestfs_h *g);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:2618 ../fish/guestfish-actions.pod:1781
+#: ../src/guestfs-actions.pod:2110 ../fish/guestfish-actions.pod:1425
+msgid "This returns the verbose messages flag."
+msgstr ""
+
+# type: =head2
+#. type: =head2
+#: ../src/guestfs-actions.pod:2116
+msgid "guestfs_getcon"
+msgstr ""
+
+# type: verbatim
+#. type: verbatim
+#: ../src/guestfs-actions.pod:2118
+#, no-wrap

 msgid ""
 msgid ""

-"This returns a list of all the filesystems that we think are associated with "
-"this operating system.  This includes the root filesystem, other ordinary "
-"filesystems, and non-mounted devices like swap partitions."
+" char *\n"
+" guestfs_getcon (guestfs_h *g);\n"
+"\n"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:2623 ../fish/guestfish-actions.pod:1786
-msgid ""
-"In the case of a multi-boot virtual machine, it is possible for a filesystem "
-"to be shared between operating systems."
+#: ../src/guestfs-actions.pod:2121 ../fish/guestfish-actions.pod:1431
+msgid "This gets the SELinux security context of the daemon."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:2626
+#: ../src/guestfs-actions.pod:2123

 msgid ""
 msgid ""

-"Please read L<guestfs(3)/INSPECTION> for more details.  See also "
-"C<guestfs_inspect_get_mountpoints>."
+"See the documentation about SELINUX in L<guestfs(3)>, and C<guestfs_setcon>"

 msgstr ""
 
 msgstr ""
 

+# type: =head2

 #. type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:2635
-msgid "guestfs_inspect_get_format"
+#: ../src/guestfs-actions.pod:2131
+msgid "guestfs_getxattr"

 msgstr ""
 
 msgstr ""
 

+# type: verbatim

 #. type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:2637
+#: ../src/guestfs-actions.pod:2133

 #, no-wrap
 msgid ""
 " char *\n"
 #, no-wrap
 msgid ""
 " char *\n"

-" guestfs_inspect_get_format (guestfs_h *g,\n"
-"                             const char *root);\n"
+" guestfs_getxattr (guestfs_h *g,\n"
+"                   const char *path,\n"
+"                   const char *name,\n"
+"                   size_t *size_r);\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

+# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:2644 ../fish/guestfish-actions.pod:1799
+#: ../src/guestfs-actions.pod:2139

 msgid ""
 msgid ""

-"This returns the format of the inspected operating system.  You can use it "
-"to detect install images, live CDs and similar."
+"Get a single extended attribute from file C<path> named C<name>.  This call "
+"follows symlinks.  If you want to lookup an extended attribute for the "
+"symlink itself, use C<guestfs_lgetxattr>."

 msgstr ""
 
 msgstr ""
 

+# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:2647 ../fish/guestfish-actions.pod:1802
-msgid "Currently defined formats are:"
-msgstr ""
-
-#. type: =item
-#: ../src/guestfs-actions.pod:2651 ../fish/guestfish-actions.pod:1806
-msgid "\"installed\""
+#: ../src/guestfs-actions.pod:2143 ../src/guestfs-actions.pod:3512
+msgid ""
+"Normally it is better to get all extended attributes from a file in one go "
+"by calling C<guestfs_getxattrs>.  However some Linux filesystem "
+"implementations are buggy and do not provide a way to list out attributes.  "
+"For these filesystems (notably ntfs-3g)  you have to know the names of the "
+"extended attributes you want in advance and call this function."

 msgstr ""
 
 msgstr ""
 

+# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:2653 ../fish/guestfish-actions.pod:1808
-msgid "This is an installed operating system."
+#: ../src/guestfs-actions.pod:2150 ../src/guestfs-actions.pod:3519
+#: ../fish/guestfish-actions.pod:1451 ../fish/guestfish-actions.pod:2457
+msgid ""
+"Extended attribute values are blobs of binary data.  If there is no extended "
+"attribute named C<name>, this returns an error."

 msgstr ""
 
 msgstr ""
 

-#. type: =item
-#: ../src/guestfs-actions.pod:2655 ../fish/guestfish-actions.pod:1810
-msgid "\"installer\""
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:2153
+msgid "See also: C<guestfs_getxattrs>, C<guestfs_lgetxattr>, L<attr(5)>."

 msgstr ""
 
 msgstr ""
 

+# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:2657 ../fish/guestfish-actions.pod:1812
+#: ../src/guestfs-actions.pod:2155 ../src/guestfs-actions.pod:2346
+#: ../src/guestfs-actions.pod:3524 ../src/guestfs-actions.pod:5257
+#: ../src/guestfs-actions.pod:5283 ../src/guestfs-actions.pod:5464

 msgid ""
 msgid ""

-"The disk image being inspected is not an installed operating system, but a "
-"I<bootable> install disk, live CD, or similar."
+"This function returns a buffer, or NULL on error.  The size of the returned "
+"buffer is written to C<*size_r>.  I<The caller must free the returned buffer "
+"after use>."

 msgstr ""
 
 #. type: textblock
 msgstr ""
 
 #. type: textblock

-#: ../src/guestfs-actions.pod:2662 ../fish/guestfish-actions.pod:1817
-msgid "The format of this disk image is not known."
+#: ../src/guestfs-actions.pod:2159 ../src/guestfs-actions.pod:3528
+msgid "(Added in 1.7.24)"

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:2674
-msgid "guestfs_inspect_get_hostname"
+#: ../src/guestfs-actions.pod:2161
+msgid "guestfs_getxattrs"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:2676
+#: ../src/guestfs-actions.pod:2163

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" char *\n"
-" guestfs_inspect_get_hostname (guestfs_h *g,\n"
-"                               const char *root);\n"
+" struct guestfs_xattr_list *\n"
+" guestfs_getxattrs (guestfs_h *g,\n"
+"                    const char *path);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:2683 ../fish/guestfish-actions.pod:1833
+#: ../src/guestfs-actions.pod:2167 ../fish/guestfish-actions.pod:1460

 msgid ""
 msgid ""

-"This function returns the hostname of the operating system as found by "
-"inspection of the guest's configuration files."
+"This call lists the extended attributes of the file or directory C<path>."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:2686 ../fish/guestfish-actions.pod:1836
+#: ../src/guestfs-actions.pod:2170 ../fish/guestfish-actions.pod:1463

 msgid ""
 msgid ""

-"If the hostname could not be determined, then the string C<unknown> is "
-"returned."
+"At the system call level, this is a combination of the L<listxattr(2)> and "
+"L<getxattr(2)> calls."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:2694
-msgid "(Added in 1.7.9)"
+#: ../src/guestfs-actions.pod:2173
+msgid "See also: C<guestfs_lgetxattrs>, L<attr(5)>."
+msgstr ""
+
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:2175 ../src/guestfs-actions.pod:3540
+#: ../src/guestfs-actions.pod:4191
+msgid ""
+"This function returns a C<struct guestfs_xattr_list *>, or NULL if there was "
+"an error.  I<The caller must call C<guestfs_free_xattr_list> after use>."
+msgstr ""
+
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:2179 ../src/guestfs-actions.pod:3544
+#: ../src/guestfs-actions.pod:3709 ../src/guestfs-actions.pod:3745
+#: ../src/guestfs-actions.pod:5637 ../src/guestfs-actions.pod:6125
+#: ../src/guestfs-actions.pod:7495
+msgid "(Added in 1.0.59)"

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:2696
-msgid "guestfs_inspect_get_major_version"
+#: ../src/guestfs-actions.pod:2181
+msgid "guestfs_glob_expand"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:2698
+#: ../src/guestfs-actions.pod:2183

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" int\n"
-" guestfs_inspect_get_major_version (guestfs_h *g,\n"
-"                                    const char *root);\n"
-"\n"
+" char **\n"
+" guestfs_glob_expand (guestfs_h *g,\n"
+"                      const char *pattern);\n"
+"\n"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:2705 ../fish/guestfish-actions.pod:1848
+#: ../src/guestfs-actions.pod:2187 ../fish/guestfish-actions.pod:1472

 msgid ""
 msgid ""

-"This returns the major version number of the inspected operating system."
+"This command searches for all the pathnames matching C<pattern> according to "
+"the wildcard expansion rules used by the shell."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:2708 ../fish/guestfish-actions.pod:1851
+#: ../src/guestfs-actions.pod:2191 ../fish/guestfish-actions.pod:1476

 msgid ""
 msgid ""

-"Windows uses a consistent versioning scheme which is I<not> reflected in the "
-"popular public names used by the operating system.  Notably the operating "
-"system known as \"Windows 7\" is really version 6.1 (ie. major = 6, minor = "
-"1).  You can find out the real versions corresponding to releases of Windows "
-"by consulting Wikipedia or MSDN."
+"If no paths match, then this returns an empty list (note: not an error)."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:2715 ../src/guestfs-actions.pod:2735
-#: ../fish/guestfish-actions.pod:1858 ../fish/guestfish-actions.pod:1872
-msgid "If the version could not be determined, then C<0> is returned."
+#: ../src/guestfs-actions.pod:2194 ../fish/guestfish-actions.pod:1479
+msgid ""
+"It is just a wrapper around the C L<glob(3)> function with flags C<GLOB_MARK|"
+"GLOB_BRACE>.  See that manual page for more details."
+msgstr ""
+
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:2202 ../src/guestfs-actions.pod:6318
+#: ../src/guestfs-actions.pod:6335
+msgid "(Added in 1.0.50)"

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:2723
-msgid "guestfs_inspect_get_minor_version"
+#: ../src/guestfs-actions.pod:2204
+msgid "guestfs_grep"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:2725
+#: ../src/guestfs-actions.pod:2206

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" int\n"
-" guestfs_inspect_get_minor_version (guestfs_h *g,\n"
-"                                    const char *root);\n"
+" char **\n"
+" guestfs_grep (guestfs_h *g,\n"
+"               const char *regex,\n"
+"               const char *path);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:2732 ../fish/guestfish-actions.pod:1869
+#: ../src/guestfs-actions.pod:2211 ../fish/guestfish-actions.pod:1487
+msgid "This calls the external C<grep> program and returns the matching lines."
+msgstr ""
+
+# type: =head2
+#. type: =head2
+#: ../src/guestfs-actions.pod:2223
+msgid "guestfs_grepi"
+msgstr ""
+
+# type: verbatim
+#. type: verbatim
+#: ../src/guestfs-actions.pod:2225
+#, no-wrap

 msgid ""
 msgid ""

-"This returns the minor version number of the inspected operating system."
+" char **\n"
+" guestfs_grepi (guestfs_h *g,\n"
+"                const char *regex,\n"
+"                const char *path);\n"
+"\n"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:2737
+#: ../src/guestfs-actions.pod:2230 ../fish/guestfish-actions.pod:1497

 msgid ""
 msgid ""

-"Please read L<guestfs(3)/INSPECTION> for more details.  See also "
-"C<guestfs_inspect_get_major_version>."
+"This calls the external C<grep -i> program and returns the matching lines."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:2744
-msgid "guestfs_inspect_get_mountpoints"
+#: ../src/guestfs-actions.pod:2242
+msgid "guestfs_grub_install"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:2746
+#: ../src/guestfs-actions.pod:2244

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" char **\n"
-" guestfs_inspect_get_mountpoints (guestfs_h *g,\n"
-"                                  const char *root);\n"
+" int\n"
+" guestfs_grub_install (guestfs_h *g,\n"
+"                       const char *root,\n"
+"                       const char *device);\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

+# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:2753 ../fish/guestfish-actions.pod:1884
+#: ../src/guestfs-actions.pod:2249 ../fish/guestfish-actions.pod:1507

 msgid ""
 msgid ""

-"This returns a hash of where we think the filesystems associated with this "
-"operating system should be mounted.  Callers should note that this is at "
-"best an educated guess made by reading configuration files such as C</etc/"
-"fstab>.  I<In particular note> that this may return filesystems which are "
-"non-existent or not mountable and callers should be prepared to handle or "
-"ignore failures if they try to mount them."
+"This command installs GRUB (the Grand Unified Bootloader) on C<device>, with "
+"the root directory being C<root>."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:2762 ../fish/guestfish-actions.pod:1893
+#: ../src/guestfs-actions.pod:2252 ../fish/guestfish-actions.pod:1510

 msgid ""
 msgid ""

-"Each element in the returned hashtable has a key which is the path of the "
-"mountpoint (eg. C</boot>) and a value which is the filesystem that would be "
-"mounted there (eg. C</dev/sda1>)."
+"Note: If grub-install reports the error \"No suitable drive was found in the "
+"generated device map.\" it may be that you need to create a C</boot/grub/"
+"device.map> file first that contains the mapping between grub device names "
+"and Linux device names.  It is usually sufficient to create a file "
+"containing:"

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:2767 ../fish/guestfish-actions.pod:1898
+# type: verbatim
+#. type: verbatim
+#: ../src/guestfs-actions.pod:2259 ../fish/guestfish-actions.pod:1517
+#, no-wrap

 msgid ""
 msgid ""

-"Non-mounted devices such as swap devices are I<not> returned in this list."
+" (hd0) /dev/vda\n"
+"\n"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:2770
-msgid ""
-"Please read L<guestfs(3)/INSPECTION> for more details.  See also "
-"C<guestfs_inspect_get_filesystems>."
+#: ../src/guestfs-actions.pod:2261 ../fish/guestfish-actions.pod:1519
+msgid "replacing C</dev/vda> with the name of the installation device."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:2773 ../src/guestfs-actions.pod:3472
-#: ../src/guestfs-actions.pod:4682 ../src/guestfs-actions.pod:6583
-msgid ""
-"This function returns a NULL-terminated array of strings, or NULL if there "
-"was an error.  The array of strings will always have length C<2n+1>, where "
-"C<n> keys and values alternate, followed by the trailing NULL entry.  I<The "
-"caller must free the strings and the array after use>."
+#: ../src/guestfs-actions.pod:2265
+msgid "(Added in 1.0.17)"

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:2781
-msgid "guestfs_inspect_get_package_format"
+#: ../src/guestfs-actions.pod:2267
+msgid "guestfs_head"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:2783
+#: ../src/guestfs-actions.pod:2269

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" char *\n"
-" guestfs_inspect_get_package_format (guestfs_h *g,\n"
-"                                     const char *root);\n"
+" char **\n"
+" guestfs_head (guestfs_h *g,\n"
+"               const char *path);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:2790
+#: ../src/guestfs-actions.pod:2273 ../fish/guestfish-actions.pod:1525

 msgid ""
 msgid ""

-"This function and C<guestfs_inspect_get_package_management> return the "
-"package format and package management tool used by the inspected operating "
-"system.  For example for Fedora these functions would return C<rpm> (package "
-"format) and C<yum> (package management)."
+"This command returns up to the first 10 lines of a file as a list of strings."
+msgstr ""
+
+# type: =head2
+#. type: =head2
+#: ../src/guestfs-actions.pod:2285
+msgid "guestfs_head_n"
+msgstr ""
+
+# type: verbatim
+#. type: verbatim
+#: ../src/guestfs-actions.pod:2287
+#, no-wrap
+msgid ""
+" char **\n"
+" guestfs_head_n (guestfs_h *g,\n"
+"                 int nrlines,\n"
+"                 const char *path);\n"
+"\n"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:2796 ../fish/guestfish-actions.pod:1917
+#: ../src/guestfs-actions.pod:2292 ../fish/guestfish-actions.pod:1535

 msgid ""
 msgid ""

-"This returns the string C<unknown> if we could not determine the package "
-"format I<or> if the operating system does not have a real packaging system "
-"(eg. Windows)."
+"If the parameter C<nrlines> is a positive number, this returns the first "
+"C<nrlines> lines of the file C<path>."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:2800 ../fish/guestfish-actions.pod:1921
+#: ../src/guestfs-actions.pod:2295 ../fish/guestfish-actions.pod:1538

 msgid ""
 msgid ""

-"Possible strings include: C<rpm>, C<deb>, C<ebuild>, C<pisi>, C<pacman>.  "
-"Future versions of libguestfs may return other strings."
+"If the parameter C<nrlines> is a negative number, this returns lines from "
+"the file C<path>, excluding the last C<nrlines> lines."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:2808 ../src/guestfs-actions.pod:2839
-msgid "(Added in 1.7.5)"
+#: ../src/guestfs-actions.pod:2298 ../src/guestfs-actions.pod:6615
+#: ../fish/guestfish-actions.pod:1541 ../fish/guestfish-actions.pod:4471
+msgid "If the parameter C<nrlines> is zero, this returns an empty list."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:2810
-msgid "guestfs_inspect_get_package_management"
+#: ../src/guestfs-actions.pod:2309
+msgid "guestfs_hexdump"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:2812
+#: ../src/guestfs-actions.pod:2311

 #, no-wrap
 msgid ""
 " char *\n"
 #, no-wrap
 msgid ""
 " char *\n"

-" guestfs_inspect_get_package_management (guestfs_h *g,\n"
-"                                         const char *root);\n"
+" guestfs_hexdump (guestfs_h *g,\n"
+"                  const char *path);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:2819
-msgid ""
-"C<guestfs_inspect_get_package_format> and this function return the package "
-"format and package management tool used by the inspected operating system.  "
-"For example for Fedora these functions would return C<rpm> (package format) "
-"and C<yum> (package management)."
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:2825 ../fish/guestfish-actions.pod:1939
+#: ../src/guestfs-actions.pod:2315 ../fish/guestfish-actions.pod:1550

 msgid ""
 msgid ""

-"This returns the string C<unknown> if we could not determine the package "
-"management tool I<or> if the operating system does not have a real packaging "
-"system (eg. Windows)."
+"This runs C<hexdump -C> on the given C<path>.  The result is the human-"
+"readable, canonical hex dump of the file."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:2829 ../fish/guestfish-actions.pod:1943
-msgid ""
-"Possible strings include: C<yum>, C<up2date>, C<apt> (for all Debian "
-"derivatives), C<portage>, C<pisi>, C<pacman>, C<urpmi>.  Future versions of "
-"libguestfs may return other strings."
+#: ../src/guestfs-actions.pod:2324 ../src/guestfs-actions.pod:6399
+#: ../src/guestfs-actions.pod:6454
+msgid "(Added in 1.0.22)"

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:2841
-msgid "guestfs_inspect_get_product_name"
+#: ../src/guestfs-actions.pod:2326
+msgid "guestfs_initrd_cat"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:2843
+#: ../src/guestfs-actions.pod:2328

 #, no-wrap
 msgid ""
 " char *\n"
 #, no-wrap
 msgid ""
 " char *\n"

-" guestfs_inspect_get_product_name (guestfs_h *g,\n"
-"                                   const char *root);\n"
+" guestfs_initrd_cat (guestfs_h *g,\n"
+"                     const char *initrdpath,\n"
+"                     const char *filename,\n"
+"                     size_t *size_r);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:2850 ../fish/guestfish-actions.pod:1957
+#: ../src/guestfs-actions.pod:2334 ../fish/guestfish-actions.pod:1560

 msgid ""
 msgid ""

-"This returns the product name of the inspected operating system.  The "
-"product name is generally some freeform string which can be displayed to the "
-"user, but should not be parsed by programs."
+"This command unpacks the file C<filename> from the initrd file called "
+"C<initrdpath>.  The filename must be given I<without> the initial C</> "
+"character."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:2855 ../fish/guestfish-actions.pod:1962
+#: ../src/guestfs-actions.pod:2338 ../fish/guestfish-actions.pod:1564

 msgid ""
 msgid ""

-"If the product name could not be determined, then the string C<unknown> is "
-"returned."
+"For example, in guestfish you could use the following command to examine the "
+"boot script (usually called C</init>)  contained in a Linux initrd or "
+"initramfs image:"
+msgstr ""
+
+# type: verbatim
+#. type: verbatim
+#: ../src/guestfs-actions.pod:2342 ../fish/guestfish-actions.pod:1568
+#, no-wrap
+msgid ""
+" initrd-cat /boot/initrd-<version>.img init\n"
+"\n"
+msgstr ""
+
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:2344
+msgid "See also C<guestfs_initrd_list>."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:2865
-msgid "guestfs_inspect_get_roots"
+#: ../src/guestfs-actions.pod:2355
+msgid "guestfs_initrd_list"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:2867
+#: ../src/guestfs-actions.pod:2357

 #, no-wrap
 msgid ""
 " char **\n"
 #, no-wrap
 msgid ""
 " char **\n"

-" guestfs_inspect_get_roots (guestfs_h *g);\n"
+" guestfs_initrd_list (guestfs_h *g,\n"
+"                      const char *path);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:2870
-msgid ""
-"This function is a convenient way to get the list of root devices, as "
-"returned from a previous call to C<guestfs_inspect_os>, but without redoing "
-"the whole inspection process."
+#: ../src/guestfs-actions.pod:2361 ../fish/guestfish-actions.pod:1579
+msgid "This command lists out files contained in an initrd."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:2874
+#: ../src/guestfs-actions.pod:2363 ../fish/guestfish-actions.pod:1581

 msgid ""
 msgid ""

-"This returns an empty list if either no root devices were found or the "
-"caller has not called C<guestfs_inspect_os>."
+"The files are listed without any initial C</> character.  The files are "
+"listed in the order they appear (not necessarily alphabetical).  Directory "
+"names are listed as separate items."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:2883
-msgid "(Added in 1.7.3)"
+#: ../src/guestfs-actions.pod:2367 ../fish/guestfish-actions.pod:1585
+msgid ""
+"Old Linux kernels (2.4 and earlier) used a compressed ext2 filesystem as "
+"initrd.  We I<only> support the newer initramfs format (compressed cpio "
+"files)."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:2885
-msgid "guestfs_inspect_get_type"
+#: ../src/guestfs-actions.pod:2377
+msgid "guestfs_inotify_add_watch"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:2887
+#: ../src/guestfs-actions.pod:2379

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" char *\n"
-" guestfs_inspect_get_type (guestfs_h *g,\n"
-"                           const char *root);\n"
+" int64_t\n"
+" guestfs_inotify_add_watch (guestfs_h *g,\n"
+"                            const char *path,\n"
+"                            int mask);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:2894 ../fish/guestfish-actions.pod:1987
-msgid ""
-"This returns the type of the inspected operating system.  Currently defined "
-"types are:"
-msgstr ""
-
-# type: =item
-#. type: =item
-#: ../src/guestfs-actions.pod:2899 ../fish/guestfish-actions.pod:1992
-msgid "\"linux\""
+#: ../src/guestfs-actions.pod:2384 ../fish/guestfish-actions.pod:1593
+msgid "Watch C<path> for the events listed in C<mask>."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:2901 ../fish/guestfish-actions.pod:1994
-msgid "Any Linux-based operating system."
+#: ../src/guestfs-actions.pod:2386 ../fish/guestfish-actions.pod:1595
+msgid ""
+"Note that if C<path> is a directory then events within that directory are "
+"watched, but this does I<not> happen recursively (in subdirectories)."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:2905 ../fish/guestfish-actions.pod:1998
-msgid "Any Microsoft Windows operating system."
+#: ../src/guestfs-actions.pod:2390 ../fish/guestfish-actions.pod:1599
+msgid ""
+"Note for non-C or non-Linux callers: the inotify events are defined by the "
+"Linux kernel ABI and are listed in C</usr/include/sys/inotify.h>."

 msgstr ""
 
 msgstr ""
 

-# type: =item
-#. type: =item
-#: ../src/guestfs-actions.pod:2907 ../fish/guestfish-actions.pod:2000
-msgid "\"freebsd\""
+# type: =head2
+#. type: =head2
+#: ../src/guestfs-actions.pod:2398
+msgid "guestfs_inotify_close"
+msgstr ""
+
+# type: verbatim
+#. type: verbatim
+#: ../src/guestfs-actions.pod:2400
+#, no-wrap
+msgid ""
+" int\n"
+" guestfs_inotify_close (guestfs_h *g);\n"
+"\n"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:2909 ../fish/guestfish-actions.pod:2002
-msgid "FreeBSD."
+#: ../src/guestfs-actions.pod:2403 ../fish/guestfish-actions.pod:1607
+msgid ""
+"This closes the inotify handle which was previously opened by inotify_init.  "
+"It removes all watches, throws away any pending events, and deallocates all "
+"resources."
+msgstr ""
+
+# type: =head2
+#. type: =head2
+#: ../src/guestfs-actions.pod:2411
+msgid "guestfs_inotify_files"
+msgstr ""
+
+# type: verbatim
+#. type: verbatim
+#: ../src/guestfs-actions.pod:2413
+#, no-wrap
+msgid ""
+" char **\n"
+" guestfs_inotify_files (guestfs_h *g);\n"
+"\n"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:2913 ../fish/guestfish-actions.pod:2006
-msgid "The operating system type could not be determined."
+#: ../src/guestfs-actions.pod:2416
+msgid ""
+"This function is a helpful wrapper around C<guestfs_inotify_read> which just "
+"returns a list of pathnames of objects that were touched.  The returned "
+"pathnames are sorted and deduplicated."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:2927
-msgid "guestfs_inspect_get_windows_systemroot"
+#: ../src/guestfs-actions.pod:2426
+msgid "guestfs_inotify_init"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:2929
+#: ../src/guestfs-actions.pod:2428

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" char *\n"
-" guestfs_inspect_get_windows_systemroot (guestfs_h *g,\n"
-"                                         const char *root);\n"
+" int\n"
+" guestfs_inotify_init (guestfs_h *g,\n"
+"                       int maxevents);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:2936 ../fish/guestfish-actions.pod:2022
+#: ../src/guestfs-actions.pod:2432 ../fish/guestfish-actions.pod:1623

 msgid ""
 msgid ""

-"This returns the Windows systemroot of the inspected guest.  The systemroot "
-"is a directory path such as C</WINDOWS>."
+"This command creates a new inotify handle.  The inotify subsystem can be "
+"used to notify events which happen to objects in the guest filesystem."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:2939 ../fish/guestfish-actions.pod:2025
+#: ../src/guestfs-actions.pod:2436

 msgid ""
 msgid ""

-"This call assumes that the guest is Windows and that the systemroot could be "
-"determined by inspection.  If this is not the case then an error is returned."
+"C<maxevents> is the maximum number of events which will be queued up between "
+"calls to C<guestfs_inotify_read> or C<guestfs_inotify_files>.  If this is "
+"passed as C<0>, then the kernel (or previously set)  default is used.  For "
+"Linux 2.6.29 the default was 16384 events.  Beyond this limit, the kernel "
+"throws away events, but records the fact that it threw them away by setting "
+"a flag C<IN_Q_OVERFLOW> in the returned structure list (see "
+"C<guestfs_inotify_read>)."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:2948
-msgid "(Added in 1.5.25)"
+#: ../src/guestfs-actions.pod:2446
+msgid ""
+"Before any events are generated, you have to add some watches to the "
+"internal watch list.  See: C<guestfs_inotify_add_watch>, "
+"C<guestfs_inotify_rm_watch> and C<guestfs_inotify_watch_all>."

 msgstr ""
 
 msgstr ""
 

-#. type: =head2
-#: ../src/guestfs-actions.pod:2950
-msgid "guestfs_inspect_is_live"
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:2452
+msgid ""
+"Queued up events should be read periodically by calling "
+"C<guestfs_inotify_read> (or C<guestfs_inotify_files> which is just a helpful "
+"wrapper around C<guestfs_inotify_read>).  If you don't read the events out "
+"often enough then you risk the internal queue overflowing."

 msgstr ""
 
 msgstr ""
 

-#. type: verbatim
-#: ../src/guestfs-actions.pod:2952
-#, no-wrap
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:2459

 msgid ""
 msgid ""

-" int\n"
-" guestfs_inspect_is_live (guestfs_h *g,\n"
-"                          const char *root);\n"
-"\n"
+"The handle should be closed after use by calling C<guestfs_inotify_close>.  "
+"This also removes any watches automatically."

 msgstr ""
 
 msgstr ""
 

+# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:2959
+#: ../src/guestfs-actions.pod:2463 ../fish/guestfish-actions.pod:1654

 msgid ""
 msgid ""

-"If C<guestfs_inspect_get_format> returns C<installer> (this is an install "
-"disk), then this returns true if a live image was detected on the disk."
+"See also L<inotify(7)> for an overview of the inotify interface as exposed "
+"by the Linux kernel, which is roughly what we expose via libguestfs.  Note "
+"that there is one global inotify handle per libguestfs instance."

 msgstr ""
 
 msgstr ""
 

+# type: =head2

 #. type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:2967
-msgid "guestfs_inspect_is_multipart"
+#: ../src/guestfs-actions.pod:2472
+msgid "guestfs_inotify_read"

 msgstr ""
 
 msgstr ""
 

+# type: verbatim

 #. type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:2969
+#: ../src/guestfs-actions.pod:2474

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" int\n"
-" guestfs_inspect_is_multipart (guestfs_h *g,\n"
-"                               const char *root);\n"
+" struct guestfs_inotify_event_list *\n"
+" guestfs_inotify_read (guestfs_h *g);\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

+# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:2976
+#: ../src/guestfs-actions.pod:2477 ../fish/guestfish-actions.pod:1663

 msgid ""
 msgid ""

-"If C<guestfs_inspect_get_format> returns C<installer> (this is an install "
-"disk), then this returns true if the disk is part of a set."
+"Return the complete queue of events that have happened since the previous "
+"read call."
+msgstr ""
+
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:2480 ../fish/guestfish-actions.pod:1666
+msgid "If no events have happened, this returns an empty list."
+msgstr ""
+
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:2482 ../fish/guestfish-actions.pod:1668
+msgid ""
+"I<Note>: In order to make sure that all events have been read, you must call "
+"this function repeatedly until it returns an empty list.  The reason is that "
+"the call will read events up to the maximum appliance-to-host message size "
+"and leave remaining events in the queue."
+msgstr ""
+
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:2488
+msgid ""
+"This function returns a C<struct guestfs_inotify_event_list *>, or NULL if "
+"there was an error.  I<The caller must call "
+"C<guestfs_free_inotify_event_list> after use>."

 msgstr ""
 
 msgstr ""
 

+# type: =head2

 #. type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:2984
-msgid "guestfs_inspect_is_netinst"
+#: ../src/guestfs-actions.pod:2494
+msgid "guestfs_inotify_rm_watch"

 msgstr ""
 
 msgstr ""
 

+# type: verbatim

 #. type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:2986
+#: ../src/guestfs-actions.pod:2496

 #, no-wrap
 msgid ""
 " int\n"
 #, no-wrap
 msgid ""
 " int\n"

-" guestfs_inspect_is_netinst (guestfs_h *g,\n"
-"                             const char *root);\n"
+" guestfs_inotify_rm_watch (guestfs_h *g,\n"
+"                           int wd);\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

+# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:2993
+#: ../src/guestfs-actions.pod:2500

 msgid ""
 msgid ""

-"If C<guestfs_inspect_get_format> returns C<installer> (this is an install "
-"disk), then this returns true if the disk is a network installer, ie. not a "
-"self-contained install CD but one which is likely to require network access "
-"to complete the install."
+"Remove a previously defined inotify watch.  See C<guestfs_inotify_add_watch>."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:3003
-msgid "guestfs_inspect_list_applications"
+#: ../src/guestfs-actions.pod:2507
+msgid "guestfs_inspect_get_arch"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:3005
+#: ../src/guestfs-actions.pod:2509

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" struct guestfs_application_list *\n"
-" guestfs_inspect_list_applications (guestfs_h *g,\n"
-"                                    const char *root);\n"
+" char *\n"
+" guestfs_inspect_get_arch (guestfs_h *g,\n"
+"                           const char *root);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:3012 ../fish/guestfish-actions.pod:2079
-msgid "Return the list of applications installed in the operating system."
+#: ../src/guestfs-actions.pod:2513 ../src/guestfs-actions.pod:2536
+#: ../src/guestfs-actions.pod:2629 ../src/guestfs-actions.pod:2673
+#: ../src/guestfs-actions.pod:2699 ../src/guestfs-actions.pod:2738
+#: ../src/guestfs-actions.pod:2760 ../src/guestfs-actions.pod:2787
+#: ../src/guestfs-actions.pod:2808 ../src/guestfs-actions.pod:2851
+#: ../src/guestfs-actions.pod:2880 ../src/guestfs-actions.pod:2911
+#: ../src/guestfs-actions.pod:2935 ../src/guestfs-actions.pod:2990
+#: ../src/guestfs-actions.pod:3032 ../src/guestfs-actions.pod:3053
+#: ../src/guestfs-actions.pod:3076 ../src/guestfs-actions.pod:3093
+#: ../src/guestfs-actions.pod:3110 ../src/guestfs-actions.pod:3129
+msgid ""
+"This function should only be called with a root device string as returned by "
+"C<guestfs_inspect_os>."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:3014
+#: ../src/guestfs-actions.pod:2516

 msgid ""
 msgid ""

-"I<Note:> This call works differently from other parts of the inspection "
-"API.  You have to call C<guestfs_inspect_os>, then "
-"C<guestfs_inspect_get_mountpoints>, then mount up the disks, before calling "
-"this.  Listing applications is a significantly more difficult operation "
-"which requires access to the full filesystem.  Also note that unlike the "
-"other C<guestfs_inspect_get_*> calls which are just returning data cached in "
-"the libguestfs handle, this call actually reads parts of the mounted "
-"filesystems during the call."
+"This returns the architecture of the inspected operating system.  The "
+"possible return values are listed under C<guestfs_file_architecture>."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:3024 ../fish/guestfish-actions.pod:2091
+#: ../src/guestfs-actions.pod:2520 ../fish/guestfish-actions.pod:1692

 msgid ""
 msgid ""

-"This returns an empty list if the inspection code was not able to determine "
-"the list of applications."
+"If the architecture could not be determined, then the string C<unknown> is "
+"returned."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:3027 ../fish/guestfish-actions.pod:2094
-msgid "The application structure contains the following fields:"
+#: ../src/guestfs-actions.pod:2523 ../src/guestfs-actions.pod:2616
+#: ../src/guestfs-actions.pod:2727 ../src/guestfs-actions.pod:2747
+#: ../src/guestfs-actions.pod:2775 ../src/guestfs-actions.pod:2867
+#: ../src/guestfs-actions.pod:2898 ../src/guestfs-actions.pod:2922
+#: ../src/guestfs-actions.pod:2976 ../src/guestfs-actions.pod:3019
+#: ../src/guestfs-actions.pod:3042 ../src/guestfs-actions.pod:3063
+#: ../src/guestfs-actions.pod:3083 ../src/guestfs-actions.pod:3100
+#: ../src/guestfs-actions.pod:3119 ../src/guestfs-actions.pod:3222
+#: ../src/guestfs-actions.pod:3263 ../fish/guestfish-actions.pod:1695
+#: ../fish/guestfish-actions.pod:1781 ../fish/guestfish-actions.pod:1869
+#: ../fish/guestfish-actions.pod:1884 ../fish/guestfish-actions.pod:1905
+#: ../fish/guestfish-actions.pod:1975 ../fish/guestfish-actions.pod:1999
+#: ../fish/guestfish-actions.pod:2016 ../fish/guestfish-actions.pod:2059
+#: ../fish/guestfish-actions.pod:2094 ../fish/guestfish-actions.pod:2110
+#: ../fish/guestfish-actions.pod:2126 ../fish/guestfish-actions.pod:2139
+#: ../fish/guestfish-actions.pod:2152 ../fish/guestfish-actions.pod:2167
+#: ../fish/guestfish-actions.pod:2266 ../fish/guestfish-actions.pod:2300
+msgid "Please read L<guestfs(3)/INSPECTION> for more details."

 msgstr ""
 
 msgstr ""
 

-# type: =item
-#. type: =item
-#: ../src/guestfs-actions.pod:3031 ../fish/guestfish-actions.pod:2098
-msgid "C<app_name>"
+# type: =head2
+#. type: =head2
+#: ../src/guestfs-actions.pod:2530
+msgid "guestfs_inspect_get_distro"

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:3033 ../fish/guestfish-actions.pod:2100
+# type: verbatim
+#. type: verbatim
+#: ../src/guestfs-actions.pod:2532
+#, no-wrap

 msgid ""
 msgid ""

-"The name of the application.  For Red Hat-derived and Debian-derived Linux "
-"guests, this is the package name."
-msgstr ""
-
-# type: =item
-#. type: =item
-#: ../src/guestfs-actions.pod:3036 ../fish/guestfish-actions.pod:2103
-msgid "C<app_display_name>"
+" char *\n"
+" guestfs_inspect_get_distro (guestfs_h *g,\n"
+"                             const char *root);\n"
+"\n"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:3038 ../fish/guestfish-actions.pod:2105
+#: ../src/guestfs-actions.pod:2539 ../fish/guestfish-actions.pod:1704

 msgid ""
 msgid ""

-"The display name of the application, sometimes localized to the install "
-"language of the guest operating system."
+"This returns the distro (distribution) of the inspected operating system."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:3041 ../fish/guestfish-actions.pod:2108
-msgid ""
-"If unavailable this is returned as an empty string C<\"\">.  Callers needing "
-"to display something can use C<app_name> instead."
+#: ../src/guestfs-actions.pod:2542 ../fish/guestfish-actions.pod:1707
+msgid "Currently defined distros are:"

 msgstr ""
 
 # type: =item
 #. type: =item
 msgstr ""
 
 # type: =item
 #. type: =item

-#: ../src/guestfs-actions.pod:3044 ../fish/guestfish-actions.pod:2111
-msgid "C<app_epoch>"
+#: ../src/guestfs-actions.pod:2546 ../fish/guestfish-actions.pod:1711
+msgid "\"archlinux\""

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:3046 ../fish/guestfish-actions.pod:2113
-msgid ""
-"For package managers which use epochs, this contains the epoch of the "
-"package (an integer).  If unavailable, this is returned as C<0>."
+#: ../src/guestfs-actions.pod:2548 ../fish/guestfish-actions.pod:1713
+msgid "Arch Linux."

 msgstr ""
 
 msgstr ""
 

-# type: =item

 #. type: =item
 #. type: =item

-#: ../src/guestfs-actions.pod:3049 ../fish/guestfish-actions.pod:2116
-msgid "C<app_version>"
+#: ../src/guestfs-actions.pod:2550 ../fish/guestfish-actions.pod:1715
+msgid "\"centos\""

 msgstr ""
 
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:3051 ../fish/guestfish-actions.pod:2118
-msgid ""
-"The version string of the application or package.  If unavailable this is "
-"returned as an empty string C<\"\">."
+#: ../src/guestfs-actions.pod:2552 ../fish/guestfish-actions.pod:1717
+msgid "CentOS."

 msgstr ""
 
 # type: =item
 #. type: =item
 msgstr ""
 
 # type: =item
 #. type: =item

-#: ../src/guestfs-actions.pod:3054 ../fish/guestfish-actions.pod:2121
-msgid "C<app_release>"
+#: ../src/guestfs-actions.pod:2554 ../fish/guestfish-actions.pod:1719
+msgid "\"debian\""

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:3056 ../fish/guestfish-actions.pod:2123
-msgid ""
-"The release string of the application or package, for package managers that "
-"use this.  If unavailable this is returned as an empty string C<\"\">."
+#: ../src/guestfs-actions.pod:2556 ../fish/guestfish-actions.pod:1721
+msgid "Debian."

 msgstr ""
 
 # type: =item
 #. type: =item
 msgstr ""
 
 # type: =item
 #. type: =item

-#: ../src/guestfs-actions.pod:3060 ../fish/guestfish-actions.pod:2127
-msgid "C<app_install_path>"
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:3062 ../fish/guestfish-actions.pod:2129
-msgid ""
-"The installation path of the application (on operating systems such as "
-"Windows which use installation paths).  This path is in the format used by "
-"the guest operating system, it is not a libguestfs path."
+#: ../src/guestfs-actions.pod:2558 ../fish/guestfish-actions.pod:1723
+msgid "\"fedora\""

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:3067 ../fish/guestfish-actions.pod:2134
-msgid "If unavailable this is returned as an empty string C<\"\">."
+#: ../src/guestfs-actions.pod:2560 ../fish/guestfish-actions.pod:1725
+msgid "Fedora."

 msgstr ""
 
 # type: =item
 #. type: =item
 msgstr ""
 
 # type: =item
 #. type: =item

-#: ../src/guestfs-actions.pod:3069 ../fish/guestfish-actions.pod:2136
-msgid "C<app_trans_path>"
+#: ../src/guestfs-actions.pod:2562 ../fish/guestfish-actions.pod:1727
+msgid "\"gentoo\""

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:3071 ../fish/guestfish-actions.pod:2138
-msgid ""
-"The install path translated into a libguestfs path.  If unavailable this is "
-"returned as an empty string C<\"\">."
+#: ../src/guestfs-actions.pod:2564 ../fish/guestfish-actions.pod:1729
+msgid "Gentoo."

 msgstr ""
 
 # type: =item
 #. type: =item
 msgstr ""
 
 # type: =item
 #. type: =item

-#: ../src/guestfs-actions.pod:3074 ../fish/guestfish-actions.pod:2141
-msgid "C<app_publisher>"
+#: ../src/guestfs-actions.pod:2566 ../fish/guestfish-actions.pod:1731
+msgid "\"linuxmint\""

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:3076 ../fish/guestfish-actions.pod:2143
-msgid ""
-"The name of the publisher of the application, for package managers that use "
-"this.  If unavailable this is returned as an empty string C<\"\">."
+#: ../src/guestfs-actions.pod:2568 ../fish/guestfish-actions.pod:1733
+msgid "Linux Mint."

 msgstr ""
 
 # type: =item
 #. type: =item
 msgstr ""
 
 # type: =item
 #. type: =item

-#: ../src/guestfs-actions.pod:3080 ../fish/guestfish-actions.pod:2147
-msgid "C<app_url>"
+#: ../src/guestfs-actions.pod:2570 ../fish/guestfish-actions.pod:1735
+msgid "\"mandriva\""

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:3082 ../fish/guestfish-actions.pod:2149
-msgid ""
-"The URL (eg. upstream URL) of the application.  If unavailable this is "
-"returned as an empty string C<\"\">."
+#: ../src/guestfs-actions.pod:2572 ../fish/guestfish-actions.pod:1737
+msgid "Mandriva."

 msgstr ""
 
 # type: =item
 #. type: =item
 msgstr ""
 
 # type: =item
 #. type: =item

-#: ../src/guestfs-actions.pod:3085 ../fish/guestfish-actions.pod:2152
-msgid "C<app_source_package>"
+#: ../src/guestfs-actions.pod:2574 ../fish/guestfish-actions.pod:1739
+msgid "\"meego\""

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:3087 ../fish/guestfish-actions.pod:2154
-msgid ""
-"For packaging systems which support this, the name of the source package.  "
-"If unavailable this is returned as an empty string C<\"\">."
+#: ../src/guestfs-actions.pod:2576 ../fish/guestfish-actions.pod:1741
+msgid "MeeGo."

 msgstr ""
 
 # type: =item
 #. type: =item
 msgstr ""
 
 # type: =item
 #. type: =item

-#: ../src/guestfs-actions.pod:3090 ../fish/guestfish-actions.pod:2157
-msgid "C<app_summary>"
+#: ../src/guestfs-actions.pod:2578 ../fish/guestfish-actions.pod:1743
+msgid "\"pardus\""

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:3092 ../fish/guestfish-actions.pod:2159
-msgid ""
-"A short (usually one line) description of the application or package.  If "
-"unavailable this is returned as an empty string C<\"\">."
+#: ../src/guestfs-actions.pod:2580 ../fish/guestfish-actions.pod:1745
+msgid "Pardus."

 msgstr ""
 
 # type: =item
 #. type: =item
 msgstr ""
 
 # type: =item
 #. type: =item

-#: ../src/guestfs-actions.pod:3095 ../fish/guestfish-actions.pod:2162
-msgid "C<app_description>"
+#: ../src/guestfs-actions.pod:2582 ../fish/guestfish-actions.pod:1747
+msgid "\"redhat-based\""

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:3097 ../fish/guestfish-actions.pod:2164
-msgid ""
-"A longer description of the application or package.  If unavailable this is "
-"returned as an empty string C<\"\">."
+#: ../src/guestfs-actions.pod:2584 ../fish/guestfish-actions.pod:1749
+msgid "Some Red Hat-derived distro."
+msgstr ""
+
+# type: =item
+#. type: =item
+#: ../src/guestfs-actions.pod:2586 ../fish/guestfish-actions.pod:1751
+msgid "\"rhel\""
+msgstr ""
+
+#. type: textblock
+#: ../src/guestfs-actions.pod:2588 ../fish/guestfish-actions.pod:1753
+msgid "Red Hat Enterprise Linux."
+msgstr ""
+
+#. type: =item
+#: ../src/guestfs-actions.pod:2590 ../fish/guestfish-actions.pod:1755
+msgid "\"scientificlinux\""
+msgstr ""
+
+#. type: textblock
+#: ../src/guestfs-actions.pod:2592 ../fish/guestfish-actions.pod:1757
+msgid "Scientific Linux."
+msgstr ""
+
+#. type: =item
+#: ../src/guestfs-actions.pod:2594 ../fish/guestfish-actions.pod:1759
+msgid "\"slackware\""
+msgstr ""
+
+#. type: textblock
+#: ../src/guestfs-actions.pod:2596 ../fish/guestfish-actions.pod:1761
+msgid "Slackware."
+msgstr ""
+
+# type: =item
+#. type: =item
+#: ../src/guestfs-actions.pod:2598 ../fish/guestfish-actions.pod:1763
+msgid "\"ubuntu\""

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:3104
+#: ../src/guestfs-actions.pod:2600 ../fish/guestfish-actions.pod:1765
+msgid "Ubuntu."
+msgstr ""
+
+# type: =item
+#. type: =item
+#: ../src/guestfs-actions.pod:2602 ../src/guestfs-actions.pod:2718
+#: ../src/guestfs-actions.pod:3010 ../fish/guestfish-actions.pod:1767
+#: ../fish/guestfish-actions.pod:1860 ../fish/guestfish-actions.pod:2085
+msgid "\"unknown\""
+msgstr ""
+
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:2604 ../fish/guestfish-actions.pod:1769
+msgid "The distro could not be determined."
+msgstr ""
+
+# type: =item
+#. type: =item
+#: ../src/guestfs-actions.pod:2606 ../src/guestfs-actions.pod:3002
+#: ../fish/guestfish-actions.pod:1771 ../fish/guestfish-actions.pod:2077
+msgid "\"windows\""
+msgstr ""
+
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:2608 ../fish/guestfish-actions.pod:1773

 msgid ""
 msgid ""

-"This function returns a C<struct guestfs_application_list *>, or NULL if "
-"there was an error.  I<The caller must call C<guestfs_free_application_list> "
-"after use>."
+"Windows does not have distributions.  This string is returned if the OS type "
+"is Windows."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:3108
-msgid "(Added in 1.7.8)"
+#: ../src/guestfs-actions.pod:2613 ../src/guestfs-actions.pod:2724
+#: ../src/guestfs-actions.pod:3016 ../fish/guestfish-actions.pod:1778
+#: ../fish/guestfish-actions.pod:1866 ../fish/guestfish-actions.pod:2091
+msgid ""
+"Future versions of libguestfs may return other strings here.  The caller "
+"should be prepared to handle any string."

 msgstr ""
 
 msgstr ""
 

-# type: =head2

 #. type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:3110
-msgid "guestfs_inspect_os"
+#: ../src/guestfs-actions.pod:2623
+msgid "guestfs_inspect_get_drive_mappings"

 msgstr ""
 
 msgstr ""
 

-# type: verbatim

 #. type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:3112
+#: ../src/guestfs-actions.pod:2625

 #, no-wrap
 msgid ""
 " char **\n"
 #, no-wrap
 msgid ""
 " char **\n"

-" guestfs_inspect_os (guestfs_h *g);\n"
+" guestfs_inspect_get_drive_mappings (guestfs_h *g,\n"
+"                                     const char *root);\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:3115 ../fish/guestfish-actions.pod:2175
+#: ../src/guestfs-actions.pod:2632 ../fish/guestfish-actions.pod:1790

 msgid ""
 msgid ""

-"This function uses other libguestfs functions and certain heuristics to "
-"inspect the disk(s) (usually disks belonging to a virtual machine), looking "
-"for operating systems."
+"This call is useful for Windows which uses a primitive system of assigning "
+"drive letters (like \"C:\") to partitions.  This inspection API examines the "
+"Windows Registry to find out how disks/partitions are mapped to drive "
+"letters, and returns a hash table as in the example below:"
+msgstr ""
+
+#. type: verbatim
+#: ../src/guestfs-actions.pod:2638 ../fish/guestfish-actions.pod:1796
+#, no-wrap
+msgid ""
+" C      =>     /dev/vda2\n"
+" E      =>     /dev/vdb1\n"
+" F      =>     /dev/vdc1\n"
+"\n"

 msgstr ""
 
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:3119 ../fish/guestfish-actions.pod:2179
-msgid "The list returned is empty if no operating systems were found."
+#: ../src/guestfs-actions.pod:2642 ../fish/guestfish-actions.pod:1800
+msgid ""
+"Note that keys are drive letters.  For Windows, the key is case insensitive "
+"and just contains the drive letter, without the customary colon separator "
+"character."

 msgstr ""
 
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:3121 ../fish/guestfish-actions.pod:2181
+#: ../src/guestfs-actions.pod:2646 ../fish/guestfish-actions.pod:1804

 msgid ""
 msgid ""

-"If one operating system was found, then this returns a list with a single "
-"element, which is the name of the root filesystem of this operating system.  "
-"It is also possible for this function to return a list containing more than "
-"one element, indicating a dual-boot or multi-boot virtual machine, with each "
-"element being the root filesystem of one of the operating systems."
+"In future we may support other operating systems that also used drive "
+"letters, but the keys for those might not be case insensitive and might be "
+"longer than 1 character.  For example in OS-9, hard drives were named C<h0>, "
+"C<h1> etc."

 msgstr ""
 
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:3128
+#: ../src/guestfs-actions.pod:2651 ../fish/guestfish-actions.pod:1809

 msgid ""
 msgid ""

-"You can pass the root string(s) returned to other C<guestfs_inspect_get_*> "
-"functions in order to query further information about each operating system, "
-"such as the name and version."
+"For Windows guests, currently only hard drive mappings are returned.  "
+"Removable disks (eg. DVD-ROMs) are ignored."

 msgstr ""
 
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:3133
+#: ../src/guestfs-actions.pod:2654 ../fish/guestfish-actions.pod:1812

 msgid ""
 msgid ""

-"This function uses other libguestfs features such as C<guestfs_mount_ro> and "
-"C<guestfs_umount_all> in order to mount and unmount filesystems and look at "
-"the contents.  This should be called with no disks currently mounted.  The "
-"function may also use Augeas, so any existing Augeas handle will be closed."
+"For guests that do not use drive mappings, or if the drive mappings could "
+"not be determined, this returns an empty hash table."

 msgstr ""
 
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:3139 ../fish/guestfish-actions.pod:2199
+#: ../src/guestfs-actions.pod:2657

 msgid ""
 msgid ""

-"This function cannot decrypt encrypted disks.  The caller must do that first "
-"(supplying the necessary keys) if the disk is encrypted."
+"Please read L<guestfs(3)/INSPECTION> for more details.  See also "
+"C<guestfs_inspect_get_mountpoints>, C<guestfs_inspect_get_filesystems>."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:3145 ../src/guestfs-actions.pod:3430
-#: ../src/guestfs-actions.pod:3492
-msgid "See also C<guestfs_list_filesystems>."
+#: ../src/guestfs-actions.pod:2661 ../src/guestfs-actions.pod:2837
+#: ../src/guestfs-actions.pod:3597 ../src/guestfs-actions.pod:4814
+#: ../src/guestfs-actions.pod:6756
+msgid ""
+"This function returns a NULL-terminated array of strings, or NULL if there "
+"was an error.  The array of strings will always have length C<2n+1>, where "
+"C<n> keys and values alternate, followed by the trailing NULL entry.  I<The "
+"caller must free the strings and the array after use>."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:3153
-msgid "guestfs_is_blockdev"
+#: ../src/guestfs-actions.pod:2667
+msgid "guestfs_inspect_get_filesystems"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:3155
+#: ../src/guestfs-actions.pod:2669

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" int\n"
-" guestfs_is_blockdev (guestfs_h *g,\n"
-"                      const char *path);\n"
+" char **\n"
+" guestfs_inspect_get_filesystems (guestfs_h *g,\n"
+"                                  const char *root);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:3159 ../fish/guestfish-actions.pod:2211
+#: ../src/guestfs-actions.pod:2676 ../fish/guestfish-actions.pod:1826

 msgid ""
 msgid ""

-"This returns C<true> if and only if there is a block device with the given "
-"C<path> name."
+"This returns a list of all the filesystems that we think are associated with "
+"this operating system.  This includes the root filesystem, other ordinary "
+"filesystems, and non-mounted devices like swap partitions."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:3162 ../src/guestfs-actions.pod:3191
-#: ../src/guestfs-actions.pod:3221 ../src/guestfs-actions.pod:3236
-#: ../src/guestfs-actions.pod:3252 ../src/guestfs-actions.pod:3308
-#: ../src/guestfs-actions.pod:3323
-msgid "See also C<guestfs_stat>."
+#: ../src/guestfs-actions.pod:2681 ../fish/guestfish-actions.pod:1831
+msgid ""
+"In the case of a multi-boot virtual machine, it is possible for a filesystem "
+"to be shared between operating systems."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:3166 ../src/guestfs-actions.pod:3195
-#: ../src/guestfs-actions.pod:3240 ../src/guestfs-actions.pod:3312
-#: ../src/guestfs-actions.pod:3327
-msgid "(Added in 1.5.10)"
+#: ../src/guestfs-actions.pod:2684
+msgid ""
+"Please read L<guestfs(3)/INSPECTION> for more details.  See also "
+"C<guestfs_inspect_get_mountpoints>."

 msgstr ""
 
 msgstr ""
 

-# type: =head2

 #. type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:3168
-msgid "guestfs_is_busy"
+#: ../src/guestfs-actions.pod:2693
+msgid "guestfs_inspect_get_format"

 msgstr ""
 
 msgstr ""
 

-# type: verbatim

 #. type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:3170
+#: ../src/guestfs-actions.pod:2695

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" int\n"
-" guestfs_is_busy (guestfs_h *g);\n"
+" char *\n"
+" guestfs_inspect_get_format (guestfs_h *g,\n"
+"                             const char *root);\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:3173 ../fish/guestfish-actions.pod:2220
+#: ../src/guestfs-actions.pod:2702 ../fish/guestfish-actions.pod:1844

 msgid ""
 msgid ""

-"This returns true iff this handle is busy processing a command (in the "
-"C<BUSY> state)."
+"This returns the format of the inspected operating system.  You can use it "
+"to detect install images, live CDs and similar."

 msgstr ""
 
 msgstr ""
 

-# type: =head2
-#. type: =head2
-#: ../src/guestfs-actions.pod:3182
-msgid "guestfs_is_chardev"
+#. type: textblock
+#: ../src/guestfs-actions.pod:2705 ../fish/guestfish-actions.pod:1847
+msgid "Currently defined formats are:"

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../src/guestfs-actions.pod:3184
-#, no-wrap
-msgid ""
-" int\n"
-" guestfs_is_chardev (guestfs_h *g,\n"
-"                     const char *path);\n"
-"\n"
+#. type: =item
+#: ../src/guestfs-actions.pod:2709 ../fish/guestfish-actions.pod:1851
+msgid "\"installed\""

 msgstr ""
 
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:3188 ../fish/guestfish-actions.pod:2229
-msgid ""
-"This returns C<true> if and only if there is a character device with the "
-"given C<path> name."
+#: ../src/guestfs-actions.pod:2711 ../fish/guestfish-actions.pod:1853
+msgid "This is an installed operating system."

 msgstr ""
 
 msgstr ""
 

-# type: =head2
-#. type: =head2
-#: ../src/guestfs-actions.pod:3197
-msgid "guestfs_is_config"
+#. type: =item
+#: ../src/guestfs-actions.pod:2713 ../fish/guestfish-actions.pod:1855
+msgid "\"installer\""

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../src/guestfs-actions.pod:3199
-#, no-wrap
+#. type: textblock
+#: ../src/guestfs-actions.pod:2715 ../fish/guestfish-actions.pod:1857

 msgid ""
 msgid ""

-" int\n"
-" guestfs_is_config (guestfs_h *g);\n"
-"\n"
+"The disk image being inspected is not an installed operating system, but a "
+"I<bootable> install disk, live CD, or similar."

 msgstr ""
 
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:3202 ../fish/guestfish-actions.pod:2238
-msgid ""
-"This returns true iff this handle is being configured (in the C<CONFIG> "
-"state)."
+#: ../src/guestfs-actions.pod:2720 ../fish/guestfish-actions.pod:1862
+msgid "The format of this disk image is not known."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:3211
-msgid "guestfs_is_dir"
+#: ../src/guestfs-actions.pod:2732
+msgid "guestfs_inspect_get_hostname"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:3213
+#: ../src/guestfs-actions.pod:2734

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" int\n"
-" guestfs_is_dir (guestfs_h *g,\n"
-"                 const char *path);\n"
+" char *\n"
+" guestfs_inspect_get_hostname (guestfs_h *g,\n"
+"                               const char *root);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:3217 ../fish/guestfish-actions.pod:2247
+#: ../src/guestfs-actions.pod:2741 ../fish/guestfish-actions.pod:1878

 msgid ""
 msgid ""

-"This returns C<true> if and only if there is a directory with the given "
-"C<path> name.  Note that it returns false for other objects like files."
+"This function returns the hostname of the operating system as found by "
+"inspection of the guest's configuration files."
+msgstr ""
+
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:2744 ../fish/guestfish-actions.pod:1881
+msgid ""
+"If the hostname could not be determined, then the string C<unknown> is "
+"returned."
+msgstr ""
+
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:2752
+msgid "(Added in 1.7.9)"

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:3227
-msgid "guestfs_is_fifo"
+#: ../src/guestfs-actions.pod:2754
+msgid "guestfs_inspect_get_major_version"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:3229
+#: ../src/guestfs-actions.pod:2756

 #, no-wrap
 msgid ""
 " int\n"
 #, no-wrap
 msgid ""
 " int\n"

-" guestfs_is_fifo (guestfs_h *g,\n"
-"                  const char *path);\n"
+" guestfs_inspect_get_major_version (guestfs_h *g,\n"
+"                                    const char *root);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:3233 ../fish/guestfish-actions.pod:2257
+#: ../src/guestfs-actions.pod:2763 ../fish/guestfish-actions.pod:1893

 msgid ""
 msgid ""

-"This returns C<true> if and only if there is a FIFO (named pipe)  with the "
-"given C<path> name."
+"This returns the major version number of the inspected operating system."
+msgstr ""
+
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:2766 ../fish/guestfish-actions.pod:1896
+msgid ""
+"Windows uses a consistent versioning scheme which is I<not> reflected in the "
+"popular public names used by the operating system.  Notably the operating "
+"system known as \"Windows 7\" is really version 6.1 (ie. major = 6, minor = "
+"1).  You can find out the real versions corresponding to releases of Windows "
+"by consulting Wikipedia or MSDN."
+msgstr ""
+
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:2773 ../src/guestfs-actions.pod:2793
+#: ../fish/guestfish-actions.pod:1903 ../fish/guestfish-actions.pod:1917
+msgid "If the version could not be determined, then C<0> is returned."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:3242
-msgid "guestfs_is_file"
+#: ../src/guestfs-actions.pod:2781
+msgid "guestfs_inspect_get_minor_version"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:3244
+#: ../src/guestfs-actions.pod:2783

 #, no-wrap
 msgid ""
 " int\n"
 #, no-wrap
 msgid ""
 " int\n"

-" guestfs_is_file (guestfs_h *g,\n"
-"                  const char *path);\n"
+" guestfs_inspect_get_minor_version (guestfs_h *g,\n"
+"                                    const char *root);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:3248 ../fish/guestfish-actions.pod:2266
+#: ../src/guestfs-actions.pod:2790 ../fish/guestfish-actions.pod:1914

 msgid ""
 msgid ""

-"This returns C<true> if and only if there is a regular file with the given "
-"C<path> name.  Note that it returns false for other objects like directories."
+"This returns the minor version number of the inspected operating system."
+msgstr ""
+
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:2795
+msgid ""
+"Please read L<guestfs(3)/INSPECTION> for more details.  See also "
+"C<guestfs_inspect_get_major_version>."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:3258
-msgid "guestfs_is_launching"
+#: ../src/guestfs-actions.pod:2802
+msgid "guestfs_inspect_get_mountpoints"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:3260
+#: ../src/guestfs-actions.pod:2804

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" int\n"
-" guestfs_is_launching (guestfs_h *g);\n"
+" char **\n"
+" guestfs_inspect_get_mountpoints (guestfs_h *g,\n"
+"                                  const char *root);\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

+#. type: textblock
+#: ../src/guestfs-actions.pod:2811 ../fish/guestfish-actions.pod:1929
+msgid ""
+"This returns a hash of where we think the filesystems associated with this "
+"operating system should be mounted.  Callers should note that this is at "
+"best an educated guess made by reading configuration files such as C</etc/"
+"fstab>.  I<In particular note> that this may return filesystems which are "
+"non-existent or not mountable and callers should be prepared to handle or "
+"ignore failures if they try to mount them."
+msgstr ""
+

 # type: textblock
 #. type: textblock
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:3263 ../fish/guestfish-actions.pod:2276
+#: ../src/guestfs-actions.pod:2820 ../fish/guestfish-actions.pod:1938

 msgid ""
 msgid ""

-"This returns true iff this handle is launching the subprocess (in the "
-"C<LAUNCHING> state)."
+"Each element in the returned hashtable has a key which is the path of the "
+"mountpoint (eg. C</boot>) and a value which is the filesystem that would be "
+"mounted there (eg. C</dev/sda1>)."

 msgstr ""
 
 msgstr ""
 

-# type: =head2
-#. type: =head2
-#: ../src/guestfs-actions.pod:3272
-msgid "guestfs_is_lv"
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:2825 ../fish/guestfish-actions.pod:1943
+msgid ""
+"Non-mounted devices such as swap devices are I<not> returned in this list."

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../src/guestfs-actions.pod:3274
-#, no-wrap
+#. type: textblock
+#: ../src/guestfs-actions.pod:2828

 msgid ""
 msgid ""

-" int\n"
-" guestfs_is_lv (guestfs_h *g,\n"
-"                const char *device);\n"
-"\n"
+"For operating systems like Windows which still use drive letters, this call "
+"will only return an entry for the first drive \"mounted on\" C</>.  For "
+"information about the mapping of drive letters to partitions, see "
+"C<guestfs_inspect_get_drive_mappings>."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:3278 ../fish/guestfish-actions.pod:2285
+#: ../src/guestfs-actions.pod:2834

 msgid ""
 msgid ""

-"This command tests whether C<device> is a logical volume, and returns true "
-"iff this is the case."
+"Please read L<guestfs(3)/INSPECTION> for more details.  See also "
+"C<guestfs_inspect_get_filesystems>."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:3285
-msgid "guestfs_is_ready"
+#: ../src/guestfs-actions.pod:2845
+msgid "guestfs_inspect_get_package_format"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:3287
+#: ../src/guestfs-actions.pod:2847

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" int\n"
-" guestfs_is_ready (guestfs_h *g);\n"
+" char *\n"
+" guestfs_inspect_get_package_format (guestfs_h *g,\n"
+"                                     const char *root);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:3290 ../fish/guestfish-actions.pod:2292
+#: ../src/guestfs-actions.pod:2854

 msgid ""
 msgid ""

-"This returns true iff this handle is ready to accept commands (in the "
-"C<READY> state)."
+"This function and C<guestfs_inspect_get_package_management> return the "
+"package format and package management tool used by the inspected operating "
+"system.  For example for Fedora these functions would return C<rpm> (package "
+"format) and C<yum> (package management)."

 msgstr ""
 
 msgstr ""
 

-# type: =head2
-#. type: =head2
-#: ../src/guestfs-actions.pod:3299
-msgid "guestfs_is_socket"
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:2860 ../fish/guestfish-actions.pod:1968
+msgid ""
+"This returns the string C<unknown> if we could not determine the package "
+"format I<or> if the operating system does not have a real packaging system "
+"(eg. Windows)."

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../src/guestfs-actions.pod:3301
-#, no-wrap
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:2864 ../fish/guestfish-actions.pod:1972

 msgid ""
 msgid ""

-" int\n"
-" guestfs_is_socket (guestfs_h *g,\n"
-"                    const char *path);\n"
-"\n"
+"Possible strings include: C<rpm>, C<deb>, C<ebuild>, C<pisi>, C<pacman>.  "
+"Future versions of libguestfs may return other strings."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:3305 ../fish/guestfish-actions.pod:2301
-msgid ""
-"This returns C<true> if and only if there is a Unix domain socket with the "
-"given C<path> name."
+#: ../src/guestfs-actions.pod:2872 ../src/guestfs-actions.pod:2903
+msgid "(Added in 1.7.5)"

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:3314
-msgid "guestfs_is_symlink"
+#: ../src/guestfs-actions.pod:2874
+msgid "guestfs_inspect_get_package_management"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:3316
+#: ../src/guestfs-actions.pod:2876

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" int\n"
-" guestfs_is_symlink (guestfs_h *g,\n"
-"                     const char *path);\n"
+" char *\n"
+" guestfs_inspect_get_package_management (guestfs_h *g,\n"
+"                                         const char *root);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:3320 ../fish/guestfish-actions.pod:2310
+#: ../src/guestfs-actions.pod:2883

 msgid ""
 msgid ""

-"This returns C<true> if and only if there is a symbolic link with the given "
-"C<path> name."
-msgstr ""
-
-# type: =head2
-#. type: =head2
-#: ../src/guestfs-actions.pod:3329
-msgid "guestfs_kill_subprocess"
+"C<guestfs_inspect_get_package_format> and this function return the package "
+"format and package management tool used by the inspected operating system.  "
+"For example for Fedora these functions would return C<rpm> (package format) "
+"and C<yum> (package management)."

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../src/guestfs-actions.pod:3331
-#, no-wrap
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:2889 ../fish/guestfish-actions.pod:1990

 msgid ""
 msgid ""

-" int\n"
-" guestfs_kill_subprocess (guestfs_h *g);\n"
-"\n"
+"This returns the string C<unknown> if we could not determine the package "
+"management tool I<or> if the operating system does not have a real packaging "
+"system (eg. Windows)."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:3334 ../fish/guestfish-actions.pod:2319
-msgid "This kills the qemu subprocess.  You should never need to call this."
+#: ../src/guestfs-actions.pod:2893 ../fish/guestfish-actions.pod:1994
+msgid ""
+"Possible strings include: C<yum>, C<up2date>, C<apt> (for all Debian "
+"derivatives), C<portage>, C<pisi>, C<pacman>, C<urpmi>.  Future versions of "
+"libguestfs may return other strings."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:3340
-msgid "guestfs_launch"
+#: ../src/guestfs-actions.pod:2905
+msgid "guestfs_inspect_get_product_name"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:3342
+#: ../src/guestfs-actions.pod:2907

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" int\n"
-" guestfs_launch (guestfs_h *g);\n"
+" char *\n"
+" guestfs_inspect_get_product_name (guestfs_h *g,\n"
+"                                   const char *root);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:3345 ../fish/guestfish-actions.pod:2327
+#: ../src/guestfs-actions.pod:2914 ../fish/guestfish-actions.pod:2008

 msgid ""
 msgid ""

-"Internally libguestfs is implemented by running a virtual machine using "
-"L<qemu(1)>."
+"This returns the product name of the inspected operating system.  The "
+"product name is generally some freeform string which can be displayed to the "
+"user, but should not be parsed by programs."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:3348 ../fish/guestfish-actions.pod:2330
+#: ../src/guestfs-actions.pod:2919 ../fish/guestfish-actions.pod:2013

 msgid ""
 msgid ""

-"You should call this after configuring the handle (eg. adding drives) but "
-"before performing any actions."
+"If the product name could not be determined, then the string C<unknown> is "
+"returned."

 msgstr ""
 
 msgstr ""
 

-# type: =head2

 #. type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:3355
-msgid "guestfs_lchown"
+#: ../src/guestfs-actions.pod:2929
+msgid "guestfs_inspect_get_product_variant"

 msgstr ""
 
 msgstr ""
 

-# type: verbatim

 #. type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:3357
+#: ../src/guestfs-actions.pod:2931

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" int\n"
-" guestfs_lchown (guestfs_h *g,\n"
-"                 int owner,\n"
-"                 int group,\n"
-"                 const char *path);\n"
+" char *\n"
+" guestfs_inspect_get_product_variant (guestfs_h *g,\n"
+"                                      const char *root);\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:3363
+#: ../src/guestfs-actions.pod:2938 ../fish/guestfish-actions.pod:2025
+msgid "This returns the product variant of the inspected operating system."
+msgstr ""
+
+#. type: textblock
+#: ../src/guestfs-actions.pod:2941 ../fish/guestfish-actions.pod:2028

 msgid ""
 msgid ""

-"Change the file owner to C<owner> and group to C<group>.  This is like "
-"C<guestfs_chown> but if C<path> is a symlink then the link itself is "
-"changed, not the target."
+"For Windows guests, this returns the contents of the Registry key C<HKLM"
+"\\Software\\Microsoft\\Windows NT\\CurrentVersion> C<InstallationType> which "
+"is usually a string such as C<Client> or C<Server> (other values are "
+"possible).  This can be used to distinguish consumer and enterprise versions "
+"of Windows that have the same version number (for example, Windows 7 and "
+"Windows 2008 Server are both version 6.1, but the former is C<Client> and "
+"the latter is C<Server>)."
+msgstr ""
+
+#. type: textblock
+#: ../src/guestfs-actions.pod:2950 ../fish/guestfish-actions.pod:2037
+msgid ""
+"For enterprise Linux guests, in future we intend this to return the product "
+"variant such as C<Desktop>, C<Server> and so on.  But this is not "
+"implemented at present."
+msgstr ""
+
+#. type: textblock
+#: ../src/guestfs-actions.pod:2954 ../fish/guestfish-actions.pod:2041
+msgid ""
+"If the product variant could not be determined, then the string C<unknown> "
+"is returned."
+msgstr ""
+
+#. type: textblock
+#: ../src/guestfs-actions.pod:2957
+msgid ""
+"Please read L<guestfs(3)/INSPECTION> for more details.  See also "
+"C<guestfs_inspect_get_product_name>, C<guestfs_inspect_get_major_version>."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:3375
-msgid "guestfs_lgetxattr"
+#: ../src/guestfs-actions.pod:2964
+msgid "guestfs_inspect_get_roots"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:3377
+#: ../src/guestfs-actions.pod:2966

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" char *\n"
-" guestfs_lgetxattr (guestfs_h *g,\n"
-"                    const char *path,\n"
-"                    const char *name,\n"
-"                    size_t *size_r);\n"
+" char **\n"
+" guestfs_inspect_get_roots (guestfs_h *g);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:3383 ../fish/guestfish-actions.pod:2349
+#: ../src/guestfs-actions.pod:2969

 msgid ""
 msgid ""

-"Get a single extended attribute from file C<path> named C<name>.  If C<path> "
-"is a symlink, then this call returns an extended attribute from the symlink."
+"This function is a convenient way to get the list of root devices, as "
+"returned from a previous call to C<guestfs_inspect_os>, but without redoing "
+"the whole inspection process."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:3397
-msgid "See also: C<guestfs_lgetxattrs>, C<guestfs_getxattr>, L<attr(5)>."
+#: ../src/guestfs-actions.pod:2973
+msgid ""
+"This returns an empty list if either no root devices were found or the "
+"caller has not called C<guestfs_inspect_os>."
+msgstr ""
+
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:2982
+msgid "(Added in 1.7.3)"

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:3405
-msgid "guestfs_lgetxattrs"
+#: ../src/guestfs-actions.pod:2984
+msgid "guestfs_inspect_get_type"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:3407
+#: ../src/guestfs-actions.pod:2986

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" struct guestfs_xattr_list *\n"
-" guestfs_lgetxattrs (guestfs_h *g,\n"
-"                     const char *path);\n"
+" char *\n"
+" guestfs_inspect_get_type (guestfs_h *g,\n"
+"                           const char *root);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:3411
+#: ../src/guestfs-actions.pod:2993 ../fish/guestfish-actions.pod:2068

 msgid ""
 msgid ""

-"This is the same as C<guestfs_getxattrs>, but if C<path> is a symbolic link, "
-"then it returns the extended attributes of the link itself."
+"This returns the type of the inspected operating system.  Currently defined "
+"types are:"

 msgstr ""
 
 msgstr ""
 

-# type: =head2
-#. type: =head2
-#: ../src/guestfs-actions.pod:3421
-msgid "guestfs_list_devices"
+# type: =item
+#. type: =item
+#: ../src/guestfs-actions.pod:2998 ../fish/guestfish-actions.pod:2073
+msgid "\"linux\""

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../src/guestfs-actions.pod:3423
-#, no-wrap
-msgid ""
-" char **\n"
-" guestfs_list_devices (guestfs_h *g);\n"
-"\n"
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:3000 ../fish/guestfish-actions.pod:2075
+msgid "Any Linux-based operating system."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:3426 ../fish/guestfish-actions.pod:2377
-msgid "List all the block devices."
+#: ../src/guestfs-actions.pod:3004 ../fish/guestfish-actions.pod:2079
+msgid "Any Microsoft Windows operating system."
+msgstr ""
+
+# type: =item
+#. type: =item
+#: ../src/guestfs-actions.pod:3006 ../fish/guestfish-actions.pod:2081
+msgid "\"freebsd\""

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:3428 ../fish/guestfish-actions.pod:2379
-msgid "The full block device names are returned, eg. C</dev/sda>."
+#: ../src/guestfs-actions.pod:3008 ../fish/guestfish-actions.pod:2083
+msgid "FreeBSD."
+msgstr ""
+
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:3012 ../fish/guestfish-actions.pod:2087
+msgid "The operating system type could not be determined."

 msgstr ""
 
 msgstr ""
 

-# type: =head2

 #. type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:3438
-msgid "guestfs_list_filesystems"
+#: ../src/guestfs-actions.pod:3026
+msgid "guestfs_inspect_get_windows_current_control_set"

 msgstr ""
 
 msgstr ""
 

-# type: verbatim

 #. type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:3440
+#: ../src/guestfs-actions.pod:3028

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" char **\n"
-" guestfs_list_filesystems (guestfs_h *g);\n"
+" char *\n"
+" guestfs_inspect_get_windows_current_control_set (guestfs_h *g,\n"
+"                                                  const char *root);\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:3443 ../fish/guestfish-actions.pod:2387
+#: ../src/guestfs-actions.pod:3035 ../fish/guestfish-actions.pod:2103

 msgid ""
 msgid ""

-"This inspection command looks for filesystems on partitions, block devices "
-"and logical volumes, returning a list of devices containing filesystems and "
-"their type."
+"This returns the Windows CurrentControlSet of the inspected guest.  The "
+"CurrentControlSet is a registry key name such as C<ControlSet001>."

 msgstr ""
 
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:3447 ../fish/guestfish-actions.pod:2391
+#: ../src/guestfs-actions.pod:3038 ../fish/guestfish-actions.pod:2106

 msgid ""
 msgid ""

-"The return value is a hash, where the keys are the devices containing "
-"filesystems, and the values are the filesystem types.  For example:"
+"This call assumes that the guest is Windows and that the Registry could be "
+"examined by inspection.  If this is not the case then an error is returned."
+msgstr ""
+
+# type: =head2
+#. type: =head2
+#: ../src/guestfs-actions.pod:3047
+msgid "guestfs_inspect_get_windows_systemroot"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:3451 ../fish/guestfish-actions.pod:2395
+#: ../src/guestfs-actions.pod:3049

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" \"/dev/sda1\" => \"ntfs\"\n"
-" \"/dev/sda2\" => \"ext2\"\n"
-" \"/dev/vg_guest/lv_root\" => \"ext4\"\n"
-" \"/dev/vg_guest/lv_swap\" => \"swap\"\n"
+" char *\n"
+" guestfs_inspect_get_windows_systemroot (guestfs_h *g,\n"
+"                                         const char *root);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:3456 ../fish/guestfish-actions.pod:2400
+#: ../src/guestfs-actions.pod:3056 ../fish/guestfish-actions.pod:2119

 msgid ""
 msgid ""

-"The value can have the special value \"unknown\", meaning the content of the "
-"device is undetermined or empty.  \"swap\" means a Linux swap partition."
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:3460
-msgid ""
-"This command runs other libguestfs commands, which might include "
-"C<guestfs_mount> and C<guestfs_umount>, and therefore you should use this "
-"soon after launch and only when nothing is mounted."
+"This returns the Windows systemroot of the inspected guest.  The systemroot "
+"is a directory path such as C</WINDOWS>."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:3464
+#: ../src/guestfs-actions.pod:3059 ../fish/guestfish-actions.pod:2122

 msgid ""
 msgid ""

-"Not all of the filesystems returned will be mountable.  In particular, swap "
-"partitions are returned in the list.  Also this command does not check that "
-"each filesystem found is valid and mountable, and some filesystems might be "
-"mountable but require special options.  Filesystems may not all belong to a "
-"single logical operating system (use C<guestfs_inspect_os> to look for OSes)."
+"This call assumes that the guest is Windows and that the systemroot could be "
+"determined by inspection.  If this is not the case then an error is returned."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:3478 ../src/guestfs-actions.pod:5083
-msgid "(Added in 1.5.15)"
+#: ../src/guestfs-actions.pod:3068
+msgid "(Added in 1.5.25)"

 msgstr ""
 
 msgstr ""
 

-# type: =head2

 #. type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:3480
-msgid "guestfs_list_partitions"
+#: ../src/guestfs-actions.pod:3070
+msgid "guestfs_inspect_is_live"

 msgstr ""
 
 msgstr ""
 

-# type: verbatim

 #. type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:3482
+#: ../src/guestfs-actions.pod:3072

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" char **\n"
-" guestfs_list_partitions (guestfs_h *g);\n"
+" int\n"
+" guestfs_inspect_is_live (guestfs_h *g,\n"
+"                          const char *root);\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:3485 ../fish/guestfish-actions.pod:2420
-msgid "List all the partitions detected on all block devices."
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:3487 ../fish/guestfish-actions.pod:2422
-msgid "The full partition device names are returned, eg. C</dev/sda1>"
-msgstr ""
-
-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:3489
+#: ../src/guestfs-actions.pod:3079

 msgid ""
 msgid ""

-"This does not return logical volumes.  For that you will need to call "
-"C<guestfs_lvs>."
+"If C<guestfs_inspect_get_format> returns C<installer> (this is an install "
+"disk), then this returns true if a live image was detected on the disk."

 msgstr ""
 
 msgstr ""
 

-# type: =head2

 #. type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:3500
-msgid "guestfs_ll"
+#: ../src/guestfs-actions.pod:3087
+msgid "guestfs_inspect_is_multipart"

 msgstr ""
 
 msgstr ""
 

-# type: verbatim

 #. type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:3502
+#: ../src/guestfs-actions.pod:3089

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" char *\n"
-" guestfs_ll (guestfs_h *g,\n"
-"             const char *directory);\n"
+" int\n"
+" guestfs_inspect_is_multipart (guestfs_h *g,\n"
+"                               const char *root);\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:3506 ../fish/guestfish-actions.pod:2433
-msgid ""
-"List the files in C<directory> (relative to the root directory, there is no "
-"cwd) in the format of 'ls -la'."
-msgstr ""
-
-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:3509 ../fish/guestfish-actions.pod:2436
+#: ../src/guestfs-actions.pod:3096

 msgid ""
 msgid ""

-"This command is mostly useful for interactive sessions.  It is I<not> "
-"intended that you try to parse the output string."
+"If C<guestfs_inspect_get_format> returns C<installer> (this is an install "
+"disk), then this returns true if the disk is part of a set."

 msgstr ""
 
 msgstr ""
 

-# type: =head2

 #. type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:3517
-msgid "guestfs_ln"
+#: ../src/guestfs-actions.pod:3104
+msgid "guestfs_inspect_is_netinst"

 msgstr ""
 
 msgstr ""
 

-# type: verbatim

 #. type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:3519
+#: ../src/guestfs-actions.pod:3106

 #, no-wrap
 msgid ""
 " int\n"
 #, no-wrap
 msgid ""
 " int\n"

-" guestfs_ln (guestfs_h *g,\n"
-"             const char *target,\n"
-"             const char *linkname);\n"
+" guestfs_inspect_is_netinst (guestfs_h *g,\n"
+"                             const char *root);\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:3524 ../fish/guestfish-actions.pod:2443
-msgid "This command creates a hard link using the C<ln> command."
+#: ../src/guestfs-actions.pod:3113
+msgid ""
+"If C<guestfs_inspect_get_format> returns C<installer> (this is an install "
+"disk), then this returns true if the disk is a network installer, ie. not a "
+"self-contained install CD but one which is likely to require network access "
+"to complete the install."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:3530
-msgid "guestfs_ln_f"
+#: ../src/guestfs-actions.pod:3123
+msgid "guestfs_inspect_list_applications"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:3532
+#: ../src/guestfs-actions.pod:3125

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" int\n"
-" guestfs_ln_f (guestfs_h *g,\n"
-"               const char *target,\n"
-"               const char *linkname);\n"
+" struct guestfs_application_list *\n"
+" guestfs_inspect_list_applications (guestfs_h *g,\n"
+"                                    const char *root);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:3537 ../fish/guestfish-actions.pod:2449
-msgid ""
-"This command creates a hard link using the C<ln -f> command.  The C<-f> "
-"option removes the link (C<linkname>) if it exists already."
-msgstr ""
-
-# type: =head2
-#. type: =head2
-#: ../src/guestfs-actions.pod:3544
-msgid "guestfs_ln_s"
-msgstr ""
-
-# type: verbatim
-#. type: verbatim
-#: ../src/guestfs-actions.pod:3546
-#, no-wrap
-msgid ""
-" int\n"
-" guestfs_ln_s (guestfs_h *g,\n"
-"               const char *target,\n"
-"               const char *linkname);\n"
-"\n"
+#: ../src/guestfs-actions.pod:3132 ../fish/guestfish-actions.pod:2176
+msgid "Return the list of applications installed in the operating system."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:3551 ../fish/guestfish-actions.pod:2456
-msgid "This command creates a symbolic link using the C<ln -s> command."
-msgstr ""
-
-# type: =head2
-#. type: =head2
-#: ../src/guestfs-actions.pod:3557
-msgid "guestfs_ln_sf"
-msgstr ""
-
-# type: verbatim
-#. type: verbatim
-#: ../src/guestfs-actions.pod:3559
-#, no-wrap
+#: ../src/guestfs-actions.pod:3134

 msgid ""
 msgid ""

-" int\n"
-" guestfs_ln_sf (guestfs_h *g,\n"
-"                const char *target,\n"
-"                const char *linkname);\n"
-"\n"
+"I<Note:> This call works differently from other parts of the inspection "
+"API.  You have to call C<guestfs_inspect_os>, then "
+"C<guestfs_inspect_get_mountpoints>, then mount up the disks, before calling "
+"this.  Listing applications is a significantly more difficult operation "
+"which requires access to the full filesystem.  Also note that unlike the "
+"other C<guestfs_inspect_get_*> calls which are just returning data cached in "
+"the libguestfs handle, this call actually reads parts of the mounted "
+"filesystems during the call."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:3564 ../fish/guestfish-actions.pod:2462
+#: ../src/guestfs-actions.pod:3144 ../fish/guestfish-actions.pod:2188

 msgid ""
 msgid ""

-"This command creates a symbolic link using the C<ln -sf> command, The C<-f> "
-"option removes the link (C<linkname>) if it exists already."
+"This returns an empty list if the inspection code was not able to determine "
+"the list of applications."

 msgstr ""
 
 msgstr ""
 

-# type: =head2
-#. type: =head2
-#: ../src/guestfs-actions.pod:3571
-msgid "guestfs_lremovexattr"
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:3147 ../fish/guestfish-actions.pod:2191
+msgid "The application structure contains the following fields:"

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../src/guestfs-actions.pod:3573
-#, no-wrap
-msgid ""
-" int\n"
-" guestfs_lremovexattr (guestfs_h *g,\n"
-"                       const char *xattr,\n"
-"                       const char *path);\n"
-"\n"
+# type: =item
+#. type: =item
+#: ../src/guestfs-actions.pod:3151 ../fish/guestfish-actions.pod:2195
+msgid "C<app_name>"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:3578
+#: ../src/guestfs-actions.pod:3153 ../fish/guestfish-actions.pod:2197

 msgid ""
 msgid ""

-"This is the same as C<guestfs_removexattr>, but if C<path> is a symbolic "
-"link, then it removes an extended attribute of the link itself."
-msgstr ""
-
-# type: =head2
-#. type: =head2
-#: ../src/guestfs-actions.pod:3586
-msgid "guestfs_ls"
+"The name of the application.  For Red Hat-derived and Debian-derived Linux "
+"guests, this is the package name."

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../src/guestfs-actions.pod:3588
-#, no-wrap
-msgid ""
-" char **\n"
-" guestfs_ls (guestfs_h *g,\n"
-"             const char *directory);\n"
-"\n"
+# type: =item
+#. type: =item
+#: ../src/guestfs-actions.pod:3156 ../fish/guestfish-actions.pod:2200
+msgid "C<app_display_name>"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:3592 ../fish/guestfish-actions.pod:2477
+#: ../src/guestfs-actions.pod:3158 ../fish/guestfish-actions.pod:2202

 msgid ""
 msgid ""

-"List the files in C<directory> (relative to the root directory, there is no "
-"cwd).  The '.' and '..' entries are not returned, but hidden files are shown."
+"The display name of the application, sometimes localized to the install "
+"language of the guest operating system."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:3596
+#: ../src/guestfs-actions.pod:3161 ../fish/guestfish-actions.pod:2205

 msgid ""
 msgid ""

-"This command is mostly useful for interactive sessions.  Programs should "
-"probably use C<guestfs_readdir> instead."
+"If unavailable this is returned as an empty string C<\"\">.  Callers needing "
+"to display something can use C<app_name> instead."

 msgstr ""
 
 msgstr ""
 

-# type: =head2
-#. type: =head2
-#: ../src/guestfs-actions.pod:3605
-msgid "guestfs_lsetxattr"
+# type: =item
+#. type: =item
+#: ../src/guestfs-actions.pod:3164 ../fish/guestfish-actions.pod:2208
+msgid "C<app_epoch>"

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../src/guestfs-actions.pod:3607
-#, no-wrap
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:3166 ../fish/guestfish-actions.pod:2210

 msgid ""
 msgid ""

-" int\n"
-" guestfs_lsetxattr (guestfs_h *g,\n"
-"                    const char *xattr,\n"
-"                    const char *val,\n"
-"                    int vallen,\n"
-"                    const char *path);\n"
-"\n"
+"For package managers which use epochs, this contains the epoch of the "
+"package (an integer).  If unavailable, this is returned as C<0>."
+msgstr ""
+
+# type: =item
+#. type: =item
+#: ../src/guestfs-actions.pod:3169 ../fish/guestfish-actions.pod:2213
+msgid "C<app_version>"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:3614
+#: ../src/guestfs-actions.pod:3171 ../fish/guestfish-actions.pod:2215

 msgid ""
 msgid ""

-"This is the same as C<guestfs_setxattr>, but if C<path> is a symbolic link, "
-"then it sets an extended attribute of the link itself."
+"The version string of the application or package.  If unavailable this is "
+"returned as an empty string C<\"\">."

 msgstr ""
 
 msgstr ""
 

-# type: =head2
-#. type: =head2
-#: ../src/guestfs-actions.pod:3622
-msgid "guestfs_lstat"
+# type: =item
+#. type: =item
+#: ../src/guestfs-actions.pod:3174 ../fish/guestfish-actions.pod:2218
+msgid "C<app_release>"

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../src/guestfs-actions.pod:3624
-#, no-wrap
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:3176 ../fish/guestfish-actions.pod:2220

 msgid ""
 msgid ""

-" struct guestfs_stat *\n"
-" guestfs_lstat (guestfs_h *g,\n"
-"                const char *path);\n"
-"\n"
+"The release string of the application or package, for package managers that "
+"use this.  If unavailable this is returned as an empty string C<\"\">."

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:3628 ../src/guestfs-actions.pod:6182
-#: ../fish/guestfish-actions.pod:2496 ../fish/guestfish-actions.pod:4161
-msgid "Returns file information for the given C<path>."
+# type: =item
+#. type: =item
+#: ../src/guestfs-actions.pod:3180 ../fish/guestfish-actions.pod:2224
+msgid "C<app_install_path>"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:3630
+#: ../src/guestfs-actions.pod:3182 ../fish/guestfish-actions.pod:2226

 msgid ""
 msgid ""

-"This is the same as C<guestfs_stat> except that if C<path> is a symbolic "
-"link, then the link is stat-ed, not the file it refers to."
+"The installation path of the application (on operating systems such as "
+"Windows which use installation paths).  This path is in the format used by "
+"the guest operating system, it is not a libguestfs path."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:3634 ../fish/guestfish-actions.pod:2502
-msgid "This is the same as the C<lstat(2)> system call."
+#: ../src/guestfs-actions.pod:3187 ../fish/guestfish-actions.pod:2231
+msgid "If unavailable this is returned as an empty string C<\"\">."

 msgstr ""
 
 msgstr ""
 

-# type: textblock
+# type: =item
+#. type: =item
+#: ../src/guestfs-actions.pod:3189 ../fish/guestfish-actions.pod:2233
+msgid "C<app_trans_path>"
+msgstr ""
+
+# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:3636 ../src/guestfs-actions.pod:6186
+#: ../src/guestfs-actions.pod:3191 ../fish/guestfish-actions.pod:2235

 msgid ""
 msgid ""

-"This function returns a C<struct guestfs_stat *>, or NULL if there was an "
-"error.  I<The caller must call C<guestfs_free_stat> after use>."
+"The install path translated into a libguestfs path.  If unavailable this is "
+"returned as an empty string C<\"\">."
+msgstr ""
+
+# type: =item
+#. type: =item
+#: ../src/guestfs-actions.pod:3194 ../fish/guestfish-actions.pod:2238
+msgid "C<app_publisher>"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:3640 ../src/guestfs-actions.pod:6190
-#: ../src/guestfs-actions.pod:6208 ../src/guestfs-actions.pod:6589
-msgid "(Added in 0.9.2)"
+#: ../src/guestfs-actions.pod:3196 ../fish/guestfish-actions.pod:2240
+msgid ""
+"The name of the publisher of the application, for package managers that use "
+"this.  If unavailable this is returned as an empty string C<\"\">."

 msgstr ""
 
 msgstr ""
 

-# type: =head2
-#. type: =head2
-#: ../src/guestfs-actions.pod:3642
-msgid "guestfs_lstatlist"
+# type: =item
+#. type: =item
+#: ../src/guestfs-actions.pod:3200 ../fish/guestfish-actions.pod:2244
+msgid "C<app_url>"

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../src/guestfs-actions.pod:3644
-#, no-wrap
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:3202 ../fish/guestfish-actions.pod:2246

 msgid ""
 msgid ""

-" struct guestfs_stat_list *\n"
-" guestfs_lstatlist (guestfs_h *g,\n"
-"                    const char *path,\n"
-"                    char *const *names);\n"
-"\n"
+"The URL (eg. upstream URL) of the application.  If unavailable this is "
+"returned as an empty string C<\"\">."
+msgstr ""
+
+# type: =item
+#. type: =item
+#: ../src/guestfs-actions.pod:3205 ../fish/guestfish-actions.pod:2249
+msgid "C<app_source_package>"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:3649
+#: ../src/guestfs-actions.pod:3207 ../fish/guestfish-actions.pod:2251

 msgid ""
 msgid ""

-"This call allows you to perform the C<guestfs_lstat> operation on multiple "
-"files, where all files are in the directory C<path>.  C<names> is the list "
-"of files from this directory."
+"For packaging systems which support this, the name of the source package.  "
+"If unavailable this is returned as an empty string C<\"\">."
+msgstr ""
+
+# type: =item
+#. type: =item
+#: ../src/guestfs-actions.pod:3210 ../fish/guestfish-actions.pod:2254
+msgid "C<app_summary>"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:3653 ../fish/guestfish-actions.pod:2512
+#: ../src/guestfs-actions.pod:3212 ../fish/guestfish-actions.pod:2256

 msgid ""
 msgid ""

-"On return you get a list of stat structs, with a one-to-one correspondence "
-"to the C<names> list.  If any name did not exist or could not be lstat'd, "
-"then the C<ino> field of that structure is set to C<-1>."
+"A short (usually one line) description of the application or package.  If "
+"unavailable this is returned as an empty string C<\"\">."
+msgstr ""
+
+# type: =item
+#. type: =item
+#: ../src/guestfs-actions.pod:3215 ../fish/guestfish-actions.pod:2259
+msgid "C<app_description>"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:3658
+#: ../src/guestfs-actions.pod:3217 ../fish/guestfish-actions.pod:2261

 msgid ""
 msgid ""

-"This call is intended for programs that want to efficiently list a directory "
-"contents without making many round-trips.  See also C<guestfs_lxattrlist> "
-"for a similarly efficient call for getting extended attributes.  Very long "
-"directory listings might cause the protocol message size to be exceeded, "
-"causing this call to fail.  The caller must split up such requests into "
-"smaller groups of names."
+"A longer description of the application or package.  If unavailable this is "
+"returned as an empty string C<\"\">."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:3666
+#: ../src/guestfs-actions.pod:3224

 msgid ""
 msgid ""

-"This function returns a C<struct guestfs_stat_list *>, or NULL if there was "
-"an error.  I<The caller must call C<guestfs_free_stat_list> after use>."
+"This function returns a C<struct guestfs_application_list *>, or NULL if "
+"there was an error.  I<The caller must call C<guestfs_free_application_list> "
+"after use>."
+msgstr ""
+
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:3228
+msgid "(Added in 1.7.8)"

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:3672
-msgid "guestfs_luks_add_key"
+#: ../src/guestfs-actions.pod:3230
+msgid "guestfs_inspect_os"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:3674
+#: ../src/guestfs-actions.pod:3232

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" int\n"
-" guestfs_luks_add_key (guestfs_h *g,\n"
-"                       const char *device,\n"
-"                       const char *key,\n"
-"                       const char *newkey,\n"
-"                       int keyslot);\n"
+" char **\n"
+" guestfs_inspect_os (guestfs_h *g);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:3681 ../fish/guestfish-actions.pod:2529
+#: ../src/guestfs-actions.pod:3235 ../fish/guestfish-actions.pod:2272

 msgid ""
 msgid ""

-"This command adds a new key on LUKS device C<device>.  C<key> is any "
-"existing key, and is used to access the device.  C<newkey> is the new key to "
-"add.  C<keyslot> is the key slot that will be replaced."
+"This function uses other libguestfs functions and certain heuristics to "
+"inspect the disk(s) (usually disks belonging to a virtual machine), looking "
+"for operating systems."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:3686
-msgid ""
-"Note that if C<keyslot> already contains a key, then this command will "
-"fail.  You have to use C<guestfs_luks_kill_slot> first to remove that key."
+#: ../src/guestfs-actions.pod:3239 ../fish/guestfish-actions.pod:2276
+msgid "The list returned is empty if no operating systems were found."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:3692 ../src/guestfs-actions.pod:3732
-#: ../src/guestfs-actions.pod:3755 ../src/guestfs-actions.pod:3775
-#: ../src/guestfs-actions.pod:3807 ../src/guestfs-actions.pod:3826
+#: ../src/guestfs-actions.pod:3241 ../fish/guestfish-actions.pod:2278

 msgid ""
 msgid ""

-"This function takes a key or passphrase parameter which could contain "
-"sensitive material.  Read the section L</KEYS AND PASSPHRASES> for more "
-"information."
+"If one operating system was found, then this returns a list with a single "
+"element, which is the name of the root filesystem of this operating system.  "
+"It is also possible for this function to return a list containing more than "
+"one element, indicating a dual-boot or multi-boot virtual machine, with each "
+"element being the root filesystem of one of the operating systems."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:3696 ../src/guestfs-actions.pod:3736
-#: ../src/guestfs-actions.pod:3759 ../src/guestfs-actions.pod:3779
-msgid "(Added in 1.5.2)"
-msgstr ""
-
-# type: =head2
-#. type: =head2
-#: ../src/guestfs-actions.pod:3698
-msgid "guestfs_luks_close"
+#: ../src/guestfs-actions.pod:3248
+msgid ""
+"You can pass the root string(s) returned to other C<guestfs_inspect_get_*> "
+"functions in order to query further information about each operating system, "
+"such as the name and version."

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../src/guestfs-actions.pod:3700
-#, no-wrap
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:3253

 msgid ""
 msgid ""

-" int\n"
-" guestfs_luks_close (guestfs_h *g,\n"
-"                     const char *device);\n"
-"\n"
+"This function uses other libguestfs features such as C<guestfs_mount_ro> and "
+"C<guestfs_umount_all> in order to mount and unmount filesystems and look at "
+"the contents.  This should be called with no disks currently mounted.  The "
+"function may also use Augeas, so any existing Augeas handle will be closed."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:3704
+#: ../src/guestfs-actions.pod:3259 ../fish/guestfish-actions.pod:2296

 msgid ""
 msgid ""

-"This closes a LUKS device that was created earlier by C<guestfs_luks_open> "
-"or C<guestfs_luks_open_ro>.  The C<device> parameter must be the name of the "
-"LUKS mapping device (ie. C</dev/mapper/mapname>) and I<not> the name of the "
-"underlying block device."
+"This function cannot decrypt encrypted disks.  The caller must do that first "
+"(supplying the necessary keys) if the disk is encrypted."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:3712 ../src/guestfs-actions.pod:3811
-#: ../src/guestfs-actions.pod:3830 ../src/guestfs-actions.pod:3880
-#: ../src/guestfs-actions.pod:3928
-msgid "(Added in 1.5.1)"
+#: ../src/guestfs-actions.pod:3265 ../src/guestfs-actions.pod:3555
+#: ../src/guestfs-actions.pod:3617
+msgid "See also C<guestfs_list_filesystems>."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:3714
-msgid "guestfs_luks_format"
+#: ../src/guestfs-actions.pod:3273
+msgid "guestfs_is_blockdev"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:3716
+#: ../src/guestfs-actions.pod:3275

 #, no-wrap
 msgid ""
 " int\n"
 #, no-wrap
 msgid ""
 " int\n"

-" guestfs_luks_format (guestfs_h *g,\n"
-"                      const char *device,\n"
-"                      const char *key,\n"
-"                      int keyslot);\n"
+" guestfs_is_blockdev (guestfs_h *g,\n"
+"                      const char *path);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:3722 ../fish/guestfish-actions.pod:2555
+#: ../src/guestfs-actions.pod:3279 ../fish/guestfish-actions.pod:2308

 msgid ""
 msgid ""

-"This command erases existing data on C<device> and formats the device as a "
-"LUKS encrypted device.  C<key> is the initial key, which is added to key "
-"slot C<slot>.  (LUKS supports 8 key slots, numbered 0-7)."
+"This returns C<true> if and only if there is a block device with the given "
+"C<path> name."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:3729 ../src/guestfs-actions.pod:3752
-#: ../src/guestfs-actions.pod:3892 ../src/guestfs-actions.pod:4834
-#: ../src/guestfs-actions.pod:5614 ../src/guestfs-actions.pod:6017
-#: ../src/guestfs-actions.pod:6040 ../src/guestfs-actions.pod:6066
-#: ../src/guestfs-actions.pod:7226 ../fish/guestfish-actions.pod:2563
-#: ../fish/guestfish-actions.pod:2576 ../fish/guestfish-actions.pod:2660
-#: ../fish/guestfish-actions.pod:3234 ../fish/guestfish-actions.pod:3754
-#: ../fish/guestfish-actions.pod:4060 ../fish/guestfish-actions.pod:4076
-#: ../fish/guestfish-actions.pod:4091 ../fish/guestfish-actions.pod:4806
-msgid ""
-"B<This command is dangerous.  Without careful use you can easily destroy all "
-"your data>."
+#: ../src/guestfs-actions.pod:3282 ../src/guestfs-actions.pod:3311
+#: ../src/guestfs-actions.pod:3341 ../src/guestfs-actions.pod:3356
+#: ../src/guestfs-actions.pod:3372 ../src/guestfs-actions.pod:3428
+#: ../src/guestfs-actions.pod:3443
+msgid "See also C<guestfs_stat>."
+msgstr ""
+
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:3286 ../src/guestfs-actions.pod:3315
+#: ../src/guestfs-actions.pod:3360 ../src/guestfs-actions.pod:3432
+#: ../src/guestfs-actions.pod:3447
+msgid "(Added in 1.5.10)"

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:3738
-msgid "guestfs_luks_format_cipher"
+#: ../src/guestfs-actions.pod:3288
+msgid "guestfs_is_busy"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:3740
+#: ../src/guestfs-actions.pod:3290

 #, no-wrap
 msgid ""
 " int\n"
 #, no-wrap
 msgid ""
 " int\n"

-" guestfs_luks_format_cipher (guestfs_h *g,\n"
-"                             const char *device,\n"
-"                             const char *key,\n"
-"                             int keyslot,\n"
-"                             const char *cipher);\n"
+" guestfs_is_busy (guestfs_h *g);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:3747
+#: ../src/guestfs-actions.pod:3293 ../fish/guestfish-actions.pod:2317

 msgid ""
 msgid ""

-"This command is the same as C<guestfs_luks_format> but it also allows you to "
-"set the C<cipher> used."
+"This returns true iff this handle is busy processing a command (in the "
+"C<BUSY> state)."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:3761
-msgid "guestfs_luks_kill_slot"
+#: ../src/guestfs-actions.pod:3302
+msgid "guestfs_is_chardev"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:3763
+#: ../src/guestfs-actions.pod:3304

 #, no-wrap
 msgid ""
 " int\n"
 #, no-wrap
 msgid ""
 " int\n"

-" guestfs_luks_kill_slot (guestfs_h *g,\n"
-"                         const char *device,\n"
-"                         const char *key,\n"
-"                         int keyslot);\n"
+" guestfs_is_chardev (guestfs_h *g,\n"
+"                     const char *path);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:3769 ../fish/guestfish-actions.pod:2583
+#: ../src/guestfs-actions.pod:3308 ../fish/guestfish-actions.pod:2326

 msgid ""
 msgid ""

-"This command deletes the key in key slot C<keyslot> from the encrypted LUKS "
-"device C<device>.  C<key> must be one of the I<other> keys."
+"This returns C<true> if and only if there is a character device with the "
+"given C<path> name."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:3781
-msgid "guestfs_luks_open"
+#: ../src/guestfs-actions.pod:3317
+msgid "guestfs_is_config"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:3783
+#: ../src/guestfs-actions.pod:3319

 #, no-wrap
 msgid ""
 " int\n"
 #, no-wrap
 msgid ""
 " int\n"

-" guestfs_luks_open (guestfs_h *g,\n"
-"                    const char *device,\n"
-"                    const char *key,\n"
-"                    const char *mapname);\n"
+" guestfs_is_config (guestfs_h *g);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:3789 ../fish/guestfish-actions.pod:2594
+#: ../src/guestfs-actions.pod:3322 ../fish/guestfish-actions.pod:2335

 msgid ""
 msgid ""

-"This command opens a block device which has been encrypted according to the "
-"Linux Unified Key Setup (LUKS) standard."
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:3792 ../fish/guestfish-actions.pod:2597
-msgid "C<device> is the encrypted block device or partition."
+"This returns true iff this handle is being configured (in the C<CONFIG> "
+"state)."

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:3794 ../fish/guestfish-actions.pod:2599
-msgid ""
-"The caller must supply one of the keys associated with the LUKS block "
-"device, in the C<key> parameter."
+# type: =head2
+#. type: =head2
+#: ../src/guestfs-actions.pod:3331
+msgid "guestfs_is_dir"

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:3797 ../fish/guestfish-actions.pod:2602
+# type: verbatim
+#. type: verbatim
+#: ../src/guestfs-actions.pod:3333
+#, no-wrap

 msgid ""
 msgid ""

-"This creates a new block device called C</dev/mapper/mapname>.  Reads and "
-"writes to this block device are decrypted from and encrypted to the "
-"underlying C<device> respectively."
+" int\n"
+" guestfs_is_dir (guestfs_h *g,\n"
+"                 const char *path);\n"
+"\n"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:3801
+#: ../src/guestfs-actions.pod:3337 ../fish/guestfish-actions.pod:2344

 msgid ""
 msgid ""

-"If this block device contains LVM volume groups, then calling "
-"C<guestfs_vgscan> followed by C<guestfs_vg_activate_all> will make them "
-"visible."
+"This returns C<true> if and only if there is a directory with the given "
+"C<path> name.  Note that it returns false for other objects like files."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:3813
-msgid "guestfs_luks_open_ro"
+#: ../src/guestfs-actions.pod:3347
+msgid "guestfs_is_fifo"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:3815
+#: ../src/guestfs-actions.pod:3349

 #, no-wrap
 msgid ""
 " int\n"
 #, no-wrap
 msgid ""
 " int\n"

-" guestfs_luks_open_ro (guestfs_h *g,\n"
-"                       const char *device,\n"
-"                       const char *key,\n"
-"                       const char *mapname);\n"
+" guestfs_is_fifo (guestfs_h *g,\n"
+"                  const char *path);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:3821
+#: ../src/guestfs-actions.pod:3353 ../fish/guestfish-actions.pod:2354

 msgid ""
 msgid ""

-"This is the same as C<guestfs_luks_open> except that a read-only mapping is "
-"created."
+"This returns C<true> if and only if there is a FIFO (named pipe)  with the "
+"given C<path> name."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:3832
-msgid "guestfs_lvcreate"
+#: ../src/guestfs-actions.pod:3362
+msgid "guestfs_is_file"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:3834
+#: ../src/guestfs-actions.pod:3364

 #, no-wrap
 msgid ""
 " int\n"
 #, no-wrap
 msgid ""
 " int\n"

-" guestfs_lvcreate (guestfs_h *g,\n"
-"                   const char *logvol,\n"
-"                   const char *volgroup,\n"
-"                   int mbytes);\n"
+" guestfs_is_file (guestfs_h *g,\n"
+"                  const char *path);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:3840 ../fish/guestfish-actions.pod:2627
+#: ../src/guestfs-actions.pod:3368 ../fish/guestfish-actions.pod:2363

 msgid ""
 msgid ""

-"This creates an LVM logical volume called C<logvol> on the volume group "
-"C<volgroup>, with C<size> megabytes."
+"This returns C<true> if and only if there is a regular file with the given "
+"C<path> name.  Note that it returns false for other objects like directories."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:3847
-msgid "guestfs_lvm_canonical_lv_name"
+#: ../src/guestfs-actions.pod:3378
+msgid "guestfs_is_launching"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:3849
+#: ../src/guestfs-actions.pod:3380

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" char *\n"
-" guestfs_lvm_canonical_lv_name (guestfs_h *g,\n"
-"                                const char *lvname);\n"
+" int\n"
+" guestfs_is_launching (guestfs_h *g);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:3853 ../fish/guestfish-actions.pod:2634
-msgid ""
-"This converts alternative naming schemes for LVs that you might find to the "
-"canonical name.  For example, C</dev/mapper/VG-LV> is converted to C</dev/VG/"
-"LV>."
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:3857 ../fish/guestfish-actions.pod:2638
+#: ../src/guestfs-actions.pod:3383 ../fish/guestfish-actions.pod:2373

 msgid ""
 msgid ""

-"This command returns an error if the C<lvname> parameter does not refer to a "
-"logical volume."
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:3860
-msgid "See also C<guestfs_is_lv>."
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:3865
-msgid "(Added in 1.5.24)"
+"This returns true iff this handle is launching the subprocess (in the "
+"C<LAUNCHING> state)."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:3867
-msgid "guestfs_lvm_clear_filter"
+#: ../src/guestfs-actions.pod:3392
+msgid "guestfs_is_lv"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:3869
+#: ../src/guestfs-actions.pod:3394

 #, no-wrap
 msgid ""
 " int\n"
 #, no-wrap
 msgid ""
 " int\n"

-" guestfs_lvm_clear_filter (guestfs_h *g);\n"
+" guestfs_is_lv (guestfs_h *g,\n"
+"                const char *device);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:3872
-msgid ""
-"This undoes the effect of C<guestfs_lvm_set_filter>.  LVM will be able to "
-"see every block device."
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:3875 ../src/guestfs-actions.pod:3917
-#: ../fish/guestfish-actions.pod:2650 ../fish/guestfish-actions.pod:2681
+#: ../src/guestfs-actions.pod:3398 ../fish/guestfish-actions.pod:2382

 msgid ""
 msgid ""

-"This command also clears the LVM cache and performs a volume group scan."
+"This command tests whether C<device> is a logical volume, and returns true "
+"iff this is the case."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:3882
-msgid "guestfs_lvm_remove_all"
+#: ../src/guestfs-actions.pod:3405
+msgid "guestfs_is_ready"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:3884
+#: ../src/guestfs-actions.pod:3407

 #, no-wrap
 msgid ""
 " int\n"
 #, no-wrap
 msgid ""
 " int\n"

-" guestfs_lvm_remove_all (guestfs_h *g);\n"
+" guestfs_is_ready (guestfs_h *g);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:3887 ../fish/guestfish-actions.pod:2657
+#: ../src/guestfs-actions.pod:3410 ../fish/guestfish-actions.pod:2389

 msgid ""
 msgid ""

-"This command removes all LVM logical volumes, volume groups and physical "
-"volumes."
+"This returns true iff this handle is ready to accept commands (in the "
+"C<READY> state)."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:3897
-msgid "guestfs_lvm_set_filter"
+#: ../src/guestfs-actions.pod:3419
+msgid "guestfs_is_socket"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:3899
+#: ../src/guestfs-actions.pod:3421

 #, no-wrap
 msgid ""
 " int\n"
 #, no-wrap
 msgid ""
 " int\n"

-" guestfs_lvm_set_filter (guestfs_h *g,\n"
-"                         char *const *devices);\n"
+" guestfs_is_socket (guestfs_h *g,\n"
+"                    const char *path);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:3903 ../fish/guestfish-actions.pod:2667
+#: ../src/guestfs-actions.pod:3425 ../fish/guestfish-actions.pod:2398

 msgid ""
 msgid ""

-"This sets the LVM device filter so that LVM will only be able to \"see\" the "
-"block devices in the list C<devices>, and will ignore all other attached "
-"block devices."
+"This returns C<true> if and only if there is a Unix domain socket with the "
+"given C<path> name."

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:3907 ../fish/guestfish-actions.pod:2671
-msgid ""
-"Where disk image(s) contain duplicate PVs or VGs, this command is useful to "
-"get LVM to ignore the duplicates, otherwise LVM can get confused.  Note also "
-"there are two types of duplication possible: either cloned PVs/VGs which "
-"have identical UUIDs; or VGs that are not cloned but just happen to have the "
-"same name.  In normal operation you cannot create this situation, but you "
-"can do it outside LVM, eg.  by cloning disk images or by bit twiddling "
-"inside the LVM metadata."
+# type: =head2
+#. type: =head2
+#: ../src/guestfs-actions.pod:3434
+msgid "guestfs_is_symlink"

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:3920 ../fish/guestfish-actions.pod:2684
-msgid "You can filter whole block devices or individual partitions."
+# type: verbatim
+#. type: verbatim
+#: ../src/guestfs-actions.pod:3436
+#, no-wrap
+msgid ""
+" int\n"
+" guestfs_is_symlink (guestfs_h *g,\n"
+"                     const char *path);\n"
+"\n"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:3922 ../fish/guestfish-actions.pod:2686
+#: ../src/guestfs-actions.pod:3440 ../fish/guestfish-actions.pod:2407

 msgid ""
 msgid ""

-"You cannot use this if any VG is currently in use (eg.  contains a mounted "
-"filesystem), even if you are not filtering out that VG."
+"This returns C<true> if and only if there is a symbolic link with the given "
+"C<path> name."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:3930
-msgid "guestfs_lvremove"
+#: ../src/guestfs-actions.pod:3449
+msgid "guestfs_kill_subprocess"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:3932
+#: ../src/guestfs-actions.pod:3451

 #, no-wrap
 msgid ""
 " int\n"
 #, no-wrap
 msgid ""
 " int\n"

-" guestfs_lvremove (guestfs_h *g,\n"
-"                   const char *device);\n"
+" guestfs_kill_subprocess (guestfs_h *g);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:3936 ../fish/guestfish-actions.pod:2694
-msgid ""
-"Remove an LVM logical volume C<device>, where C<device> is the path to the "
-"LV, such as C</dev/VG/LV>."
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:3939 ../fish/guestfish-actions.pod:2697
-msgid ""
-"You can also remove all LVs in a volume group by specifying the VG name, C</"
-"dev/VG>."
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:3944 ../src/guestfs-actions.pod:5180
-#: ../src/guestfs-actions.pod:6965
-msgid "(Added in 1.0.13)"
+#: ../src/guestfs-actions.pod:3454 ../fish/guestfish-actions.pod:2416
+msgid "This kills the qemu subprocess.  You should never need to call this."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:3946
-msgid "guestfs_lvrename"
+#: ../src/guestfs-actions.pod:3460
+msgid "guestfs_launch"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:3948
+#: ../src/guestfs-actions.pod:3462

 #, no-wrap
 msgid ""
 " int\n"
 #, no-wrap
 msgid ""
 " int\n"

-" guestfs_lvrename (guestfs_h *g,\n"
-"                   const char *logvol,\n"
-"                   const char *newlogvol);\n"
+" guestfs_launch (guestfs_h *g);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:3953 ../fish/guestfish-actions.pod:2704
-msgid "Rename a logical volume C<logvol> with the new name C<newlogvol>."
+#: ../src/guestfs-actions.pod:3465 ../fish/guestfish-actions.pod:2424
+msgid ""
+"Internally libguestfs is implemented by running a virtual machine using "
+"L<qemu(1)>."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:3957 ../src/guestfs-actions.pod:6978
-msgid "(Added in 1.0.83)"
+#: ../src/guestfs-actions.pod:3468 ../fish/guestfish-actions.pod:2427
+msgid ""
+"You should call this after configuring the handle (eg. adding drives) but "
+"before performing any actions."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:3959
-msgid "guestfs_lvresize"
+#: ../src/guestfs-actions.pod:3480
+msgid "guestfs_lchown"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:3961
+#: ../src/guestfs-actions.pod:3482

 #, no-wrap
 msgid ""
 " int\n"
 #, no-wrap
 msgid ""
 " int\n"

-" guestfs_lvresize (guestfs_h *g,\n"
-"                   const char *device,\n"
-"                   int mbytes);\n"
+" guestfs_lchown (guestfs_h *g,\n"
+"                 int owner,\n"
+"                 int group,\n"
+"                 const char *path);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:3966 ../fish/guestfish-actions.pod:2710
+#: ../src/guestfs-actions.pod:3488

 msgid ""
 msgid ""

-"This resizes (expands or shrinks) an existing LVM logical volume to "
-"C<mbytes>.  When reducing, data in the reduced part is lost."
+"Change the file owner to C<owner> and group to C<group>.  This is like "
+"C<guestfs_chown> but if C<path> is a symlink then the link itself is "
+"changed, not the target."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:3974
-msgid "guestfs_lvresize_free"
+#: ../src/guestfs-actions.pod:3500
+msgid "guestfs_lgetxattr"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:3976
+#: ../src/guestfs-actions.pod:3502

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" int\n"
-" guestfs_lvresize_free (guestfs_h *g,\n"
-"                        const char *lv,\n"
-"                        int percent);\n"
+" char *\n"
+" guestfs_lgetxattr (guestfs_h *g,\n"
+"                    const char *path,\n"
+"                    const char *name,\n"
+"                    size_t *size_r);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:3981 ../fish/guestfish-actions.pod:2718
+#: ../src/guestfs-actions.pod:3508 ../fish/guestfish-actions.pod:2446

 msgid ""
 msgid ""

-"This expands an existing logical volume C<lv> so that it fills C<pc>% of the "
-"remaining free space in the volume group.  Commonly you would call this with "
-"pc = 100 which expands the logical volume as much as possible, using all "
-"remaining free space in the volume group."
+"Get a single extended attribute from file C<path> named C<name>.  If C<path> "
+"is a symlink, then this call returns an extended attribute from the symlink."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:3989
-msgid "(Added in 1.3.3)"
+#: ../src/guestfs-actions.pod:3522
+msgid "See also: C<guestfs_lgetxattrs>, C<guestfs_getxattr>, L<attr(5)>."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:3991
-msgid "guestfs_lvs"
+#: ../src/guestfs-actions.pod:3530
+msgid "guestfs_lgetxattrs"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:3993
+#: ../src/guestfs-actions.pod:3532

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" char **\n"
-" guestfs_lvs (guestfs_h *g);\n"
+" struct guestfs_xattr_list *\n"
+" guestfs_lgetxattrs (guestfs_h *g,\n"
+"                     const char *path);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:3996 ../fish/guestfish-actions.pod:2728
-msgid ""
-"List all the logical volumes detected.  This is the equivalent of the L<lvs"
-"(8)> command."
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:3999 ../fish/guestfish-actions.pod:2731
+#: ../src/guestfs-actions.pod:3536

 msgid ""
 msgid ""

-"This returns a list of the logical volume device names (eg. C</dev/"
-"VolGroup00/LogVol00>)."
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:4002
-msgid "See also C<guestfs_lvs_full>, C<guestfs_list_filesystems>."
+"This is the same as C<guestfs_getxattrs>, but if C<path> is a symbolic link, "
+"then it returns the extended attributes of the link itself."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:4010
-msgid "guestfs_lvs_full"
+#: ../src/guestfs-actions.pod:3546
+msgid "guestfs_list_devices"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:4012
+#: ../src/guestfs-actions.pod:3548

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" struct guestfs_lvm_lv_list *\n"
-" guestfs_lvs_full (guestfs_h *g);\n"
+" char **\n"
+" guestfs_list_devices (guestfs_h *g);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:4015 ../fish/guestfish-actions.pod:2740
-msgid ""
-"List all the logical volumes detected.  This is the equivalent of the L<lvs"
-"(8)> command.  The \"full\" version includes all fields."
+#: ../src/guestfs-actions.pod:3551 ../fish/guestfish-actions.pod:2474
+msgid "List all the block devices."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:4018
-msgid ""
-"This function returns a C<struct guestfs_lvm_lv_list *>, or NULL if there "
-"was an error.  I<The caller must call C<guestfs_free_lvm_lv_list> after use>."
+#: ../src/guestfs-actions.pod:3553 ../fish/guestfish-actions.pod:2476
+msgid "The full block device names are returned, eg. C</dev/sda>."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:4024
-msgid "guestfs_lvuuid"
+#: ../src/guestfs-actions.pod:3563
+msgid "guestfs_list_filesystems"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:4026
+#: ../src/guestfs-actions.pod:3565

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" char *\n"
-" guestfs_lvuuid (guestfs_h *g,\n"
-"                 const char *device);\n"
+" char **\n"
+" guestfs_list_filesystems (guestfs_h *g);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:4030 ../fish/guestfish-actions.pod:2747
-msgid "This command returns the UUID of the LVM LV C<device>."
+#: ../src/guestfs-actions.pod:3568 ../fish/guestfish-actions.pod:2484
+msgid ""
+"This inspection command looks for filesystems on partitions, block devices "
+"and logical volumes, returning a list of devices containing filesystems and "
+"their type."

 msgstr ""
 
 msgstr ""
 

-# type: =head2
-#. type: =head2
-#: ../src/guestfs-actions.pod:4037
-msgid "guestfs_lxattrlist"
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:3572 ../fish/guestfish-actions.pod:2488
+msgid ""
+"The return value is a hash, where the keys are the devices containing "
+"filesystems, and the values are the filesystem types.  For example:"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:4039
+#: ../src/guestfs-actions.pod:3576 ../fish/guestfish-actions.pod:2492

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" struct guestfs_xattr_list *\n"
-" guestfs_lxattrlist (guestfs_h *g,\n"
-"                     const char *path,\n"
-"                     char *const *names);\n"
+" \"/dev/sda1\" => \"ntfs\"\n"
+" \"/dev/sda2\" => \"ext2\"\n"
+" \"/dev/vg_guest/lv_root\" => \"ext4\"\n"
+" \"/dev/vg_guest/lv_swap\" => \"swap\"\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:4044 ../fish/guestfish-actions.pod:2753
+#: ../src/guestfs-actions.pod:3581 ../fish/guestfish-actions.pod:2497

 msgid ""
 msgid ""

-"This call allows you to get the extended attributes of multiple files, where "
-"all files are in the directory C<path>.  C<names> is the list of files from "
-"this directory."
+"The value can have the special value \"unknown\", meaning the content of the "
+"device is undetermined or empty.  \"swap\" means a Linux swap partition."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:4048 ../fish/guestfish-actions.pod:2757
+#: ../src/guestfs-actions.pod:3585

 msgid ""
 msgid ""

-"On return you get a flat list of xattr structs which must be interpreted "
-"sequentially.  The first xattr struct always has a zero-length C<attrname>.  "
-"C<attrval> in this struct is zero-length to indicate there was an error "
-"doing C<lgetxattr> for this file, I<or> is a C string which is a decimal "
-"number (the number of following attributes for this file, which could be C<"
-"\"0\">).  Then after the first xattr struct are the zero or more attributes "
-"for the first named file.  This repeats for the second and subsequent files."
+"This command runs other libguestfs commands, which might include "
+"C<guestfs_mount> and C<guestfs_umount>, and therefore you should use this "
+"soon after launch and only when nothing is mounted."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:4058
+#: ../src/guestfs-actions.pod:3589

 msgid ""
 msgid ""

-"This call is intended for programs that want to efficiently list a directory "
-"contents without making many round-trips.  See also C<guestfs_lstatlist> for "
-"a similarly efficient call for getting standard stats.  Very long directory "
-"listings might cause the protocol message size to be exceeded, causing this "
-"call to fail.  The caller must split up such requests into smaller groups of "
-"names."
+"Not all of the filesystems returned will be mountable.  In particular, swap "
+"partitions are returned in the list.  Also this command does not check that "
+"each filesystem found is valid and mountable, and some filesystems might be "
+"mountable but require special options.  Filesystems may not all belong to a "
+"single logical operating system (use C<guestfs_inspect_os> to look for OSes)."
+msgstr ""
+
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:3603 ../src/guestfs-actions.pod:5224
+msgid "(Added in 1.5.15)"

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:4072
-msgid "guestfs_mkdir"
+#: ../src/guestfs-actions.pod:3605
+msgid "guestfs_list_partitions"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:4074
+#: ../src/guestfs-actions.pod:3607

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" int\n"
-" guestfs_mkdir (guestfs_h *g,\n"
-"                const char *path);\n"
+" char **\n"
+" guestfs_list_partitions (guestfs_h *g);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:4078 ../fish/guestfish-actions.pod:2779
-msgid "Create a directory named C<path>."
+#: ../src/guestfs-actions.pod:3610 ../fish/guestfish-actions.pod:2517
+msgid "List all the partitions detected on all block devices."
+msgstr ""
+
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:3612 ../fish/guestfish-actions.pod:2519
+msgid "The full partition device names are returned, eg. C</dev/sda1>"
+msgstr ""
+
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:3614
+msgid ""
+"This does not return logical volumes.  For that you will need to call "
+"C<guestfs_lvs>."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:4084
-msgid "guestfs_mkdir_mode"
+#: ../src/guestfs-actions.pod:3625
+msgid "guestfs_ll"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:4086
+#: ../src/guestfs-actions.pod:3627

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" int\n"
-" guestfs_mkdir_mode (guestfs_h *g,\n"
-"                     const char *path,\n"
-"                     int mode);\n"
+" char *\n"
+" guestfs_ll (guestfs_h *g,\n"
+"             const char *directory);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:4091 ../fish/guestfish-actions.pod:2785
+#: ../src/guestfs-actions.pod:3631 ../fish/guestfish-actions.pod:2530

 msgid ""
 msgid ""

-"This command creates a directory, setting the initial permissions of the "
-"directory to C<mode>."
+"List the files in C<directory> (relative to the root directory, there is no "
+"cwd) in the format of 'ls -la'."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:4094 ../fish/guestfish-actions.pod:2788
+#: ../src/guestfs-actions.pod:3634 ../fish/guestfish-actions.pod:2533

 msgid ""
 msgid ""

-"For common Linux filesystems, the actual mode which is set will be C<mode & "
-"~umask & 01777>.  Non-native-Linux filesystems may interpret the mode in "
-"other ways."
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:4098
-msgid "See also C<guestfs_mkdir>, C<guestfs_umask>"
+"This command is mostly useful for interactive sessions.  It is I<not> "
+"intended that you try to parse the output string."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:4104
-msgid "guestfs_mkdir_p"
+#: ../src/guestfs-actions.pod:3642
+msgid "guestfs_ln"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:4106
+#: ../src/guestfs-actions.pod:3644

 #, no-wrap
 msgid ""
 " int\n"
 #, no-wrap
 msgid ""
 " int\n"

-" guestfs_mkdir_p (guestfs_h *g,\n"
-"                  const char *path);\n"
+" guestfs_ln (guestfs_h *g,\n"
+"             const char *target,\n"
+"             const char *linkname);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:4110 ../fish/guestfish-actions.pod:2798
-msgid ""
-"Create a directory named C<path>, creating any parent directories as "
-"necessary.  This is like the C<mkdir -p> shell command."
+#: ../src/guestfs-actions.pod:3649 ../fish/guestfish-actions.pod:2540
+msgid "This command creates a hard link using the C<ln> command."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:4117
-msgid "guestfs_mkdtemp"
+#: ../src/guestfs-actions.pod:3655
+msgid "guestfs_ln_f"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:4119
+#: ../src/guestfs-actions.pod:3657

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" char *\n"
-" guestfs_mkdtemp (guestfs_h *g,\n"
-"                  const char *template);\n"
+" int\n"
+" guestfs_ln_f (guestfs_h *g,\n"
+"               const char *target,\n"
+"               const char *linkname);\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:4123 ../fish/guestfish-actions.pod:2805
-msgid ""
-"This command creates a temporary directory.  The C<template> parameter "
-"should be a full pathname for the temporary directory name with the final "
-"six characters being \"XXXXXX\"."
-msgstr ""
-
-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:4128 ../fish/guestfish-actions.pod:2810
+#: ../src/guestfs-actions.pod:3662 ../fish/guestfish-actions.pod:2546

 msgid ""
 msgid ""

-"For example: \"/tmp/myprogXXXXXX\" or \"/Temp/myprogXXXXXX\", the second one "
-"being suitable for Windows filesystems."
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:4131 ../fish/guestfish-actions.pod:2813
-msgid "The name of the temporary directory that was created is returned."
+"This command creates a hard link using the C<ln -f> command.  The I<-f> "
+"option removes the link (C<linkname>) if it exists already."

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:4134 ../fish/guestfish-actions.pod:2816
-msgid "The temporary directory is created with mode 0700 and is owned by root."
+# type: =head2
+#. type: =head2
+#: ../src/guestfs-actions.pod:3669
+msgid "guestfs_ln_s"

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:4137 ../fish/guestfish-actions.pod:2819
+# type: verbatim
+#. type: verbatim
+#: ../src/guestfs-actions.pod:3671
+#, no-wrap

 msgid ""
 msgid ""

-"The caller is responsible for deleting the temporary directory and its "
-"contents after use."
+" int\n"
+" guestfs_ln_s (guestfs_h *g,\n"
+"               const char *target,\n"
+"               const char *linkname);\n"
+"\n"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:4140 ../fish/guestfish-actions.pod:2822
-msgid "See also: L<mkdtemp(3)>"
+#: ../src/guestfs-actions.pod:3676 ../fish/guestfish-actions.pod:2553
+msgid "This command creates a symbolic link using the C<ln -s> command."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:4147
-msgid "guestfs_mke2fs_J"
+#: ../src/guestfs-actions.pod:3682
+msgid "guestfs_ln_sf"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:4149
+#: ../src/guestfs-actions.pod:3684

 #, no-wrap
 msgid ""
 " int\n"
 #, no-wrap
 msgid ""
 " int\n"

-" guestfs_mke2fs_J (guestfs_h *g,\n"
-"                   const char *fstype,\n"
-"                   int blocksize,\n"
-"                   const char *device,\n"
-"                   const char *journal);\n"
+" guestfs_ln_sf (guestfs_h *g,\n"
+"                const char *target,\n"
+"                const char *linkname);\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:4156 ../fish/guestfish-actions.pod:2828
+#: ../src/guestfs-actions.pod:3689 ../fish/guestfish-actions.pod:2559

 msgid ""
 msgid ""

-"This creates an ext2/3/4 filesystem on C<device> with an external journal on "
-"C<journal>.  It is equivalent to the command:"
+"This command creates a symbolic link using the C<ln -sf> command, The I<-f> "
+"option removes the link (C<linkname>) if it exists already."
+msgstr ""
+
+# type: =head2
+#. type: =head2
+#: ../src/guestfs-actions.pod:3696
+msgid "guestfs_lremovexattr"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:4160 ../fish/guestfish-actions.pod:2832
+#: ../src/guestfs-actions.pod:3698

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" mke2fs -t fstype -b blocksize -J device=<journal> <device>\n"
+" int\n"
+" guestfs_lremovexattr (guestfs_h *g,\n"
+"                       const char *xattr,\n"
+"                       const char *path);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:4162
-msgid "See also C<guestfs_mke2journal>."
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:4166 ../src/guestfs-actions.pod:4184
-#: ../src/guestfs-actions.pod:4202 ../src/guestfs-actions.pod:4218
-#: ../src/guestfs-actions.pod:4232 ../src/guestfs-actions.pod:4246
-#: ../src/guestfs-actions.pod:4305 ../src/guestfs-actions.pod:4570
-msgid "(Added in 1.0.68)"
+#: ../src/guestfs-actions.pod:3703
+msgid ""
+"This is the same as C<guestfs_removexattr>, but if C<path> is a symbolic "
+"link, then it removes an extended attribute of the link itself."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:4168
-msgid "guestfs_mke2fs_JL"
+#: ../src/guestfs-actions.pod:3711
+msgid "guestfs_ls"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:4170
+#: ../src/guestfs-actions.pod:3713

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" int\n"
-" guestfs_mke2fs_JL (guestfs_h *g,\n"
-"                    const char *fstype,\n"
-"                    int blocksize,\n"
-"                    const char *device,\n"
-"                    const char *label);\n"
+" char **\n"
+" guestfs_ls (guestfs_h *g,\n"
+"             const char *directory);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:4177 ../fish/guestfish-actions.pod:2840
+#: ../src/guestfs-actions.pod:3717 ../fish/guestfish-actions.pod:2574

 msgid ""
 msgid ""

-"This creates an ext2/3/4 filesystem on C<device> with an external journal on "
-"the journal labeled C<label>."
+"List the files in C<directory> (relative to the root directory, there is no "
+"cwd).  The '.' and '..' entries are not returned, but hidden files are shown."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:4180
-msgid "See also C<guestfs_mke2journal_L>."
+#: ../src/guestfs-actions.pod:3721
+msgid ""
+"This command is mostly useful for interactive sessions.  Programs should "
+"probably use C<guestfs_readdir> instead."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:4186
-msgid "guestfs_mke2fs_JU"
+#: ../src/guestfs-actions.pod:3730
+msgid "guestfs_lsetxattr"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:4188
+#: ../src/guestfs-actions.pod:3732

 #, no-wrap
 msgid ""
 " int\n"
 #, no-wrap
 msgid ""
 " int\n"

-" guestfs_mke2fs_JU (guestfs_h *g,\n"
-"                    const char *fstype,\n"
-"                    int blocksize,\n"
-"                    const char *device,\n"
-"                    const char *uuid);\n"
+" guestfs_lsetxattr (guestfs_h *g,\n"
+"                    const char *xattr,\n"
+"                    const char *val,\n"
+"                    int vallen,\n"
+"                    const char *path);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:4195 ../fish/guestfish-actions.pod:2849
+#: ../src/guestfs-actions.pod:3739

 msgid ""
 msgid ""

-"This creates an ext2/3/4 filesystem on C<device> with an external journal on "
-"the journal with UUID C<uuid>."
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:4198
-msgid "See also C<guestfs_mke2journal_U>."
+"This is the same as C<guestfs_setxattr>, but if C<path> is a symbolic link, "
+"then it sets an extended attribute of the link itself."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:4204
-msgid "guestfs_mke2journal"
+#: ../src/guestfs-actions.pod:3747
+msgid "guestfs_lstat"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:4206
+#: ../src/guestfs-actions.pod:3749

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" int\n"
-" guestfs_mke2journal (guestfs_h *g,\n"
-"                      int blocksize,\n"
-"                      const char *device);\n"
+" struct guestfs_stat *\n"
+" guestfs_lstat (guestfs_h *g,\n"
+"                const char *path);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:4211 ../fish/guestfish-actions.pod:2858
-msgid ""
-"This creates an ext2 external journal on C<device>.  It is equivalent to the "
-"command:"
+#: ../src/guestfs-actions.pod:3753 ../src/guestfs-actions.pod:6355
+#: ../fish/guestfish-actions.pod:2593 ../fish/guestfish-actions.pod:4306
+msgid "Returns file information for the given C<path>."

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../src/guestfs-actions.pod:4214 ../fish/guestfish-actions.pod:2861
-#, no-wrap
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:3755

 msgid ""
 msgid ""

-" mke2fs -O journal_dev -b blocksize device\n"
-"\n"
+"This is the same as C<guestfs_stat> except that if C<path> is a symbolic "
+"link, then the link is stat-ed, not the file it refers to."

 msgstr ""
 
 msgstr ""
 

-# type: =head2
-#. type: =head2
-#: ../src/guestfs-actions.pod:4220
-msgid "guestfs_mke2journal_L"
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:3759 ../fish/guestfish-actions.pod:2599
+msgid "This is the same as the C<lstat(2)> system call."

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../src/guestfs-actions.pod:4222
-#, no-wrap
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:3761 ../src/guestfs-actions.pod:6359

 msgid ""
 msgid ""

-" int\n"
-" guestfs_mke2journal_L (guestfs_h *g,\n"
-"                        int blocksize,\n"
-"                        const char *label,\n"
-"                        const char *device);\n"
-"\n"
+"This function returns a C<struct guestfs_stat *>, or NULL if there was an "
+"error.  I<The caller must call C<guestfs_free_stat> after use>."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:4228 ../fish/guestfish-actions.pod:2867
-msgid "This creates an ext2 external journal on C<device> with label C<label>."
+#: ../src/guestfs-actions.pod:3765 ../src/guestfs-actions.pod:6363
+#: ../src/guestfs-actions.pod:6381 ../src/guestfs-actions.pod:6762
+msgid "(Added in 0.9.2)"

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:4234
-msgid "guestfs_mke2journal_U"
+#: ../src/guestfs-actions.pod:3767
+msgid "guestfs_lstatlist"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:4236
+#: ../src/guestfs-actions.pod:3769

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" int\n"
-" guestfs_mke2journal_U (guestfs_h *g,\n"
-"                        int blocksize,\n"
-"                        const char *uuid,\n"
-"                        const char *device);\n"
+" struct guestfs_stat_list *\n"
+" guestfs_lstatlist (guestfs_h *g,\n"
+"                    const char *path,\n"
+"                    char *const *names);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:4242 ../fish/guestfish-actions.pod:2873
-msgid "This creates an ext2 external journal on C<device> with UUID C<uuid>."
+#: ../src/guestfs-actions.pod:3774
+msgid ""
+"This call allows you to perform the C<guestfs_lstat> operation on multiple "
+"files, where all files are in the directory C<path>.  C<names> is the list "
+"of files from this directory."
+msgstr ""
+
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:3778 ../fish/guestfish-actions.pod:2609
+msgid ""
+"On return you get a list of stat structs, with a one-to-one correspondence "
+"to the C<names> list.  If any name did not exist or could not be lstat'd, "
+"then the C<ino> field of that structure is set to C<-1>."
+msgstr ""
+
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:3783
+msgid ""
+"This call is intended for programs that want to efficiently list a directory "
+"contents without making many round-trips.  See also C<guestfs_lxattrlist> "
+"for a similarly efficient call for getting extended attributes.  Very long "
+"directory listings might cause the protocol message size to be exceeded, "
+"causing this call to fail.  The caller must split up such requests into "
+"smaller groups of names."
+msgstr ""
+
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:3791
+msgid ""
+"This function returns a C<struct guestfs_stat_list *>, or NULL if there was "
+"an error.  I<The caller must call C<guestfs_free_stat_list> after use>."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:4248
-msgid "guestfs_mkfifo"
+#: ../src/guestfs-actions.pod:3797
+msgid "guestfs_luks_add_key"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:4250
+#: ../src/guestfs-actions.pod:3799

 #, no-wrap
 msgid ""
 " int\n"
 #, no-wrap
 msgid ""
 " int\n"

-" guestfs_mkfifo (guestfs_h *g,\n"
-"                 int mode,\n"
-"                 const char *path);\n"
+" guestfs_luks_add_key (guestfs_h *g,\n"
+"                       const char *device,\n"
+"                       const char *key,\n"
+"                       const char *newkey,\n"
+"                       int keyslot);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:4255
+#: ../src/guestfs-actions.pod:3806 ../fish/guestfish-actions.pod:2626

 msgid ""
 msgid ""

-"This call creates a FIFO (named pipe) called C<path> with mode C<mode>.  It "
-"is just a convenient wrapper around C<guestfs_mknod>."
+"This command adds a new key on LUKS device C<device>.  C<key> is any "
+"existing key, and is used to access the device.  C<newkey> is the new key to "
+"add.  C<keyslot> is the key slot that will be replaced."
+msgstr ""
+
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:3811
+msgid ""
+"Note that if C<keyslot> already contains a key, then this command will "
+"fail.  You have to use C<guestfs_luks_kill_slot> first to remove that key."
+msgstr ""
+
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:3817 ../src/guestfs-actions.pod:3857
+#: ../src/guestfs-actions.pod:3880 ../src/guestfs-actions.pod:3900
+#: ../src/guestfs-actions.pod:3932 ../src/guestfs-actions.pod:3951
+msgid ""
+"This function takes a key or passphrase parameter which could contain "
+"sensitive material.  Read the section L</KEYS AND PASSPHRASES> for more "
+"information."
+msgstr ""
+
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:3821 ../src/guestfs-actions.pod:3861
+#: ../src/guestfs-actions.pod:3884 ../src/guestfs-actions.pod:3904
+msgid "(Added in 1.5.2)"

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:4265
-msgid "guestfs_mkfs"
+#: ../src/guestfs-actions.pod:3823
+msgid "guestfs_luks_close"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:4267
+#: ../src/guestfs-actions.pod:3825

 #, no-wrap
 msgid ""
 " int\n"
 #, no-wrap
 msgid ""
 " int\n"

-" guestfs_mkfs (guestfs_h *g,\n"
-"               const char *fstype,\n"
-"               const char *device);\n"
+" guestfs_luks_close (guestfs_h *g,\n"
+"                     const char *device);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:4272 ../fish/guestfish-actions.pod:2889
+#: ../src/guestfs-actions.pod:3829

 msgid ""
 msgid ""

-"This creates a filesystem on C<device> (usually a partition or LVM logical "
-"volume).  The filesystem type is C<fstype>, for example C<ext3>."
+"This closes a LUKS device that was created earlier by C<guestfs_luks_open> "
+"or C<guestfs_luks_open_ro>.  The C<device> parameter must be the name of the "
+"LUKS mapping device (ie. C</dev/mapper/mapname>) and I<not> the name of the "
+"underlying block device."
+msgstr ""
+
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:3837 ../src/guestfs-actions.pod:3936
+#: ../src/guestfs-actions.pod:3955 ../src/guestfs-actions.pod:4005
+#: ../src/guestfs-actions.pod:4053
+msgid "(Added in 1.5.1)"

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:4280
-msgid "guestfs_mkfs_b"
+#: ../src/guestfs-actions.pod:3839
+msgid "guestfs_luks_format"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:4282
+#: ../src/guestfs-actions.pod:3841

 #, no-wrap
 msgid ""
 " int\n"
 #, no-wrap
 msgid ""
 " int\n"

-" guestfs_mkfs_b (guestfs_h *g,\n"
-"                 const char *fstype,\n"
-"                 int blocksize,\n"
-"                 const char *device);\n"
+" guestfs_luks_format (guestfs_h *g,\n"
+"                      const char *device,\n"
+"                      const char *key,\n"
+"                      int keyslot);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:4288
-msgid ""
-"This call is similar to C<guestfs_mkfs>, but it allows you to control the "
-"block size of the resulting filesystem.  Supported block sizes depend on the "
-"filesystem type, but typically they are C<1024>, C<2048> or C<4096> only."
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:4293 ../src/guestfs-actions.pod:4336
-#: ../fish/guestfish-actions.pod:2902 ../fish/guestfish-actions.pod:2929
+#: ../src/guestfs-actions.pod:3847 ../fish/guestfish-actions.pod:2652

 msgid ""
 msgid ""

-"For VFAT and NTFS the C<blocksize> parameter is treated as the requested "
-"cluster size."
+"This command erases existing data on C<device> and formats the device as a "
+"LUKS encrypted device.  C<key> is the initial key, which is added to key "
+"slot C<slot>.  (LUKS supports 8 key slots, numbered 0-7)."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:4298 ../fish/guestfish-actions.pod:2905
+#: ../src/guestfs-actions.pod:3854 ../src/guestfs-actions.pod:3877
+#: ../src/guestfs-actions.pod:4017 ../src/guestfs-actions.pod:4975
+#: ../src/guestfs-actions.pod:5755 ../src/guestfs-actions.pod:6162
+#: ../src/guestfs-actions.pod:6192 ../src/guestfs-actions.pod:6225
+#: ../src/guestfs-actions.pod:7406 ../fish/guestfish-actions.pod:2660
+#: ../fish/guestfish-actions.pod:2673 ../fish/guestfish-actions.pod:2757
+#: ../fish/guestfish-actions.pod:3347 ../fish/guestfish-actions.pod:3867
+#: ../fish/guestfish-actions.pod:4177 ../fish/guestfish-actions.pod:4200
+#: ../fish/guestfish-actions.pod:4222 ../fish/guestfish-actions.pod:4951

 msgid ""
 msgid ""

-"This function is deprecated.  In new code, use the C<mkfs_opts> call instead."
+"B<This command is dangerous.  Without careful use you can easily destroy all "
+"your data>."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:4307
-msgid "guestfs_mkfs_opts"
+#: ../src/guestfs-actions.pod:3863
+msgid "guestfs_luks_format_cipher"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:4309
+#: ../src/guestfs-actions.pod:3865

 #, no-wrap
 msgid ""
 " int\n"
 #, no-wrap
 msgid ""
 " int\n"

-" guestfs_mkfs_opts (guestfs_h *g,\n"
-"                    const char *fstype,\n"
-"                    const char *device,\n"
-"                    ...);\n"
+" guestfs_luks_format_cipher (guestfs_h *g,\n"
+"                             const char *device,\n"
+"                             const char *key,\n"
+"                             int keyslot,\n"
+"                             const char *cipher);\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:3872
+msgid ""
+"This command is the same as C<guestfs_luks_format> but it also allows you to "
+"set the C<cipher> used."
+msgstr ""
+
+# type: =head2
+#. type: =head2
+#: ../src/guestfs-actions.pod:3886
+msgid "guestfs_luks_kill_slot"
+msgstr ""
+
+# type: verbatim

 #. type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:4320
+#: ../src/guestfs-actions.pod:3888

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" GUESTFS_MKFS_OPTS_BLOCKSIZE, int blocksize,\n"
-" GUESTFS_MKFS_OPTS_FEATURES, const char *features,\n"
+" int\n"
+" guestfs_luks_kill_slot (guestfs_h *g,\n"
+"                         const char *device,\n"
+"                         const char *key,\n"
+"                         int keyslot);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:4323 ../fish/guestfish-actions.pod:2916
+#: ../src/guestfs-actions.pod:3894 ../fish/guestfish-actions.pod:2680

 msgid ""
 msgid ""

-"This function creates a filesystem on C<device>.  The filesystem type is "
-"C<fstype>, for example C<ext3>."
+"This command deletes the key in key slot C<keyslot> from the encrypted LUKS "
+"device C<device>.  C<key> must be one of the I<other> keys."

 msgstr ""
 
 msgstr ""
 

-# type: =item
-#. type: =item
-#: ../src/guestfs-actions.pod:4330 ../fish/guestfish-actions.pod:2923
-msgid "C<blocksize>"
+# type: =head2
+#. type: =head2
+#: ../src/guestfs-actions.pod:3906
+msgid "guestfs_luks_open"

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:4332 ../fish/guestfish-actions.pod:2925
+# type: verbatim
+#. type: verbatim
+#: ../src/guestfs-actions.pod:3908
+#, no-wrap

 msgid ""
 msgid ""

-"The filesystem block size.  Supported block sizes depend on the filesystem "
-"type, but typically they are C<1024>, C<2048> or C<4096> for Linux ext2/3 "
-"filesystems."
+" int\n"
+" guestfs_luks_open (guestfs_h *g,\n"
+"                    const char *device,\n"
+"                    const char *key,\n"
+"                    const char *mapname);\n"
+"\n"

 msgstr ""
 
 msgstr ""
 

+# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:4339 ../fish/guestfish-actions.pod:2932
-msgid "For UFS block sizes, please see L<mkfs.ufs(8)>."
-msgstr ""
-
-#. type: =item
-#: ../src/guestfs-actions.pod:4341 ../fish/guestfish-actions.pod:2934
-msgid "C<features>"
+#: ../src/guestfs-actions.pod:3914 ../fish/guestfish-actions.pod:2691
+msgid ""
+"This command opens a block device which has been encrypted according to the "
+"Linux Unified Key Setup (LUKS) standard."

 msgstr ""
 
 msgstr ""
 

+# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:4343 ../fish/guestfish-actions.pod:2936
-msgid "This passes the C<-O> parameter to the external mkfs program."
+#: ../src/guestfs-actions.pod:3917 ../fish/guestfish-actions.pod:2694
+msgid "C<device> is the encrypted block device or partition."

 msgstr ""
 
 msgstr ""
 

+# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:4345 ../fish/guestfish-actions.pod:2938
+#: ../src/guestfs-actions.pod:3919 ../fish/guestfish-actions.pod:2696

 msgid ""
 msgid ""

-"For certain filesystem types, this allows extra filesystem features to be "
-"selected.  See L<mke2fs(8)> and L<mkfs.ufs(8)> for more details."
+"The caller must supply one of the keys associated with the LUKS block "
+"device, in the C<key> parameter."

 msgstr ""
 
 msgstr ""
 

+# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:4349 ../fish/guestfish-actions.pod:2942
+#: ../src/guestfs-actions.pod:3922 ../fish/guestfish-actions.pod:2699

 msgid ""
 msgid ""

-"You cannot use this optional parameter with the C<gfs> or C<gfs2> filesystem "
-"type."
+"This creates a new block device called C</dev/mapper/mapname>.  Reads and "
+"writes to this block device are decrypted from and encrypted to the "
+"underlying C<device> respectively."

 msgstr ""
 
 msgstr ""
 

+# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:4356
-msgid "(Added in 1.7.19)"
+#: ../src/guestfs-actions.pod:3926
+msgid ""
+"If this block device contains LVM volume groups, then calling "
+"C<guestfs_vgscan> followed by C<guestfs_vg_activate_all> will make them "
+"visible."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:4358
-msgid "guestfs_mkfs_opts_va"
+#: ../src/guestfs-actions.pod:3938
+msgid "guestfs_luks_open_ro"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:4360
+#: ../src/guestfs-actions.pod:3940

 #, no-wrap
 msgid ""
 " int\n"
 #, no-wrap
 msgid ""
 " int\n"

-" guestfs_mkfs_opts_va (guestfs_h *g,\n"
-"                       const char *fstype,\n"
+" guestfs_luks_open_ro (guestfs_h *g,\n"

 "                       const char *device,\n"
 "                       const char *device,\n"

-"                       va_list args);\n"
+"                       const char *key,\n"
+"                       const char *mapname);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:4366
-msgid "This is the \"va_list variant\" of L</guestfs_mkfs_opts>."
+#: ../src/guestfs-actions.pod:3946
+msgid ""
+"This is the same as C<guestfs_luks_open> except that a read-only mapping is "
+"created."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:4370
-msgid "guestfs_mkfs_opts_argv"
+#: ../src/guestfs-actions.pod:3957
+msgid "guestfs_lvcreate"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:4372
+#: ../src/guestfs-actions.pod:3959

 #, no-wrap
 msgid ""
 " int\n"
 #, no-wrap
 msgid ""
 " int\n"

-" guestfs_mkfs_opts_argv (guestfs_h *g,\n"
-"                         const char *fstype,\n"
-"                         const char *device,\n"
-"                         const struct guestfs_mkfs_opts_argv *optargs);\n"
+" guestfs_lvcreate (guestfs_h *g,\n"
+"                   const char *logvol,\n"
+"                   const char *volgroup,\n"
+"                   int mbytes);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:4378
-msgid "This is the \"argv variant\" of L</guestfs_mkfs_opts>."
+#: ../src/guestfs-actions.pod:3965 ../fish/guestfish-actions.pod:2724
+msgid ""
+"This creates an LVM logical volume called C<logvol> on the volume group "
+"C<volgroup>, with C<size> megabytes."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:4382
-msgid "guestfs_mkmountpoint"
+#: ../src/guestfs-actions.pod:3972
+msgid "guestfs_lvm_canonical_lv_name"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:4384
+#: ../src/guestfs-actions.pod:3974

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" int\n"
-" guestfs_mkmountpoint (guestfs_h *g,\n"
-"                       const char *exemptpath);\n"
+" char *\n"
+" guestfs_lvm_canonical_lv_name (guestfs_h *g,\n"
+"                                const char *lvname);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:4388
+#: ../src/guestfs-actions.pod:3978 ../fish/guestfish-actions.pod:2731

 msgid ""
 msgid ""

-"C<guestfs_mkmountpoint> and C<guestfs_rmmountpoint> are specialized calls "
-"that can be used to create extra mountpoints before mounting the first "
-"filesystem."
+"This converts alternative naming schemes for LVs that you might find to the "
+"canonical name.  For example, C</dev/mapper/VG-LV> is converted to C</dev/VG/"
+"LV>."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:4392 ../fish/guestfish-actions.pod:2957
+#: ../src/guestfs-actions.pod:3982 ../fish/guestfish-actions.pod:2735

 msgid ""
 msgid ""

-"These calls are I<only> necessary in some very limited circumstances, mainly "
-"the case where you want to mount a mix of unrelated and/or read-only "
-"filesystems together."
+"This command returns an error if the C<lvname> parameter does not refer to a "
+"logical volume."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:4396 ../fish/guestfish-actions.pod:2961
-msgid ""
-"For example, live CDs often contain a \"Russian doll\" nest of filesystems, "
-"an ISO outer layer, with a squashfs image inside, with an ext2/3 image "
-"inside that.  You can unpack this as follows in guestfish:"
-msgstr ""
-
-# type: verbatim
-#. type: verbatim
-#: ../src/guestfs-actions.pod:4401 ../fish/guestfish-actions.pod:2966
-#, no-wrap
-msgid ""
-" add-ro Fedora-11-i686-Live.iso\n"
-" run\n"
-" mkmountpoint /cd\n"
-" mkmountpoint /sqsh\n"
-" mkmountpoint /ext3fs\n"
-" mount /dev/sda /cd\n"
-" mount-loop /cd/LiveOS/squashfs.img /sqsh\n"
-" mount-loop /sqsh/LiveOS/ext3fs.img /ext3fs\n"
-"\n"
+#: ../src/guestfs-actions.pod:3985
+msgid "See also C<guestfs_is_lv>."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:4410 ../fish/guestfish-actions.pod:2975
-msgid "The inner filesystem is now unpacked under the /ext3fs mountpoint."
+#: ../src/guestfs-actions.pod:3990
+msgid "(Added in 1.5.24)"

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:4412
+# type: =head2
+#. type: =head2
+#: ../src/guestfs-actions.pod:3992
+msgid "guestfs_lvm_clear_filter"
+msgstr ""
+
+# type: verbatim
+#. type: verbatim
+#: ../src/guestfs-actions.pod:3994
+#, no-wrap

 msgid ""
 msgid ""

-"C<guestfs_mkmountpoint> is not compatible with C<guestfs_umount_all>.  You "
-"may get unexpected errors if you try to mix these calls.  It is safest to "
-"manually unmount filesystems and remove mountpoints after use."
+" int\n"
+" guestfs_lvm_clear_filter (guestfs_h *g);\n"
+"\n"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:4416
+#: ../src/guestfs-actions.pod:3997

 msgid ""
 msgid ""

-"C<guestfs_umount_all> unmounts filesystems by sorting the paths longest "
-"first, so for this to work for manual mountpoints, you must ensure that the "
-"innermost mountpoints have the longest pathnames, as in the example code "
-"above."
+"This undoes the effect of C<guestfs_lvm_set_filter>.  LVM will be able to "
+"see every block device."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:4421 ../fish/guestfish-actions.pod:2986
+#: ../src/guestfs-actions.pod:4000 ../src/guestfs-actions.pod:4042
+#: ../fish/guestfish-actions.pod:2747 ../fish/guestfish-actions.pod:2778

 msgid ""
 msgid ""

-"For more details see L<https://bugzilla.redhat.com/show_bug.cgi?id=599503>"
+"This command also clears the LVM cache and performs a volume group scan."

 msgstr ""
 
 msgstr ""
 

-#. type: textblock
-#: ../src/guestfs-actions.pod:4423
+# type: =head2
+#. type: =head2
+#: ../src/guestfs-actions.pod:4007
+msgid "guestfs_lvm_remove_all"
+msgstr ""
+
+# type: verbatim
+#. type: verbatim
+#: ../src/guestfs-actions.pod:4009
+#, no-wrap

 msgid ""
 msgid ""

-"Autosync [see C<guestfs_set_autosync>, this is set by default on handles] "
-"can cause C<guestfs_umount_all> to be called when the handle is closed which "
-"can also trigger these issues."
+" int\n"
+" guestfs_lvm_remove_all (guestfs_h *g);\n"
+"\n"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:4429 ../src/guestfs-actions.pod:4688
-#: ../src/guestfs-actions.pod:5598
-msgid "(Added in 1.0.62)"
+#: ../src/guestfs-actions.pod:4012 ../fish/guestfish-actions.pod:2754
+msgid ""
+"This command removes all LVM logical volumes, volume groups and physical "
+"volumes."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:4431
-msgid "guestfs_mknod"
+#: ../src/guestfs-actions.pod:4022
+msgid "guestfs_lvm_set_filter"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:4433
+#: ../src/guestfs-actions.pod:4024

 #, no-wrap
 msgid ""
 " int\n"
 #, no-wrap
 msgid ""
 " int\n"

-" guestfs_mknod (guestfs_h *g,\n"
-"                int mode,\n"
-"                int devmajor,\n"
-"                int devminor,\n"
-"                const char *path);\n"
+" guestfs_lvm_set_filter (guestfs_h *g,\n"
+"                         char *const *devices);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:4440 ../fish/guestfish-actions.pod:2996
+#: ../src/guestfs-actions.pod:4028 ../fish/guestfish-actions.pod:2764

 msgid ""
 msgid ""

-"This call creates block or character special devices, or named pipes (FIFOs)."
+"This sets the LVM device filter so that LVM will only be able to \"see\" the "
+"block devices in the list C<devices>, and will ignore all other attached "
+"block devices."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:4443 ../fish/guestfish-actions.pod:2999
+#: ../src/guestfs-actions.pod:4032 ../fish/guestfish-actions.pod:2768

 msgid ""
 msgid ""

-"The C<mode> parameter should be the mode, using the standard constants.  "
-"C<devmajor> and C<devminor> are the device major and minor numbers, only "
-"used when creating block and character special devices."
+"Where disk image(s) contain duplicate PVs or VGs, this command is useful to "
+"get LVM to ignore the duplicates, otherwise LVM can get confused.  Note also "
+"there are two types of duplication possible: either cloned PVs/VGs which "
+"have identical UUIDs; or VGs that are not cloned but just happen to have the "
+"same name.  In normal operation you cannot create this situation, but you "
+"can do it outside LVM, eg.  by cloning disk images or by bit twiddling "
+"inside the LVM metadata."
+msgstr ""
+
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:4045 ../fish/guestfish-actions.pod:2781
+msgid "You can filter whole block devices or individual partitions."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:4448
+#: ../src/guestfs-actions.pod:4047 ../fish/guestfish-actions.pod:2783

 msgid ""
 msgid ""

-"Note that, just like L<mknod(2)>, the mode must be bitwise OR'd with "
-"S_IFBLK, S_IFCHR, S_IFIFO or S_IFSOCK (otherwise this call just creates a "
-"regular file).  These constants are available in the standard Linux header "
-"files, or you can use C<guestfs_mknod_b>, C<guestfs_mknod_c> or "
-"C<guestfs_mkfifo> which are wrappers around this command which bitwise OR in "
-"the appropriate constant for you."
+"You cannot use this if any VG is currently in use (eg.  contains a mounted "
+"filesystem), even if you are not filtering out that VG."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:4462
-msgid "guestfs_mknod_b"
+#: ../src/guestfs-actions.pod:4055
+msgid "guestfs_lvremove"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:4464
+#: ../src/guestfs-actions.pod:4057

 #, no-wrap
 msgid ""
 " int\n"
 #, no-wrap
 msgid ""
 " int\n"

-" guestfs_mknod_b (guestfs_h *g,\n"
-"                  int mode,\n"
-"                  int devmajor,\n"
-"                  int devminor,\n"
-"                  const char *path);\n"
+" guestfs_lvremove (guestfs_h *g,\n"
+"                   const char *device);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:4471
+#: ../src/guestfs-actions.pod:4061 ../fish/guestfish-actions.pod:2791

 msgid ""
 msgid ""

-"This call creates a block device node called C<path> with mode C<mode> and "
-"device major/minor C<devmajor> and C<devminor>.  It is just a convenient "
-"wrapper around C<guestfs_mknod>."
+"Remove an LVM logical volume C<device>, where C<device> is the path to the "
+"LV, such as C</dev/VG/LV>."
+msgstr ""
+
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:4064 ../fish/guestfish-actions.pod:2794
+msgid ""
+"You can also remove all LVs in a volume group by specifying the VG name, C</"
+"dev/VG>."
+msgstr ""
+
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:4069 ../src/guestfs-actions.pod:5321
+#: ../src/guestfs-actions.pod:7138
+msgid "(Added in 1.0.13)"

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:4481
-msgid "guestfs_mknod_c"
+#: ../src/guestfs-actions.pod:4071
+msgid "guestfs_lvrename"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:4483
+#: ../src/guestfs-actions.pod:4073

 #, no-wrap
 msgid ""
 " int\n"
 #, no-wrap
 msgid ""
 " int\n"

-" guestfs_mknod_c (guestfs_h *g,\n"
-"                  int mode,\n"
-"                  int devmajor,\n"
-"                  int devminor,\n"
-"                  const char *path);\n"
+" guestfs_lvrename (guestfs_h *g,\n"
+"                   const char *logvol,\n"
+"                   const char *newlogvol);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:4490
-msgid ""
-"This call creates a char device node called C<path> with mode C<mode> and "
-"device major/minor C<devmajor> and C<devminor>.  It is just a convenient "
-"wrapper around C<guestfs_mknod>."
+#: ../src/guestfs-actions.pod:4078 ../fish/guestfish-actions.pod:2801
+msgid "Rename a logical volume C<logvol> with the new name C<newlogvol>."
+msgstr ""
+
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:4082 ../src/guestfs-actions.pod:7151
+msgid "(Added in 1.0.83)"

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:4500
-msgid "guestfs_mkswap"
+#: ../src/guestfs-actions.pod:4084
+msgid "guestfs_lvresize"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:4502
+#: ../src/guestfs-actions.pod:4086

 #, no-wrap
 msgid ""
 " int\n"
 #, no-wrap
 msgid ""
 " int\n"

-" guestfs_mkswap (guestfs_h *g,\n"
-"                 const char *device);\n"
+" guestfs_lvresize (guestfs_h *g,\n"
+"                   const char *device,\n"
+"                   int mbytes);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:4506 ../fish/guestfish-actions.pod:3038
-msgid "Create a swap partition on C<device>."
+#: ../src/guestfs-actions.pod:4091 ../fish/guestfish-actions.pod:2807
+msgid ""
+"This resizes (expands or shrinks) an existing LVM logical volume to "
+"C<mbytes>.  When reducing, data in the reduced part is lost."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:4512
-msgid "guestfs_mkswap_L"
+#: ../src/guestfs-actions.pod:4099
+msgid "guestfs_lvresize_free"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:4514
+#: ../src/guestfs-actions.pod:4101

 #, no-wrap
 msgid ""
 " int\n"
 #, no-wrap
 msgid ""
 " int\n"

-" guestfs_mkswap_L (guestfs_h *g,\n"
-"                   const char *label,\n"
-"                   const char *device);\n"
+" guestfs_lvresize_free (guestfs_h *g,\n"
+"                        const char *lv,\n"
+"                        int percent);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:4519 ../fish/guestfish-actions.pod:3044
-msgid "Create a swap partition on C<device> with label C<label>."
+#: ../src/guestfs-actions.pod:4106 ../fish/guestfish-actions.pod:2815
+msgid ""
+"This expands an existing logical volume C<lv> so that it fills C<pc>% of the "
+"remaining free space in the volume group.  Commonly you would call this with "
+"pc = 100 which expands the logical volume as much as possible, using all "
+"remaining free space in the volume group."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:4521 ../fish/guestfish-actions.pod:3046
-msgid ""
-"Note that you cannot attach a swap label to a block device (eg. C</dev/"
-"sda>), just to a partition.  This appears to be a limitation of the kernel "
-"or swap tools."
+#: ../src/guestfs-actions.pod:4114
+msgid "(Added in 1.3.3)"

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:4529
-msgid "guestfs_mkswap_U"
+#: ../src/guestfs-actions.pod:4116
+msgid "guestfs_lvs"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:4531
+#: ../src/guestfs-actions.pod:4118

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" int\n"
-" guestfs_mkswap_U (guestfs_h *g,\n"
-"                   const char *uuid,\n"
-"                   const char *device);\n"
+" char **\n"
+" guestfs_lvs (guestfs_h *g);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:4536 ../fish/guestfish-actions.pod:3054
-msgid "Create a swap partition on C<device> with UUID C<uuid>."
+#: ../src/guestfs-actions.pod:4121 ../fish/guestfish-actions.pod:2825
+msgid ""
+"List all the logical volumes detected.  This is the equivalent of the L<lvs"
+"(8)> command."
+msgstr ""
+
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:4124 ../fish/guestfish-actions.pod:2828
+msgid ""
+"This returns a list of the logical volume device names (eg. C</dev/"
+"VolGroup00/LogVol00>)."
+msgstr ""
+
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:4127
+msgid "See also C<guestfs_lvs_full>, C<guestfs_list_filesystems>."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:4542
-msgid "guestfs_mkswap_file"
+#: ../src/guestfs-actions.pod:4135
+msgid "guestfs_lvs_full"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:4544
+#: ../src/guestfs-actions.pod:4137

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" int\n"
-" guestfs_mkswap_file (guestfs_h *g,\n"
-"                      const char *path);\n"
+" struct guestfs_lvm_lv_list *\n"
+" guestfs_lvs_full (guestfs_h *g);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:4548 ../fish/guestfish-actions.pod:3060
-msgid "Create a swap file."
+#: ../src/guestfs-actions.pod:4140 ../fish/guestfish-actions.pod:2837
+msgid ""
+"List all the logical volumes detected.  This is the equivalent of the L<lvs"
+"(8)> command.  The \"full\" version includes all fields."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:4550
+#: ../src/guestfs-actions.pod:4143

 msgid ""
 msgid ""

-"This command just writes a swap file signature to an existing file.  To "
-"create the file itself, use something like C<guestfs_fallocate>."
+"This function returns a C<struct guestfs_lvm_lv_list *>, or NULL if there "
+"was an error.  I<The caller must call C<guestfs_free_lvm_lv_list> after use>."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:4557
-msgid "guestfs_modprobe"
+#: ../src/guestfs-actions.pod:4149
+msgid "guestfs_lvuuid"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:4559
+#: ../src/guestfs-actions.pod:4151

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" int\n"
-" guestfs_modprobe (guestfs_h *g,\n"
-"                   const char *modulename);\n"
+" char *\n"
+" guestfs_lvuuid (guestfs_h *g,\n"
+"                 const char *device);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:4563 ../fish/guestfish-actions.pod:3069
-msgid "This loads a kernel module in the appliance."
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:4565 ../fish/guestfish-actions.pod:3071
-msgid ""
-"The kernel module must have been whitelisted when libguestfs was built (see "
-"C<appliance/kmod.whitelist.in> in the source)."
+#: ../src/guestfs-actions.pod:4155 ../fish/guestfish-actions.pod:2844
+msgid "This command returns the UUID of the LVM LV C<device>."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:4572
-msgid "guestfs_mount"
+#: ../src/guestfs-actions.pod:4162
+msgid "guestfs_lxattrlist"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:4574
+#: ../src/guestfs-actions.pod:4164

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" int\n"
-" guestfs_mount (guestfs_h *g,\n"
-"                const char *device,\n"
-"                const char *mountpoint);\n"
+" struct guestfs_xattr_list *\n"
+" guestfs_lxattrlist (guestfs_h *g,\n"
+"                     const char *path,\n"
+"                     char *const *names);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:4579 ../fish/guestfish-actions.pod:3078
+#: ../src/guestfs-actions.pod:4169 ../fish/guestfish-actions.pod:2850

 msgid ""
 msgid ""

-"Mount a guest disk at a position in the filesystem.  Block devices are named "
-"C</dev/sda>, C</dev/sdb> and so on, as they were added to the guest.  If "
-"those block devices contain partitions, they will have the usual names (eg. "
-"C</dev/sda1>).  Also LVM C</dev/VG/LV>-style names can be used."
+"This call allows you to get the extended attributes of multiple files, where "
+"all files are in the directory C<path>.  C<names> is the list of files from "
+"this directory."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:4585 ../fish/guestfish-actions.pod:3084
+#: ../src/guestfs-actions.pod:4173 ../fish/guestfish-actions.pod:2854

 msgid ""
 msgid ""

-"The rules are the same as for L<mount(2)>: A filesystem must first be "
-"mounted on C</> before others can be mounted.  Other filesystems can only be "
-"mounted on directories which already exist."
+"On return you get a flat list of xattr structs which must be interpreted "
+"sequentially.  The first xattr struct always has a zero-length C<attrname>.  "
+"C<attrval> in this struct is zero-length to indicate there was an error "
+"doing C<lgetxattr> for this file, I<or> is a C string which is a decimal "
+"number (the number of following attributes for this file, which could be C<"
+"\"0\">).  Then after the first xattr struct are the zero or more attributes "
+"for the first named file.  This repeats for the second and subsequent files."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:4590 ../fish/guestfish-actions.pod:3089
+#: ../src/guestfs-actions.pod:4183

 msgid ""
 msgid ""

-"The mounted filesystem is writable, if we have sufficient permissions on the "
-"underlying device."
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:4593
-msgid ""
-"B<Important note:> When you use this call, the filesystem options C<sync> "
-"and C<noatime> are set implicitly.  This was originally done because we "
-"thought it would improve reliability, but it turns out that I<-o sync> has a "
-"very large negative performance impact and negligible effect on "
-"reliability.  Therefore we recommend that you avoid using C<guestfs_mount> "
-"in any code that needs performance, and instead use C<guestfs_mount_options> "
-"(use an empty string for the first parameter if you don't want any options)."
+"This call is intended for programs that want to efficiently list a directory "
+"contents without making many round-trips.  See also C<guestfs_lstatlist> for "
+"a similarly efficient call for getting standard stats.  Very long directory "
+"listings might cause the protocol message size to be exceeded, causing this "
+"call to fail.  The caller must split up such requests into smaller groups of "
+"names."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:4607
-msgid "guestfs_mount_loop"
+#: ../src/guestfs-actions.pod:4197
+msgid "guestfs_mkdir"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:4609
+#: ../src/guestfs-actions.pod:4199

 #, no-wrap
 msgid ""
 " int\n"
 #, no-wrap
 msgid ""
 " int\n"

-" guestfs_mount_loop (guestfs_h *g,\n"
-"                     const char *file,\n"
-"                     const char *mountpoint);\n"
+" guestfs_mkdir (guestfs_h *g,\n"
+"                const char *path);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:4614 ../fish/guestfish-actions.pod:3106
-msgid ""
-"This command lets you mount C<file> (a filesystem image in a file) on a "
-"mount point.  It is entirely equivalent to the command C<mount -o loop file "
-"mountpoint>."
+#: ../src/guestfs-actions.pod:4203 ../fish/guestfish-actions.pod:2876
+msgid "Create a directory named C<path>."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:4622
-msgid "guestfs_mount_options"
+#: ../src/guestfs-actions.pod:4209
+msgid "guestfs_mkdir_mode"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:4624
+#: ../src/guestfs-actions.pod:4211

 #, no-wrap
 msgid ""
 " int\n"
 #, no-wrap
 msgid ""
 " int\n"

-" guestfs_mount_options (guestfs_h *g,\n"
-"                        const char *options,\n"
-"                        const char *device,\n"
-"                        const char *mountpoint);\n"
+" guestfs_mkdir_mode (guestfs_h *g,\n"
+"                     const char *path,\n"
+"                     int mode);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:4630
+#: ../src/guestfs-actions.pod:4216 ../fish/guestfish-actions.pod:2882

 msgid ""
 msgid ""

-"This is the same as the C<guestfs_mount> command, but it allows you to set "
-"the mount options as for the L<mount(8)> I<-o> flag."
+"This command creates a directory, setting the initial permissions of the "
+"directory to C<mode>."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:4634 ../fish/guestfish-actions.pod:3118
+#: ../src/guestfs-actions.pod:4219 ../fish/guestfish-actions.pod:2885

 msgid ""
 msgid ""

-"If the C<options> parameter is an empty string, then no options are passed "
-"(all options default to whatever the filesystem uses)."
+"For common Linux filesystems, the actual mode which is set will be C<mode & "
+"~umask & 01777>.  Non-native-Linux filesystems may interpret the mode in "
+"other ways."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:4640 ../src/guestfs-actions.pod:4654
-#: ../src/guestfs-actions.pod:4671
-msgid "(Added in 1.0.10)"
+#: ../src/guestfs-actions.pod:4223
+msgid "See also C<guestfs_mkdir>, C<guestfs_umask>"

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:4642
-msgid "guestfs_mount_ro"
+#: ../src/guestfs-actions.pod:4229
+msgid "guestfs_mkdir_p"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:4644
+#: ../src/guestfs-actions.pod:4231

 #, no-wrap
 msgid ""
 " int\n"
 #, no-wrap
 msgid ""
 " int\n"

-" guestfs_mount_ro (guestfs_h *g,\n"
-"                   const char *device,\n"
-"                   const char *mountpoint);\n"
+" guestfs_mkdir_p (guestfs_h *g,\n"
+"                  const char *path);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:4649
+#: ../src/guestfs-actions.pod:4235 ../fish/guestfish-actions.pod:2895

 msgid ""
 msgid ""

-"This is the same as the C<guestfs_mount> command, but it mounts the "
-"filesystem with the read-only (I<-o ro>) flag."
+"Create a directory named C<path>, creating any parent directories as "
+"necessary.  This is like the C<mkdir -p> shell command."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:4656
-msgid "guestfs_mount_vfs"
+#: ../src/guestfs-actions.pod:4242
+msgid "guestfs_mkdtemp"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:4658
+#: ../src/guestfs-actions.pod:4244

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" int\n"
-" guestfs_mount_vfs (guestfs_h *g,\n"
-"                    const char *options,\n"
-"                    const char *vfstype,\n"
-"                    const char *device,\n"
-"                    const char *mountpoint);\n"
+" char *\n"
+" guestfs_mkdtemp (guestfs_h *g,\n"
+"                  const char *template);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:4665
+#: ../src/guestfs-actions.pod:4248 ../fish/guestfish-actions.pod:2902

 msgid ""
 msgid ""

-"This is the same as the C<guestfs_mount> command, but it allows you to set "
-"both the mount options and the vfstype as for the L<mount(8)> I<-o> and I<-"
-"t> flags."
+"This command creates a temporary directory.  The C<template> parameter "
+"should be a full pathname for the temporary directory name with the final "
+"six characters being \"XXXXXX\"."

 msgstr ""
 
 msgstr ""
 

-# type: =head2
-#. type: =head2
-#: ../src/guestfs-actions.pod:4673
-msgid "guestfs_mountpoints"
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:4253 ../fish/guestfish-actions.pod:2907
+msgid ""
+"For example: \"/tmp/myprogXXXXXX\" or \"/Temp/myprogXXXXXX\", the second one "
+"being suitable for Windows filesystems."

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../src/guestfs-actions.pod:4675
-#, no-wrap
-msgid ""
-" char **\n"
-" guestfs_mountpoints (guestfs_h *g);\n"
-"\n"
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:4256 ../fish/guestfish-actions.pod:2910
+msgid "The name of the temporary directory that was created is returned."
+msgstr ""
+
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:4259 ../fish/guestfish-actions.pod:2913
+msgid "The temporary directory is created with mode 0700 and is owned by root."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:4678
+#: ../src/guestfs-actions.pod:4262 ../fish/guestfish-actions.pod:2916

 msgid ""
 msgid ""

-"This call is similar to C<guestfs_mounts>.  That call returns a list of "
-"devices.  This one returns a hash table (map) of device name to directory "
-"where the device is mounted."
+"The caller is responsible for deleting the temporary directory and its "
+"contents after use."
+msgstr ""
+
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:4265 ../fish/guestfish-actions.pod:2919
+msgid "See also: L<mkdtemp(3)>"

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:4690
-msgid "guestfs_mounts"
+#: ../src/guestfs-actions.pod:4272
+msgid "guestfs_mke2fs_J"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:4692
+#: ../src/guestfs-actions.pod:4274

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" char **\n"
-" guestfs_mounts (guestfs_h *g);\n"
+" int\n"
+" guestfs_mke2fs_J (guestfs_h *g,\n"
+"                   const char *fstype,\n"
+"                   int blocksize,\n"
+"                   const char *device,\n"
+"                   const char *journal);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:4695 ../fish/guestfish-actions.pod:3149
+#: ../src/guestfs-actions.pod:4281 ../fish/guestfish-actions.pod:2925

 msgid ""
 msgid ""

-"This returns the list of currently mounted filesystems.  It returns the list "
-"of devices (eg. C</dev/sda1>, C</dev/VG/LV>)."
+"This creates an ext2/3/4 filesystem on C<device> with an external journal on "
+"C<journal>.  It is equivalent to the command:"
+msgstr ""
+
+# type: verbatim
+#. type: verbatim
+#: ../src/guestfs-actions.pod:4285 ../fish/guestfish-actions.pod:2929
+#, no-wrap
+msgid ""
+" mke2fs -t fstype -b blocksize -J device=<journal> <device>\n"
+"\n"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:4698 ../fish/guestfish-actions.pod:3152
-msgid "Some internal mounts are not shown."
+#: ../src/guestfs-actions.pod:4287
+msgid "See also C<guestfs_mke2journal>."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:4700
-msgid "See also: C<guestfs_mountpoints>"
+#: ../src/guestfs-actions.pod:4291 ../src/guestfs-actions.pod:4309
+#: ../src/guestfs-actions.pod:4327 ../src/guestfs-actions.pod:4343
+#: ../src/guestfs-actions.pod:4357 ../src/guestfs-actions.pod:4371
+#: ../src/guestfs-actions.pod:4430 ../src/guestfs-actions.pod:4695
+msgid "(Added in 1.0.68)"

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:4708
-msgid "guestfs_mv"
+#: ../src/guestfs-actions.pod:4293
+msgid "guestfs_mke2fs_JL"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:4710
+#: ../src/guestfs-actions.pod:4295

 #, no-wrap
 msgid ""
 " int\n"
 #, no-wrap
 msgid ""
 " int\n"

-" guestfs_mv (guestfs_h *g,\n"
-"             const char *src,\n"
-"             const char *dest);\n"
+" guestfs_mke2fs_JL (guestfs_h *g,\n"
+"                    const char *fstype,\n"
+"                    int blocksize,\n"
+"                    const char *device,\n"
+"                    const char *label);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:4715 ../fish/guestfish-actions.pod:3160
+#: ../src/guestfs-actions.pod:4302 ../fish/guestfish-actions.pod:2937

 msgid ""
 msgid ""

-"This moves a file from C<src> to C<dest> where C<dest> is either a "
-"destination filename or destination directory."
+"This creates an ext2/3/4 filesystem on C<device> with an external journal on "
+"the journal labeled C<label>."
+msgstr ""
+
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:4305
+msgid "See also C<guestfs_mke2journal_L>."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:4722
-msgid "guestfs_ntfs_3g_probe"
+#: ../src/guestfs-actions.pod:4311
+msgid "guestfs_mke2fs_JU"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:4724
+#: ../src/guestfs-actions.pod:4313

 #, no-wrap
 msgid ""
 " int\n"
 #, no-wrap
 msgid ""
 " int\n"

-" guestfs_ntfs_3g_probe (guestfs_h *g,\n"
-"                        int rw,\n"
-"                        const char *device);\n"
+" guestfs_mke2fs_JU (guestfs_h *g,\n"
+"                    const char *fstype,\n"
+"                    int blocksize,\n"
+"                    const char *device,\n"
+"                    const char *uuid);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:4729 ../fish/guestfish-actions.pod:3167
+#: ../src/guestfs-actions.pod:4320 ../fish/guestfish-actions.pod:2946

 msgid ""
 msgid ""

-"This command runs the L<ntfs-3g.probe(8)> command which probes an NTFS "
-"C<device> for mountability.  (Not all NTFS volumes can be mounted read-"
-"write, and some cannot be mounted at all)."
+"This creates an ext2/3/4 filesystem on C<device> with an external journal on "
+"the journal with UUID C<uuid>."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:4733 ../fish/guestfish-actions.pod:3171
+#: ../src/guestfs-actions.pod:4323
+msgid "See also C<guestfs_mke2journal_U>."
+msgstr ""
+
+# type: =head2
+#. type: =head2
+#: ../src/guestfs-actions.pod:4329
+msgid "guestfs_mke2journal"
+msgstr ""
+
+# type: verbatim
+#. type: verbatim
+#: ../src/guestfs-actions.pod:4331
+#, no-wrap

 msgid ""
 msgid ""

-"C<rw> is a boolean flag.  Set it to true if you want to test if the volume "
-"can be mounted read-write.  Set it to false if you want to test if the "
-"volume can be mounted read-only."
+" int\n"
+" guestfs_mke2journal (guestfs_h *g,\n"
+"                      int blocksize,\n"
+"                      const char *device);\n"
+"\n"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:4737 ../fish/guestfish-actions.pod:3175
+#: ../src/guestfs-actions.pod:4336 ../fish/guestfish-actions.pod:2955

 msgid ""
 msgid ""

-"The return value is an integer which C<0> if the operation would succeed, or "
-"some non-zero value documented in the L<ntfs-3g.probe(8)> manual page."
+"This creates an ext2 external journal on C<device>.  It is equivalent to the "
+"command:"

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:4743
-msgid "(Added in 1.0.43)"
+# type: verbatim
+#. type: verbatim
+#: ../src/guestfs-actions.pod:4339 ../fish/guestfish-actions.pod:2958
+#, no-wrap
+msgid ""
+" mke2fs -O journal_dev -b blocksize device\n"
+"\n"

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:4745
-msgid "guestfs_ntfsresize"
+#: ../src/guestfs-actions.pod:4345
+msgid "guestfs_mke2journal_L"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:4747
+#: ../src/guestfs-actions.pod:4347

 #, no-wrap
 msgid ""
 " int\n"
 #, no-wrap
 msgid ""
 " int\n"

-" guestfs_ntfsresize (guestfs_h *g,\n"
-"                     const char *device);\n"
+" guestfs_mke2journal_L (guestfs_h *g,\n"
+"                        int blocksize,\n"
+"                        const char *label,\n"
+"                        const char *device);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:4751 ../fish/guestfish-actions.pod:3183
-msgid ""
-"This command resizes an NTFS filesystem, expanding or shrinking it to the "
-"size of the underlying device.  See also L<ntfsresize(8)>."
+#: ../src/guestfs-actions.pod:4353 ../fish/guestfish-actions.pod:2964
+msgid "This creates an ext2 external journal on C<device> with label C<label>."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:4759
-msgid "guestfs_ntfsresize_size"
+#: ../src/guestfs-actions.pod:4359
+msgid "guestfs_mke2journal_U"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:4761
+#: ../src/guestfs-actions.pod:4361

 #, no-wrap
 msgid ""
 " int\n"
 #, no-wrap
 msgid ""
 " int\n"

-" guestfs_ntfsresize_size (guestfs_h *g,\n"
-"                          const char *device,\n"
-"                          int64_t size);\n"
+" guestfs_mke2journal_U (guestfs_h *g,\n"
+"                        int blocksize,\n"
+"                        const char *uuid,\n"
+"                        const char *device);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:4766
-msgid ""
-"This command is the same as C<guestfs_ntfsresize> except that it allows you "
-"to specify the new size (in bytes) explicitly."
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:4771 ../src/guestfs-actions.pod:5207
-#: ../src/guestfs-actions.pod:5280 ../src/guestfs-actions.pod:5546
-#: ../src/guestfs-actions.pod:7113
-msgid "(Added in 1.3.14)"
+#: ../src/guestfs-actions.pod:4367 ../fish/guestfish-actions.pod:2970
+msgid "This creates an ext2 external journal on C<device> with UUID C<uuid>."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:4773
-msgid "guestfs_part_add"
+#: ../src/guestfs-actions.pod:4373
+msgid "guestfs_mkfifo"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:4775
+#: ../src/guestfs-actions.pod:4375

 #, no-wrap
 msgid ""
 " int\n"
 #, no-wrap
 msgid ""
 " int\n"

-" guestfs_part_add (guestfs_h *g,\n"
-"                   const char *device,\n"
-"                   const char *prlogex,\n"
-"                   int64_t startsect,\n"
-"                   int64_t endsect);\n"
+" guestfs_mkfifo (guestfs_h *g,\n"
+"                 int mode,\n"
+"                 const char *path);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:4782
-msgid ""
-"This command adds a partition to C<device>.  If there is no partition table "
-"on the device, call C<guestfs_part_init> first."
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:4785 ../fish/guestfish-actions.pod:3201
+#: ../src/guestfs-actions.pod:4380

 msgid ""
 msgid ""

-"The C<prlogex> parameter is the type of partition.  Normally you should pass "
-"C<p> or C<primary> here, but MBR partition tables also support C<l> (or "
-"C<logical>) and C<e> (or C<extended>) partition types."
+"This call creates a FIFO (named pipe) called C<path> with mode C<mode>.  It "
+"is just a convenient wrapper around C<guestfs_mknod>."

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:4790 ../fish/guestfish-actions.pod:3206
-msgid ""
-"C<startsect> and C<endsect> are the start and end of the partition in "
-"I<sectors>.  C<endsect> may be negative, which means it counts backwards "
-"from the end of the disk (C<-1> is the last sector)."
+# type: =head2
+#. type: =head2
+#: ../src/guestfs-actions.pod:4390
+msgid "guestfs_mkfs"

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:4794
+# type: verbatim
+#. type: verbatim
+#: ../src/guestfs-actions.pod:4392
+#, no-wrap

 msgid ""
 msgid ""

-"Creating a partition which covers the whole disk is not so easy.  Use "
-"C<guestfs_part_disk> to do that."
+" int\n"
+" guestfs_mkfs (guestfs_h *g,\n"
+"               const char *fstype,\n"
+"               const char *device);\n"
+"\n"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:4799 ../src/guestfs-actions.pod:4837
-#: ../src/guestfs-actions.pod:4890 ../src/guestfs-actions.pod:4968
-#: ../src/guestfs-actions.pod:5006 ../src/guestfs-actions.pod:5025
-#: ../src/guestfs-actions.pod:5065
-msgid "(Added in 1.0.78)"
+#: ../src/guestfs-actions.pod:4397 ../fish/guestfish-actions.pod:2986
+msgid ""
+"This creates a filesystem on C<device> (usually a partition or LVM logical "
+"volume).  The filesystem type is C<fstype>, for example C<ext3>."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:4801
-msgid "guestfs_part_del"
+#: ../src/guestfs-actions.pod:4405
+msgid "guestfs_mkfs_b"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:4803
+#: ../src/guestfs-actions.pod:4407

 #, no-wrap
 msgid ""
 " int\n"
 #, no-wrap
 msgid ""
 " int\n"

-" guestfs_part_del (guestfs_h *g,\n"
-"                   const char *device,\n"
-"                   int partnum);\n"
+" guestfs_mkfs_b (guestfs_h *g,\n"
+"                 const char *fstype,\n"
+"                 int blocksize,\n"
+"                 const char *device);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:4808 ../fish/guestfish-actions.pod:3217
-msgid "This command deletes the partition numbered C<partnum> on C<device>."
+#: ../src/guestfs-actions.pod:4413
+msgid ""
+"This call is similar to C<guestfs_mkfs>, but it allows you to control the "
+"block size of the resulting filesystem.  Supported block sizes depend on the "
+"filesystem type, but typically they are C<1024>, C<2048> or C<4096> only."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:4810 ../fish/guestfish-actions.pod:3219
+#: ../src/guestfs-actions.pod:4418 ../src/guestfs-actions.pod:4461
+#: ../fish/guestfish-actions.pod:2999 ../fish/guestfish-actions.pod:3026

 msgid ""
 msgid ""

-"Note that in the case of MBR partitioning, deleting an extended partition "
-"also deletes any logical partitions it contains."
+"For VFAT and NTFS the C<blocksize> parameter is treated as the requested "
+"cluster size."
+msgstr ""
+
+#. type: textblock
+#: ../src/guestfs-actions.pod:4423
+msgid ""
+"This function is deprecated.  In new code, use the L</guestfs_mkfs_opts> "
+"call instead."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:4818
-msgid "guestfs_part_disk"
+#: ../src/guestfs-actions.pod:4432
+msgid "guestfs_mkfs_opts"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:4820
+#: ../src/guestfs-actions.pod:4434

 #, no-wrap
 msgid ""
 " int\n"
 #, no-wrap
 msgid ""
 " int\n"

-" guestfs_part_disk (guestfs_h *g,\n"
+" guestfs_mkfs_opts (guestfs_h *g,\n"
+"                    const char *fstype,\n"

 "                    const char *device,\n"
 "                    const char *device,\n"

-"                    const char *parttype);\n"
+"                    ...);\n"
+"\n"
+msgstr ""
+
+#. type: verbatim
+#: ../src/guestfs-actions.pod:4445
+#, no-wrap
+msgid ""
+" GUESTFS_MKFS_OPTS_BLOCKSIZE, int blocksize,\n"
+" GUESTFS_MKFS_OPTS_FEATURES, const char *features,\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:4825
+#: ../src/guestfs-actions.pod:4448 ../fish/guestfish-actions.pod:3013

 msgid ""
 msgid ""

-"This command is simply a combination of C<guestfs_part_init> followed by "
-"C<guestfs_part_add> to create a single primary partition covering the whole "
-"disk."
+"This function creates a filesystem on C<device>.  The filesystem type is "
+"C<fstype>, for example C<ext3>."
+msgstr ""
+
+# type: =item
+#. type: =item
+#: ../src/guestfs-actions.pod:4455 ../fish/guestfish-actions.pod:3020
+msgid "C<blocksize>"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:4829
+#: ../src/guestfs-actions.pod:4457 ../fish/guestfish-actions.pod:3022

 msgid ""
 msgid ""

-"C<parttype> is the partition table type, usually C<mbr> or C<gpt>, but other "
-"possible values are described in C<guestfs_part_init>."
+"The filesystem block size.  Supported block sizes depend on the filesystem "
+"type, but typically they are C<1024>, C<2048> or C<4096> for Linux ext2/3 "
+"filesystems."

 msgstr ""
 
 msgstr ""
 

-# type: =head2
-#. type: =head2
-#: ../src/guestfs-actions.pod:4839
-msgid "guestfs_part_get_bootable"
+#. type: textblock
+#: ../src/guestfs-actions.pod:4464 ../fish/guestfish-actions.pod:3029
+msgid "For UFS block sizes, please see L<mkfs.ufs(8)>."

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../src/guestfs-actions.pod:4841
-#, no-wrap
+#. type: =item
+#: ../src/guestfs-actions.pod:4466 ../fish/guestfish-actions.pod:3031
+msgid "C<features>"
+msgstr ""
+
+#. type: textblock
+#: ../src/guestfs-actions.pod:4468 ../fish/guestfish-actions.pod:3033
+msgid "This passes the I<-O> parameter to the external mkfs program."
+msgstr ""
+
+#. type: textblock
+#: ../src/guestfs-actions.pod:4470 ../fish/guestfish-actions.pod:3035

 msgid ""
 msgid ""

-" int\n"
-" guestfs_part_get_bootable (guestfs_h *g,\n"
-"                            const char *device,\n"
-"                            int partnum);\n"
-"\n"
+"For certain filesystem types, this allows extra filesystem features to be "
+"selected.  See L<mke2fs(8)> and L<mkfs.ufs(8)> for more details."

 msgstr ""
 
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:4846 ../fish/guestfish-actions.pod:3241
+#: ../src/guestfs-actions.pod:4474 ../fish/guestfish-actions.pod:3039

 msgid ""
 msgid ""

-"This command returns true if the partition C<partnum> on C<device> has the "
-"bootable flag set."
+"You cannot use this optional parameter with the C<gfs> or C<gfs2> filesystem "
+"type."

 msgstr ""
 
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:4849
-msgid "See also C<guestfs_part_set_bootable>."
+#: ../src/guestfs-actions.pod:4481
+msgid "(Added in 1.7.19)"

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:4855
-msgid "guestfs_part_get_mbr_id"
+#: ../src/guestfs-actions.pod:4483
+msgid "guestfs_mkfs_opts_va"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:4857
+#: ../src/guestfs-actions.pod:4485

 #, no-wrap
 msgid ""
 " int\n"
 #, no-wrap
 msgid ""
 " int\n"

-" guestfs_part_get_mbr_id (guestfs_h *g,\n"
-"                          const char *device,\n"
-"                          int partnum);\n"
+" guestfs_mkfs_opts_va (guestfs_h *g,\n"
+"                       const char *fstype,\n"
+"                       const char *device,\n"
+"                       va_list args);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:4862 ../fish/guestfish-actions.pod:3250
-msgid ""
-"Returns the MBR type byte (also known as the ID byte) from the numbered "
-"partition C<partnum>."
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:4865 ../src/guestfs-actions.pod:5041
-msgid ""
-"Note that only MBR (old DOS-style) partitions have type bytes.  You will get "
-"undefined results for other partition table types (see "
-"C<guestfs_part_get_parttype>)."
+#: ../src/guestfs-actions.pod:4491
+msgid "This is the \"va_list variant\" of L</guestfs_mkfs_opts>."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:4873
-msgid "guestfs_part_get_parttype"
+#: ../src/guestfs-actions.pod:4495
+msgid "guestfs_mkfs_opts_argv"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:4875
+#: ../src/guestfs-actions.pod:4497

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" char *\n"
-" guestfs_part_get_parttype (guestfs_h *g,\n"
-"                            const char *device);\n"
+" int\n"
+" guestfs_mkfs_opts_argv (guestfs_h *g,\n"
+"                         const char *fstype,\n"
+"                         const char *device,\n"
+"                         const struct guestfs_mkfs_opts_argv *optargs);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:4879 ../fish/guestfish-actions.pod:3261
-msgid ""
-"This command examines the partition table on C<device> and returns the "
-"partition table type (format) being used."
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:4882
-msgid ""
-"Common return values include: C<msdos> (a DOS/Windows style MBR partition "
-"table), C<gpt> (a GPT/EFI-style partition table).  Other values are "
-"possible, although unusual.  See C<guestfs_part_init> for a full list."
+#: ../src/guestfs-actions.pod:4503
+msgid "This is the \"argv variant\" of L</guestfs_mkfs_opts>."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:4892
-msgid "guestfs_part_init"
+#: ../src/guestfs-actions.pod:4507
+msgid "guestfs_mkmountpoint"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:4894
+#: ../src/guestfs-actions.pod:4509

 #, no-wrap
 msgid ""
 " int\n"
 #, no-wrap
 msgid ""
 " int\n"

-" guestfs_part_init (guestfs_h *g,\n"
-"                    const char *device,\n"
-"                    const char *parttype);\n"
+" guestfs_mkmountpoint (guestfs_h *g,\n"
+"                       const char *exemptpath);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:4899 ../fish/guestfish-actions.pod:3273
+#: ../src/guestfs-actions.pod:4513

 msgid ""
 msgid ""

-"This creates an empty partition table on C<device> of one of the partition "
-"types listed below.  Usually C<parttype> should be either C<msdos> or C<gpt> "
-"(for large disks)."
+"C<guestfs_mkmountpoint> and C<guestfs_rmmountpoint> are specialized calls "
+"that can be used to create extra mountpoints before mounting the first "
+"filesystem."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:4903
+#: ../src/guestfs-actions.pod:4517 ../fish/guestfish-actions.pod:3054

 msgid ""
 msgid ""

-"Initially there are no partitions.  Following this, you should call "
-"C<guestfs_part_add> for each partition required."
+"These calls are I<only> necessary in some very limited circumstances, mainly "
+"the case where you want to mount a mix of unrelated and/or read-only "
+"filesystems together."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:4906 ../fish/guestfish-actions.pod:3280
-msgid "Possible values for C<parttype> are:"
+#: ../src/guestfs-actions.pod:4521 ../fish/guestfish-actions.pod:3058
+msgid ""
+"For example, live CDs often contain a \"Russian doll\" nest of filesystems, "
+"an ISO outer layer, with a squashfs image inside, with an ext2/3 image "
+"inside that.  You can unpack this as follows in guestfish:"

 msgstr ""
 
 msgstr ""
 

-# type: =item
-#. type: =item
-#: ../src/guestfs-actions.pod:4910 ../fish/guestfish-actions.pod:3284
-msgid "B<efi> | B<gpt>"
+# type: verbatim
+#. type: verbatim
+#: ../src/guestfs-actions.pod:4526 ../fish/guestfish-actions.pod:3063
+#, no-wrap
+msgid ""
+" add-ro Fedora-11-i686-Live.iso\n"
+" run\n"
+" mkmountpoint /cd\n"
+" mkmountpoint /sqsh\n"
+" mkmountpoint /ext3fs\n"
+" mount /dev/sda /cd\n"
+" mount-loop /cd/LiveOS/squashfs.img /sqsh\n"
+" mount-loop /sqsh/LiveOS/ext3fs.img /ext3fs\n"
+"\n"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:4912 ../fish/guestfish-actions.pod:3286
-msgid "Intel EFI / GPT partition table."
+#: ../src/guestfs-actions.pod:4535 ../fish/guestfish-actions.pod:3072
+msgid "The inner filesystem is now unpacked under the /ext3fs mountpoint."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:4914 ../fish/guestfish-actions.pod:3288
+#: ../src/guestfs-actions.pod:4537

 msgid ""
 msgid ""

-"This is recommended for >= 2 TB partitions that will be accessed from Linux "
-"and Intel-based Mac OS X.  It also has limited backwards compatibility with "
-"the C<mbr> format."
-msgstr ""
-
-# type: =item
-#. type: =item
-#: ../src/guestfs-actions.pod:4918 ../fish/guestfish-actions.pod:3292
-msgid "B<mbr> | B<msdos>"
+"C<guestfs_mkmountpoint> is not compatible with C<guestfs_umount_all>.  You "
+"may get unexpected errors if you try to mix these calls.  It is safest to "
+"manually unmount filesystems and remove mountpoints after use."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:4920 ../fish/guestfish-actions.pod:3294
+#: ../src/guestfs-actions.pod:4541

 msgid ""
 msgid ""

-"The standard PC \"Master Boot Record\" (MBR) format used by MS-DOS and "
-"Windows.  This partition type will B<only> work for device sizes up to 2 "
-"TB.  For large disks we recommend using C<gpt>."
+"C<guestfs_umount_all> unmounts filesystems by sorting the paths longest "
+"first, so for this to work for manual mountpoints, you must ensure that the "
+"innermost mountpoints have the longest pathnames, as in the example code "
+"above."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:4927 ../fish/guestfish-actions.pod:3301
+#: ../src/guestfs-actions.pod:4546 ../fish/guestfish-actions.pod:3083

 msgid ""
 msgid ""

-"Other partition table types that may work but are not supported include:"
+"For more details see L<https://bugzilla.redhat.com/show_bug.cgi?id=599503>"

 msgstr ""
 
 msgstr ""
 

-# type: =item
-#. type: =item
-#: ../src/guestfs-actions.pod:4932 ../fish/guestfish-actions.pod:3306
-msgid "B<aix>"
+#. type: textblock
+#: ../src/guestfs-actions.pod:4548
+msgid ""
+"Autosync [see C<guestfs_set_autosync>, this is set by default on handles] "
+"can cause C<guestfs_umount_all> to be called when the handle is closed which "
+"can also trigger these issues."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:4934 ../fish/guestfish-actions.pod:3308
-msgid "AIX disk labels."
-msgstr ""
-
-# type: =item
-#. type: =item
-#: ../src/guestfs-actions.pod:4936 ../fish/guestfish-actions.pod:3310
-msgid "B<amiga> | B<rdb>"
+#: ../src/guestfs-actions.pod:4554 ../src/guestfs-actions.pod:4820
+#: ../src/guestfs-actions.pod:5739
+msgid "(Added in 1.0.62)"

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:4938 ../fish/guestfish-actions.pod:3312
-msgid "Amiga \"Rigid Disk Block\" format."
+# type: =head2
+#. type: =head2
+#: ../src/guestfs-actions.pod:4556
+msgid "guestfs_mknod"

 msgstr ""
 
 msgstr ""
 

-# type: =item
-#. type: =item
-#: ../src/guestfs-actions.pod:4940 ../fish/guestfish-actions.pod:3314
-msgid "B<bsd>"
+# type: verbatim
+#. type: verbatim
+#: ../src/guestfs-actions.pod:4558
+#, no-wrap
+msgid ""
+" int\n"
+" guestfs_mknod (guestfs_h *g,\n"
+"                int mode,\n"
+"                int devmajor,\n"
+"                int devminor,\n"
+"                const char *path);\n"
+"\n"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:4942 ../fish/guestfish-actions.pod:3316
-msgid "BSD disk labels."
-msgstr ""
-
-# type: =item
-#. type: =item
-#: ../src/guestfs-actions.pod:4944 ../fish/guestfish-actions.pod:3318
-msgid "B<dasd>"
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:4946 ../fish/guestfish-actions.pod:3320
-msgid "DASD, used on IBM mainframes."
-msgstr ""
-
-# type: =item
-#. type: =item
-#: ../src/guestfs-actions.pod:4948 ../fish/guestfish-actions.pod:3322
-msgid "B<dvh>"
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:4950 ../fish/guestfish-actions.pod:3324
-msgid "MIPS/SGI volumes."
-msgstr ""
-
-# type: =item
-#. type: =item
-#: ../src/guestfs-actions.pod:4952 ../fish/guestfish-actions.pod:3326
-msgid "B<mac>"
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:4954 ../fish/guestfish-actions.pod:3328
-msgid "Old Mac partition format.  Modern Macs use C<gpt>."
-msgstr ""
-
-# type: =item
-#. type: =item
-#: ../src/guestfs-actions.pod:4956 ../fish/guestfish-actions.pod:3330
-msgid "B<pc98>"
+#: ../src/guestfs-actions.pod:4565 ../fish/guestfish-actions.pod:3093
+msgid ""
+"This call creates block or character special devices, or named pipes (FIFOs)."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:4958 ../fish/guestfish-actions.pod:3332
-msgid "NEC PC-98 format, common in Japan apparently."
-msgstr ""
-
-# type: =item
-#. type: =item
-#: ../src/guestfs-actions.pod:4960 ../fish/guestfish-actions.pod:3334
-msgid "B<sun>"
+#: ../src/guestfs-actions.pod:4568 ../fish/guestfish-actions.pod:3096
+msgid ""
+"The C<mode> parameter should be the mode, using the standard constants.  "
+"C<devmajor> and C<devminor> are the device major and minor numbers, only "
+"used when creating block and character special devices."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:4962 ../fish/guestfish-actions.pod:3336
-msgid "Sun disk labels."
+#: ../src/guestfs-actions.pod:4573
+msgid ""
+"Note that, just like L<mknod(2)>, the mode must be bitwise OR'd with "
+"S_IFBLK, S_IFCHR, S_IFIFO or S_IFSOCK (otherwise this call just creates a "
+"regular file).  These constants are available in the standard Linux header "
+"files, or you can use C<guestfs_mknod_b>, C<guestfs_mknod_c> or "
+"C<guestfs_mkfifo> which are wrappers around this command which bitwise OR in "
+"the appropriate constant for you."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:4970
-msgid "guestfs_part_list"
+#: ../src/guestfs-actions.pod:4587
+msgid "guestfs_mknod_b"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:4972
+#: ../src/guestfs-actions.pod:4589

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" struct guestfs_partition_list *\n"
-" guestfs_part_list (guestfs_h *g,\n"
-"                    const char *device);\n"
+" int\n"
+" guestfs_mknod_b (guestfs_h *g,\n"
+"                  int mode,\n"
+"                  int devmajor,\n"
+"                  int devminor,\n"
+"                  const char *path);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:4976 ../fish/guestfish-actions.pod:3344
+#: ../src/guestfs-actions.pod:4596

 msgid ""
 msgid ""

-"This command parses the partition table on C<device> and returns the list of "
-"partitions found."
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:4979 ../fish/guestfish-actions.pod:3347
-msgid "The fields in the returned structure are:"
-msgstr ""
-
-# type: =item
-#. type: =item
-#: ../src/guestfs-actions.pod:4983 ../fish/guestfish-actions.pod:3351
-msgid "B<part_num>"
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:4985 ../fish/guestfish-actions.pod:3353
-msgid "Partition number, counting from 1."
+"This call creates a block device node called C<path> with mode C<mode> and "
+"device major/minor C<devmajor> and C<devminor>.  It is just a convenient "
+"wrapper around C<guestfs_mknod>."

 msgstr ""
 
 msgstr ""
 

-# type: =item
-#. type: =item
-#: ../src/guestfs-actions.pod:4987 ../fish/guestfish-actions.pod:3355
-msgid "B<part_start>"
+# type: =head2
+#. type: =head2
+#: ../src/guestfs-actions.pod:4606
+msgid "guestfs_mknod_c"

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:4989
+# type: verbatim
+#. type: verbatim
+#: ../src/guestfs-actions.pod:4608
+#, no-wrap

 msgid ""
 msgid ""

-"Start of the partition I<in bytes>.  To get sectors you have to divide by "
-"the device's sector size, see C<guestfs_blockdev_getss>."
-msgstr ""
-
-# type: =item
-#. type: =item
-#: ../src/guestfs-actions.pod:4992 ../fish/guestfish-actions.pod:3360
-msgid "B<part_end>"
+" int\n"
+" guestfs_mknod_c (guestfs_h *g,\n"
+"                  int mode,\n"
+"                  int devmajor,\n"
+"                  int devminor,\n"
+"                  const char *path);\n"
+"\n"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:4994 ../fish/guestfish-actions.pod:3362
-msgid "End of the partition in bytes."
+#: ../src/guestfs-actions.pod:4615
+msgid ""
+"This call creates a char device node called C<path> with mode C<mode> and "
+"device major/minor C<devmajor> and C<devminor>.  It is just a convenient "
+"wrapper around C<guestfs_mknod>."

 msgstr ""
 
 msgstr ""
 

-# type: =item
-#. type: =item
-#: ../src/guestfs-actions.pod:4996 ../fish/guestfish-actions.pod:3364
-msgid "B<part_size>"
+# type: =head2
+#. type: =head2
+#: ../src/guestfs-actions.pod:4625
+msgid "guestfs_mkswap"

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:4998 ../fish/guestfish-actions.pod:3366
-msgid "Size of the partition in bytes."
+# type: verbatim
+#. type: verbatim
+#: ../src/guestfs-actions.pod:4627
+#, no-wrap
+msgid ""
+" int\n"
+" guestfs_mkswap (guestfs_h *g,\n"
+"                 const char *device);\n"
+"\n"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:5002
-msgid ""
-"This function returns a C<struct guestfs_partition_list *>, or NULL if there "
-"was an error.  I<The caller must call C<guestfs_free_partition_list> after "
-"use>."
+#: ../src/guestfs-actions.pod:4631 ../fish/guestfish-actions.pod:3135
+msgid "Create a swap partition on C<device>."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:5008
-msgid "guestfs_part_set_bootable"
+#: ../src/guestfs-actions.pod:4637
+msgid "guestfs_mkswap_L"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:5010
+#: ../src/guestfs-actions.pod:4639

 #, no-wrap
 msgid ""
 " int\n"
 #, no-wrap
 msgid ""
 " int\n"

-" guestfs_part_set_bootable (guestfs_h *g,\n"
-"                            const char *device,\n"
-"                            int partnum,\n"
-"                            int bootable);\n"
+" guestfs_mkswap_L (guestfs_h *g,\n"
+"                   const char *label,\n"
+"                   const char *device);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:5016 ../fish/guestfish-actions.pod:3374
-msgid ""
-"This sets the bootable flag on partition numbered C<partnum> on device "
-"C<device>.  Note that partitions are numbered from 1."
+#: ../src/guestfs-actions.pod:4644 ../fish/guestfish-actions.pod:3141
+msgid "Create a swap partition on C<device> with label C<label>."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:5019 ../fish/guestfish-actions.pod:3377
+#: ../src/guestfs-actions.pod:4646 ../fish/guestfish-actions.pod:3143

 msgid ""
 msgid ""

-"The bootable flag is used by some operating systems (notably Windows) to "
-"determine which partition to boot from.  It is by no means universally "
-"recognized."
+"Note that you cannot attach a swap label to a block device (eg. C</dev/"
+"sda>), just to a partition.  This appears to be a limitation of the kernel "
+"or swap tools."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:5027
-msgid "guestfs_part_set_mbr_id"
+#: ../src/guestfs-actions.pod:4654
+msgid "guestfs_mkswap_U"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:5029
+#: ../src/guestfs-actions.pod:4656

 #, no-wrap
 msgid ""
 " int\n"
 #, no-wrap
 msgid ""
 " int\n"

-" guestfs_part_set_mbr_id (guestfs_h *g,\n"
-"                          const char *device,\n"
-"                          int partnum,\n"
-"                          int idbyte);\n"
+" guestfs_mkswap_U (guestfs_h *g,\n"
+"                   const char *uuid,\n"
+"                   const char *device);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:5035 ../fish/guestfish-actions.pod:3385
-msgid ""
-"Sets the MBR type byte (also known as the ID byte) of the numbered partition "
-"C<partnum> to C<idbyte>.  Note that the type bytes quoted in most "
-"documentation are in fact hexadecimal numbers, but usually documented "
-"without any leading \"0x\" which might be confusing."
+#: ../src/guestfs-actions.pod:4661 ../fish/guestfish-actions.pod:3151
+msgid "Create a swap partition on C<device> with UUID C<uuid>."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:5049
-msgid "guestfs_part_set_name"
+#: ../src/guestfs-actions.pod:4667
+msgid "guestfs_mkswap_file"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:5051
+#: ../src/guestfs-actions.pod:4669

 #, no-wrap
 msgid ""
 " int\n"
 #, no-wrap
 msgid ""
 " int\n"

-" guestfs_part_set_name (guestfs_h *g,\n"
-"                        const char *device,\n"
-"                        int partnum,\n"
-"                        const char *name);\n"
+" guestfs_mkswap_file (guestfs_h *g,\n"
+"                      const char *path);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:5057 ../fish/guestfish-actions.pod:3399
-msgid ""
-"This sets the partition name on partition numbered C<partnum> on device "
-"C<device>.  Note that partitions are numbered from 1."
+#: ../src/guestfs-actions.pod:4673 ../fish/guestfish-actions.pod:3157
+msgid "Create a swap file."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:5060 ../fish/guestfish-actions.pod:3402
+#: ../src/guestfs-actions.pod:4675

 msgid ""
 msgid ""

-"The partition name can only be set on certain types of partition table.  "
-"This works on C<gpt> but not on C<mbr> partitions."
+"This command just writes a swap file signature to an existing file.  To "
+"create the file itself, use something like C<guestfs_fallocate>."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:5067
-msgid "guestfs_part_to_dev"
+#: ../src/guestfs-actions.pod:4682
+msgid "guestfs_modprobe"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:5069
+#: ../src/guestfs-actions.pod:4684

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" char *\n"
-" guestfs_part_to_dev (guestfs_h *g,\n"
-"                      const char *partition);\n"
+" int\n"
+" guestfs_modprobe (guestfs_h *g,\n"
+"                   const char *modulename);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:5073 ../fish/guestfish-actions.pod:3409
-msgid ""
-"This function takes a partition name (eg. \"/dev/sdb1\") and removes the "
-"partition number, returning the device name (eg. \"/dev/sdb\")."
+#: ../src/guestfs-actions.pod:4688 ../fish/guestfish-actions.pod:3166
+msgid "This loads a kernel module in the appliance."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:5077
+#: ../src/guestfs-actions.pod:4690 ../fish/guestfish-actions.pod:3168

 msgid ""
 msgid ""

-"The named partition must exist, for example as a string returned from "
-"C<guestfs_list_partitions>."
+"The kernel module must have been whitelisted when libguestfs was built (see "
+"C<appliance/kmod.whitelist.in> in the source)."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:5085
-msgid "guestfs_ping_daemon"
+#: ../src/guestfs-actions.pod:4697
+msgid "guestfs_mount"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:5087
+#: ../src/guestfs-actions.pod:4699

 #, no-wrap
 msgid ""
 " int\n"
 #, no-wrap
 msgid ""
 " int\n"

-" guestfs_ping_daemon (guestfs_h *g);\n"
+" guestfs_mount (guestfs_h *g,\n"
+"                const char *device,\n"
+"                const char *mountpoint);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:5090 ../fish/guestfish-actions.pod:3420
+#: ../src/guestfs-actions.pod:4704 ../fish/guestfish-actions.pod:3175

 msgid ""
 msgid ""

-"This is a test probe into the guestfs daemon running inside the qemu "
-"subprocess.  Calling this function checks that the daemon responds to the "
-"ping message, without affecting the daemon or attached block device(s) in "
-"any other way."
-msgstr ""
-
-# type: =head2
-#. type: =head2
-#: ../src/guestfs-actions.pod:5099
-msgid "guestfs_pread"
+"Mount a guest disk at a position in the filesystem.  Block devices are named "
+"C</dev/sda>, C</dev/sdb> and so on, as they were added to the guest.  If "
+"those block devices contain partitions, they will have the usual names (eg. "
+"C</dev/sda1>).  Also LVM C</dev/VG/LV>-style names can be used."

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../src/guestfs-actions.pod:5101
-#, no-wrap
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:4710 ../fish/guestfish-actions.pod:3181

 msgid ""
 msgid ""

-" char *\n"
-" guestfs_pread (guestfs_h *g,\n"
-"                const char *path,\n"
-"                int count,\n"
-"                int64_t offset,\n"
-"                size_t *size_r);\n"
-"\n"
+"The rules are the same as for L<mount(2)>: A filesystem must first be "
+"mounted on C</> before others can be mounted.  Other filesystems can only be "
+"mounted on directories which already exist."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:5108 ../fish/guestfish-actions.pod:3429
+#: ../src/guestfs-actions.pod:4715 ../fish/guestfish-actions.pod:3186

 msgid ""
 msgid ""

-"This command lets you read part of a file.  It reads C<count> bytes of the "
-"file, starting at C<offset>, from file C<path>."
+"The mounted filesystem is writable, if we have sufficient permissions on the "
+"underlying device."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:5111 ../src/guestfs-actions.pod:5137
-#: ../fish/guestfish-actions.pod:3432 ../fish/guestfish-actions.pod:3447
+#: ../src/guestfs-actions.pod:4718

 msgid ""
 msgid ""

-"This may read fewer bytes than requested.  For further details see the "
-"L<pread(2)> system call."
+"B<Important note:> When you use this call, the filesystem options C<sync> "
+"and C<noatime> are set implicitly.  This was originally done because we "
+"thought it would improve reliability, but it turns out that I<-o sync> has a "
+"very large negative performance impact and negligible effect on "
+"reliability.  Therefore we recommend that you avoid using C<guestfs_mount> "
+"in any code that needs performance, and instead use C<guestfs_mount_options> "
+"(use an empty string for the first parameter if you don't want any options)."

 msgstr ""
 
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:5114
-msgid "See also C<guestfs_pwrite>, C<guestfs_pread_device>."
+#: ../src/guestfs-actions.pod:4730
+msgid ""
+"This function is deprecated.  In new code, use the L</guestfs_mount_options> "
+"call instead."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:5125
-msgid "guestfs_pread_device"
+#: ../src/guestfs-actions.pod:4739
+msgid "guestfs_mount_loop"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:5127
+#: ../src/guestfs-actions.pod:4741

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" char *\n"
-" guestfs_pread_device (guestfs_h *g,\n"
-"                       const char *device,\n"
-"                       int count,\n"
-"                       int64_t offset,\n"
-"                       size_t *size_r);\n"
+" int\n"
+" guestfs_mount_loop (guestfs_h *g,\n"
+"                     const char *file,\n"
+"                     const char *mountpoint);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:5134 ../fish/guestfish-actions.pod:3444
+#: ../src/guestfs-actions.pod:4746 ../fish/guestfish-actions.pod:3210

 msgid ""
 msgid ""

-"This command lets you read part of a file.  It reads C<count> bytes of "
-"C<device>, starting at C<offset>."
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:5140
-msgid "See also C<guestfs_pread>."
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:5149
-msgid "(Added in 1.5.21)"
+"This command lets you mount C<file> (a filesystem image in a file) on a "
+"mount point.  It is entirely equivalent to the command C<mount -o loop file "
+"mountpoint>."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:5151
-msgid "guestfs_pvcreate"
+#: ../src/guestfs-actions.pod:4754
+msgid "guestfs_mount_options"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:5153
+#: ../src/guestfs-actions.pod:4756

 #, no-wrap
 msgid ""
 " int\n"
 #, no-wrap
 msgid ""
 " int\n"

-" guestfs_pvcreate (guestfs_h *g,\n"
-"                   const char *device);\n"
+" guestfs_mount_options (guestfs_h *g,\n"
+"                        const char *options,\n"
+"                        const char *device,\n"
+"                        const char *mountpoint);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:5157 ../fish/guestfish-actions.pod:3459
-msgid ""
-"This creates an LVM physical volume on the named C<device>, where C<device> "
-"should usually be a partition name such as C</dev/sda1>."
-msgstr ""
-
-# type: =head2
-#. type: =head2
-#: ../src/guestfs-actions.pod:5165
-msgid "guestfs_pvremove"
-msgstr ""
-
-# type: verbatim
-#. type: verbatim
-#: ../src/guestfs-actions.pod:5167
-#, no-wrap
+#: ../src/guestfs-actions.pod:4762

 msgid ""
 msgid ""

-" int\n"
-" guestfs_pvremove (guestfs_h *g,\n"
-"                   const char *device);\n"
-"\n"
+"This is the same as the C<guestfs_mount> command, but it allows you to set "
+"the mount options as for the L<mount(8)> I<-o> flag."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:5171 ../fish/guestfish-actions.pod:3467
+#: ../src/guestfs-actions.pod:4766 ../fish/guestfish-actions.pod:3222

 msgid ""
 msgid ""

-"This wipes a physical volume C<device> so that LVM will no longer recognise "
-"it."
+"If the C<options> parameter is an empty string, then no options are passed "
+"(all options default to whatever the filesystem uses)."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:5174 ../fish/guestfish-actions.pod:3470
-msgid ""
-"The implementation uses the C<pvremove> command which refuses to wipe "
-"physical volumes that contain any volume groups, so you have to remove those "
-"first."
+#: ../src/guestfs-actions.pod:4772 ../src/guestfs-actions.pod:4786
+#: ../src/guestfs-actions.pod:4803
+msgid "(Added in 1.0.10)"

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:5182
-msgid "guestfs_pvresize"
+#: ../src/guestfs-actions.pod:4774
+msgid "guestfs_mount_ro"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:5184
+#: ../src/guestfs-actions.pod:4776

 #, no-wrap
 msgid ""
 " int\n"
 #, no-wrap
 msgid ""
 " int\n"

-" guestfs_pvresize (guestfs_h *g,\n"
-"                   const char *device);\n"
+" guestfs_mount_ro (guestfs_h *g,\n"
+"                   const char *device,\n"
+"                   const char *mountpoint);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:5188 ../fish/guestfish-actions.pod:3478
+#: ../src/guestfs-actions.pod:4781

 msgid ""
 msgid ""

-"This resizes (expands or shrinks) an existing LVM physical volume to match "
-"the new size of the underlying device."
+"This is the same as the C<guestfs_mount> command, but it mounts the "
+"filesystem with the read-only (I<-o ro>) flag."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:5195
-msgid "guestfs_pvresize_size"
+#: ../src/guestfs-actions.pod:4788
+msgid "guestfs_mount_vfs"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:5197
+#: ../src/guestfs-actions.pod:4790

 #, no-wrap
 msgid ""
 " int\n"
 #, no-wrap
 msgid ""
 " int\n"

-" guestfs_pvresize_size (guestfs_h *g,\n"
-"                        const char *device,\n"
-"                        int64_t size);\n"
+" guestfs_mount_vfs (guestfs_h *g,\n"
+"                    const char *options,\n"
+"                    const char *vfstype,\n"
+"                    const char *device,\n"
+"                    const char *mountpoint);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:5202
+#: ../src/guestfs-actions.pod:4797

 msgid ""
 msgid ""

-"This command is the same as C<guestfs_pvresize> except that it allows you to "
-"specify the new size (in bytes) explicitly."
+"This is the same as the C<guestfs_mount> command, but it allows you to set "
+"both the mount options and the vfstype as for the L<mount(8)> I<-o> and I<-"
+"t> flags."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:5209
-msgid "guestfs_pvs"
+#: ../src/guestfs-actions.pod:4805
+msgid "guestfs_mountpoints"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:5211
+#: ../src/guestfs-actions.pod:4807

 #, no-wrap
 msgid ""
 " char **\n"
 #, no-wrap
 msgid ""
 " char **\n"

-" guestfs_pvs (guestfs_h *g);\n"
+" guestfs_mountpoints (guestfs_h *g);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:5214 ../fish/guestfish-actions.pod:3492
-msgid ""
-"List all the physical volumes detected.  This is the equivalent of the L<pvs"
-"(8)> command."
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:5217 ../fish/guestfish-actions.pod:3495
+#: ../src/guestfs-actions.pod:4810

 msgid ""
 msgid ""

-"This returns a list of just the device names that contain PVs (eg. C</dev/"
-"sda2>)."
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:5220
-msgid "See also C<guestfs_pvs_full>."
+"This call is similar to C<guestfs_mounts>.  That call returns a list of "
+"devices.  This one returns a hash table (map) of device name to directory "
+"where the device is mounted."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:5228
-msgid "guestfs_pvs_full"
+#: ../src/guestfs-actions.pod:4822
+msgid "guestfs_mounts"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:5230
+#: ../src/guestfs-actions.pod:4824

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" struct guestfs_lvm_pv_list *\n"
-" guestfs_pvs_full (guestfs_h *g);\n"
+" char **\n"
+" guestfs_mounts (guestfs_h *g);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:5233 ../fish/guestfish-actions.pod:3504
+#: ../src/guestfs-actions.pod:4827 ../fish/guestfish-actions.pod:3253

 msgid ""
 msgid ""

-"List all the physical volumes detected.  This is the equivalent of the L<pvs"
-"(8)> command.  The \"full\" version includes all fields."
+"This returns the list of currently mounted filesystems.  It returns the list "
+"of devices (eg. C</dev/sda1>, C</dev/VG/LV>)."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:5236
-msgid ""
-"This function returns a C<struct guestfs_lvm_pv_list *>, or NULL if there "
-"was an error.  I<The caller must call C<guestfs_free_lvm_pv_list> after use>."
-msgstr ""
-
-# type: =head2
-#. type: =head2
-#: ../src/guestfs-actions.pod:5242
-msgid "guestfs_pvuuid"
-msgstr ""
-
-# type: verbatim
-#. type: verbatim
-#: ../src/guestfs-actions.pod:5244
-#, no-wrap
-msgid ""
-" char *\n"
-" guestfs_pvuuid (guestfs_h *g,\n"
-"                 const char *device);\n"
-"\n"
+#: ../src/guestfs-actions.pod:4830 ../fish/guestfish-actions.pod:3256
+msgid "Some internal mounts are not shown."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:5248 ../fish/guestfish-actions.pod:3511
-msgid "This command returns the UUID of the LVM PV C<device>."
+#: ../src/guestfs-actions.pod:4832
+msgid "See also: C<guestfs_mountpoints>"

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:5255
-msgid "guestfs_pwrite"
+#: ../src/guestfs-actions.pod:4840
+msgid "guestfs_mv"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:5257
+#: ../src/guestfs-actions.pod:4842

 #, no-wrap
 msgid ""
 " int\n"
 #, no-wrap
 msgid ""
 " int\n"

-" guestfs_pwrite (guestfs_h *g,\n"
-"                 const char *path,\n"
-"                 const char *content,\n"
-"                 size_t content_size,\n"
-"                 int64_t offset);\n"
+" guestfs_mv (guestfs_h *g,\n"
+"             const char *src,\n"
+"             const char *dest);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:5264 ../fish/guestfish-actions.pod:3517
-msgid ""
-"This command writes to part of a file.  It writes the data buffer C<content> "
-"to the file C<path> starting at offset C<offset>."
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:5267 ../fish/guestfish-actions.pod:3520
+#: ../src/guestfs-actions.pod:4847 ../fish/guestfish-actions.pod:3264

 msgid ""
 msgid ""

-"This command implements the L<pwrite(2)> system call, and like that system "
-"call it may not write the full data requested.  The return value is the "
-"number of bytes that were actually written to the file.  This could even be "
-"0, although short writes are unlikely for regular files in ordinary "
-"circumstances."
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:5273
-msgid "See also C<guestfs_pread>, C<guestfs_pwrite_device>."
+"This moves a file from C<src> to C<dest> where C<dest> is either a "
+"destination filename or destination directory."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:5282
-msgid "guestfs_pwrite_device"
+#: ../src/guestfs-actions.pod:4854
+msgid "guestfs_ntfs_3g_probe"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:5284
+#: ../src/guestfs-actions.pod:4856

 #, no-wrap
 msgid ""
 " int\n"
 #, no-wrap
 msgid ""
 " int\n"

-" guestfs_pwrite_device (guestfs_h *g,\n"
-"                        const char *device,\n"
-"                        const char *content,\n"
-"                        size_t content_size,\n"
-"                        int64_t offset);\n"
+" guestfs_ntfs_3g_probe (guestfs_h *g,\n"
+"                        int rw,\n"
+"                        const char *device);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:5291 ../fish/guestfish-actions.pod:3535
+#: ../src/guestfs-actions.pod:4861 ../fish/guestfish-actions.pod:3271

 msgid ""
 msgid ""

-"This command writes to part of a device.  It writes the data buffer "
-"C<content> to C<device> starting at offset C<offset>."
+"This command runs the L<ntfs-3g.probe(8)> command which probes an NTFS "
+"C<device> for mountability.  (Not all NTFS volumes can be mounted read-"
+"write, and some cannot be mounted at all)."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:5294 ../fish/guestfish-actions.pod:3538
+#: ../src/guestfs-actions.pod:4865 ../fish/guestfish-actions.pod:3275

 msgid ""
 msgid ""

-"This command implements the L<pwrite(2)> system call, and like that system "
-"call it may not write the full data requested (although short writes to disk "
-"devices and partitions are probably impossible with standard Linux kernels)."
+"C<rw> is a boolean flag.  Set it to true if you want to test if the volume "
+"can be mounted read-write.  Set it to false if you want to test if the "
+"volume can be mounted read-only."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:5299
-msgid "See also C<guestfs_pwrite>."
+#: ../src/guestfs-actions.pod:4869 ../fish/guestfish-actions.pod:3279
+msgid ""
+"The return value is an integer which C<0> if the operation would succeed, or "
+"some non-zero value documented in the L<ntfs-3g.probe(8)> manual page."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:5306
-msgid "(Added in 1.5.20)"
+#: ../src/guestfs-actions.pod:4875
+msgid "(Added in 1.0.43)"

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:5308
-msgid "guestfs_read_file"
+#: ../src/guestfs-actions.pod:4877
+msgid "guestfs_ntfsresize"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:5310
+#: ../src/guestfs-actions.pod:4879

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" char *\n"
-" guestfs_read_file (guestfs_h *g,\n"
-"                    const char *path,\n"
-"                    size_t *size_r);\n"
+" int\n"
+" guestfs_ntfsresize (guestfs_h *g,\n"
+"                     const char *device);\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:5315 ../fish/guestfish-actions.pod:3552
-msgid "This calls returns the contents of the file C<path> as a buffer."
+#: ../src/guestfs-actions.pod:4883 ../fish/guestfish-actions.pod:3287
+msgid ""
+"This command resizes an NTFS filesystem, expanding or shrinking it to the "
+"size of the underlying device."

 msgstr ""
 
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:5318
+#: ../src/guestfs-actions.pod:4886 ../fish/guestfish-actions.pod:3290

 msgid ""
 msgid ""

-"Unlike C<guestfs_cat>, this function can correctly handle files that contain "
-"embedded ASCII NUL characters.  However unlike C<guestfs_download>, this "
-"function is limited in the total size of file that can be handled."
+"I<Note:> After the resize operation, the filesystem is marked as requiring a "
+"consistency check (for safety).  You have to boot into Windows to perform "
+"this check and clear this condition.  Furthermore, ntfsresize refuses to "
+"resize filesystems which have been marked in this way.  So in effect it is "
+"not possible to call ntfsresize multiple times on a single filesystem "
+"without booting into Windows between each resize."

 msgstr ""
 
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:5330
-msgid "(Added in 1.0.63)"
+#: ../src/guestfs-actions.pod:4894 ../fish/guestfish-actions.pod:3298
+msgid "See also L<ntfsresize(8)>."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:5332
-msgid "guestfs_read_lines"
+#: ../src/guestfs-actions.pod:4900
+msgid "guestfs_ntfsresize_size"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:5334
+#: ../src/guestfs-actions.pod:4902

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" char **\n"
-" guestfs_read_lines (guestfs_h *g,\n"
-"                     const char *path);\n"
+" int\n"
+" guestfs_ntfsresize_size (guestfs_h *g,\n"
+"                          const char *device,\n"
+"                          int64_t size);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:5340 ../fish/guestfish-actions.pod:3569
+#: ../src/guestfs-actions.pod:4907

 msgid ""
 msgid ""

-"The file contents are returned as a list of lines.  Trailing C<LF> and "
-"C<CRLF> character sequences are I<not> returned."
+"This command is the same as C<guestfs_ntfsresize> except that it allows you "
+"to specify the new size (in bytes) explicitly."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:5343
-msgid ""
-"Note that this function cannot correctly handle binary files (specifically, "
-"files containing C<\\0> character which is treated as end of line).  For "
-"those you need to use the C<guestfs_read_file> function which has a more "
-"complex interface."
+#: ../src/guestfs-actions.pod:4912 ../src/guestfs-actions.pod:5348
+#: ../src/guestfs-actions.pod:5421 ../src/guestfs-actions.pod:5687
+#: ../src/guestfs-actions.pod:7293
+msgid "(Added in 1.3.14)"

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:5354
-msgid "guestfs_readdir"
+#: ../src/guestfs-actions.pod:4914
+msgid "guestfs_part_add"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:5356
+#: ../src/guestfs-actions.pod:4916

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" struct guestfs_dirent_list *\n"
-" guestfs_readdir (guestfs_h *g,\n"
-"                  const char *dir);\n"
+" int\n"
+" guestfs_part_add (guestfs_h *g,\n"
+"                   const char *device,\n"
+"                   const char *prlogex,\n"
+"                   int64_t startsect,\n"
+"                   int64_t endsect);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:5360 ../fish/guestfish-actions.pod:3581
-msgid "This returns the list of directory entries in directory C<dir>."
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:5362 ../fish/guestfish-actions.pod:3583
+#: ../src/guestfs-actions.pod:4923

 msgid ""
 msgid ""

-"All entries in the directory are returned, including C<.> and C<..>.  The "
-"entries are I<not> sorted, but returned in the same order as the underlying "
-"filesystem."
+"This command adds a partition to C<device>.  If there is no partition table "
+"on the device, call C<guestfs_part_init> first."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:5366 ../fish/guestfish-actions.pod:3587
+#: ../src/guestfs-actions.pod:4926 ../fish/guestfish-actions.pod:3314

 msgid ""
 msgid ""

-"Also this call returns basic file type information about each file.  The "
-"C<ftyp> field will contain one of the following characters:"
-msgstr ""
-
-# type: =item
-#. type: =item
-#: ../src/guestfs-actions.pod:5371 ../fish/guestfish-actions.pod:3592
-msgid "'b'"
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:5373 ../fish/guestfish-actions.pod:3594
-msgid "Block special"
-msgstr ""
-
-# type: =item
-#. type: =item
-#: ../src/guestfs-actions.pod:5375 ../fish/guestfish-actions.pod:3596
-msgid "'c'"
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:5377 ../fish/guestfish-actions.pod:3598
-msgid "Char special"
-msgstr ""
-
-# type: =item
-#. type: =item
-#: ../src/guestfs-actions.pod:5379 ../fish/guestfish-actions.pod:3600
-msgid "'d'"
+"The C<prlogex> parameter is the type of partition.  Normally you should pass "
+"C<p> or C<primary> here, but MBR partition tables also support C<l> (or "
+"C<logical>) and C<e> (or C<extended>) partition types."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:5381 ../fish/guestfish-actions.pod:3602
-msgid "Directory"
-msgstr ""
-
-# type: =item
-#. type: =item
-#: ../src/guestfs-actions.pod:5383 ../fish/guestfish-actions.pod:3604
-msgid "'f'"
+#: ../src/guestfs-actions.pod:4931 ../fish/guestfish-actions.pod:3319
+msgid ""
+"C<startsect> and C<endsect> are the start and end of the partition in "
+"I<sectors>.  C<endsect> may be negative, which means it counts backwards "
+"from the end of the disk (C<-1> is the last sector)."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:5385 ../fish/guestfish-actions.pod:3606
-msgid "FIFO (named pipe)"
-msgstr ""
-
-# type: =item
-#. type: =item
-#: ../src/guestfs-actions.pod:5387 ../fish/guestfish-actions.pod:3608
-msgid "'l'"
+#: ../src/guestfs-actions.pod:4935
+msgid ""
+"Creating a partition which covers the whole disk is not so easy.  Use "
+"C<guestfs_part_disk> to do that."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:5389 ../fish/guestfish-actions.pod:3610
-msgid "Symbolic link"
-msgstr ""
-
-# type: =item
-#. type: =item
-#: ../src/guestfs-actions.pod:5391 ../fish/guestfish-actions.pod:3612
-msgid "'r'"
+#: ../src/guestfs-actions.pod:4940 ../src/guestfs-actions.pod:4978
+#: ../src/guestfs-actions.pod:5031 ../src/guestfs-actions.pod:5109
+#: ../src/guestfs-actions.pod:5147 ../src/guestfs-actions.pod:5166
+#: ../src/guestfs-actions.pod:5206
+msgid "(Added in 1.0.78)"

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:5393 ../fish/guestfish-actions.pod:3614
-msgid "Regular file"
+# type: =head2
+#. type: =head2
+#: ../src/guestfs-actions.pod:4942
+msgid "guestfs_part_del"

 msgstr ""
 
 msgstr ""
 

-# type: =item
-#. type: =item
-#: ../src/guestfs-actions.pod:5395 ../fish/guestfish-actions.pod:3616
-msgid "'s'"
+# type: verbatim
+#. type: verbatim
+#: ../src/guestfs-actions.pod:4944
+#, no-wrap
+msgid ""
+" int\n"
+" guestfs_part_del (guestfs_h *g,\n"
+"                   const char *device,\n"
+"                   int partnum);\n"
+"\n"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:5397 ../fish/guestfish-actions.pod:3618
-msgid "Socket"
-msgstr ""
-
-# type: =item
-#. type: =item
-#: ../src/guestfs-actions.pod:5399 ../fish/guestfish-actions.pod:3620
-msgid "'u'"
+#: ../src/guestfs-actions.pod:4949 ../fish/guestfish-actions.pod:3330
+msgid "This command deletes the partition numbered C<partnum> on C<device>."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:5401 ../fish/guestfish-actions.pod:3622
-msgid "Unknown file type"
+#: ../src/guestfs-actions.pod:4951 ../fish/guestfish-actions.pod:3332
+msgid ""
+"Note that in the case of MBR partitioning, deleting an extended partition "
+"also deletes any logical partitions it contains."

 msgstr ""
 
 msgstr ""
 

-# type: =item
-#. type: =item
-#: ../src/guestfs-actions.pod:5403 ../fish/guestfish-actions.pod:3624
-msgid "'?'"
+# type: =head2
+#. type: =head2
+#: ../src/guestfs-actions.pod:4959
+msgid "guestfs_part_disk"

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:5405 ../fish/guestfish-actions.pod:3626
+# type: verbatim
+#. type: verbatim
+#: ../src/guestfs-actions.pod:4961
+#, no-wrap

 msgid ""
 msgid ""

-"The L<readdir(3)> call returned a C<d_type> field with an unexpected value"
+" int\n"
+" guestfs_part_disk (guestfs_h *g,\n"
+"                    const char *device,\n"
+"                    const char *parttype);\n"
+"\n"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:5410
+#: ../src/guestfs-actions.pod:4966

 msgid ""
 msgid ""

-"This function is primarily intended for use by programs.  To get a simple "
-"list of names, use C<guestfs_ls>.  To get a printable directory for human "
-"consumption, use C<guestfs_ll>."
+"This command is simply a combination of C<guestfs_part_init> followed by "
+"C<guestfs_part_add> to create a single primary partition covering the whole "
+"disk."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:5414
+#: ../src/guestfs-actions.pod:4970

 msgid ""
 msgid ""

-"This function returns a C<struct guestfs_dirent_list *>, or NULL if there "
-"was an error.  I<The caller must call C<guestfs_free_dirent_list> after use>."
+"C<parttype> is the partition table type, usually C<mbr> or C<gpt>, but other "
+"possible values are described in C<guestfs_part_init>."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:5420
-msgid "guestfs_readlink"
+#: ../src/guestfs-actions.pod:4980
+msgid "guestfs_part_get_bootable"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:5422
+#: ../src/guestfs-actions.pod:4982

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" char *\n"
-" guestfs_readlink (guestfs_h *g,\n"
-"                   const char *path);\n"
+" int\n"
+" guestfs_part_get_bootable (guestfs_h *g,\n"
+"                            const char *device,\n"
+"                            int partnum);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:5426 ../fish/guestfish-actions.pod:3639
-msgid "This command reads the target of a symbolic link."
+#: ../src/guestfs-actions.pod:4987 ../fish/guestfish-actions.pod:3354
+msgid ""
+"This command returns true if the partition C<partnum> on C<device> has the "
+"bootable flag set."
+msgstr ""
+
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:4990
+msgid "See also C<guestfs_part_set_bootable>."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:5433
-msgid "guestfs_readlinklist"
+#: ../src/guestfs-actions.pod:4996
+msgid "guestfs_part_get_mbr_id"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:5435
+#: ../src/guestfs-actions.pod:4998

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" char **\n"
-" guestfs_readlinklist (guestfs_h *g,\n"
-"                       const char *path,\n"
-"                       char *const *names);\n"
+" int\n"
+" guestfs_part_get_mbr_id (guestfs_h *g,\n"
+"                          const char *device,\n"
+"                          int partnum);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:5440 ../fish/guestfish-actions.pod:3645
-msgid ""
-"This call allows you to do a C<readlink> operation on multiple files, where "
-"all files are in the directory C<path>.  C<names> is the list of files from "
-"this directory."
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:5444 ../fish/guestfish-actions.pod:3649
-msgid ""
-"On return you get a list of strings, with a one-to-one correspondence to the "
-"C<names> list.  Each string is the value of the symbolic link."
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:5448 ../fish/guestfish-actions.pod:3653
+#: ../src/guestfs-actions.pod:5003 ../fish/guestfish-actions.pod:3363

 msgid ""
 msgid ""

-"If the C<readlink(2)> operation fails on any name, then the corresponding "
-"result string is the empty string C<\"\">.  However the whole operation is "
-"completed even if there were C<readlink(2)> errors, and so you can call this "
-"function with names where you don't know if they are symbolic links already "
-"(albeit slightly less efficient)."
+"Returns the MBR type byte (also known as the ID byte) from the numbered "
+"partition C<partnum>."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:5455 ../fish/guestfish-actions.pod:3660
+#: ../src/guestfs-actions.pod:5006 ../src/guestfs-actions.pod:5182

 msgid ""
 msgid ""

-"This call is intended for programs that want to efficiently list a directory "
-"contents without making many round-trips.  Very long directory listings "
-"might cause the protocol message size to be exceeded, causing this call to "
-"fail.  The caller must split up such requests into smaller groups of names."
+"Note that only MBR (old DOS-style) partitions have type bytes.  You will get "
+"undefined results for other partition table types (see "
+"C<guestfs_part_get_parttype>)."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:5468
-msgid "guestfs_realpath"
+#: ../src/guestfs-actions.pod:5014
+msgid "guestfs_part_get_parttype"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:5470
+#: ../src/guestfs-actions.pod:5016

 #, no-wrap
 msgid ""
 " char *\n"
 #, no-wrap
 msgid ""
 " char *\n"

-" guestfs_realpath (guestfs_h *g,\n"
-"                   const char *path);\n"
+" guestfs_part_get_parttype (guestfs_h *g,\n"
+"                            const char *device);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:5474 ../fish/guestfish-actions.pod:3671
+#: ../src/guestfs-actions.pod:5020 ../fish/guestfish-actions.pod:3374

 msgid ""
 msgid ""

-"Return the canonicalized absolute pathname of C<path>.  The returned path "
-"has no C<.>, C<..> or symbolic link path elements."
+"This command examines the partition table on C<device> and returns the "
+"partition table type (format) being used."
+msgstr ""
+
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:5023
+msgid ""
+"Common return values include: C<msdos> (a DOS/Windows style MBR partition "
+"table), C<gpt> (a GPT/EFI-style partition table).  Other values are "
+"possible, although unusual.  See C<guestfs_part_init> for a full list."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:5482
-msgid "guestfs_removexattr"
+#: ../src/guestfs-actions.pod:5033
+msgid "guestfs_part_init"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:5484
+#: ../src/guestfs-actions.pod:5035

 #, no-wrap
 msgid ""
 " int\n"
 #, no-wrap
 msgid ""
 " int\n"

-" guestfs_removexattr (guestfs_h *g,\n"
-"                      const char *xattr,\n"
-"                      const char *path);\n"
+" guestfs_part_init (guestfs_h *g,\n"
+"                    const char *device,\n"
+"                    const char *parttype);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:5489 ../fish/guestfish-actions.pod:3678
+#: ../src/guestfs-actions.pod:5040 ../fish/guestfish-actions.pod:3386

 msgid ""
 msgid ""

-"This call removes the extended attribute named C<xattr> of the file C<path>."
+"This creates an empty partition table on C<device> of one of the partition "
+"types listed below.  Usually C<parttype> should be either C<msdos> or C<gpt> "
+"(for large disks)."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:5492
-msgid "See also: C<guestfs_lremovexattr>, L<attr(5)>."
+#: ../src/guestfs-actions.pod:5044
+msgid ""
+"Initially there are no partitions.  Following this, you should call "
+"C<guestfs_part_add> for each partition required."

 msgstr ""
 
 msgstr ""
 

-# type: =head2
-#. type: =head2
-#: ../src/guestfs-actions.pod:5498
-msgid "guestfs_resize2fs"
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:5047 ../fish/guestfish-actions.pod:3393
+msgid "Possible values for C<parttype> are:"

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../src/guestfs-actions.pod:5500
-#, no-wrap
-msgid ""
-" int\n"
-" guestfs_resize2fs (guestfs_h *g,\n"
-"                    const char *device);\n"
-"\n"
+# type: =item
+#. type: =item
+#: ../src/guestfs-actions.pod:5051 ../fish/guestfish-actions.pod:3397
+msgid "B<efi> | B<gpt>"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:5504 ../fish/guestfish-actions.pod:3687
-msgid ""
-"This resizes an ext2, ext3 or ext4 filesystem to match the size of the "
-"underlying device."
+#: ../src/guestfs-actions.pod:5053 ../fish/guestfish-actions.pod:3399
+msgid "Intel EFI / GPT partition table."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:5507
+#: ../src/guestfs-actions.pod:5055 ../fish/guestfish-actions.pod:3401

 msgid ""
 msgid ""

-"I<Note:> It is sometimes required that you run C<guestfs_e2fsck_f> on the "
-"C<device> before calling this command.  For unknown reasons C<resize2fs> "
-"sometimes gives an error about this and sometimes not.  In any case, it is "
-"always safe to call C<guestfs_e2fsck_f> before calling this function."
+"This is recommended for >= 2 TB partitions that will be accessed from Linux "
+"and Intel-based Mac OS X.  It also has limited backwards compatibility with "
+"the C<mbr> format."

 msgstr ""
 
 msgstr ""
 

-#. type: =head2
-#: ../src/guestfs-actions.pod:5517
-msgid "guestfs_resize2fs_M"
+# type: =item
+#. type: =item
+#: ../src/guestfs-actions.pod:5059 ../fish/guestfish-actions.pod:3405
+msgid "B<mbr> | B<msdos>"

 msgstr ""
 
 msgstr ""
 

-#. type: verbatim
-#: ../src/guestfs-actions.pod:5519
-#, no-wrap
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:5061 ../fish/guestfish-actions.pod:3407

 msgid ""
 msgid ""

-" int\n"
-" guestfs_resize2fs_M (guestfs_h *g,\n"
-"                      const char *device);\n"
-"\n"
-msgstr ""
+"The standard PC \"Master Boot Record\" (MBR) format used by MS-DOS and "
+"Windows.  This partition type will B<only> work for device sizes up to 2 "
+"TB.  For large disks we recommend using C<gpt>."
+msgstr ""

 
 

+# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:5523
+#: ../src/guestfs-actions.pod:5068 ../fish/guestfish-actions.pod:3414

 msgid ""
 msgid ""

-"This command is the same as C<guestfs_resize2fs>, but the filesystem is "
-"resized to its minimum size.  This works like the C<-M> option to the "
-"C<resize2fs> command."
+"Other partition table types that may work but are not supported include:"

 msgstr ""
 
 msgstr ""
 

-#. type: textblock
-#: ../src/guestfs-actions.pod:5527
-msgid ""
-"To get the resulting size of the filesystem you should call "
-"C<guestfs_tune2fs_l> and read the C<Block size> and C<Block count> values.  "
-"These two numbers, multiplied together, give the resulting size of the "
-"minimal filesystem in bytes."
+# type: =item
+#. type: =item
+#: ../src/guestfs-actions.pod:5073 ../fish/guestfish-actions.pod:3419
+msgid "B<aix>"

 msgstr ""
 
 msgstr ""
 

-# type: =head2
-#. type: =head2
-#: ../src/guestfs-actions.pod:5534
-msgid "guestfs_resize2fs_size"
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:5075 ../fish/guestfish-actions.pod:3421
+msgid "AIX disk labels."

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../src/guestfs-actions.pod:5536
-#, no-wrap
-msgid ""
-" int\n"
-" guestfs_resize2fs_size (guestfs_h *g,\n"
-"                         const char *device,\n"
-"                         int64_t size);\n"
-"\n"
+# type: =item
+#. type: =item
+#: ../src/guestfs-actions.pod:5077 ../fish/guestfish-actions.pod:3423
+msgid "B<amiga> | B<rdb>"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:5541
-msgid ""
-"This command is the same as C<guestfs_resize2fs> except that it allows you "
-"to specify the new size (in bytes) explicitly."
+#: ../src/guestfs-actions.pod:5079 ../fish/guestfish-actions.pod:3425
+msgid "Amiga \"Rigid Disk Block\" format."

 msgstr ""
 
 msgstr ""
 

-# type: =head2
-#. type: =head2
-#: ../src/guestfs-actions.pod:5548
-msgid "guestfs_rm"
+# type: =item
+#. type: =item
+#: ../src/guestfs-actions.pod:5081 ../fish/guestfish-actions.pod:3427
+msgid "B<bsd>"

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../src/guestfs-actions.pod:5550
-#, no-wrap
-msgid ""
-" int\n"
-" guestfs_rm (guestfs_h *g,\n"
-"             const char *path);\n"
-"\n"
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:5083 ../fish/guestfish-actions.pod:3429
+msgid "BSD disk labels."
+msgstr ""
+
+# type: =item
+#. type: =item
+#: ../src/guestfs-actions.pod:5085 ../fish/guestfish-actions.pod:3431
+msgid "B<dasd>"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:5554 ../fish/guestfish-actions.pod:3720
-msgid "Remove the single file C<path>."
+#: ../src/guestfs-actions.pod:5087 ../fish/guestfish-actions.pod:3433
+msgid "DASD, used on IBM mainframes."

 msgstr ""
 
 msgstr ""
 

-# type: =head2
-#. type: =head2
-#: ../src/guestfs-actions.pod:5560
-msgid "guestfs_rm_rf"
+# type: =item
+#. type: =item
+#: ../src/guestfs-actions.pod:5089 ../fish/guestfish-actions.pod:3435
+msgid "B<dvh>"

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../src/guestfs-actions.pod:5562
-#, no-wrap
-msgid ""
-" int\n"
-" guestfs_rm_rf (guestfs_h *g,\n"
-"                const char *path);\n"
-"\n"
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:5091 ../fish/guestfish-actions.pod:3437
+msgid "MIPS/SGI volumes."
+msgstr ""
+
+# type: =item
+#. type: =item
+#: ../src/guestfs-actions.pod:5093 ../fish/guestfish-actions.pod:3439
+msgid "B<mac>"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:5566 ../fish/guestfish-actions.pod:3726
-msgid ""
-"Remove the file or directory C<path>, recursively removing the contents if "
-"its a directory.  This is like the C<rm -rf> shell command."
+#: ../src/guestfs-actions.pod:5095 ../fish/guestfish-actions.pod:3441
+msgid "Old Mac partition format.  Modern Macs use C<gpt>."

 msgstr ""
 
 msgstr ""
 

-# type: =head2
-#. type: =head2
-#: ../src/guestfs-actions.pod:5574
-msgid "guestfs_rmdir"
+# type: =item
+#. type: =item
+#: ../src/guestfs-actions.pod:5097 ../fish/guestfish-actions.pod:3443
+msgid "B<pc98>"

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../src/guestfs-actions.pod:5576
-#, no-wrap
-msgid ""
-" int\n"
-" guestfs_rmdir (guestfs_h *g,\n"
-"                const char *path);\n"
-"\n"
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:5099 ../fish/guestfish-actions.pod:3445
+msgid "NEC PC-98 format, common in Japan apparently."
+msgstr ""
+
+# type: =item
+#. type: =item
+#: ../src/guestfs-actions.pod:5101 ../fish/guestfish-actions.pod:3447
+msgid "B<sun>"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:5580 ../fish/guestfish-actions.pod:3734
-msgid "Remove the single directory C<path>."
+#: ../src/guestfs-actions.pod:5103 ../fish/guestfish-actions.pod:3449
+msgid "Sun disk labels."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:5586
-msgid "guestfs_rmmountpoint"
+#: ../src/guestfs-actions.pod:5111
+msgid "guestfs_part_list"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:5588
+#: ../src/guestfs-actions.pod:5113

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" int\n"
-" guestfs_rmmountpoint (guestfs_h *g,\n"
-"                       const char *exemptpath);\n"
+" struct guestfs_partition_list *\n"
+" guestfs_part_list (guestfs_h *g,\n"
+"                    const char *device);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:5592
+#: ../src/guestfs-actions.pod:5117 ../fish/guestfish-actions.pod:3457

 msgid ""
 msgid ""

-"This calls removes a mountpoint that was previously created with "
-"C<guestfs_mkmountpoint>.  See C<guestfs_mkmountpoint> for full details."
+"This command parses the partition table on C<device> and returns the list of "
+"partitions found."

 msgstr ""
 
 msgstr ""
 

-# type: =head2
-#. type: =head2
-#: ../src/guestfs-actions.pod:5600
-msgid "guestfs_scrub_device"
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:5120 ../fish/guestfish-actions.pod:3460
+msgid "The fields in the returned structure are:"

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../src/guestfs-actions.pod:5602
-#, no-wrap
-msgid ""
-" int\n"
-" guestfs_scrub_device (guestfs_h *g,\n"
-"                       const char *device);\n"
-"\n"
+# type: =item
+#. type: =item
+#: ../src/guestfs-actions.pod:5124 ../fish/guestfish-actions.pod:3464
+msgid "B<part_num>"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:5606 ../fish/guestfish-actions.pod:3748
-msgid ""
-"This command writes patterns over C<device> to make data retrieval more "
-"difficult."
+#: ../src/guestfs-actions.pod:5126 ../fish/guestfish-actions.pod:3466
+msgid "Partition number, counting from 1."
+msgstr ""
+
+# type: =item
+#. type: =item
+#: ../src/guestfs-actions.pod:5128 ../fish/guestfish-actions.pod:3468
+msgid "B<part_start>"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:5609 ../src/guestfs-actions.pod:5630
-#: ../src/guestfs-actions.pod:5649 ../fish/guestfish-actions.pod:3751
-#: ../fish/guestfish-actions.pod:3766 ../fish/guestfish-actions.pod:3779
+#: ../src/guestfs-actions.pod:5130

 msgid ""
 msgid ""

-"It is an interface to the L<scrub(1)> program.  See that manual page for "
-"more details."
+"Start of the partition I<in bytes>.  To get sectors you have to divide by "
+"the device's sector size, see C<guestfs_blockdev_getss>."
+msgstr ""
+
+# type: =item
+#. type: =item
+#: ../src/guestfs-actions.pod:5133 ../fish/guestfish-actions.pod:3473
+msgid "B<part_end>"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:5617 ../src/guestfs-actions.pod:5635
-#: ../src/guestfs-actions.pod:5654
-msgid "(Added in 1.0.52)"
+#: ../src/guestfs-actions.pod:5135 ../fish/guestfish-actions.pod:3475
+msgid "End of the partition in bytes."
+msgstr ""
+
+# type: =item
+#. type: =item
+#: ../src/guestfs-actions.pod:5137 ../fish/guestfish-actions.pod:3477
+msgid "B<part_size>"
+msgstr ""
+
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:5139 ../fish/guestfish-actions.pod:3479
+msgid "Size of the partition in bytes."
+msgstr ""
+
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:5143
+msgid ""
+"This function returns a C<struct guestfs_partition_list *>, or NULL if there "
+"was an error.  I<The caller must call C<guestfs_free_partition_list> after "
+"use>."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:5619
-msgid "guestfs_scrub_file"
+#: ../src/guestfs-actions.pod:5149
+msgid "guestfs_part_set_bootable"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:5621
+#: ../src/guestfs-actions.pod:5151

 #, no-wrap
 msgid ""
 " int\n"
 #, no-wrap
 msgid ""
 " int\n"

-" guestfs_scrub_file (guestfs_h *g,\n"
-"                     const char *file);\n"
+" guestfs_part_set_bootable (guestfs_h *g,\n"
+"                            const char *device,\n"
+"                            int partnum,\n"
+"                            int bootable);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:5625 ../fish/guestfish-actions.pod:3761
+#: ../src/guestfs-actions.pod:5157 ../fish/guestfish-actions.pod:3487

 msgid ""
 msgid ""

-"This command writes patterns over a file to make data retrieval more "
-"difficult."
+"This sets the bootable flag on partition numbered C<partnum> on device "
+"C<device>.  Note that partitions are numbered from 1."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:5628 ../fish/guestfish-actions.pod:3764
-msgid "The file is I<removed> after scrubbing."
+#: ../src/guestfs-actions.pod:5160 ../fish/guestfish-actions.pod:3490
+msgid ""
+"The bootable flag is used by some operating systems (notably Windows) to "
+"determine which partition to boot from.  It is by no means universally "
+"recognized."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:5637
-msgid "guestfs_scrub_freespace"
+#: ../src/guestfs-actions.pod:5168
+msgid "guestfs_part_set_mbr_id"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:5639
+#: ../src/guestfs-actions.pod:5170

 #, no-wrap
 msgid ""
 " int\n"
 #, no-wrap
 msgid ""
 " int\n"

-" guestfs_scrub_freespace (guestfs_h *g,\n"
-"                          const char *dir);\n"
+" guestfs_part_set_mbr_id (guestfs_h *g,\n"
+"                          const char *device,\n"
+"                          int partnum,\n"
+"                          int idbyte);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:5643
+#: ../src/guestfs-actions.pod:5176 ../fish/guestfish-actions.pod:3498

 msgid ""
 msgid ""

-"This command creates the directory C<dir> and then fills it with files until "
-"the filesystem is full, and scrubs the files as for C<guestfs_scrub_file>, "
-"and deletes them.  The intention is to scrub any free space on the partition "
-"containing C<dir>."
+"Sets the MBR type byte (also known as the ID byte) of the numbered partition "
+"C<partnum> to C<idbyte>.  Note that the type bytes quoted in most "
+"documentation are in fact hexadecimal numbers, but usually documented "
+"without any leading \"0x\" which might be confusing."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:5656
-msgid "guestfs_set_append"
+#: ../src/guestfs-actions.pod:5190
+msgid "guestfs_part_set_name"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:5658
+#: ../src/guestfs-actions.pod:5192

 #, no-wrap
 msgid ""
 " int\n"
 #, no-wrap
 msgid ""
 " int\n"

-" guestfs_set_append (guestfs_h *g,\n"
-"                     const char *append);\n"
+" guestfs_part_set_name (guestfs_h *g,\n"
+"                        const char *device,\n"
+"                        int partnum,\n"
+"                        const char *name);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:5662 ../fish/guestfish-actions.pod:3788
-msgid ""
-"This function is used to add additional options to the guest kernel command "
-"line."
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:5665 ../fish/guestfish-actions.pod:3791
+#: ../src/guestfs-actions.pod:5198 ../fish/guestfish-actions.pod:3512

 msgid ""
 msgid ""

-"The default is C<NULL> unless overridden by setting C<LIBGUESTFS_APPEND> "
-"environment variable."
+"This sets the partition name on partition numbered C<partnum> on device "
+"C<device>.  Note that partitions are numbered from 1."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:5668 ../fish/guestfish-actions.pod:3794
+#: ../src/guestfs-actions.pod:5201 ../fish/guestfish-actions.pod:3515

 msgid ""
 msgid ""

-"Setting C<append> to C<NULL> means I<no> additional options are passed "
-"(libguestfs always adds a few of its own)."
+"The partition name can only be set on certain types of partition table.  "
+"This works on C<gpt> but not on C<mbr> partitions."

 msgstr ""
 
 msgstr ""
 

+# type: =head2

 #. type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:5675
-msgid "guestfs_set_attach_method"
+#: ../src/guestfs-actions.pod:5208
+msgid "guestfs_part_to_dev"

 msgstr ""
 
 msgstr ""
 

+# type: verbatim

 #. type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:5677
+#: ../src/guestfs-actions.pod:5210

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" int\n"
-" guestfs_set_attach_method (guestfs_h *g,\n"
-"                            const char *attachmethod);\n"
+" char *\n"
+" guestfs_part_to_dev (guestfs_h *g,\n"
+"                      const char *partition);\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

+# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:5681 ../fish/guestfish-actions.pod:3803
+#: ../src/guestfs-actions.pod:5214 ../fish/guestfish-actions.pod:3522

 msgid ""
 msgid ""

-"Set the method that libguestfs uses to connect to the back end guestfsd "
-"daemon.  Possible methods are:"
+"This function takes a partition name (eg. \"/dev/sdb1\") and removes the "
+"partition number, returning the device name (eg. \"/dev/sdb\")."

 msgstr ""
 
 msgstr ""
 

+# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:5688 ../fish/guestfish-actions.pod:3810
+#: ../src/guestfs-actions.pod:5218

 msgid ""
 msgid ""

-"Launch an appliance and connect to it.  This is the ordinary method and the "
-"default."
+"The named partition must exist, for example as a string returned from "
+"C<guestfs_list_partitions>."

 msgstr ""
 
 msgstr ""
 

-#. type: =item
-#: ../src/guestfs-actions.pod:5691 ../fish/guestfish-actions.pod:3813
-msgid "C<unix:I<path>>"
+# type: =head2
+#. type: =head2
+#: ../src/guestfs-actions.pod:5226
+msgid "guestfs_ping_daemon"

 msgstr ""
 
 msgstr ""
 

-#. type: textblock
-#: ../src/guestfs-actions.pod:5693 ../fish/guestfish-actions.pod:3815
-msgid "Connect to the Unix domain socket I<path>."
+# type: verbatim
+#. type: verbatim
+#: ../src/guestfs-actions.pod:5228
+#, no-wrap
+msgid ""
+" int\n"
+" guestfs_ping_daemon (guestfs_h *g);\n"
+"\n"

 msgstr ""
 
 msgstr ""
 

+# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:5695 ../fish/guestfish-actions.pod:3817
+#: ../src/guestfs-actions.pod:5231 ../fish/guestfish-actions.pod:3533

 msgid ""
 msgid ""

-"This method lets you connect to an existing daemon or (using virtio-serial) "
-"to a live guest.  For more information, see L<guestfs(3)/ATTACHING TO "
-"RUNNING DAEMONS>."
+"This is a test probe into the guestfs daemon running inside the qemu "
+"subprocess.  Calling this function checks that the daemon responds to the "
+"ping message, without affecting the daemon or attached block device(s) in "
+"any other way."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:5703
-msgid "guestfs_set_autosync"
+#: ../src/guestfs-actions.pod:5240
+msgid "guestfs_pread"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:5705
+#: ../src/guestfs-actions.pod:5242

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" int\n"
-" guestfs_set_autosync (guestfs_h *g,\n"
-"                       int autosync);\n"
+" char *\n"
+" guestfs_pread (guestfs_h *g,\n"
+"                const char *path,\n"
+"                int count,\n"
+"                int64_t offset,\n"
+"                size_t *size_r);\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

+# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:5709 ../fish/guestfish-actions.pod:3829
+#: ../src/guestfs-actions.pod:5249 ../fish/guestfish-actions.pod:3542

 msgid ""
 msgid ""

-"If C<autosync> is true, this enables autosync.  Libguestfs will make a best "
-"effort attempt to make filesystems consistent and synchronized when the "
-"handle is closed (also if the program exits without closing handles)."
+"This command lets you read part of a file.  It reads C<count> bytes of the "
+"file, starting at C<offset>, from file C<path>."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:5714 ../fish/guestfish-actions.pod:3834
+#: ../src/guestfs-actions.pod:5252 ../src/guestfs-actions.pod:5278
+#: ../fish/guestfish-actions.pod:3545 ../fish/guestfish-actions.pod:3560

 msgid ""
 msgid ""

-"This is enabled by default (since libguestfs 1.5.24, previously it was "
-"disabled by default)."
+"This may read fewer bytes than requested.  For further details see the "
+"L<pread(2)> system call."
+msgstr ""
+
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:5255
+msgid "See also C<guestfs_pwrite>, C<guestfs_pread_device>."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:5721
-msgid "guestfs_set_direct"
+#: ../src/guestfs-actions.pod:5266
+msgid "guestfs_pread_device"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:5723
+#: ../src/guestfs-actions.pod:5268

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" int\n"
-" guestfs_set_direct (guestfs_h *g,\n"
-"                     int direct);\n"
+" char *\n"
+" guestfs_pread_device (guestfs_h *g,\n"
+"                       const char *device,\n"
+"                       int count,\n"
+"                       int64_t offset,\n"
+"                       size_t *size_r);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:5727 ../fish/guestfish-actions.pod:3843
-msgid ""
-"If the direct appliance mode flag is enabled, then stdin and stdout are "
-"passed directly through to the appliance once it is launched."
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:5731
+#: ../src/guestfs-actions.pod:5275 ../fish/guestfish-actions.pod:3557

 msgid ""
 msgid ""

-"One consequence of this is that log messages aren't caught by the library "
-"and handled by C<guestfs_set_log_message_callback>, but go straight to "
-"stdout."
+"This command lets you read part of a file.  It reads C<count> bytes of "
+"C<device>, starting at C<offset>."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:5735 ../fish/guestfish-actions.pod:3851
-msgid "You probably don't want to use this unless you know what you are doing."
+#: ../src/guestfs-actions.pod:5281
+msgid "See also C<guestfs_pread>."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:5738 ../fish/guestfish-actions.pod:3854
-msgid "The default is disabled."
+#: ../src/guestfs-actions.pod:5290
+msgid "(Added in 1.5.21)"

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:5744
-msgid "guestfs_set_e2label"
+#: ../src/guestfs-actions.pod:5292
+msgid "guestfs_pvcreate"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:5746
+#: ../src/guestfs-actions.pod:5294

 #, no-wrap
 msgid ""
 " int\n"
 #, no-wrap
 msgid ""
 " int\n"

-" guestfs_set_e2label (guestfs_h *g,\n"
-"                      const char *device,\n"
-"                      const char *label);\n"
+" guestfs_pvcreate (guestfs_h *g,\n"
+"                   const char *device);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:5751 ../fish/guestfish-actions.pod:3860
+#: ../src/guestfs-actions.pod:5298 ../fish/guestfish-actions.pod:3572

 msgid ""
 msgid ""

-"This sets the ext2/3/4 filesystem label of the filesystem on C<device> to "
-"C<label>.  Filesystem labels are limited to 16 characters."
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:5755
-msgid ""
-"You can use either C<guestfs_tune2fs_l> or C<guestfs_get_e2label> to return "
-"the existing label on a filesystem."
+"This creates an LVM physical volume on the named C<device>, where C<device> "
+"should usually be a partition name such as C</dev/sda1>."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:5762
-msgid "guestfs_set_e2uuid"
+#: ../src/guestfs-actions.pod:5306
+msgid "guestfs_pvremove"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:5764
+#: ../src/guestfs-actions.pod:5308

 #, no-wrap
 msgid ""
 " int\n"
 #, no-wrap
 msgid ""
 " int\n"

-" guestfs_set_e2uuid (guestfs_h *g,\n"
-"                     const char *device,\n"
-"                     const char *uuid);\n"
+" guestfs_pvremove (guestfs_h *g,\n"
+"                   const char *device);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:5769 ../fish/guestfish-actions.pod:3871
+#: ../src/guestfs-actions.pod:5312 ../fish/guestfish-actions.pod:3580

 msgid ""
 msgid ""

-"This sets the ext2/3/4 filesystem UUID of the filesystem on C<device> to "
-"C<uuid>.  The format of the UUID and alternatives such as C<clear>, "
-"C<random> and C<time> are described in the L<tune2fs(8)> manpage."
+"This wipes a physical volume C<device> so that LVM will no longer recognise "
+"it."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:5774
+#: ../src/guestfs-actions.pod:5315 ../fish/guestfish-actions.pod:3583

 msgid ""
 msgid ""

-"You can use either C<guestfs_tune2fs_l> or C<guestfs_get_e2uuid> to return "
-"the existing UUID of a filesystem."
+"The implementation uses the C<pvremove> command which refuses to wipe "
+"physical volumes that contain any volume groups, so you have to remove those "
+"first."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:5781
-msgid "guestfs_set_memsize"
+#: ../src/guestfs-actions.pod:5323
+msgid "guestfs_pvresize"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:5783
+#: ../src/guestfs-actions.pod:5325

 #, no-wrap
 msgid ""
 " int\n"
 #, no-wrap
 msgid ""
 " int\n"

-" guestfs_set_memsize (guestfs_h *g,\n"
-"                      int memsize);\n"
+" guestfs_pvresize (guestfs_h *g,\n"
+"                   const char *device);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:5787
+#: ../src/guestfs-actions.pod:5329 ../fish/guestfish-actions.pod:3591

 msgid ""
 msgid ""

-"This sets the memory size in megabytes allocated to the qemu subprocess.  "
-"This only has any effect if called before C<guestfs_launch>."
+"This resizes (expands or shrinks) an existing LVM physical volume to match "
+"the new size of the underlying device."
+msgstr ""
+
+# type: =head2
+#. type: =head2
+#: ../src/guestfs-actions.pod:5336
+msgid "guestfs_pvresize_size"
+msgstr ""
+
+# type: verbatim
+#. type: verbatim
+#: ../src/guestfs-actions.pod:5338
+#, no-wrap
+msgid ""
+" int\n"
+" guestfs_pvresize_size (guestfs_h *g,\n"
+"                        const char *device,\n"
+"                        int64_t size);\n"
+"\n"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:5791 ../fish/guestfish-actions.pod:3889
+#: ../src/guestfs-actions.pod:5343

 msgid ""
 msgid ""

-"You can also change this by setting the environment variable "
-"C<LIBGUESTFS_MEMSIZE> before the handle is created."
+"This command is the same as C<guestfs_pvresize> except that it allows you to "
+"specify the new size (in bytes) explicitly."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:5802
-msgid "guestfs_set_network"
+#: ../src/guestfs-actions.pod:5350
+msgid "guestfs_pvs"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:5804
+#: ../src/guestfs-actions.pod:5352

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" int\n"
-" guestfs_set_network (guestfs_h *g,\n"
-"                      int network);\n"
+" char **\n"
+" guestfs_pvs (guestfs_h *g);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:5808 ../fish/guestfish-actions.pod:3902
+#: ../src/guestfs-actions.pod:5355 ../fish/guestfish-actions.pod:3605

 msgid ""
 msgid ""

-"If C<network> is true, then the network is enabled in the libguestfs "
-"appliance.  The default is false."
+"List all the physical volumes detected.  This is the equivalent of the L<pvs"
+"(8)> command."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:5811 ../fish/guestfish-actions.pod:3905
+#: ../src/guestfs-actions.pod:5358 ../fish/guestfish-actions.pod:3608

 msgid ""
 msgid ""

-"This affects whether commands are able to access the network (see L<guestfs"
-"(3)/RUNNING COMMANDS>)."
+"This returns a list of just the device names that contain PVs (eg. C</dev/"
+"sda2>)."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:5814
-msgid ""
-"You must call this before calling C<guestfs_launch>, otherwise it has no "
-"effect."
+#: ../src/guestfs-actions.pod:5361
+msgid "See also C<guestfs_pvs_full>."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:5821
-msgid "guestfs_set_path"
+#: ../src/guestfs-actions.pod:5369
+msgid "guestfs_pvs_full"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:5823
+#: ../src/guestfs-actions.pod:5371

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" int\n"
-" guestfs_set_path (guestfs_h *g,\n"
-"                   const char *searchpath);\n"
+" struct guestfs_lvm_pv_list *\n"
+" guestfs_pvs_full (guestfs_h *g);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:5827 ../fish/guestfish-actions.pod:3917
-msgid "Set the path that libguestfs searches for kernel and initrd.img."
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:5829 ../fish/guestfish-actions.pod:3919
+#: ../src/guestfs-actions.pod:5374 ../fish/guestfish-actions.pod:3617

 msgid ""
 msgid ""

-"The default is C<$libdir/guestfs> unless overridden by setting "
-"C<LIBGUESTFS_PATH> environment variable."
+"List all the physical volumes detected.  This is the equivalent of the L<pvs"
+"(8)> command.  The \"full\" version includes all fields."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:5832 ../fish/guestfish-actions.pod:3922
-msgid "Setting C<path> to C<NULL> restores the default path."
+#: ../src/guestfs-actions.pod:5377
+msgid ""
+"This function returns a C<struct guestfs_lvm_pv_list *>, or NULL if there "
+"was an error.  I<The caller must call C<guestfs_free_lvm_pv_list> after use>."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:5838
-msgid "guestfs_set_qemu"
+#: ../src/guestfs-actions.pod:5383
+msgid "guestfs_pvuuid"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:5840
+#: ../src/guestfs-actions.pod:5385

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" int\n"
-" guestfs_set_qemu (guestfs_h *g,\n"
-"                   const char *qemu);\n"
+" char *\n"
+" guestfs_pvuuid (guestfs_h *g,\n"
+"                 const char *device);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:5844 ../fish/guestfish-actions.pod:3930
-msgid "Set the qemu binary that we will use."
+#: ../src/guestfs-actions.pod:5389 ../fish/guestfish-actions.pod:3624
+msgid "This command returns the UUID of the LVM PV C<device>."

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:5846 ../fish/guestfish-actions.pod:3932
+# type: =head2
+#. type: =head2
+#: ../src/guestfs-actions.pod:5396
+msgid "guestfs_pwrite"
+msgstr ""
+
+# type: verbatim
+#. type: verbatim
+#: ../src/guestfs-actions.pod:5398
+#, no-wrap

 msgid ""
 msgid ""

-"The default is chosen when the library was compiled by the configure script."
+" int\n"
+" guestfs_pwrite (guestfs_h *g,\n"
+"                 const char *path,\n"
+"                 const char *content,\n"
+"                 size_t content_size,\n"
+"                 int64_t offset);\n"
+"\n"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:5849 ../fish/guestfish-actions.pod:3935
+#: ../src/guestfs-actions.pod:5405 ../fish/guestfish-actions.pod:3630

 msgid ""
 msgid ""

-"You can also override this by setting the C<LIBGUESTFS_QEMU> environment "
-"variable."
+"This command writes to part of a file.  It writes the data buffer C<content> "
+"to the file C<path> starting at offset C<offset>."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:5852 ../fish/guestfish-actions.pod:3938
-msgid "Setting C<qemu> to C<NULL> restores the default qemu binary."
+#: ../src/guestfs-actions.pod:5408 ../fish/guestfish-actions.pod:3633
+msgid ""
+"This command implements the L<pwrite(2)> system call, and like that system "
+"call it may not write the full data requested.  The return value is the "
+"number of bytes that were actually written to the file.  This could even be "
+"0, although short writes are unlikely for regular files in ordinary "
+"circumstances."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:5854 ../fish/guestfish-actions.pod:3940
-msgid ""
-"Note that you should call this function as early as possible after creating "
-"the handle.  This is because some pre-launch operations depend on testing "
-"qemu features (by running C<qemu -help>).  If the qemu binary changes, we "
-"don't retest features, and so you might see inconsistent results.  Using the "
-"environment variable C<LIBGUESTFS_QEMU> is safest of all since that picks "
-"the qemu binary at the same time as the handle is created."
+#: ../src/guestfs-actions.pod:5414
+msgid "See also C<guestfs_pread>, C<guestfs_pwrite_device>."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:5866
-msgid "guestfs_set_recovery_proc"
+#: ../src/guestfs-actions.pod:5423
+msgid "guestfs_pwrite_device"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:5868
+#: ../src/guestfs-actions.pod:5425

 #, no-wrap
 msgid ""
 " int\n"
 #, no-wrap
 msgid ""
 " int\n"

-" guestfs_set_recovery_proc (guestfs_h *g,\n"
-"                            int recoveryproc);\n"
+" guestfs_pwrite_device (guestfs_h *g,\n"
+"                        const char *device,\n"
+"                        const char *content,\n"
+"                        size_t content_size,\n"
+"                        int64_t offset);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:5872
+#: ../src/guestfs-actions.pod:5432 ../fish/guestfish-actions.pod:3648

 msgid ""
 msgid ""

-"If this is called with the parameter C<false> then C<guestfs_launch> does "
-"not create a recovery process.  The purpose of the recovery process is to "
-"stop runaway qemu processes in the case where the main program aborts "
-"abruptly."
+"This command writes to part of a device.  It writes the data buffer "
+"C<content> to C<device> starting at offset C<offset>."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:5877
+#: ../src/guestfs-actions.pod:5435 ../fish/guestfish-actions.pod:3651

 msgid ""
 msgid ""

-"This only has any effect if called before C<guestfs_launch>, and the default "
-"is true."
+"This command implements the L<pwrite(2)> system call, and like that system "
+"call it may not write the full data requested (although short writes to disk "
+"devices and partitions are probably impossible with standard Linux kernels)."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:5880 ../fish/guestfish-actions.pod:3962
-msgid ""
-"About the only time when you would want to disable this is if the main "
-"process will fork itself into the background (\"daemonize\" itself).  In "
-"this case the recovery process thinks that the main program has disappeared "
-"and so kills qemu, which is not very helpful."
+#: ../src/guestfs-actions.pod:5440
+msgid "See also C<guestfs_pwrite>."
+msgstr ""
+
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:5447
+msgid "(Added in 1.5.20)"

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:5890
-msgid "guestfs_set_selinux"
+#: ../src/guestfs-actions.pod:5449
+msgid "guestfs_read_file"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:5892
+#: ../src/guestfs-actions.pod:5451

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" int\n"
-" guestfs_set_selinux (guestfs_h *g,\n"
-"                      int selinux);\n"
+" char *\n"
+" guestfs_read_file (guestfs_h *g,\n"
+"                    const char *path,\n"
+"                    size_t *size_r);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:5896 ../fish/guestfish-actions.pod:3974
-msgid ""
-"This sets the selinux flag that is passed to the appliance at boot time.  "
-"The default is C<selinux=0> (disabled)."
+#: ../src/guestfs-actions.pod:5456 ../fish/guestfish-actions.pod:3665
+msgid "This calls returns the contents of the file C<path> as a buffer."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:5899 ../fish/guestfish-actions.pod:3977
+#: ../src/guestfs-actions.pod:5459

 msgid ""
 msgid ""

-"Note that if SELinux is enabled, it is always in Permissive mode "
-"(C<enforcing=0>)."
+"Unlike C<guestfs_cat>, this function can correctly handle files that contain "
+"embedded ASCII NUL characters.  However unlike C<guestfs_download>, this "
+"function is limited in the total size of file that can be handled."
+msgstr ""
+
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:5471
+msgid "(Added in 1.0.63)"

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:5909
-msgid "guestfs_set_trace"
+#: ../src/guestfs-actions.pod:5473
+msgid "guestfs_read_lines"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:5911
+#: ../src/guestfs-actions.pod:5475

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" int\n"
-" guestfs_set_trace (guestfs_h *g,\n"
-"                    int trace);\n"
+" char **\n"
+" guestfs_read_lines (guestfs_h *g,\n"
+"                     const char *path);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:5915 ../fish/guestfish-actions.pod:3989
-msgid ""
-"If the command trace flag is set to 1, then commands are printed on stderr "
-"before they are executed in a format which is very similar to the one used "
-"by guestfish.  In other words, you can run a program with this enabled, and "
-"you will get out a script which you can feed to guestfish to perform the "
-"same set of actions."
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:5922 ../fish/guestfish-actions.pod:3996
+#: ../src/guestfs-actions.pod:5481 ../fish/guestfish-actions.pod:3682

 msgid ""
 msgid ""

-"If you want to trace C API calls into libguestfs (and other libraries) then "
-"possibly a better way is to use the external ltrace(1) command."
+"The file contents are returned as a list of lines.  Trailing C<LF> and "
+"C<CRLF> character sequences are I<not> returned."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:5926 ../fish/guestfish-actions.pod:4000
+#: ../src/guestfs-actions.pod:5484

 msgid ""
 msgid ""

-"Command traces are disabled unless the environment variable "
-"C<LIBGUESTFS_TRACE> is defined and set to C<1>."
+"Note that this function cannot correctly handle binary files (specifically, "
+"files containing C<\\0> character which is treated as end of line).  For "
+"those you need to use the C<guestfs_read_file> function which has a more "
+"complex interface."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:5933
-msgid "guestfs_set_verbose"
+#: ../src/guestfs-actions.pod:5495
+msgid "guestfs_readdir"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:5935
+#: ../src/guestfs-actions.pod:5497

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" int\n"
-" guestfs_set_verbose (guestfs_h *g,\n"
-"                      int verbose);\n"
+" struct guestfs_dirent_list *\n"
+" guestfs_readdir (guestfs_h *g,\n"
+"                  const char *dir);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:5939 ../fish/guestfish-actions.pod:4009
-msgid "If C<verbose> is true, this turns on verbose messages (to C<stderr>)."
+#: ../src/guestfs-actions.pod:5501 ../fish/guestfish-actions.pod:3694
+msgid "This returns the list of directory entries in directory C<dir>."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:5941 ../fish/guestfish-actions.pod:4011
+#: ../src/guestfs-actions.pod:5503 ../fish/guestfish-actions.pod:3696

 msgid ""
 msgid ""

-"Verbose messages are disabled unless the environment variable "
-"C<LIBGUESTFS_DEBUG> is defined and set to C<1>."
+"All entries in the directory are returned, including C<.> and C<..>.  The "
+"entries are I<not> sorted, but returned in the same order as the underlying "
+"filesystem."

 msgstr ""
 
 msgstr ""
 

-# type: =head2
-#. type: =head2
-#: ../src/guestfs-actions.pod:5948
-msgid "guestfs_setcon"
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:5507 ../fish/guestfish-actions.pod:3700
+msgid ""
+"Also this call returns basic file type information about each file.  The "
+"C<ftyp> field will contain one of the following characters:"

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../src/guestfs-actions.pod:5950
-#, no-wrap
-msgid ""
-" int\n"
-" guestfs_setcon (guestfs_h *g,\n"
-"                 const char *context);\n"
-"\n"
+# type: =item
+#. type: =item
+#: ../src/guestfs-actions.pod:5512 ../fish/guestfish-actions.pod:3705
+msgid "'b'"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:5954 ../fish/guestfish-actions.pod:4018
-msgid ""
-"This sets the SELinux security context of the daemon to the string "
-"C<context>."
+#: ../src/guestfs-actions.pod:5514 ../fish/guestfish-actions.pod:3707
+msgid "Block special"

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:5957 ../fish/guestfish-actions.pod:4021
-msgid "See the documentation about SELINUX in L<guestfs(3)>."
+# type: =item
+#. type: =item
+#: ../src/guestfs-actions.pod:5516 ../fish/guestfish-actions.pod:3709
+msgid "'c'"

 msgstr ""
 
 msgstr ""
 

-# type: =head2
-#. type: =head2
-#: ../src/guestfs-actions.pod:5963
-msgid "guestfs_setxattr"
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:5518 ../fish/guestfish-actions.pod:3711
+msgid "Char special"

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../src/guestfs-actions.pod:5965
-#, no-wrap
-msgid ""
-" int\n"
-" guestfs_setxattr (guestfs_h *g,\n"
-"                   const char *xattr,\n"
-"                   const char *val,\n"
-"                   int vallen,\n"
-"                   const char *path);\n"
-"\n"
+# type: =item
+#. type: =item
+#: ../src/guestfs-actions.pod:5520 ../fish/guestfish-actions.pod:3713
+msgid "'d'"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:5972 ../fish/guestfish-actions.pod:4027
-msgid ""
-"This call sets the extended attribute named C<xattr> of the file C<path> to "
-"the value C<val> (of length C<vallen>).  The value is arbitrary 8 bit data."
+#: ../src/guestfs-actions.pod:5522 ../fish/guestfish-actions.pod:3715
+msgid "Directory"
+msgstr ""
+
+# type: =item
+#. type: =item
+#: ../src/guestfs-actions.pod:5524 ../fish/guestfish-actions.pod:3717
+msgid "'f'"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:5976
-msgid "See also: C<guestfs_lsetxattr>, L<attr(5)>."
+#: ../src/guestfs-actions.pod:5526 ../fish/guestfish-actions.pod:3719
+msgid "FIFO (named pipe)"

 msgstr ""
 
 msgstr ""
 

-# type: =head2
-#. type: =head2
-#: ../src/guestfs-actions.pod:5982
-msgid "guestfs_sfdisk"
+# type: =item
+#. type: =item
+#: ../src/guestfs-actions.pod:5528 ../fish/guestfish-actions.pod:3721
+msgid "'l'"

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../src/guestfs-actions.pod:5984
-#, no-wrap
-msgid ""
-" int\n"
-" guestfs_sfdisk (guestfs_h *g,\n"
-"                 const char *device,\n"
-"                 int cyls,\n"
-"                 int heads,\n"
-"                 int sectors,\n"
-"                 char *const *lines);\n"
-"\n"
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:5530 ../fish/guestfish-actions.pod:3723
+msgid "Symbolic link"
+msgstr ""
+
+# type: =item
+#. type: =item
+#: ../src/guestfs-actions.pod:5532 ../fish/guestfish-actions.pod:3725
+msgid "'r'"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:5992 ../fish/guestfish-actions.pod:4037
-msgid ""
-"This is a direct interface to the L<sfdisk(8)> program for creating "
-"partitions on block devices."
+#: ../src/guestfs-actions.pod:5534 ../fish/guestfish-actions.pod:3727
+msgid "Regular file"
+msgstr ""
+
+# type: =item
+#. type: =item
+#: ../src/guestfs-actions.pod:5536 ../fish/guestfish-actions.pod:3729
+msgid "'s'"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:5995 ../fish/guestfish-actions.pod:4040
-msgid "C<device> should be a block device, for example C</dev/sda>."
+#: ../src/guestfs-actions.pod:5538 ../fish/guestfish-actions.pod:3731
+msgid "Socket"
+msgstr ""
+
+# type: =item
+#. type: =item
+#: ../src/guestfs-actions.pod:5540 ../fish/guestfish-actions.pod:3733
+msgid "'u'"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:5997 ../fish/guestfish-actions.pod:4042
-msgid ""
-"C<cyls>, C<heads> and C<sectors> are the number of cylinders, heads and "
-"sectors on the device, which are passed directly to sfdisk as the I<-C>, I<-"
-"H> and I<-S> parameters.  If you pass C<0> for any of these, then the "
-"corresponding parameter is omitted.  Usually for 'large' disks, you can just "
-"pass C<0> for these, but for small (floppy-sized) disks, sfdisk (or rather, "
-"the kernel) cannot work out the right geometry and you will need to tell it."
+#: ../src/guestfs-actions.pod:5542 ../fish/guestfish-actions.pod:3735
+msgid "Unknown file type"
+msgstr ""
+
+# type: =item
+#. type: =item
+#: ../src/guestfs-actions.pod:5544 ../fish/guestfish-actions.pod:3737
+msgid "'?'"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:6005 ../fish/guestfish-actions.pod:4050
+#: ../src/guestfs-actions.pod:5546 ../fish/guestfish-actions.pod:3739

 msgid ""
 msgid ""

-"C<lines> is a list of lines that we feed to C<sfdisk>.  For more information "
-"refer to the L<sfdisk(8)> manpage."
+"The L<readdir(3)> call returned a C<d_type> field with an unexpected value"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:6008 ../fish/guestfish-actions.pod:4053
+#: ../src/guestfs-actions.pod:5551

 msgid ""
 msgid ""

-"To create a single partition occupying the whole disk, you would pass "
-"C<lines> as a single element list, when the single element being the string "
-"C<,> (comma)."
+"This function is primarily intended for use by programs.  To get a simple "
+"list of names, use C<guestfs_ls>.  To get a printable directory for human "
+"consumption, use C<guestfs_ll>."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:6012
+#: ../src/guestfs-actions.pod:5555

 msgid ""
 msgid ""

-"See also: C<guestfs_sfdisk_l>, C<guestfs_sfdisk_N>, C<guestfs_part_init>"
+"This function returns a C<struct guestfs_dirent_list *>, or NULL if there "
+"was an error.  I<The caller must call C<guestfs_free_dirent_list> after use>."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:6022
-msgid "guestfs_sfdiskM"
+#: ../src/guestfs-actions.pod:5561
+msgid "guestfs_readlink"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:6024
+#: ../src/guestfs-actions.pod:5563

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" int\n"
-" guestfs_sfdiskM (guestfs_h *g,\n"
-"                  const char *device,\n"
-"                  char *const *lines);\n"
+" char *\n"
+" guestfs_readlink (guestfs_h *g,\n"
+"                   const char *path);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:6029
-msgid ""
-"This is a simplified interface to the C<guestfs_sfdisk> command, where "
-"partition sizes are specified in megabytes only (rounded to the nearest "
-"cylinder) and you don't need to specify the cyls, heads and sectors "
-"parameters which were rarely if ever used anyway."
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:6035
-msgid ""
-"See also: C<guestfs_sfdisk>, the L<sfdisk(8)> manpage and "
-"C<guestfs_part_disk>"
+#: ../src/guestfs-actions.pod:5567 ../fish/guestfish-actions.pod:3752
+msgid "This command reads the target of a symbolic link."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:6045
-msgid "guestfs_sfdisk_N"
+#: ../src/guestfs-actions.pod:5574
+msgid "guestfs_readlinklist"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:6047
+#: ../src/guestfs-actions.pod:5576

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" int\n"
-" guestfs_sfdisk_N (guestfs_h *g,\n"
-"                   const char *device,\n"
-"                   int partnum,\n"
-"                   int cyls,\n"
-"                   int heads,\n"
-"                   int sectors,\n"
-"                   const char *line);\n"
+" char **\n"
+" guestfs_readlinklist (guestfs_h *g,\n"
+"                       const char *path,\n"
+"                       char *const *names);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:6056 ../fish/guestfish-actions.pod:4083
+#: ../src/guestfs-actions.pod:5581 ../fish/guestfish-actions.pod:3758

 msgid ""
 msgid ""

-"This runs L<sfdisk(8)> option to modify just the single partition C<n> "
-"(note: C<n> counts from 1)."
+"This call allows you to do a C<readlink> operation on multiple files, where "
+"all files are in the directory C<path>.  C<names> is the list of files from "
+"this directory."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:6059
+#: ../src/guestfs-actions.pod:5585 ../fish/guestfish-actions.pod:3762

 msgid ""
 msgid ""

-"For other parameters, see C<guestfs_sfdisk>.  You should usually pass C<0> "
-"for the cyls/heads/sectors parameters."
-msgstr ""
+"On return you get a list of strings, with a one-to-one correspondence to the "
+"C<names> list.  Each string is the value of the symbolic link."
+msgstr ""

 
 # type: textblock
 #. type: textblock
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:6062
-msgid "See also: C<guestfs_part_add>"
+#: ../src/guestfs-actions.pod:5589 ../fish/guestfish-actions.pod:3766
+msgid ""
+"If the C<readlink(2)> operation fails on any name, then the corresponding "
+"result string is the empty string C<\"\">.  However the whole operation is "
+"completed even if there were C<readlink(2)> errors, and so you can call this "
+"function with names where you don't know if they are symbolic links already "
+"(albeit slightly less efficient)."
+msgstr ""
+
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:5596 ../fish/guestfish-actions.pod:3773
+msgid ""
+"This call is intended for programs that want to efficiently list a directory "
+"contents without making many round-trips.  Very long directory listings "
+"might cause the protocol message size to be exceeded, causing this call to "
+"fail.  The caller must split up such requests into smaller groups of names."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:6071
-msgid "guestfs_sfdisk_disk_geometry"
+#: ../src/guestfs-actions.pod:5609
+msgid "guestfs_realpath"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:6073
+#: ../src/guestfs-actions.pod:5611

 #, no-wrap
 msgid ""
 " char *\n"
 #, no-wrap
 msgid ""
 " char *\n"

-" guestfs_sfdisk_disk_geometry (guestfs_h *g,\n"
-"                               const char *device);\n"
+" guestfs_realpath (guestfs_h *g,\n"
+"                   const char *path);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:6077
+#: ../src/guestfs-actions.pod:5615 ../fish/guestfish-actions.pod:3784

 msgid ""
 msgid ""

-"This displays the disk geometry of C<device> read from the partition table.  "
-"Especially in the case where the underlying block device has been resized, "
-"this can be different from the kernel's idea of the geometry (see "
-"C<guestfs_sfdisk_kernel_geometry>)."
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:6082 ../src/guestfs-actions.pod:6098
-#: ../fish/guestfish-actions.pod:4103 ../fish/guestfish-actions.pod:4112
-msgid "The result is in human-readable format, and not designed to be parsed."
+"Return the canonicalized absolute pathname of C<path>.  The returned path "
+"has no C<.>, C<..> or symbolic link path elements."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:6090
-msgid "guestfs_sfdisk_kernel_geometry"
+#: ../src/guestfs-actions.pod:5623
+msgid "guestfs_removexattr"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:6092
+#: ../src/guestfs-actions.pod:5625

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" char *\n"
-" guestfs_sfdisk_kernel_geometry (guestfs_h *g,\n"
-"                                 const char *device);\n"
+" int\n"
+" guestfs_removexattr (guestfs_h *g,\n"
+"                      const char *xattr,\n"
+"                      const char *path);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:6096 ../fish/guestfish-actions.pod:4110
-msgid "This displays the kernel's idea of the geometry of C<device>."
+#: ../src/guestfs-actions.pod:5630 ../fish/guestfish-actions.pod:3791
+msgid ""
+"This call removes the extended attribute named C<xattr> of the file C<path>."
+msgstr ""
+
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:5633
+msgid "See also: C<guestfs_lremovexattr>, L<attr(5)>."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:6106
-msgid "guestfs_sfdisk_l"
+#: ../src/guestfs-actions.pod:5639
+msgid "guestfs_resize2fs"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:6108
+#: ../src/guestfs-actions.pod:5641

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" char *\n"
-" guestfs_sfdisk_l (guestfs_h *g,\n"
-"                   const char *device);\n"
+" int\n"
+" guestfs_resize2fs (guestfs_h *g,\n"
+"                    const char *device);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:6112 ../fish/guestfish-actions.pod:4119
+#: ../src/guestfs-actions.pod:5645 ../fish/guestfish-actions.pod:3800

 msgid ""
 msgid ""

-"This displays the partition table on C<device>, in the human-readable output "
-"of the L<sfdisk(8)> command.  It is not intended to be parsed."
+"This resizes an ext2, ext3 or ext4 filesystem to match the size of the "
+"underlying device."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:6116
-msgid "See also: C<guestfs_part_list>"
+#: ../src/guestfs-actions.pod:5648
+msgid ""
+"I<Note:> It is sometimes required that you run C<guestfs_e2fsck_f> on the "
+"C<device> before calling this command.  For unknown reasons C<resize2fs> "
+"sometimes gives an error about this and sometimes not.  In any case, it is "
+"always safe to call C<guestfs_e2fsck_f> before calling this function."

 msgstr ""
 
 msgstr ""
 

-# type: =head2

 #. type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:6123
-msgid "guestfs_sh"
+#: ../src/guestfs-actions.pod:5658
+msgid "guestfs_resize2fs_M"

 msgstr ""
 
 msgstr ""
 

-# type: verbatim

 #. type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:6125
+#: ../src/guestfs-actions.pod:5660

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" char *\n"
-" guestfs_sh (guestfs_h *g,\n"
-"             const char *command);\n"
+" int\n"
+" guestfs_resize2fs_M (guestfs_h *g,\n"
+"                      const char *device);\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:6129 ../fish/guestfish-actions.pod:4129
+#: ../src/guestfs-actions.pod:5664

 msgid ""
 msgid ""

-"This call runs a command from the guest filesystem via the guest's C</bin/"
-"sh>."
+"This command is the same as C<guestfs_resize2fs>, but the filesystem is "
+"resized to its minimum size.  This works like the I<-M> option to the "
+"C<resize2fs> command."

 msgstr ""
 
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:6132
-msgid "This is like C<guestfs_command>, but passes the command to:"
+#: ../src/guestfs-actions.pod:5668
+msgid ""
+"To get the resulting size of the filesystem you should call "
+"C<guestfs_tune2fs_l> and read the C<Block size> and C<Block count> values.  "
+"These two numbers, multiplied together, give the resulting size of the "
+"minimal filesystem in bytes."
+msgstr ""
+
+# type: =head2
+#. type: =head2
+#: ../src/guestfs-actions.pod:5675
+msgid "guestfs_resize2fs_size"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:6134 ../fish/guestfish-actions.pod:4134
+#: ../src/guestfs-actions.pod:5677

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" /bin/sh -c \"command\"\n"
+" int\n"
+" guestfs_resize2fs_size (guestfs_h *g,\n"
+"                         const char *device,\n"
+"                         int64_t size);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:6136 ../fish/guestfish-actions.pod:4136
+#: ../src/guestfs-actions.pod:5682

 msgid ""
 msgid ""

-"Depending on the guest's shell, this usually results in wildcards being "
-"expanded, shell expressions being interpolated and so on."
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:6140
-msgid "All the provisos about C<guestfs_command> apply to this call."
+"This command is the same as C<guestfs_resize2fs> except that it allows you "
+"to specify the new size (in bytes) explicitly."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:6147
-msgid "guestfs_sh_lines"
+#: ../src/guestfs-actions.pod:5689
+msgid "guestfs_rm"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:6149
+#: ../src/guestfs-actions.pod:5691

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" char **\n"
-" guestfs_sh_lines (guestfs_h *g,\n"
-"                   const char *command);\n"
+" int\n"
+" guestfs_rm (guestfs_h *g,\n"
+"             const char *path);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:6153
+#: ../src/guestfs-actions.pod:5695 ../fish/guestfish-actions.pod:3833
+msgid "Remove the single file C<path>."
+msgstr ""
+
+# type: =head2
+#. type: =head2
+#: ../src/guestfs-actions.pod:5701
+msgid "guestfs_rm_rf"
+msgstr ""
+
+# type: verbatim
+#. type: verbatim
+#: ../src/guestfs-actions.pod:5703
+#, no-wrap

 msgid ""
 msgid ""

-"This is the same as C<guestfs_sh>, but splits the result into a list of "
-"lines."
+" int\n"
+" guestfs_rm_rf (guestfs_h *g,\n"
+"                const char *path);\n"
+"\n"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:6156
-msgid "See also: C<guestfs_command_lines>"
+#: ../src/guestfs-actions.pod:5707 ../fish/guestfish-actions.pod:3839
+msgid ""
+"Remove the file or directory C<path>, recursively removing the contents if "
+"its a directory.  This is like the C<rm -rf> shell command."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:6164
-msgid "guestfs_sleep"
+#: ../src/guestfs-actions.pod:5715
+msgid "guestfs_rmdir"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:6166
+#: ../src/guestfs-actions.pod:5717

 #, no-wrap
 msgid ""
 " int\n"
 #, no-wrap
 msgid ""
 " int\n"

-" guestfs_sleep (guestfs_h *g,\n"
-"                int secs);\n"
+" guestfs_rmdir (guestfs_h *g,\n"
+"                const char *path);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:6170 ../fish/guestfish-actions.pod:4155
-msgid "Sleep for C<secs> seconds."
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:6174
-msgid "(Added in 1.0.41)"
+#: ../src/guestfs-actions.pod:5721 ../fish/guestfish-actions.pod:3847
+msgid "Remove the single directory C<path>."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:6176 ../src/guestfs-structs.pod:109
-msgid "guestfs_stat"
+#: ../src/guestfs-actions.pod:5727
+msgid "guestfs_rmmountpoint"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:6178
+#: ../src/guestfs-actions.pod:5729

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" struct guestfs_stat *\n"
-" guestfs_stat (guestfs_h *g,\n"
-"               const char *path);\n"
+" int\n"
+" guestfs_rmmountpoint (guestfs_h *g,\n"
+"                       const char *exemptpath);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:6184 ../fish/guestfish-actions.pod:4163
-msgid "This is the same as the C<stat(2)> system call."
+#: ../src/guestfs-actions.pod:5733
+msgid ""
+"This calls removes a mountpoint that was previously created with "
+"C<guestfs_mkmountpoint>.  See C<guestfs_mkmountpoint> for full details."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:6192 ../src/guestfs-structs.pod:135
-msgid "guestfs_statvfs"
+#: ../src/guestfs-actions.pod:5741
+msgid "guestfs_scrub_device"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:6194
+#: ../src/guestfs-actions.pod:5743

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" struct guestfs_statvfs *\n"
-" guestfs_statvfs (guestfs_h *g,\n"
-"                  const char *path);\n"
+" int\n"
+" guestfs_scrub_device (guestfs_h *g,\n"
+"                       const char *device);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:6198 ../fish/guestfish-actions.pod:4169
+#: ../src/guestfs-actions.pod:5747 ../fish/guestfish-actions.pod:3861

 msgid ""
 msgid ""

-"Returns file system statistics for any mounted file system.  C<path> should "
-"be a file or directory in the mounted file system (typically it is the mount "
-"point itself, but it doesn't need to be)."
+"This command writes patterns over C<device> to make data retrieval more "
+"difficult."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:6202 ../fish/guestfish-actions.pod:4173
-msgid "This is the same as the C<statvfs(2)> system call."
+#: ../src/guestfs-actions.pod:5750 ../src/guestfs-actions.pod:5771
+#: ../src/guestfs-actions.pod:5790 ../fish/guestfish-actions.pod:3864
+#: ../fish/guestfish-actions.pod:3879 ../fish/guestfish-actions.pod:3892
+msgid ""
+"It is an interface to the L<scrub(1)> program.  See that manual page for "
+"more details."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:6204
-msgid ""
-"This function returns a C<struct guestfs_statvfs *>, or NULL if there was an "
-"error.  I<The caller must call C<guestfs_free_statvfs> after use>."
+#: ../src/guestfs-actions.pod:5758 ../src/guestfs-actions.pod:5776
+#: ../src/guestfs-actions.pod:5795
+msgid "(Added in 1.0.52)"

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:6210
-msgid "guestfs_strings"
+#: ../src/guestfs-actions.pod:5760
+msgid "guestfs_scrub_file"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:6212
+#: ../src/guestfs-actions.pod:5762

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" char **\n"
-" guestfs_strings (guestfs_h *g,\n"
-"                  const char *path);\n"
+" int\n"
+" guestfs_scrub_file (guestfs_h *g,\n"
+"                     const char *file);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:6216 ../fish/guestfish-actions.pod:4179
+#: ../src/guestfs-actions.pod:5766 ../fish/guestfish-actions.pod:3874

 msgid ""
 msgid ""

-"This runs the L<strings(1)> command on a file and returns the list of "
-"printable strings found."
+"This command writes patterns over a file to make data retrieval more "
+"difficult."
+msgstr ""
+
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:5769 ../fish/guestfish-actions.pod:3877
+msgid "The file is I<removed> after scrubbing."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:6228
-msgid "guestfs_strings_e"
+#: ../src/guestfs-actions.pod:5778
+msgid "guestfs_scrub_freespace"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:6230
+#: ../src/guestfs-actions.pod:5780

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" char **\n"
-" guestfs_strings_e (guestfs_h *g,\n"
-"                    const char *encoding,\n"
-"                    const char *path);\n"
+" int\n"
+" guestfs_scrub_freespace (guestfs_h *g,\n"
+"                          const char *dir);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:6235
+#: ../src/guestfs-actions.pod:5784

 msgid ""
 msgid ""

-"This is like the C<guestfs_strings> command, but allows you to specify the "
-"encoding of strings that are looked for in the source file C<path>."
+"This command creates the directory C<dir> and then fills it with files until "
+"the filesystem is full, and scrubs the files as for C<guestfs_scrub_file>, "
+"and deletes them.  The intention is to scrub any free space on the partition "
+"containing C<dir>."

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:6239 ../fish/guestfish-actions.pod:4193
-msgid "Allowed encodings are:"
+# type: =head2
+#. type: =head2
+#: ../src/guestfs-actions.pod:5797
+msgid "guestfs_set_append"

 msgstr ""
 
 msgstr ""
 

-# type: =item
-#. type: =item
-#: ../src/guestfs-actions.pod:6243 ../fish/guestfish-actions.pod:4197
-msgid "s"
+# type: verbatim
+#. type: verbatim
+#: ../src/guestfs-actions.pod:5799
+#, no-wrap
+msgid ""
+" int\n"
+" guestfs_set_append (guestfs_h *g,\n"
+"                     const char *append);\n"
+"\n"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:6245
+#: ../src/guestfs-actions.pod:5803 ../fish/guestfish-actions.pod:3901

 msgid ""
 msgid ""

-"Single 7-bit-byte characters like ASCII and the ASCII-compatible parts of "
-"ISO-8859-X (this is what C<guestfs_strings> uses)."
-msgstr ""
-
-# type: =item
-#. type: =item
-#: ../src/guestfs-actions.pod:6248 ../fish/guestfish-actions.pod:4202
-msgid "S"
+"This function is used to add additional options to the guest kernel command "
+"line."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:6250 ../fish/guestfish-actions.pod:4204
-msgid "Single 8-bit-byte characters."
-msgstr ""
-
-# type: =item
-#. type: =item
-#: ../src/guestfs-actions.pod:6252 ../fish/guestfish-actions.pod:4206
-msgid "b"
+#: ../src/guestfs-actions.pod:5806 ../fish/guestfish-actions.pod:3904
+msgid ""
+"The default is C<NULL> unless overridden by setting C<LIBGUESTFS_APPEND> "
+"environment variable."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:6254 ../fish/guestfish-actions.pod:4208
-msgid "16-bit big endian strings such as those encoded in UTF-16BE or UCS-2BE."
+#: ../src/guestfs-actions.pod:5809 ../fish/guestfish-actions.pod:3907
+msgid ""
+"Setting C<append> to C<NULL> means I<no> additional options are passed "
+"(libguestfs always adds a few of its own)."

 msgstr ""
 
 msgstr ""
 

-# type: =item
-#. type: =item
-#: ../src/guestfs-actions.pod:6257 ../fish/guestfish-actions.pod:4211
-msgid "l (lower case letter L)"
+#. type: =head2
+#: ../src/guestfs-actions.pod:5816
+msgid "guestfs_set_attach_method"

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:6259 ../fish/guestfish-actions.pod:4213
+#. type: verbatim
+#: ../src/guestfs-actions.pod:5818
+#, no-wrap

 msgid ""
 msgid ""

-"16-bit little endian such as UTF-16LE and UCS-2LE.  This is useful for "
-"examining binaries in Windows guests."
+" int\n"
+" guestfs_set_attach_method (guestfs_h *g,\n"
+"                            const char *attachmethod);\n"
+"\n"

 msgstr ""
 
 msgstr ""
 

-# type: =item
-#. type: =item
-#: ../src/guestfs-actions.pod:6262 ../fish/guestfish-actions.pod:4216
-msgid "B"
+#. type: textblock
+#: ../src/guestfs-actions.pod:5822 ../fish/guestfish-actions.pod:3916
+msgid ""
+"Set the method that libguestfs uses to connect to the back end guestfsd "
+"daemon.  Possible methods are:"

 msgstr ""
 
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:6264 ../fish/guestfish-actions.pod:4218
-msgid "32-bit big endian such as UCS-4BE."
+#: ../src/guestfs-actions.pod:5829 ../fish/guestfish-actions.pod:3923
+msgid ""
+"Launch an appliance and connect to it.  This is the ordinary method and the "
+"default."

 msgstr ""
 
 msgstr ""
 

-# type: =item

 #. type: =item
 #. type: =item

-#: ../src/guestfs-actions.pod:6266 ../fish/guestfish-actions.pod:4220
-msgid "L"
+#: ../src/guestfs-actions.pod:5832 ../fish/guestfish-actions.pod:3926
+msgid "C<unix:I<path>>"

 msgstr ""
 
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:6268 ../fish/guestfish-actions.pod:4222
-msgid "32-bit little endian such as UCS-4LE."
+#: ../src/guestfs-actions.pod:5834 ../fish/guestfish-actions.pod:3928
+msgid "Connect to the Unix domain socket I<path>."

 msgstr ""
 
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:6272 ../fish/guestfish-actions.pod:4226
-msgid "The returned strings are transcoded to UTF-8."
+#: ../src/guestfs-actions.pod:5836 ../fish/guestfish-actions.pod:3930
+msgid ""
+"This method lets you connect to an existing daemon or (using virtio-serial) "
+"to a live guest.  For more information, see L<guestfs(3)/ATTACHING TO "
+"RUNNING DAEMONS>."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:6283
-msgid "guestfs_swapoff_device"
+#: ../src/guestfs-actions.pod:5844
+msgid "guestfs_set_autosync"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:6285
+#: ../src/guestfs-actions.pod:5846

 #, no-wrap
 msgid ""
 " int\n"
 #, no-wrap
 msgid ""
 " int\n"

-" guestfs_swapoff_device (guestfs_h *g,\n"
-"                         const char *device);\n"
+" guestfs_set_autosync (guestfs_h *g,\n"
+"                       int autosync);\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

+#. type: textblock
+#: ../src/guestfs-actions.pod:5850 ../fish/guestfish-actions.pod:3942
+msgid ""
+"If C<autosync> is true, this enables autosync.  Libguestfs will make a best "
+"effort attempt to make filesystems consistent and synchronized when the "
+"handle is closed (also if the program exits without closing handles)."
+msgstr ""
+

 # type: textblock
 #. type: textblock
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:6289
+#: ../src/guestfs-actions.pod:5855 ../fish/guestfish-actions.pod:3947

 msgid ""
 msgid ""

-"This command disables the libguestfs appliance swap device or partition "
-"named C<device>.  See C<guestfs_swapon_device>."
+"This is enabled by default (since libguestfs 1.5.24, previously it was "
+"disabled by default)."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:6297
-msgid "guestfs_swapoff_file"
+#: ../src/guestfs-actions.pod:5862
+msgid "guestfs_set_direct"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:6299
+#: ../src/guestfs-actions.pod:5864

 #, no-wrap
 msgid ""
 " int\n"
 #, no-wrap
 msgid ""
 " int\n"

-" guestfs_swapoff_file (guestfs_h *g,\n"
-"                       const char *file);\n"
+" guestfs_set_direct (guestfs_h *g,\n"
+"                     int direct);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:6303 ../fish/guestfish-actions.pod:4243
-msgid "This command disables the libguestfs appliance swap on file."
+#: ../src/guestfs-actions.pod:5868 ../fish/guestfish-actions.pod:3956
+msgid ""
+"If the direct appliance mode flag is enabled, then stdin and stdout are "
+"passed directly through to the appliance once it is launched."

 msgstr ""
 
 msgstr ""
 

-# type: =head2
-#. type: =head2
-#: ../src/guestfs-actions.pod:6309
-msgid "guestfs_swapoff_label"
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:5872
+msgid ""
+"One consequence of this is that log messages aren't caught by the library "
+"and handled by C<guestfs_set_log_message_callback>, but go straight to "
+"stdout."

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../src/guestfs-actions.pod:6311
-#, no-wrap
-msgid ""
-" int\n"
-" guestfs_swapoff_label (guestfs_h *g,\n"
-"                        const char *label);\n"
-"\n"
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:5876 ../fish/guestfish-actions.pod:3964
+msgid "You probably don't want to use this unless you know what you are doing."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:6315 ../fish/guestfish-actions.pod:4249
-msgid ""
-"This command disables the libguestfs appliance swap on labeled swap "
-"partition."
+#: ../src/guestfs-actions.pod:5879 ../fish/guestfish-actions.pod:3967
+msgid "The default is disabled."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:6322
-msgid "guestfs_swapoff_uuid"
+#: ../src/guestfs-actions.pod:5885
+msgid "guestfs_set_e2label"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:6324
+#: ../src/guestfs-actions.pod:5887

 #, no-wrap
 msgid ""
 " int\n"
 #, no-wrap
 msgid ""
 " int\n"

-" guestfs_swapoff_uuid (guestfs_h *g,\n"
-"                       const char *uuid);\n"
+" guestfs_set_e2label (guestfs_h *g,\n"
+"                      const char *device,\n"
+"                      const char *label);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:6328 ../fish/guestfish-actions.pod:4256
+#: ../src/guestfs-actions.pod:5892 ../fish/guestfish-actions.pod:3973

 msgid ""
 msgid ""

-"This command disables the libguestfs appliance swap partition with the given "
-"UUID."
+"This sets the ext2/3/4 filesystem label of the filesystem on C<device> to "
+"C<label>.  Filesystem labels are limited to 16 characters."
+msgstr ""
+
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:5896
+msgid ""
+"You can use either C<guestfs_tune2fs_l> or C<guestfs_get_e2label> to return "
+"the existing label on a filesystem."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:6335
-msgid "guestfs_swapon_device"
+#: ../src/guestfs-actions.pod:5903
+msgid "guestfs_set_e2uuid"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:6337
+#: ../src/guestfs-actions.pod:5905

 #, no-wrap
 msgid ""
 " int\n"
 #, no-wrap
 msgid ""
 " int\n"

-" guestfs_swapon_device (guestfs_h *g,\n"
-"                        const char *device);\n"
+" guestfs_set_e2uuid (guestfs_h *g,\n"
+"                     const char *device,\n"
+"                     const char *uuid);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:6341
+#: ../src/guestfs-actions.pod:5910 ../fish/guestfish-actions.pod:3984

 msgid ""
 msgid ""

-"This command enables the libguestfs appliance to use the swap device or "
-"partition named C<device>.  The increased memory is made available for all "
-"commands, for example those run using C<guestfs_command> or C<guestfs_sh>."
+"This sets the ext2/3/4 filesystem UUID of the filesystem on C<device> to "
+"C<uuid>.  The format of the UUID and alternatives such as C<clear>, "
+"C<random> and C<time> are described in the L<tune2fs(8)> manpage."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:6346 ../fish/guestfish-actions.pod:4268
+#: ../src/guestfs-actions.pod:5915

 msgid ""
 msgid ""

-"Note that you should not swap to existing guest swap partitions unless you "
-"know what you are doing.  They may contain hibernation information, or other "
-"information that the guest doesn't want you to trash.  You also risk leaking "
-"information about the host to the guest this way.  Instead, attach a new "
-"host device to the guest and swap on that."
+"You can use either C<guestfs_tune2fs_l> or C<guestfs_get_e2uuid> to return "
+"the existing UUID of a filesystem."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:6357
-msgid "guestfs_swapon_file"
+#: ../src/guestfs-actions.pod:5922
+msgid "guestfs_set_memsize"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:6359
+#: ../src/guestfs-actions.pod:5924

 #, no-wrap
 msgid ""
 " int\n"
 #, no-wrap
 msgid ""
 " int\n"

-" guestfs_swapon_file (guestfs_h *g,\n"
-"                      const char *file);\n"
+" guestfs_set_memsize (guestfs_h *g,\n"
+"                      int memsize);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:6363
+#: ../src/guestfs-actions.pod:5928

 msgid ""
 msgid ""

-"This command enables swap to a file.  See C<guestfs_swapon_device> for other "
-"notes."
+"This sets the memory size in megabytes allocated to the qemu subprocess.  "
+"This only has any effect if called before C<guestfs_launch>."
+msgstr ""
+
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:5932 ../fish/guestfish-actions.pod:4002
+msgid ""
+"You can also change this by setting the environment variable "
+"C<LIBGUESTFS_MEMSIZE> before the handle is created."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:6370
-msgid "guestfs_swapon_label"
+#: ../src/guestfs-actions.pod:5943
+msgid "guestfs_set_network"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:6372
+#: ../src/guestfs-actions.pod:5945

 #, no-wrap
 msgid ""
 " int\n"
 #, no-wrap
 msgid ""
 " int\n"

-" guestfs_swapon_label (guestfs_h *g,\n"
-"                       const char *label);\n"
+" guestfs_set_network (guestfs_h *g,\n"
+"                      int network);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:6376
+#: ../src/guestfs-actions.pod:5949 ../fish/guestfish-actions.pod:4015

 msgid ""
 msgid ""

-"This command enables swap to a labeled swap partition.  See "
-"C<guestfs_swapon_device> for other notes."
-msgstr ""
-
-# type: =head2
-#. type: =head2
-#: ../src/guestfs-actions.pod:6383
-msgid "guestfs_swapon_uuid"
+"If C<network> is true, then the network is enabled in the libguestfs "
+"appliance.  The default is false."

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../src/guestfs-actions.pod:6385
-#, no-wrap
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:5952 ../fish/guestfish-actions.pod:4018

 msgid ""
 msgid ""

-" int\n"
-" guestfs_swapon_uuid (guestfs_h *g,\n"
-"                      const char *uuid);\n"
-"\n"
+"This affects whether commands are able to access the network (see L<guestfs"
+"(3)/RUNNING COMMANDS>)."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:6389
+#: ../src/guestfs-actions.pod:5955

 msgid ""
 msgid ""

-"This command enables swap to a swap partition with the given UUID.  See "
-"C<guestfs_swapon_device> for other notes."
+"You must call this before calling C<guestfs_launch>, otherwise it has no "
+"effect."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:6396
-msgid "guestfs_sync"
+#: ../src/guestfs-actions.pod:5962
+msgid "guestfs_set_path"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:6398
+#: ../src/guestfs-actions.pod:5964

 #, no-wrap
 msgid ""
 " int\n"
 #, no-wrap
 msgid ""
 " int\n"

-" guestfs_sync (guestfs_h *g);\n"
+" guestfs_set_path (guestfs_h *g,\n"
+"                   const char *searchpath);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:6401 ../fish/guestfish-actions.pod:4300
-msgid ""
-"This syncs the disk, so that any writes are flushed through to the "
-"underlying disk image."
+#: ../src/guestfs-actions.pod:5968 ../fish/guestfish-actions.pod:4030
+msgid "Set the path that libguestfs searches for kernel and initrd.img."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:6404 ../fish/guestfish-actions.pod:4303
+#: ../src/guestfs-actions.pod:5970 ../fish/guestfish-actions.pod:4032

 msgid ""
 msgid ""

-"You should always call this if you have modified a disk image, before "
-"closing the handle."
+"The default is C<$libdir/guestfs> unless overridden by setting "
+"C<LIBGUESTFS_PATH> environment variable."
+msgstr ""
+
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:5973 ../fish/guestfish-actions.pod:4035
+msgid "Setting C<path> to C<NULL> restores the default path."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:6411
-msgid "guestfs_tail"
+#: ../src/guestfs-actions.pod:5979
+msgid "guestfs_set_qemu"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:6413
+#: ../src/guestfs-actions.pod:5981

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" char **\n"
-" guestfs_tail (guestfs_h *g,\n"
-"               const char *path);\n"
+" int\n"
+" guestfs_set_qemu (guestfs_h *g,\n"
+"                   const char *qemu);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:6417 ../fish/guestfish-actions.pod:4310
-msgid ""
-"This command returns up to the last 10 lines of a file as a list of strings."
+#: ../src/guestfs-actions.pod:5985 ../fish/guestfish-actions.pod:4043
+msgid "Set the qemu binary that we will use."

 msgstr ""
 
 msgstr ""
 

-# type: =head2
-#. type: =head2
-#: ../src/guestfs-actions.pod:6429
-msgid "guestfs_tail_n"
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:5987 ../fish/guestfish-actions.pod:4045
+msgid ""
+"The default is chosen when the library was compiled by the configure script."

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../src/guestfs-actions.pod:6431
-#, no-wrap
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:5990 ../fish/guestfish-actions.pod:4048

 msgid ""
 msgid ""

-" char **\n"
-" guestfs_tail_n (guestfs_h *g,\n"
-"                 int nrlines,\n"
-"                 const char *path);\n"
-"\n"
+"You can also override this by setting the C<LIBGUESTFS_QEMU> environment "
+"variable."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:6436 ../fish/guestfish-actions.pod:4320
-msgid ""
-"If the parameter C<nrlines> is a positive number, this returns the last "
-"C<nrlines> lines of the file C<path>."
+#: ../src/guestfs-actions.pod:5993 ../fish/guestfish-actions.pod:4051
+msgid "Setting C<qemu> to C<NULL> restores the default qemu binary."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:6439 ../fish/guestfish-actions.pod:4323
+#: ../src/guestfs-actions.pod:5995 ../fish/guestfish-actions.pod:4053

 msgid ""
 msgid ""

-"If the parameter C<nrlines> is a negative number, this returns lines from "
-"the file C<path>, starting with the C<-nrlines>th line."
+"Note that you should call this function as early as possible after creating "
+"the handle.  This is because some pre-launch operations depend on testing "
+"qemu features (by running C<qemu -help>).  If the qemu binary changes, we "
+"don't retest features, and so you might see inconsistent results.  Using the "
+"environment variable C<LIBGUESTFS_QEMU> is safest of all since that picks "
+"the qemu binary at the same time as the handle is created."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:6453
-msgid "guestfs_tar_in"
+#: ../src/guestfs-actions.pod:6007
+msgid "guestfs_set_recovery_proc"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:6455
+#: ../src/guestfs-actions.pod:6009

 #, no-wrap
 msgid ""
 " int\n"
 #, no-wrap
 msgid ""
 " int\n"

-" guestfs_tar_in (guestfs_h *g,\n"
-"                 const char *tarfile,\n"
-"                 const char *directory);\n"
+" guestfs_set_recovery_proc (guestfs_h *g,\n"
+"                            int recoveryproc);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:6460 ../fish/guestfish-actions.pod:4335
+#: ../src/guestfs-actions.pod:6013

 msgid ""
 msgid ""

-"This command uploads and unpacks local file C<tarfile> (an I<uncompressed> "
-"tar file) into C<directory>."
+"If this is called with the parameter C<false> then C<guestfs_launch> does "
+"not create a recovery process.  The purpose of the recovery process is to "
+"stop runaway qemu processes in the case where the main program aborts "
+"abruptly."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:6463
+#: ../src/guestfs-actions.pod:6018

 msgid ""
 msgid ""

-"To upload a compressed tarball, use C<guestfs_tgz_in> or C<guestfs_txz_in>."
+"This only has any effect if called before C<guestfs_launch>, and the default "
+"is true."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:6468 ../src/guestfs-actions.pod:6485
-#: ../src/guestfs-actions.pod:6501 ../src/guestfs-actions.pod:6517
-msgid "(Added in 1.0.3)"
+#: ../src/guestfs-actions.pod:6021 ../fish/guestfish-actions.pod:4075
+msgid ""
+"About the only time when you would want to disable this is if the main "
+"process will fork itself into the background (\"daemonize\" itself).  In "
+"this case the recovery process thinks that the main program has disappeared "
+"and so kills qemu, which is not very helpful."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:6470
-msgid "guestfs_tar_out"
+#: ../src/guestfs-actions.pod:6031
+msgid "guestfs_set_selinux"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:6472
+#: ../src/guestfs-actions.pod:6033

 #, no-wrap
 msgid ""
 " int\n"
 #, no-wrap
 msgid ""
 " int\n"

-" guestfs_tar_out (guestfs_h *g,\n"
-"                  const char *directory,\n"
-"                  const char *tarfile);\n"
+" guestfs_set_selinux (guestfs_h *g,\n"
+"                      int selinux);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:6477 ../fish/guestfish-actions.pod:4347
+#: ../src/guestfs-actions.pod:6037 ../fish/guestfish-actions.pod:4087

 msgid ""
 msgid ""

-"This command packs the contents of C<directory> and downloads it to local "
-"file C<tarfile>."
+"This sets the selinux flag that is passed to the appliance at boot time.  "
+"The default is C<selinux=0> (disabled)."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:6480
+#: ../src/guestfs-actions.pod:6040 ../fish/guestfish-actions.pod:4090

 msgid ""
 msgid ""

-"To download a compressed tarball, use C<guestfs_tgz_out> or "
-"C<guestfs_txz_out>."
+"Note that if SELinux is enabled, it is always in Permissive mode "
+"(C<enforcing=0>)."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:6487
-msgid "guestfs_tgz_in"
+#: ../src/guestfs-actions.pod:6050
+msgid "guestfs_set_trace"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:6489
+#: ../src/guestfs-actions.pod:6052

 #, no-wrap
 msgid ""
 " int\n"
 #, no-wrap
 msgid ""
 " int\n"

-" guestfs_tgz_in (guestfs_h *g,\n"
-"                 const char *tarball,\n"
-"                 const char *directory);\n"
+" guestfs_set_trace (guestfs_h *g,\n"
+"                    int trace);\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

+#. type: textblock
+#: ../src/guestfs-actions.pod:6056 ../fish/guestfish-actions.pod:4102
+msgid ""
+"If the command trace flag is set to 1, then libguestfs calls, parameters and "
+"return values are traced."
+msgstr ""
+

 # type: textblock
 #. type: textblock
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:6494 ../fish/guestfish-actions.pod:4359
+#: ../src/guestfs-actions.pod:6059 ../fish/guestfish-actions.pod:4105

 msgid ""
 msgid ""

-"This command uploads and unpacks local file C<tarball> (a I<gzip compressed> "
-"tar file) into C<directory>."
+"If you want to trace C API calls into libguestfs (and other libraries) then "
+"possibly a better way is to use the external ltrace(1) command."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:6497
-msgid "To upload an uncompressed tarball, use C<guestfs_tar_in>."
+#: ../src/guestfs-actions.pod:6063 ../fish/guestfish-actions.pod:4109
+msgid ""
+"Command traces are disabled unless the environment variable "
+"C<LIBGUESTFS_TRACE> is defined and set to C<1>."
+msgstr ""
+
+#. type: textblock
+#: ../src/guestfs-actions.pod:6066
+msgid ""
+"Trace messages are normally sent to C<stderr>, unless you register a "
+"callback to send them somewhere else (see C<guestfs_set_event_callback>)."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:6503
-msgid "guestfs_tgz_out"
+#: ../src/guestfs-actions.pod:6074
+msgid "guestfs_set_verbose"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:6505
+#: ../src/guestfs-actions.pod:6076

 #, no-wrap
 msgid ""
 " int\n"
 #, no-wrap
 msgid ""
 " int\n"

-" guestfs_tgz_out (guestfs_h *g,\n"
-"                  const char *directory,\n"
-"                  const char *tarball);\n"
+" guestfs_set_verbose (guestfs_h *g,\n"
+"                      int verbose);\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

+#. type: textblock
+#: ../src/guestfs-actions.pod:6080 ../fish/guestfish-actions.pod:4122
+msgid "If C<verbose> is true, this turns on verbose messages."
+msgstr ""
+

 # type: textblock
 #. type: textblock
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:6510 ../fish/guestfish-actions.pod:4370
+#: ../src/guestfs-actions.pod:6082 ../fish/guestfish-actions.pod:4124

 msgid ""
 msgid ""

-"This command packs the contents of C<directory> and downloads it to local "
-"file C<tarball>."
+"Verbose messages are disabled unless the environment variable "
+"C<LIBGUESTFS_DEBUG> is defined and set to C<1>."

 msgstr ""
 
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:6513
-msgid "To download an uncompressed tarball, use C<guestfs_tar_out>."
+#: ../src/guestfs-actions.pod:6085
+msgid ""
+"Verbose messages are normally sent to C<stderr>, unless you register a "
+"callback to send them somewhere else (see C<guestfs_set_event_callback>)."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:6519
-msgid "guestfs_touch"
+#: ../src/guestfs-actions.pod:6093
+msgid "guestfs_setcon"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:6521
+#: ../src/guestfs-actions.pod:6095

 #, no-wrap
 msgid ""
 " int\n"
 #, no-wrap
 msgid ""
 " int\n"

-" guestfs_touch (guestfs_h *g,\n"
-"                const char *path);\n"
+" guestfs_setcon (guestfs_h *g,\n"
+"                 const char *context);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:6525 ../fish/guestfish-actions.pod:4381
+#: ../src/guestfs-actions.pod:6099 ../fish/guestfish-actions.pod:4135

 msgid ""
 msgid ""

-"Touch acts like the L<touch(1)> command.  It can be used to update the "
-"timestamps on a file, or, if the file does not exist, to create a new zero-"
-"length file."
+"This sets the SELinux security context of the daemon to the string "
+"C<context>."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:6529 ../fish/guestfish-actions.pod:4385
-msgid ""
-"This command only works on regular files, and will fail on other file types "
-"such as directories, symbolic links, block special etc."
+#: ../src/guestfs-actions.pod:6102 ../fish/guestfish-actions.pod:4138
+msgid "See the documentation about SELINUX in L<guestfs(3)>."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:6536
-msgid "guestfs_truncate"
+#: ../src/guestfs-actions.pod:6108
+msgid "guestfs_setxattr"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:6538
+#: ../src/guestfs-actions.pod:6110

 #, no-wrap
 msgid ""
 " int\n"
 #, no-wrap
 msgid ""
 " int\n"

-" guestfs_truncate (guestfs_h *g,\n"
+" guestfs_setxattr (guestfs_h *g,\n"
+"                   const char *xattr,\n"
+"                   const char *val,\n"
+"                   int vallen,\n"

 "                   const char *path);\n"
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "                   const char *path);\n"
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:6542 ../fish/guestfish-actions.pod:4392
+#: ../src/guestfs-actions.pod:6117 ../fish/guestfish-actions.pod:4144

 msgid ""
 msgid ""

-"This command truncates C<path> to a zero-length file.  The file must exist "
-"already."
+"This call sets the extended attribute named C<xattr> of the file C<path> to "
+"the value C<val> (of length C<vallen>).  The value is arbitrary 8 bit data."
+msgstr ""
+
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:6121
+msgid "See also: C<guestfs_lsetxattr>, L<attr(5)>."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:6549
-msgid "guestfs_truncate_size"
+#: ../src/guestfs-actions.pod:6127
+msgid "guestfs_sfdisk"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:6551
+#: ../src/guestfs-actions.pod:6129

 #, no-wrap
 msgid ""
 " int\n"
 #, no-wrap
 msgid ""
 " int\n"

-" guestfs_truncate_size (guestfs_h *g,\n"
-"                        const char *path,\n"
-"                        int64_t size);\n"
+" guestfs_sfdisk (guestfs_h *g,\n"
+"                 const char *device,\n"
+"                 int cyls,\n"
+"                 int heads,\n"
+"                 int sectors,\n"
+"                 char *const *lines);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:6556 ../fish/guestfish-actions.pod:4399
+#: ../src/guestfs-actions.pod:6137 ../fish/guestfish-actions.pod:4154

 msgid ""
 msgid ""

-"This command truncates C<path> to size C<size> bytes.  The file must exist "
-"already."
+"This is a direct interface to the L<sfdisk(8)> program for creating "
+"partitions on block devices."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:6559
-msgid ""
-"If the current file size is less than C<size> then the file is extended to "
-"the required size with zero bytes.  This creates a sparse file (ie. disk "
-"blocks are not allocated for the file until you write to it).  To create a "
-"non-sparse file of zeroes, use C<guestfs_fallocate64> instead."
-msgstr ""
-
-# type: =head2
-#. type: =head2
-#: ../src/guestfs-actions.pod:6569
-msgid "guestfs_tune2fs_l"
+#: ../src/guestfs-actions.pod:6140 ../fish/guestfish-actions.pod:4157
+msgid "C<device> should be a block device, for example C</dev/sda>."

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../src/guestfs-actions.pod:6571
-#, no-wrap
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:6142 ../fish/guestfish-actions.pod:4159

 msgid ""
 msgid ""

-" char **\n"
-" guestfs_tune2fs_l (guestfs_h *g,\n"
-"                    const char *device);\n"
-"\n"
+"C<cyls>, C<heads> and C<sectors> are the number of cylinders, heads and "
+"sectors on the device, which are passed directly to sfdisk as the I<-C>, I<-"
+"H> and I<-S> parameters.  If you pass C<0> for any of these, then the "
+"corresponding parameter is omitted.  Usually for 'large' disks, you can just "
+"pass C<0> for these, but for small (floppy-sized) disks, sfdisk (or rather, "
+"the kernel) cannot work out the right geometry and you will need to tell it."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:6575 ../fish/guestfish-actions.pod:4412
+#: ../src/guestfs-actions.pod:6150 ../fish/guestfish-actions.pod:4167

 msgid ""
 msgid ""

-"This returns the contents of the ext2, ext3 or ext4 filesystem superblock on "
-"C<device>."
+"C<lines> is a list of lines that we feed to C<sfdisk>.  For more information "
+"refer to the L<sfdisk(8)> manpage."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:6578 ../fish/guestfish-actions.pod:4415
+#: ../src/guestfs-actions.pod:6153 ../fish/guestfish-actions.pod:4170

 msgid ""
 msgid ""

-"It is the same as running C<tune2fs -l device>.  See L<tune2fs(8)> manpage "
-"for more details.  The list of fields returned isn't clearly defined, and "
-"depends on both the version of C<tune2fs> that libguestfs was built against, "
-"and the filesystem itself."
-msgstr ""
-
-# type: =head2
-#. type: =head2
-#: ../src/guestfs-actions.pod:6591
-msgid "guestfs_txz_in"
+"To create a single partition occupying the whole disk, you would pass "
+"C<lines> as a single element list, when the single element being the string "
+"C<,> (comma)."

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../src/guestfs-actions.pod:6593
-#, no-wrap
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:6157

 msgid ""
 msgid ""

-" int\n"
-" guestfs_txz_in (guestfs_h *g,\n"
-"                 const char *tarball,\n"
-"                 const char *directory);\n"
-"\n"
+"See also: C<guestfs_sfdisk_l>, C<guestfs_sfdisk_N>, C<guestfs_part_init>"

 msgstr ""
 
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:6598 ../fish/guestfish-actions.pod:4424
+#: ../src/guestfs-actions.pod:6165 ../src/guestfs-actions.pod:6195
+#: ../src/guestfs-actions.pod:6228

 msgid ""
 msgid ""

-"This command uploads and unpacks local file C<tarball> (an I<xz compressed> "
-"tar file) into C<directory>."
+"This function is deprecated.  In new code, use the L</guestfs_part_add> call "
+"instead."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:6605
-msgid "guestfs_txz_out"
+#: ../src/guestfs-actions.pod:6174
+msgid "guestfs_sfdiskM"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:6607
+#: ../src/guestfs-actions.pod:6176

 #, no-wrap
 msgid ""
 " int\n"
 #, no-wrap
 msgid ""
 " int\n"

-" guestfs_txz_out (guestfs_h *g,\n"
-"                  const char *directory,\n"
-"                  const char *tarball);\n"
+" guestfs_sfdiskM (guestfs_h *g,\n"
+"                  const char *device,\n"
+"                  char *const *lines);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:6612 ../fish/guestfish-actions.pod:4433
+#: ../src/guestfs-actions.pod:6181

 msgid ""
 msgid ""

-"This command packs the contents of C<directory> and downloads it to local "
-"file C<tarball> (as an xz compressed tar archive)."
+"This is a simplified interface to the C<guestfs_sfdisk> command, where "
+"partition sizes are specified in megabytes only (rounded to the nearest "
+"cylinder) and you don't need to specify the cyls, heads and sectors "
+"parameters which were rarely if ever used anyway."
+msgstr ""
+
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:6187
+msgid ""
+"See also: C<guestfs_sfdisk>, the L<sfdisk(8)> manpage and "
+"C<guestfs_part_disk>"

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:6619
-msgid "guestfs_umask"
+#: ../src/guestfs-actions.pod:6204
+msgid "guestfs_sfdisk_N"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:6621
+#: ../src/guestfs-actions.pod:6206

 #, no-wrap
 msgid ""
 " int\n"
 #, no-wrap
 msgid ""
 " int\n"

-" guestfs_umask (guestfs_h *g,\n"
-"                int mask);\n"
+" guestfs_sfdisk_N (guestfs_h *g,\n"
+"                   const char *device,\n"
+"                   int partnum,\n"
+"                   int cyls,\n"
+"                   int heads,\n"
+"                   int sectors,\n"
+"                   const char *line);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:6625 ../fish/guestfish-actions.pod:4442
-msgid ""
-"This function sets the mask used for creating new files and device nodes to "
-"C<mask & 0777>."
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:6628 ../fish/guestfish-actions.pod:4445
-msgid ""
-"Typical umask values would be C<022> which creates new files with "
-"permissions like \"-rw-r--r--\" or \"-rwxr-xr-x\", and C<002> which creates "
-"new files with permissions like \"-rw-rw-r--\" or \"-rwxrwxr-x\"."
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:6633 ../fish/guestfish-actions.pod:4450
+#: ../src/guestfs-actions.pod:6215 ../fish/guestfish-actions.pod:4214

 msgid ""
 msgid ""

-"The default umask is C<022>.  This is important because it means that "
-"directories and device nodes will be created with C<0644> or C<0755> mode "
-"even if you specify C<0777>."
+"This runs L<sfdisk(8)> option to modify just the single partition C<n> "
+"(note: C<n> counts from 1)."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:6637
+#: ../src/guestfs-actions.pod:6218

 msgid ""
 msgid ""

-"See also C<guestfs_get_umask>, L<umask(2)>, C<guestfs_mknod>, "
-"C<guestfs_mkdir>."
+"For other parameters, see C<guestfs_sfdisk>.  You should usually pass C<0> "
+"for the cyls/heads/sectors parameters."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:6640 ../fish/guestfish-actions.pod:4457
-msgid "This call returns the previous umask."
+#: ../src/guestfs-actions.pod:6221
+msgid "See also: C<guestfs_part_add>"

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:6646
-msgid "guestfs_umount"
+#: ../src/guestfs-actions.pod:6237
+msgid "guestfs_sfdisk_disk_geometry"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:6648
+#: ../src/guestfs-actions.pod:6239

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" int\n"
-" guestfs_umount (guestfs_h *g,\n"
-"                 const char *pathordevice);\n"
+" char *\n"
+" guestfs_sfdisk_disk_geometry (guestfs_h *g,\n"
+"                               const char *device);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:6652 ../fish/guestfish-actions.pod:4465
+#: ../src/guestfs-actions.pod:6243

 msgid ""
 msgid ""

-"This unmounts the given filesystem.  The filesystem may be specified either "
-"by its mountpoint (path) or the device which contains the filesystem."
-msgstr ""
-
-# type: =head2
-#. type: =head2
-#: ../src/guestfs-actions.pod:6660
-msgid "guestfs_umount_all"
-msgstr ""
-
-# type: verbatim
-#. type: verbatim
-#: ../src/guestfs-actions.pod:6662
-#, no-wrap
-msgid ""
-" int\n"
-" guestfs_umount_all (guestfs_h *g);\n"
-"\n"
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:6665 ../fish/guestfish-actions.pod:4475
-msgid "This unmounts all mounted filesystems."
+"This displays the disk geometry of C<device> read from the partition table.  "
+"Especially in the case where the underlying block device has been resized, "
+"this can be different from the kernel's idea of the geometry (see "
+"C<guestfs_sfdisk_kernel_geometry>)."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:6667 ../fish/guestfish-actions.pod:4477
-msgid "Some internal mounts are not unmounted by this call."
+#: ../src/guestfs-actions.pod:6248 ../src/guestfs-actions.pod:6264
+#: ../fish/guestfish-actions.pod:4241 ../fish/guestfish-actions.pod:4250
+msgid "The result is in human-readable format, and not designed to be parsed."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:6673
-msgid "guestfs_upload"
+#: ../src/guestfs-actions.pod:6256
+msgid "guestfs_sfdisk_kernel_geometry"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:6675
+#: ../src/guestfs-actions.pod:6258

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" int\n"
-" guestfs_upload (guestfs_h *g,\n"
-"                 const char *filename,\n"
-"                 const char *remotefilename);\n"
+" char *\n"
+" guestfs_sfdisk_kernel_geometry (guestfs_h *g,\n"
+"                                 const char *device);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:6680 ../src/guestfs-actions.pod:6704
-#: ../fish/guestfish-actions.pod:4483 ../fish/guestfish-actions.pod:4496
-msgid "Upload local file C<filename> to C<remotefilename> on the filesystem."
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:6685
-msgid "See also C<guestfs_download>."
+#: ../src/guestfs-actions.pod:6262 ../fish/guestfish-actions.pod:4248
+msgid "This displays the kernel's idea of the geometry of C<device>."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:6696
-msgid "guestfs_upload_offset"
+#: ../src/guestfs-actions.pod:6272
+msgid "guestfs_sfdisk_l"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:6698
+#: ../src/guestfs-actions.pod:6274

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" int\n"
-" guestfs_upload_offset (guestfs_h *g,\n"
-"                        const char *filename,\n"
-"                        const char *remotefilename,\n"
-"                        int64_t offset);\n"
+" char *\n"
+" guestfs_sfdisk_l (guestfs_h *g,\n"
+"                   const char *device);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:6707 ../fish/guestfish-actions.pod:4499
+#: ../src/guestfs-actions.pod:6278 ../fish/guestfish-actions.pod:4257

 msgid ""
 msgid ""

-"C<remotefilename> is overwritten starting at the byte C<offset> specified.  "
-"The intention is to overwrite parts of existing files or devices, although "
-"if a non-existant file is specified then it is created with a \"hole\" "
-"before C<offset>.  The size of the data written is implicit in the size of "
-"the source C<filename>."
+"This displays the partition table on C<device>, in the human-readable output "
+"of the L<sfdisk(8)> command.  It is not intended to be parsed."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:6714
-msgid ""
-"Note that there is no limit on the amount of data that can be uploaded with "
-"this call, unlike with C<guestfs_pwrite>, and this call always writes the "
-"full amount unless an error occurs."
+#: ../src/guestfs-actions.pod:6282
+msgid "See also: C<guestfs_part_list>"

 msgstr ""
 
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:6719
-msgid "See also C<guestfs_upload>, C<guestfs_pwrite>."
+#: ../src/guestfs-actions.pod:6287
+msgid ""
+"This function is deprecated.  In new code, use the L</guestfs_part_list> "
+"call instead."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:6730
-msgid "guestfs_utimens"
+#: ../src/guestfs-actions.pod:6296
+msgid "guestfs_sh"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:6732
+#: ../src/guestfs-actions.pod:6298

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" int\n"
-" guestfs_utimens (guestfs_h *g,\n"
-"                  const char *path,\n"
-"                  int64_t atsecs,\n"
-"                  int64_t atnsecs,\n"
-"                  int64_t mtsecs,\n"
-"                  int64_t mtnsecs);\n"
+" char *\n"
+" guestfs_sh (guestfs_h *g,\n"
+"             const char *command);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:6740 ../fish/guestfish-actions.pod:4519
-msgid "This command sets the timestamps of a file with nanosecond precision."
+#: ../src/guestfs-actions.pod:6302 ../fish/guestfish-actions.pod:4274
+msgid ""
+"This call runs a command from the guest filesystem via the guest's C</bin/"
+"sh>."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:6743 ../fish/guestfish-actions.pod:4522
-msgid ""
-"C<atsecs, atnsecs> are the last access time (atime) in secs and nanoseconds "
-"from the epoch."
+#: ../src/guestfs-actions.pod:6305
+msgid "This is like C<guestfs_command>, but passes the command to:"

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:6746 ../fish/guestfish-actions.pod:4525
+# type: verbatim
+#. type: verbatim
+#: ../src/guestfs-actions.pod:6307 ../fish/guestfish-actions.pod:4279
+#, no-wrap

 msgid ""
 msgid ""

-"C<mtsecs, mtnsecs> are the last modification time (mtime) in secs and "
-"nanoseconds from the epoch."
+" /bin/sh -c \"command\"\n"
+"\n"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:6749 ../fish/guestfish-actions.pod:4528
+#: ../src/guestfs-actions.pod:6309 ../fish/guestfish-actions.pod:4281

 msgid ""
 msgid ""

-"If the C<*nsecs> field contains the special value C<-1> then the "
-"corresponding timestamp is set to the current time.  (The C<*secs> field is "
-"ignored in this case)."
+"Depending on the guest's shell, this usually results in wildcards being "
+"expanded, shell expressions being interpolated and so on."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:6753 ../fish/guestfish-actions.pod:4532
-msgid ""
-"If the C<*nsecs> field contains the special value C<-2> then the "
-"corresponding timestamp is left unchanged.  (The C<*secs> field is ignored "
-"in this case)."
+#: ../src/guestfs-actions.pod:6313
+msgid "All the provisos about C<guestfs_command> apply to this call."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:6761 ../src/guestfs-structs.pod:175
-msgid "guestfs_version"
+#: ../src/guestfs-actions.pod:6320
+msgid "guestfs_sh_lines"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:6763
+#: ../src/guestfs-actions.pod:6322

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" struct guestfs_version *\n"
-" guestfs_version (guestfs_h *g);\n"
+" char **\n"
+" guestfs_sh_lines (guestfs_h *g,\n"
+"                   const char *command);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:6766 ../fish/guestfish-actions.pod:4540
+#: ../src/guestfs-actions.pod:6326

 msgid ""
 msgid ""

-"Return the libguestfs version number that the program is linked against."
+"This is the same as C<guestfs_sh>, but splits the result into a list of "
+"lines."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:6769 ../fish/guestfish-actions.pod:4543
-msgid ""
-"Note that because of dynamic linking this is not necessarily the version of "
-"libguestfs that you compiled against.  You can compile the program, and then "
-"at runtime dynamically link against a completely different C<libguestfs.so> "
-"library."
+#: ../src/guestfs-actions.pod:6329
+msgid "See also: C<guestfs_command_lines>"

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:6774 ../fish/guestfish-actions.pod:4548
-msgid ""
-"This call was added in version C<1.0.58>.  In previous versions of "
-"libguestfs there was no way to get the version number.  From C code you can "
-"use dynamic linker functions to find out if this symbol exists (if it "
-"doesn't, then it's an earlier version)."
+# type: =head2
+#. type: =head2
+#: ../src/guestfs-actions.pod:6337
+msgid "guestfs_sleep"

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:6780 ../fish/guestfish-actions.pod:4554
+# type: verbatim
+#. type: verbatim
+#: ../src/guestfs-actions.pod:6339
+#, no-wrap

 msgid ""
 msgid ""

-"The call returns a structure with four elements.  The first three (C<major>, "
-"C<minor> and C<release>) are numbers and correspond to the usual version "
-"triplet.  The fourth element (C<extra>) is a string and is normally empty, "
-"but may be used for distro-specific information."
+" int\n"
+" guestfs_sleep (guestfs_h *g,\n"
+"                int secs);\n"
+"\n"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:6786 ../fish/guestfish-actions.pod:4560
-msgid ""
-"To construct the original version string: C<$major.$minor.$release$extra>"
+#: ../src/guestfs-actions.pod:6343 ../fish/guestfish-actions.pod:4300
+msgid "Sleep for C<secs> seconds."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:6789 ../fish/guestfish-actions.pod:4563
-msgid "See also: L<guestfs(3)/LIBGUESTFS VERSION NUMBERS>."
+#: ../src/guestfs-actions.pod:6347
+msgid "(Added in 1.0.41)"

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:6791
-msgid ""
-"I<Note:> Don't use this call to test for availability of features.  In "
-"enterprise distributions we backport features from later versions into "
-"earlier versions, making this an unreliable way to test for features.  Use "
-"C<guestfs_available> instead."
+# type: =head2
+#. type: =head2
+#: ../src/guestfs-actions.pod:6349 ../src/guestfs-structs.pod:109
+msgid "guestfs_stat"

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:6797
+# type: verbatim
+#. type: verbatim
+#: ../src/guestfs-actions.pod:6351
+#, no-wrap

 msgid ""
 msgid ""

-"This function returns a C<struct guestfs_version *>, or NULL if there was an "
-"error.  I<The caller must call C<guestfs_free_version> after use>."
+" struct guestfs_stat *\n"
+" guestfs_stat (guestfs_h *g,\n"
+"               const char *path);\n"
+"\n"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:6801
-msgid "(Added in 1.0.58)"
+#: ../src/guestfs-actions.pod:6357 ../fish/guestfish-actions.pod:4308
+msgid "This is the same as the C<stat(2)> system call."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:6803
-msgid "guestfs_vfs_label"
+#: ../src/guestfs-actions.pod:6365 ../src/guestfs-structs.pod:135
+msgid "guestfs_statvfs"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:6805
+#: ../src/guestfs-actions.pod:6367

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" char *\n"
-" guestfs_vfs_label (guestfs_h *g,\n"
-"                    const char *device);\n"
+" struct guestfs_statvfs *\n"
+" guestfs_statvfs (guestfs_h *g,\n"
+"                  const char *path);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:6809 ../fish/guestfish-actions.pod:4575
-msgid "This returns the filesystem label of the filesystem on C<device>."
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:6812 ../fish/guestfish-actions.pod:4578
-msgid "If the filesystem is unlabeled, this returns the empty string."
+#: ../src/guestfs-actions.pod:6371 ../fish/guestfish-actions.pod:4314
+msgid ""
+"Returns file system statistics for any mounted file system.  C<path> should "
+"be a file or directory in the mounted file system (typically it is the mount "
+"point itself, but it doesn't need to be)."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:6814
-msgid "To find a filesystem from the label, use C<guestfs_findfs_label>."
+#: ../src/guestfs-actions.pod:6375 ../fish/guestfish-actions.pod:4318
+msgid "This is the same as the C<statvfs(2)> system call."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:6819 ../src/guestfs-actions.pod:6856
-msgid "(Added in 1.3.18)"
+#: ../src/guestfs-actions.pod:6377
+msgid ""
+"This function returns a C<struct guestfs_statvfs *>, or NULL if there was an "
+"error.  I<The caller must call C<guestfs_free_statvfs> after use>."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:6821
-msgid "guestfs_vfs_type"
+#: ../src/guestfs-actions.pod:6383
+msgid "guestfs_strings"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:6823
+#: ../src/guestfs-actions.pod:6385

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" char *\n"
-" guestfs_vfs_type (guestfs_h *g,\n"
-"                   const char *device);\n"
+" char **\n"
+" guestfs_strings (guestfs_h *g,\n"
+"                  const char *path);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:6827 ../fish/guestfish-actions.pod:4586
-msgid ""
-"This command gets the filesystem type corresponding to the filesystem on "
-"C<device>."
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:6830 ../fish/guestfish-actions.pod:4589
+#: ../src/guestfs-actions.pod:6389 ../fish/guestfish-actions.pod:4324

 msgid ""
 msgid ""

-"For most filesystems, the result is the name of the Linux VFS module which "
-"would be used to mount this filesystem if you mounted it without specifying "
-"the filesystem type.  For example a string such as C<ext3> or C<ntfs>."
+"This runs the L<strings(1)> command on a file and returns the list of "
+"printable strings found."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:6840
-msgid "guestfs_vfs_uuid"
+#: ../src/guestfs-actions.pod:6401
+msgid "guestfs_strings_e"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:6842
+#: ../src/guestfs-actions.pod:6403

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" char *\n"
-" guestfs_vfs_uuid (guestfs_h *g,\n"
-"                   const char *device);\n"
+" char **\n"
+" guestfs_strings_e (guestfs_h *g,\n"
+"                    const char *encoding,\n"
+"                    const char *path);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:6846 ../fish/guestfish-actions.pod:4598
-msgid "This returns the filesystem UUID of the filesystem on C<device>."
+#: ../src/guestfs-actions.pod:6408
+msgid ""
+"This is like the C<guestfs_strings> command, but allows you to specify the "
+"encoding of strings that are looked for in the source file C<path>."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:6849 ../fish/guestfish-actions.pod:4601
-msgid "If the filesystem does not have a UUID, this returns the empty string."
+#: ../src/guestfs-actions.pod:6412 ../fish/guestfish-actions.pod:4338
+msgid "Allowed encodings are:"
+msgstr ""
+
+# type: =item
+#. type: =item
+#: ../src/guestfs-actions.pod:6416 ../fish/guestfish-actions.pod:4342
+msgid "s"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:6851
-msgid "To find a filesystem from the UUID, use C<guestfs_findfs_uuid>."
+#: ../src/guestfs-actions.pod:6418
+msgid ""
+"Single 7-bit-byte characters like ASCII and the ASCII-compatible parts of "
+"ISO-8859-X (this is what C<guestfs_strings> uses)."

 msgstr ""
 
 msgstr ""
 

-# type: =head2
-#. type: =head2
-#: ../src/guestfs-actions.pod:6858
-msgid "guestfs_vg_activate"
+# type: =item
+#. type: =item
+#: ../src/guestfs-actions.pod:6421 ../fish/guestfish-actions.pod:4347
+msgid "S"

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../src/guestfs-actions.pod:6860
-#, no-wrap
-msgid ""
-" int\n"
-" guestfs_vg_activate (guestfs_h *g,\n"
-"                      int activate,\n"
-"                      char *const *volgroups);\n"
-"\n"
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:6423 ../fish/guestfish-actions.pod:4349
+msgid "Single 8-bit-byte characters."
+msgstr ""
+
+# type: =item
+#. type: =item
+#: ../src/guestfs-actions.pod:6425 ../fish/guestfish-actions.pod:4351
+msgid "b"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:6865 ../fish/guestfish-actions.pod:4609
+#: ../src/guestfs-actions.pod:6427 ../fish/guestfish-actions.pod:4353
+msgid "16-bit big endian strings such as those encoded in UTF-16BE or UCS-2BE."
+msgstr ""
+
+# type: =item
+#. type: =item
+#: ../src/guestfs-actions.pod:6430 ../fish/guestfish-actions.pod:4356
+msgid "l (lower case letter L)"
+msgstr ""
+
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:6432 ../fish/guestfish-actions.pod:4358

 msgid ""
 msgid ""

-"This command activates or (if C<activate> is false) deactivates all logical "
-"volumes in the listed volume groups C<volgroups>.  If activated, then they "
-"are made known to the kernel, ie. they appear as C</dev/mapper> devices.  If "
-"deactivated, then those devices disappear."
+"16-bit little endian such as UTF-16LE and UCS-2LE.  This is useful for "
+"examining binaries in Windows guests."
+msgstr ""
+
+# type: =item
+#. type: =item
+#: ../src/guestfs-actions.pod:6435 ../fish/guestfish-actions.pod:4361
+msgid "B"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:6871 ../fish/guestfish-actions.pod:4615
-msgid "This command is the same as running C<vgchange -a y|n volgroups...>"
+#: ../src/guestfs-actions.pod:6437 ../fish/guestfish-actions.pod:4363
+msgid "32-bit big endian such as UCS-4BE."
+msgstr ""
+
+# type: =item
+#. type: =item
+#: ../src/guestfs-actions.pod:6439 ../fish/guestfish-actions.pod:4365
+msgid "L"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:6873 ../fish/guestfish-actions.pod:4617
-msgid ""
-"Note that if C<volgroups> is an empty list then B<all> volume groups are "
-"activated or deactivated."
+#: ../src/guestfs-actions.pod:6441 ../fish/guestfish-actions.pod:4367
+msgid "32-bit little endian such as UCS-4LE."
+msgstr ""
+
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:6445 ../fish/guestfish-actions.pod:4371
+msgid "The returned strings are transcoded to UTF-8."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:6880
-msgid "guestfs_vg_activate_all"
+#: ../src/guestfs-actions.pod:6456
+msgid "guestfs_swapoff_device"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:6882
+#: ../src/guestfs-actions.pod:6458

 #, no-wrap
 msgid ""
 " int\n"
 #, no-wrap
 msgid ""
 " int\n"

-" guestfs_vg_activate_all (guestfs_h *g,\n"
-"                          int activate);\n"
+" guestfs_swapoff_device (guestfs_h *g,\n"
+"                         const char *device);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:6886 ../fish/guestfish-actions.pod:4624
+#: ../src/guestfs-actions.pod:6462

 msgid ""
 msgid ""

-"This command activates or (if C<activate> is false) deactivates all logical "
-"volumes in all volume groups.  If activated, then they are made known to the "
-"kernel, ie. they appear as C</dev/mapper> devices.  If deactivated, then "
-"those devices disappear."
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:6892 ../fish/guestfish-actions.pod:4630
-msgid "This command is the same as running C<vgchange -a y|n>"
+"This command disables the libguestfs appliance swap device or partition "
+"named C<device>.  See C<guestfs_swapon_device>."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:6898
-msgid "guestfs_vgcreate"
+#: ../src/guestfs-actions.pod:6470
+msgid "guestfs_swapoff_file"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:6900
+#: ../src/guestfs-actions.pod:6472

 #, no-wrap
 msgid ""
 " int\n"
 #, no-wrap
 msgid ""
 " int\n"

-" guestfs_vgcreate (guestfs_h *g,\n"
-"                   const char *volgroup,\n"
-"                   char *const *physvols);\n"
+" guestfs_swapoff_file (guestfs_h *g,\n"
+"                       const char *file);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:6905 ../fish/guestfish-actions.pod:4636
-msgid ""
-"This creates an LVM volume group called C<volgroup> from the non-empty list "
-"of physical volumes C<physvols>."
+#: ../src/guestfs-actions.pod:6476 ../fish/guestfish-actions.pod:4388
+msgid "This command disables the libguestfs appliance swap on file."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:6912
-msgid "guestfs_vglvuuids"
+#: ../src/guestfs-actions.pod:6482
+msgid "guestfs_swapoff_label"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:6914
+#: ../src/guestfs-actions.pod:6484

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" char **\n"
-" guestfs_vglvuuids (guestfs_h *g,\n"
-"                    const char *vgname);\n"
+" int\n"
+" guestfs_swapoff_label (guestfs_h *g,\n"
+"                        const char *label);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:6918 ../fish/guestfish-actions.pod:4643
+#: ../src/guestfs-actions.pod:6488 ../fish/guestfish-actions.pod:4394

 msgid ""
 msgid ""

-"Given a VG called C<vgname>, this returns the UUIDs of all the logical "
-"volumes created in this volume group."
+"This command disables the libguestfs appliance swap on labeled swap "
+"partition."

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:6921
+# type: =head2
+#. type: =head2
+#: ../src/guestfs-actions.pod:6495
+msgid "guestfs_swapoff_uuid"
+msgstr ""
+
+# type: verbatim
+#. type: verbatim
+#: ../src/guestfs-actions.pod:6497
+#, no-wrap

 msgid ""
 msgid ""

-"You can use this along with C<guestfs_lvs> and C<guestfs_lvuuid> calls to "
-"associate logical volumes and volume groups."
+" int\n"
+" guestfs_swapoff_uuid (guestfs_h *g,\n"
+"                       const char *uuid);\n"
+"\n"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:6924
-msgid "See also C<guestfs_vgpvuuids>."
+#: ../src/guestfs-actions.pod:6501 ../fish/guestfish-actions.pod:4401
+msgid ""
+"This command disables the libguestfs appliance swap partition with the given "
+"UUID."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:6932
-msgid "guestfs_vgpvuuids"
+#: ../src/guestfs-actions.pod:6508
+msgid "guestfs_swapon_device"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:6934
+#: ../src/guestfs-actions.pod:6510

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" char **\n"
-" guestfs_vgpvuuids (guestfs_h *g,\n"
-"                    const char *vgname);\n"
+" int\n"
+" guestfs_swapon_device (guestfs_h *g,\n"
+"                        const char *device);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:6938 ../fish/guestfish-actions.pod:4655
+#: ../src/guestfs-actions.pod:6514

 msgid ""
 msgid ""

-"Given a VG called C<vgname>, this returns the UUIDs of all the physical "
-"volumes that this volume group resides on."
+"This command enables the libguestfs appliance to use the swap device or "
+"partition named C<device>.  The increased memory is made available for all "
+"commands, for example those run using C<guestfs_command> or C<guestfs_sh>."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:6941
+#: ../src/guestfs-actions.pod:6519 ../fish/guestfish-actions.pod:4413

 msgid ""
 msgid ""

-"You can use this along with C<guestfs_pvs> and C<guestfs_pvuuid> calls to "
-"associate physical volumes and volume groups."
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:6944
-msgid "See also C<guestfs_vglvuuids>."
+"Note that you should not swap to existing guest swap partitions unless you "
+"know what you are doing.  They may contain hibernation information, or other "
+"information that the guest doesn't want you to trash.  You also risk leaking "
+"information about the host to the guest this way.  Instead, attach a new "
+"host device to the guest and swap on that."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:6952
-msgid "guestfs_vgremove"
+#: ../src/guestfs-actions.pod:6530
+msgid "guestfs_swapon_file"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:6954
+#: ../src/guestfs-actions.pod:6532

 #, no-wrap
 msgid ""
 " int\n"
 #, no-wrap
 msgid ""
 " int\n"

-" guestfs_vgremove (guestfs_h *g,\n"
-"                   const char *vgname);\n"
+" guestfs_swapon_file (guestfs_h *g,\n"
+"                      const char *file);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:6958 ../fish/guestfish-actions.pod:4667
-msgid "Remove an LVM volume group C<vgname>, (for example C<VG>)."
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:6960 ../fish/guestfish-actions.pod:4669
+#: ../src/guestfs-actions.pod:6536

 msgid ""
 msgid ""

-"This also forcibly removes all logical volumes in the volume group (if any)."
+"This command enables swap to a file.  See C<guestfs_swapon_device> for other "
+"notes."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:6967
-msgid "guestfs_vgrename"
+#: ../src/guestfs-actions.pod:6543
+msgid "guestfs_swapon_label"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:6969
+#: ../src/guestfs-actions.pod:6545

 #, no-wrap
 msgid ""
 " int\n"
 #, no-wrap
 msgid ""
 " int\n"

-" guestfs_vgrename (guestfs_h *g,\n"
-"                   const char *volgroup,\n"
-"                   const char *newvolgroup);\n"
+" guestfs_swapon_label (guestfs_h *g,\n"
+"                       const char *label);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:6974 ../fish/guestfish-actions.pod:4676
-msgid "Rename a volume group C<volgroup> with the new name C<newvolgroup>."
+#: ../src/guestfs-actions.pod:6549
+msgid ""
+"This command enables swap to a labeled swap partition.  See "
+"C<guestfs_swapon_device> for other notes."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:6980
-msgid "guestfs_vgs"
+#: ../src/guestfs-actions.pod:6556
+msgid "guestfs_swapon_uuid"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:6982
+#: ../src/guestfs-actions.pod:6558

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" char **\n"
-" guestfs_vgs (guestfs_h *g);\n"
+" int\n"
+" guestfs_swapon_uuid (guestfs_h *g,\n"
+"                      const char *uuid);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:6985 ../fish/guestfish-actions.pod:4682
+#: ../src/guestfs-actions.pod:6562

 msgid ""
 msgid ""

-"List all the volumes groups detected.  This is the equivalent of the L<vgs(8)"
-"> command."
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:6988 ../fish/guestfish-actions.pod:4685
-msgid ""
-"This returns a list of just the volume group names that were detected (eg. "
-"C<VolGroup00>)."
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:6991
-msgid "See also C<guestfs_vgs_full>."
+"This command enables swap to a swap partition with the given UUID.  See "
+"C<guestfs_swapon_device> for other notes."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:6999
-msgid "guestfs_vgs_full"
+#: ../src/guestfs-actions.pod:6569
+msgid "guestfs_sync"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:7001
+#: ../src/guestfs-actions.pod:6571

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" struct guestfs_lvm_vg_list *\n"
-" guestfs_vgs_full (guestfs_h *g);\n"
+" int\n"
+" guestfs_sync (guestfs_h *g);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:7004 ../fish/guestfish-actions.pod:4694
+#: ../src/guestfs-actions.pod:6574 ../fish/guestfish-actions.pod:4445

 msgid ""
 msgid ""

-"List all the volumes groups detected.  This is the equivalent of the L<vgs(8)"
-"> command.  The \"full\" version includes all fields."
+"This syncs the disk, so that any writes are flushed through to the "
+"underlying disk image."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:7007
+#: ../src/guestfs-actions.pod:6577 ../fish/guestfish-actions.pod:4448

 msgid ""
 msgid ""

-"This function returns a C<struct guestfs_lvm_vg_list *>, or NULL if there "
-"was an error.  I<The caller must call C<guestfs_free_lvm_vg_list> after use>."
+"You should always call this if you have modified a disk image, before "
+"closing the handle."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:7013
-msgid "guestfs_vgscan"
+#: ../src/guestfs-actions.pod:6584
+msgid "guestfs_tail"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:7015
+#: ../src/guestfs-actions.pod:6586

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" int\n"
-" guestfs_vgscan (guestfs_h *g);\n"
+" char **\n"
+" guestfs_tail (guestfs_h *g,\n"
+"               const char *path);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:7018 ../fish/guestfish-actions.pod:4701
+#: ../src/guestfs-actions.pod:6590 ../fish/guestfish-actions.pod:4455

 msgid ""
 msgid ""

-"This rescans all block devices and rebuilds the list of LVM physical "
-"volumes, volume groups and logical volumes."
+"This command returns up to the last 10 lines of a file as a list of strings."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:7025
-msgid "guestfs_vguuid"
+#: ../src/guestfs-actions.pod:6602
+msgid "guestfs_tail_n"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:7027
+#: ../src/guestfs-actions.pod:6604

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" char *\n"
-" guestfs_vguuid (guestfs_h *g,\n"
-"                 const char *vgname);\n"
+" char **\n"
+" guestfs_tail_n (guestfs_h *g,\n"
+"                 int nrlines,\n"
+"                 const char *path);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:7031 ../fish/guestfish-actions.pod:4708
-msgid "This command returns the UUID of the LVM VG named C<vgname>."
+#: ../src/guestfs-actions.pod:6609 ../fish/guestfish-actions.pod:4465
+msgid ""
+"If the parameter C<nrlines> is a positive number, this returns the last "
+"C<nrlines> lines of the file C<path>."
+msgstr ""
+
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:6612 ../fish/guestfish-actions.pod:4468
+msgid ""
+"If the parameter C<nrlines> is a negative number, this returns lines from "
+"the file C<path>, starting with the C<-nrlines>th line."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:7038
-msgid "guestfs_wait_ready"
+#: ../src/guestfs-actions.pod:6626
+msgid "guestfs_tar_in"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:7040
+#: ../src/guestfs-actions.pod:6628

 #, no-wrap
 msgid ""
 " int\n"
 #, no-wrap
 msgid ""
 " int\n"

-" guestfs_wait_ready (guestfs_h *g);\n"
+" guestfs_tar_in (guestfs_h *g,\n"
+"                 const char *tarfile,\n"
+"                 const char *directory);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:7043
-msgid "This function is a no op."
+#: ../src/guestfs-actions.pod:6633 ../fish/guestfish-actions.pod:4480
+msgid ""
+"This command uploads and unpacks local file C<tarfile> (an I<uncompressed> "
+"tar file) into C<directory>."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:7045
+#: ../src/guestfs-actions.pod:6636

 msgid ""
 msgid ""

-"In versions of the API E<lt> 1.0.71 you had to call this function just after "
-"calling C<guestfs_launch> to wait for the launch to complete.  However this "
-"is no longer necessary because C<guestfs_launch> now does the waiting."
+"To upload a compressed tarball, use C<guestfs_tgz_in> or C<guestfs_txz_in>."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:7050
-msgid ""
-"If you see any calls to this function in code then you can just remove them, "
-"unless you want to retain compatibility with older versions of the API."
+#: ../src/guestfs-actions.pod:6641 ../src/guestfs-actions.pod:6658
+#: ../src/guestfs-actions.pod:6674 ../src/guestfs-actions.pod:6690
+msgid "(Added in 1.0.3)"

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:7058
-msgid "guestfs_wc_c"
+#: ../src/guestfs-actions.pod:6643
+msgid "guestfs_tar_out"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:7060
+#: ../src/guestfs-actions.pod:6645

 #, no-wrap
 msgid ""
 " int\n"
 #, no-wrap
 msgid ""
 " int\n"

-" guestfs_wc_c (guestfs_h *g,\n"
-"               const char *path);\n"
+" guestfs_tar_out (guestfs_h *g,\n"
+"                  const char *directory,\n"
+"                  const char *tarfile);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:7064 ../fish/guestfish-actions.pod:4714
+#: ../src/guestfs-actions.pod:6650 ../fish/guestfish-actions.pod:4492

 msgid ""
 msgid ""

-"This command counts the characters in a file, using the C<wc -c> external "
-"command."
+"This command packs the contents of C<directory> and downloads it to local "
+"file C<tarfile>."
+msgstr ""
+
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:6653
+msgid ""
+"To download a compressed tarball, use C<guestfs_tgz_out> or "
+"C<guestfs_txz_out>."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:7071
-msgid "guestfs_wc_l"
+#: ../src/guestfs-actions.pod:6660
+msgid "guestfs_tgz_in"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:7073
+#: ../src/guestfs-actions.pod:6662

 #, no-wrap
 msgid ""
 " int\n"
 #, no-wrap
 msgid ""
 " int\n"

-" guestfs_wc_l (guestfs_h *g,\n"
-"               const char *path);\n"
+" guestfs_tgz_in (guestfs_h *g,\n"
+"                 const char *tarball,\n"
+"                 const char *directory);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:7077 ../fish/guestfish-actions.pod:4721
+#: ../src/guestfs-actions.pod:6667 ../fish/guestfish-actions.pod:4504

 msgid ""
 msgid ""

-"This command counts the lines in a file, using the C<wc -l> external command."
+"This command uploads and unpacks local file C<tarball> (a I<gzip compressed> "
+"tar file) into C<directory>."
+msgstr ""
+
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:6670
+msgid "To upload an uncompressed tarball, use C<guestfs_tar_in>."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:7084
-msgid "guestfs_wc_w"
+#: ../src/guestfs-actions.pod:6676
+msgid "guestfs_tgz_out"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:7086
+#: ../src/guestfs-actions.pod:6678

 #, no-wrap
 msgid ""
 " int\n"
 #, no-wrap
 msgid ""
 " int\n"

-" guestfs_wc_w (guestfs_h *g,\n"
-"               const char *path);\n"
+" guestfs_tgz_out (guestfs_h *g,\n"
+"                  const char *directory,\n"
+"                  const char *tarball);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:7090 ../fish/guestfish-actions.pod:4728
+#: ../src/guestfs-actions.pod:6683 ../fish/guestfish-actions.pod:4515

 msgid ""
 msgid ""

-"This command counts the words in a file, using the C<wc -w> external command."
+"This command packs the contents of C<directory> and downloads it to local "
+"file C<tarball>."
+msgstr ""
+
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:6686
+msgid "To download an uncompressed tarball, use C<guestfs_tar_out>."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:7097
-msgid "guestfs_write"
+#: ../src/guestfs-actions.pod:6692
+msgid "guestfs_touch"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:7099
+#: ../src/guestfs-actions.pod:6694

 #, no-wrap
 msgid ""
 " int\n"
 #, no-wrap
 msgid ""
 " int\n"

-" guestfs_write (guestfs_h *g,\n"
-"                const char *path,\n"
-"                const char *content,\n"
-"                size_t content_size);\n"
+" guestfs_touch (guestfs_h *g,\n"
+"                const char *path);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:7105 ../fish/guestfish-actions.pod:4735
+#: ../src/guestfs-actions.pod:6698 ../fish/guestfish-actions.pod:4526

 msgid ""
 msgid ""

-"This call creates a file called C<path>.  The content of the file is the "
-"string C<content> (which can contain any 8 bit data)."
+"Touch acts like the L<touch(1)> command.  It can be used to update the "
+"timestamps on a file, or, if the file does not exist, to create a new zero-"
+"length file."
+msgstr ""
+
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:6702 ../fish/guestfish-actions.pod:4530
+msgid ""
+"This command only works on regular files, and will fail on other file types "
+"such as directories, symbolic links, block special etc."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:7115
-msgid "guestfs_write_file"
+#: ../src/guestfs-actions.pod:6709
+msgid "guestfs_truncate"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:7117
+#: ../src/guestfs-actions.pod:6711

 #, no-wrap
 msgid ""
 " int\n"
 #, no-wrap
 msgid ""
 " int\n"

-" guestfs_write_file (guestfs_h *g,\n"
-"                     const char *path,\n"
-"                     const char *content,\n"
-"                     int size);\n"
+" guestfs_truncate (guestfs_h *g,\n"
+"                   const char *path);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:7123 ../fish/guestfish-actions.pod:4745
+#: ../src/guestfs-actions.pod:6715 ../fish/guestfish-actions.pod:4537

 msgid ""
 msgid ""

-"This call creates a file called C<path>.  The contents of the file is the "
-"string C<content> (which can contain any 8 bit data), with length C<size>."
+"This command truncates C<path> to a zero-length file.  The file must exist "
+"already."

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:7127 ../fish/guestfish-actions.pod:4749
+# type: =head2
+#. type: =head2
+#: ../src/guestfs-actions.pod:6722
+msgid "guestfs_truncate_size"
+msgstr ""
+
+# type: verbatim
+#. type: verbatim
+#: ../src/guestfs-actions.pod:6724
+#, no-wrap

 msgid ""
 msgid ""

-"As a special case, if C<size> is C<0> then the length is calculated using "
-"C<strlen> (so in this case the content cannot contain embedded ASCII NULs)."
+" int\n"
+" guestfs_truncate_size (guestfs_h *g,\n"
+"                        const char *path,\n"
+"                        int64_t size);\n"
+"\n"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:7131 ../fish/guestfish-actions.pod:4753
+#: ../src/guestfs-actions.pod:6729 ../fish/guestfish-actions.pod:4544

 msgid ""
 msgid ""

-"I<NB.> Owing to a bug, writing content containing ASCII NUL characters does "
-"I<not> work, even if the length is specified."
+"This command truncates C<path> to size C<size> bytes.  The file must exist "
+"already."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:7139 ../fish/guestfish-actions.pod:4759
+#: ../src/guestfs-actions.pod:6732

 msgid ""
 msgid ""

-"This function is deprecated.  In new code, use the C<write> call instead."
+"If the current file size is less than C<size> then the file is extended to "
+"the required size with zero bytes.  This creates a sparse file (ie. disk "
+"blocks are not allocated for the file until you write to it).  To create a "
+"non-sparse file of zeroes, use C<guestfs_fallocate64> instead."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:7148
-msgid "guestfs_zegrep"
+#: ../src/guestfs-actions.pod:6742
+msgid "guestfs_tune2fs_l"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:7150
+#: ../src/guestfs-actions.pod:6744

 #, no-wrap
 msgid ""
 " char **\n"
 #, no-wrap
 msgid ""
 " char **\n"

-" guestfs_zegrep (guestfs_h *g,\n"
-"                 const char *regex,\n"
-"                 const char *path);\n"
+" guestfs_tune2fs_l (guestfs_h *g,\n"
+"                    const char *device);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:7155 ../fish/guestfish-actions.pod:4770
+#: ../src/guestfs-actions.pod:6748 ../fish/guestfish-actions.pod:4557

 msgid ""
 msgid ""

-"This calls the external C<zegrep> program and returns the matching lines."
+"This returns the contents of the ext2, ext3 or ext4 filesystem superblock on "
+"C<device>."
+msgstr ""
+
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:6751 ../fish/guestfish-actions.pod:4560
+msgid ""
+"It is the same as running C<tune2fs -l device>.  See L<tune2fs(8)> manpage "
+"for more details.  The list of fields returned isn't clearly defined, and "
+"depends on both the version of C<tune2fs> that libguestfs was built against, "
+"and the filesystem itself."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:7167
-msgid "guestfs_zegrepi"
+#: ../src/guestfs-actions.pod:6764
+msgid "guestfs_txz_in"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:7169
+#: ../src/guestfs-actions.pod:6766

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" char **\n"
-" guestfs_zegrepi (guestfs_h *g,\n"
-"                  const char *regex,\n"
-"                  const char *path);\n"
+" int\n"
+" guestfs_txz_in (guestfs_h *g,\n"
+"                 const char *tarball,\n"
+"                 const char *directory);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:7174 ../fish/guestfish-actions.pod:4780
+#: ../src/guestfs-actions.pod:6771 ../fish/guestfish-actions.pod:4569

 msgid ""
 msgid ""

-"This calls the external C<zegrep -i> program and returns the matching lines."
+"This command uploads and unpacks local file C<tarball> (an I<xz compressed> "
+"tar file) into C<directory>."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:7186
-msgid "guestfs_zero"
+#: ../src/guestfs-actions.pod:6778
+msgid "guestfs_txz_out"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:7188
+#: ../src/guestfs-actions.pod:6780

 #, no-wrap
 msgid ""
 " int\n"
 #, no-wrap
 msgid ""
 " int\n"

-" guestfs_zero (guestfs_h *g,\n"
-"               const char *device);\n"
+" guestfs_txz_out (guestfs_h *g,\n"
+"                  const char *directory,\n"
+"                  const char *tarball);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:7192 ../fish/guestfish-actions.pod:4790
-msgid "This command writes zeroes over the first few blocks of C<device>."
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:7194 ../fish/guestfish-actions.pod:4792
+#: ../src/guestfs-actions.pod:6785 ../fish/guestfish-actions.pod:4578

 msgid ""
 msgid ""

-"How many blocks are zeroed isn't specified (but it's I<not> enough to "
-"securely wipe the device).  It should be sufficient to remove any partition "
-"tables, filesystem superblocks and so on."
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:7198
-msgid "See also: C<guestfs_zero_device>, C<guestfs_scrub_device>."
+"This command packs the contents of C<directory> and downloads it to local "
+"file C<tarball> (as an xz compressed tar archive)."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:7209
-msgid "guestfs_zero_device"
+#: ../src/guestfs-actions.pod:6792
+msgid "guestfs_umask"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:7211
+#: ../src/guestfs-actions.pod:6794

 #, no-wrap
 msgid ""
 " int\n"
 #, no-wrap
 msgid ""
 " int\n"

-" guestfs_zero_device (guestfs_h *g,\n"
-"                      const char *device);\n"
+" guestfs_umask (guestfs_h *g,\n"
+"                int mask);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:7215
+#: ../src/guestfs-actions.pod:6798 ../fish/guestfish-actions.pod:4587

 msgid ""
 msgid ""

-"This command writes zeroes over the entire C<device>.  Compare with "
-"C<guestfs_zero> which just zeroes the first few blocks of a device."
+"This function sets the mask used for creating new files and device nodes to "
+"C<mask & 0777>."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:7229
-msgid "(Added in 1.3.1)"
-msgstr ""
-
-# type: =head2
-#. type: =head2
-#: ../src/guestfs-actions.pod:7231
-msgid "guestfs_zerofree"
-msgstr ""
-
-# type: verbatim
-#. type: verbatim
-#: ../src/guestfs-actions.pod:7233
-#, no-wrap
+#: ../src/guestfs-actions.pod:6801 ../fish/guestfish-actions.pod:4590

 msgid ""
 msgid ""

-" int\n"
-" guestfs_zerofree (guestfs_h *g,\n"
-"                   const char *device);\n"
-"\n"
+"Typical umask values would be C<022> which creates new files with "
+"permissions like \"-rw-r--r--\" or \"-rwxr-xr-x\", and C<002> which creates "
+"new files with permissions like \"-rw-rw-r--\" or \"-rwxrwxr-x\"."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:7237 ../fish/guestfish-actions.pod:4813
+#: ../src/guestfs-actions.pod:6806 ../fish/guestfish-actions.pod:4595

 msgid ""
 msgid ""

-"This runs the I<zerofree> program on C<device>.  This program claims to zero "
-"unused inodes and disk blocks on an ext2/3 filesystem, thus making it "
-"possible to compress the filesystem more effectively."
+"The default umask is C<022>.  This is important because it means that "
+"directories and device nodes will be created with C<0644> or C<0755> mode "
+"even if you specify C<0777>."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:7242 ../fish/guestfish-actions.pod:4818
-msgid "You should B<not> run this program if the filesystem is mounted."
+#: ../src/guestfs-actions.pod:6810
+msgid ""
+"See also C<guestfs_get_umask>, L<umask(2)>, C<guestfs_mknod>, "
+"C<guestfs_mkdir>."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:7245 ../fish/guestfish-actions.pod:4821
-msgid ""
-"It is possible that using this program can damage the filesystem or data on "
-"the filesystem."
+#: ../src/guestfs-actions.pod:6813 ../fish/guestfish-actions.pod:4602
+msgid "This call returns the previous umask."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:7252
-msgid "guestfs_zfgrep"
+#: ../src/guestfs-actions.pod:6819
+msgid "guestfs_umount"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:7254
+#: ../src/guestfs-actions.pod:6821

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" char **\n"
-" guestfs_zfgrep (guestfs_h *g,\n"
-"                 const char *pattern,\n"
-"                 const char *path);\n"
+" int\n"
+" guestfs_umount (guestfs_h *g,\n"
+"                 const char *pathordevice);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:7259 ../fish/guestfish-actions.pod:4828
+#: ../src/guestfs-actions.pod:6825 ../fish/guestfish-actions.pod:4610

 msgid ""
 msgid ""

-"This calls the external C<zfgrep> program and returns the matching lines."
+"This unmounts the given filesystem.  The filesystem may be specified either "
+"by its mountpoint (path) or the device which contains the filesystem."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:7271
-msgid "guestfs_zfgrepi"
+#: ../src/guestfs-actions.pod:6833
+msgid "guestfs_umount_all"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:7273
+#: ../src/guestfs-actions.pod:6835

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" char **\n"
-" guestfs_zfgrepi (guestfs_h *g,\n"
-"                  const char *pattern,\n"
-"                  const char *path);\n"
+" int\n"
+" guestfs_umount_all (guestfs_h *g);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:7278 ../fish/guestfish-actions.pod:4838
-msgid ""
-"This calls the external C<zfgrep -i> program and returns the matching lines."
+#: ../src/guestfs-actions.pod:6838 ../fish/guestfish-actions.pod:4620
+msgid "This unmounts all mounted filesystems."
+msgstr ""
+
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:6840 ../fish/guestfish-actions.pod:4622
+msgid "Some internal mounts are not unmounted by this call."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:7290
-msgid "guestfs_zfile"
+#: ../src/guestfs-actions.pod:6846
+msgid "guestfs_upload"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:7292
+#: ../src/guestfs-actions.pod:6848

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" char *\n"
-" guestfs_zfile (guestfs_h *g,\n"
-"                const char *meth,\n"
-"                const char *path);\n"
+" int\n"
+" guestfs_upload (guestfs_h *g,\n"
+"                 const char *filename,\n"
+"                 const char *remotefilename);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:7297 ../fish/guestfish-actions.pod:4848
-msgid ""
-"This command runs C<file> after first decompressing C<path> using C<method>."
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:7300 ../fish/guestfish-actions.pod:4851
-msgid "C<method> must be one of C<gzip>, C<compress> or C<bzip2>."
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../src/guestfs-actions.pod:7302
-msgid ""
-"Since 1.0.63, use C<guestfs_file> instead which can now process compressed "
-"files."
+#: ../src/guestfs-actions.pod:6853 ../src/guestfs-actions.pod:6877
+#: ../fish/guestfish-actions.pod:4628 ../fish/guestfish-actions.pod:4641
+msgid "Upload local file C<filename> to C<remotefilename> on the filesystem."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:7308 ../fish/guestfish-actions.pod:4856
-msgid ""
-"This function is deprecated.  In new code, use the C<file> call instead."
+#: ../src/guestfs-actions.pod:6858
+msgid "See also C<guestfs_download>."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:7317
-msgid "guestfs_zgrep"
+#: ../src/guestfs-actions.pod:6869
+msgid "guestfs_upload_offset"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:7319
+#: ../src/guestfs-actions.pod:6871

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" char **\n"
-" guestfs_zgrep (guestfs_h *g,\n"
-"                const char *regex,\n"
-"                const char *path);\n"
+" int\n"
+" guestfs_upload_offset (guestfs_h *g,\n"
+"                        const char *filename,\n"
+"                        const char *remotefilename,\n"
+"                        int64_t offset);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:7324 ../fish/guestfish-actions.pod:4867
+#: ../src/guestfs-actions.pod:6880 ../fish/guestfish-actions.pod:4644

 msgid ""
 msgid ""

-"This calls the external C<zgrep> program and returns the matching lines."
+"C<remotefilename> is overwritten starting at the byte C<offset> specified.  "
+"The intention is to overwrite parts of existing files or devices, although "
+"if a non-existant file is specified then it is created with a \"hole\" "
+"before C<offset>.  The size of the data written is implicit in the size of "
+"the source C<filename>."
+msgstr ""
+
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:6887
+msgid ""
+"Note that there is no limit on the amount of data that can be uploaded with "
+"this call, unlike with C<guestfs_pwrite>, and this call always writes the "
+"full amount unless an error occurs."
+msgstr ""
+
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:6892
+msgid "See also C<guestfs_upload>, C<guestfs_pwrite>."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-actions.pod:7336
-msgid "guestfs_zgrepi"
+#: ../src/guestfs-actions.pod:6903
+msgid "guestfs_utimens"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-actions.pod:7338
+#: ../src/guestfs-actions.pod:6905

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" char **\n"
-" guestfs_zgrepi (guestfs_h *g,\n"
-"                 const char *regex,\n"
-"                 const char *path);\n"
+" int\n"
+" guestfs_utimens (guestfs_h *g,\n"
+"                  const char *path,\n"
+"                  int64_t atsecs,\n"
+"                  int64_t atnsecs,\n"
+"                  int64_t mtsecs,\n"
+"                  int64_t mtnsecs);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-actions.pod:7343 ../fish/guestfish-actions.pod:4877
-msgid ""
-"This calls the external C<zgrep -i> program and returns the matching lines."
-msgstr ""
-
-# type: =item
-#. type: =item
-#: ../src/guestfs-availability.pod:3
-msgid "B<augeas>"
+#: ../src/guestfs-actions.pod:6913 ../fish/guestfish-actions.pod:4664
+msgid "This command sets the timestamps of a file with nanosecond precision."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-availability.pod:5
+#: ../src/guestfs-actions.pod:6916 ../fish/guestfish-actions.pod:4667

 msgid ""
 msgid ""

-"The following functions: L</guestfs_aug_clear> L</guestfs_aug_close> L</"
-"guestfs_aug_defnode> L</guestfs_aug_defvar> L</guestfs_aug_get> L</"
-"guestfs_aug_init> L</guestfs_aug_insert> L</guestfs_aug_load> L</"
-"guestfs_aug_ls> L</guestfs_aug_match> L</guestfs_aug_mv> L</guestfs_aug_rm> "
-"L</guestfs_aug_save> L</guestfs_aug_set>"
-msgstr ""
-
-# type: =item
-#. type: =item
-#: ../src/guestfs-availability.pod:21
-msgid "B<inotify>"
+"C<atsecs, atnsecs> are the last access time (atime) in secs and nanoseconds "
+"from the epoch."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-availability.pod:23
+#: ../src/guestfs-actions.pod:6919 ../fish/guestfish-actions.pod:4670

 msgid ""
 msgid ""

-"The following functions: L</guestfs_inotify_add_watch> L</"
-"guestfs_inotify_close> L</guestfs_inotify_files> L</guestfs_inotify_init> L</"
-"guestfs_inotify_read> L</guestfs_inotify_rm_watch>"
-msgstr ""
-
-# type: =item
-#. type: =item
-#: ../src/guestfs-availability.pod:31
-msgid "B<linuxfsuuid>"
+"C<mtsecs, mtnsecs> are the last modification time (mtime) in secs and "
+"nanoseconds from the epoch."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-availability.pod:33
+#: ../src/guestfs-actions.pod:6922 ../fish/guestfish-actions.pod:4673

 msgid ""
 msgid ""

-"The following functions: L</guestfs_mke2fs_JU> L</guestfs_mke2journal_U> L</"
-"guestfs_mkswap_U> L</guestfs_swapoff_uuid> L</guestfs_swapon_uuid>"
-msgstr ""
-
-# type: =item
-#. type: =item
-#: ../src/guestfs-availability.pod:40
-msgid "B<linuxmodules>"
+"If the C<*nsecs> field contains the special value C<-1> then the "
+"corresponding timestamp is set to the current time.  (The C<*secs> field is "
+"ignored in this case)."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-availability.pod:42
-msgid "The following functions: L</guestfs_modprobe>"
+#: ../src/guestfs-actions.pod:6926 ../fish/guestfish-actions.pod:4677
+msgid ""
+"If the C<*nsecs> field contains the special value C<-2> then the "
+"corresponding timestamp is left unchanged.  (The C<*secs> field is ignored "
+"in this case)."

 msgstr ""
 
 msgstr ""
 

-# type: =item
-#. type: =item
-#: ../src/guestfs-availability.pod:45
-msgid "B<linuxxattrs>"
+# type: =head2
+#. type: =head2
+#: ../src/guestfs-actions.pod:6934 ../src/guestfs-structs.pod:175
+msgid "guestfs_version"

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../src/guestfs-availability.pod:47
+# type: verbatim
+#. type: verbatim
+#: ../src/guestfs-actions.pod:6936
+#, no-wrap

 msgid ""
 msgid ""

-"The following functions: L</guestfs_getxattr> L</guestfs_getxattrs> L</"
-"guestfs_lgetxattr> L</guestfs_lgetxattrs> L</guestfs_lremovexattr> L</"
-"guestfs_lsetxattr> L</guestfs_lxattrlist> L</guestfs_removexattr> L</"
-"guestfs_setxattr>"
-msgstr ""
-
-# type: =item
-#. type: =item
-#: ../src/guestfs-availability.pod:58
-msgid "B<luks>"
+" struct guestfs_version *\n"
+" guestfs_version (guestfs_h *g);\n"
+"\n"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-availability.pod:60
+#: ../src/guestfs-actions.pod:6939 ../fish/guestfish-actions.pod:4685

 msgid ""
 msgid ""

-"The following functions: L</guestfs_luks_add_key> L</guestfs_luks_close> L</"
-"guestfs_luks_format> L</guestfs_luks_format_cipher> L</"
-"guestfs_luks_kill_slot> L</guestfs_luks_open> L</guestfs_luks_open_ro>"
-msgstr ""
-
-# type: =item
-#. type: =item
-#: ../src/guestfs-availability.pod:69
-msgid "B<lvm2>"
+"Return the libguestfs version number that the program is linked against."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-availability.pod:71
+#: ../src/guestfs-actions.pod:6942 ../fish/guestfish-actions.pod:4688

 msgid ""
 msgid ""

-"The following functions: L</guestfs_is_lv> L</guestfs_lvcreate> L</"
-"guestfs_lvm_remove_all> L</guestfs_lvm_set_filter> L</guestfs_lvremove> L</"
-"guestfs_lvresize> L</guestfs_lvresize_free> L</guestfs_lvs> L</"
-"guestfs_lvs_full> L</guestfs_pvcreate> L</guestfs_pvremove> L</"
-"guestfs_pvresize> L</guestfs_pvresize_size> L</guestfs_pvs> L</"
-"guestfs_pvs_full> L</guestfs_vg_activate> L</guestfs_vg_activate_all> L</"
-"guestfs_vgcreate> L</guestfs_vgremove> L</guestfs_vgs> L</guestfs_vgs_full>"
-msgstr ""
-
-# type: =item
-#. type: =item
-#: ../src/guestfs-availability.pod:94
-msgid "B<mknod>"
+"Note that because of dynamic linking this is not necessarily the version of "
+"libguestfs that you compiled against.  You can compile the program, and then "
+"at runtime dynamically link against a completely different C<libguestfs.so> "
+"library."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-availability.pod:96
+#: ../src/guestfs-actions.pod:6947 ../fish/guestfish-actions.pod:4693

 msgid ""
 msgid ""

-"The following functions: L</guestfs_mkfifo> L</guestfs_mknod> L</"
-"guestfs_mknod_b> L</guestfs_mknod_c>"
+"This call was added in version C<1.0.58>.  In previous versions of "
+"libguestfs there was no way to get the version number.  From C code you can "
+"use dynamic linker functions to find out if this symbol exists (if it "
+"doesn't, then it's an earlier version)."

 msgstr ""
 
 msgstr ""
 

-# type: =item
-#. type: =item
-#: ../src/guestfs-availability.pod:102
-msgid "B<ntfs3g>"
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:6953 ../fish/guestfish-actions.pod:4699
+msgid ""
+"The call returns a structure with four elements.  The first three (C<major>, "
+"C<minor> and C<release>) are numbers and correspond to the usual version "
+"triplet.  The fourth element (C<extra>) is a string and is normally empty, "
+"but may be used for distro-specific information."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-availability.pod:104
-msgid "The following functions: L</guestfs_ntfs_3g_probe>"
+#: ../src/guestfs-actions.pod:6959 ../fish/guestfish-actions.pod:4705
+msgid ""
+"To construct the original version string: C<$major.$minor.$release$extra>"

 msgstr ""
 
 msgstr ""
 

-# type: =item
-#. type: =item
-#: ../src/guestfs-availability.pod:107
-msgid "B<ntfsprogs>"
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:6962 ../fish/guestfish-actions.pod:4708
+msgid "See also: L<guestfs(3)/LIBGUESTFS VERSION NUMBERS>."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-availability.pod:109
+#: ../src/guestfs-actions.pod:6964

 msgid ""
 msgid ""

-"The following functions: L</guestfs_ntfsresize> L</guestfs_ntfsresize_size>"
+"I<Note:> Don't use this call to test for availability of features.  In "
+"enterprise distributions we backport features from later versions into "
+"earlier versions, making this an unreliable way to test for features.  Use "
+"C<guestfs_available> instead."

 msgstr ""
 
 msgstr ""
 

-# type: =item
-#. type: =item
-#: ../src/guestfs-availability.pod:113
-msgid "B<realpath>"
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:6970
+msgid ""
+"This function returns a C<struct guestfs_version *>, or NULL if there was an "
+"error.  I<The caller must call C<guestfs_free_version> after use>."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-availability.pod:115
-msgid "The following functions: L</guestfs_realpath>"
+#: ../src/guestfs-actions.pod:6974
+msgid "(Added in 1.0.58)"

 msgstr ""
 
 msgstr ""
 

-# type: =item
-#. type: =item
-#: ../src/guestfs-availability.pod:118
-msgid "B<scrub>"
+# type: =head2
+#. type: =head2
+#: ../src/guestfs-actions.pod:6976
+msgid "guestfs_vfs_label"

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../src/guestfs-availability.pod:120
+# type: verbatim
+#. type: verbatim
+#: ../src/guestfs-actions.pod:6978
+#, no-wrap

 msgid ""
 msgid ""

-"The following functions: L</guestfs_scrub_device> L</guestfs_scrub_file> L</"
-"guestfs_scrub_freespace>"
+" char *\n"
+" guestfs_vfs_label (guestfs_h *g,\n"
+"                    const char *device);\n"
+"\n"

 msgstr ""
 
 msgstr ""
 

-# type: =item
-#. type: =item
-#: ../src/guestfs-availability.pod:125
-msgid "B<selinux>"
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:6982 ../fish/guestfish-actions.pod:4720
+msgid "This returns the filesystem label of the filesystem on C<device>."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-availability.pod:127
-msgid "The following functions: L</guestfs_getcon> L</guestfs_setcon>"
+#: ../src/guestfs-actions.pod:6985 ../fish/guestfish-actions.pod:4723
+msgid "If the filesystem is unlabeled, this returns the empty string."

 msgstr ""
 
 msgstr ""
 

-# type: =item
-#. type: =item
-#: ../src/guestfs-availability.pod:131
-msgid "B<xz>"
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:6987
+msgid "To find a filesystem from the label, use C<guestfs_findfs_label>."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../src/guestfs-availability.pod:133
-msgid "The following functions: L</guestfs_txz_in> L</guestfs_txz_out>"
-msgstr ""
-
-# type: =item
-#. type: =item
-#: ../src/guestfs-availability.pod:137
-msgid "B<zerofree>"
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../src/guestfs-availability.pod:139
-msgid "The following functions: L</guestfs_zerofree>"
+#: ../src/guestfs-actions.pod:6992 ../src/guestfs-actions.pod:7029
+msgid "(Added in 1.3.18)"

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-structs.pod:1
-msgid "guestfs_int_bool"
+#: ../src/guestfs-actions.pod:6994
+msgid "guestfs_vfs_type"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-structs.pod:3
+#: ../src/guestfs-actions.pod:6996

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" struct guestfs_int_bool {\n"
-"   int32_t i;\n"
-"   int32_t b;\n"
-" };\n"
-" \n"
+" char *\n"
+" guestfs_vfs_type (guestfs_h *g,\n"
+"                   const char *device);\n"
+"\n"

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../src/guestfs-structs.pod:8
-#, no-wrap
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:7000 ../fish/guestfish-actions.pod:4731

 msgid ""
 msgid ""

-" struct guestfs_int_bool_list {\n"
-"   uint32_t len; /* Number of elements in list. */\n"
-"   struct guestfs_int_bool *val; /* Elements. */\n"
-" };\n"
-" \n"
+"This command gets the filesystem type corresponding to the filesystem on "
+"C<device>."
+msgstr ""
+
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:7003 ../fish/guestfish-actions.pod:4734
+msgid ""
+"For most filesystems, the result is the name of the Linux VFS module which "
+"would be used to mount this filesystem if you mounted it without specifying "
+"the filesystem type.  For example a string such as C<ext3> or C<ntfs>."
+msgstr ""
+
+# type: =head2
+#. type: =head2
+#: ../src/guestfs-actions.pod:7013
+msgid "guestfs_vfs_uuid"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-structs.pod:13
+#: ../src/guestfs-actions.pod:7015

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" void guestfs_free_int_bool (struct guestfs_free_int_bool *);\n"
-" void guestfs_free_int_bool_list (struct guestfs_free_int_bool_list *);\n"
+" char *\n"
+" guestfs_vfs_uuid (guestfs_h *g,\n"
+"                   const char *device);\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:7019 ../fish/guestfish-actions.pod:4743
+msgid "This returns the filesystem UUID of the filesystem on C<device>."
+msgstr ""
+
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:7022 ../fish/guestfish-actions.pod:4746
+msgid "If the filesystem does not have a UUID, this returns the empty string."
+msgstr ""
+
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:7024
+msgid "To find a filesystem from the UUID, use C<guestfs_findfs_uuid>."
+msgstr ""
+

 # type: =head2
 #. type: =head2
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-structs.pod:16
-msgid "guestfs_lvm_pv"
+#: ../src/guestfs-actions.pod:7031
+msgid "guestfs_vg_activate"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-structs.pod:18
+#: ../src/guestfs-actions.pod:7033

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" struct guestfs_lvm_pv {\n"
-"   char *pv_name;\n"
-"   /* The next field is NOT nul-terminated, be careful when printing it: */\n"
-"   char pv_uuid[32];\n"
-"   char *pv_fmt;\n"
-"   uint64_t pv_size;\n"
-"   uint64_t dev_size;\n"
-"   uint64_t pv_free;\n"
-"   uint64_t pv_used;\n"
-"   char *pv_attr;\n"
-"   int64_t pv_pe_count;\n"
-"   int64_t pv_pe_alloc_count;\n"
-"   char *pv_tags;\n"
-"   uint64_t pe_start;\n"
-"   int64_t pv_mda_count;\n"
-"   uint64_t pv_mda_free;\n"
-" };\n"
-" \n"
+" int\n"
+" guestfs_vg_activate (guestfs_h *g,\n"
+"                      int activate,\n"
+"                      char *const *volgroups);\n"
+"\n"

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../src/guestfs-structs.pod:36
-#, no-wrap
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:7038 ../fish/guestfish-actions.pod:4754

 msgid ""
 msgid ""

-" struct guestfs_lvm_pv_list {\n"
-"   uint32_t len; /* Number of elements in list. */\n"
-"   struct guestfs_lvm_pv *val; /* Elements. */\n"
-" };\n"
-" \n"
+"This command activates or (if C<activate> is false) deactivates all logical "
+"volumes in the listed volume groups C<volgroups>.  If activated, then they "
+"are made known to the kernel, ie. they appear as C</dev/mapper> devices.  If "
+"deactivated, then those devices disappear."

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../src/guestfs-structs.pod:41
-#, no-wrap
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:7044 ../fish/guestfish-actions.pod:4760
+msgid "This command is the same as running C<vgchange -a y|n volgroups...>"
+msgstr ""
+
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:7046 ../fish/guestfish-actions.pod:4762

 msgid ""
 msgid ""

-" void guestfs_free_lvm_pv (struct guestfs_free_lvm_pv *);\n"
-" void guestfs_free_lvm_pv_list (struct guestfs_free_lvm_pv_list *);\n"
-"\n"
+"Note that if C<volgroups> is an empty list then B<all> volume groups are "
+"activated or deactivated."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-structs.pod:44
-msgid "guestfs_lvm_vg"
+#: ../src/guestfs-actions.pod:7053
+msgid "guestfs_vg_activate_all"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-structs.pod:46
+#: ../src/guestfs-actions.pod:7055

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" struct guestfs_lvm_vg {\n"
-"   char *vg_name;\n"
-"   /* The next field is NOT nul-terminated, be careful when printing it: */\n"
-"   char vg_uuid[32];\n"
-"   char *vg_fmt;\n"
-"   char *vg_attr;\n"
-"   uint64_t vg_size;\n"
-"   uint64_t vg_free;\n"
-"   char *vg_sysid;\n"
-"   uint64_t vg_extent_size;\n"
-"   int64_t vg_extent_count;\n"
-"   int64_t vg_free_count;\n"
-"   int64_t max_lv;\n"
-"   int64_t max_pv;\n"
-"   int64_t pv_count;\n"
-"   int64_t lv_count;\n"
-"   int64_t snap_count;\n"
-"   int64_t vg_seqno;\n"
-"   char *vg_tags;\n"
-"   int64_t vg_mda_count;\n"
-"   uint64_t vg_mda_free;\n"
-" };\n"
-" \n"
+" int\n"
+" guestfs_vg_activate_all (guestfs_h *g,\n"
+"                          int activate);\n"
+"\n"

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../src/guestfs-structs.pod:69
-#, no-wrap
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:7059 ../fish/guestfish-actions.pod:4769

 msgid ""
 msgid ""

-" struct guestfs_lvm_vg_list {\n"
-"   uint32_t len; /* Number of elements in list. */\n"
-"   struct guestfs_lvm_vg *val; /* Elements. */\n"
-" };\n"
-" \n"
+"This command activates or (if C<activate> is false) deactivates all logical "
+"volumes in all volume groups.  If activated, then they are made known to the "
+"kernel, ie. they appear as C</dev/mapper> devices.  If deactivated, then "
+"those devices disappear."

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../src/guestfs-structs.pod:74
-#, no-wrap
-msgid ""
-" void guestfs_free_lvm_vg (struct guestfs_free_lvm_vg *);\n"
-" void guestfs_free_lvm_vg_list (struct guestfs_free_lvm_vg_list *);\n"
-"\n"
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:7065 ../fish/guestfish-actions.pod:4775
+msgid "This command is the same as running C<vgchange -a y|n>"

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-structs.pod:77
-msgid "guestfs_lvm_lv"
+#: ../src/guestfs-actions.pod:7071
+msgid "guestfs_vgcreate"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-structs.pod:79
+#: ../src/guestfs-actions.pod:7073

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" struct guestfs_lvm_lv {\n"
-"   char *lv_name;\n"
-"   /* The next field is NOT nul-terminated, be careful when printing it: */\n"
-"   char lv_uuid[32];\n"
-"   char *lv_attr;\n"
-"   int64_t lv_major;\n"
-"   int64_t lv_minor;\n"
-"   int64_t lv_kernel_major;\n"
-"   int64_t lv_kernel_minor;\n"
-"   uint64_t lv_size;\n"
-"   int64_t seg_count;\n"
-"   char *origin;\n"
-"   /* The next field is [0..100] or -1 meaning 'not present': */\n"
-"   float snap_percent;\n"
-"   /* The next field is [0..100] or -1 meaning 'not present': */\n"
-"   float copy_percent;\n"
-"   char *move_pv;\n"
-"   char *lv_tags;\n"
-"   char *mirror_log;\n"
-"   char *modules;\n"
-" };\n"
-" \n"
+" int\n"
+" guestfs_vgcreate (guestfs_h *g,\n"
+"                   const char *volgroup,\n"
+"                   char *const *physvols);\n"
+"\n"

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../src/guestfs-structs.pod:101
-#, no-wrap
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:7078 ../fish/guestfish-actions.pod:4781

 msgid ""
 msgid ""

-" struct guestfs_lvm_lv_list {\n"
-"   uint32_t len; /* Number of elements in list. */\n"
-"   struct guestfs_lvm_lv *val; /* Elements. */\n"
-" };\n"
-" \n"
+"This creates an LVM volume group called C<volgroup> from the non-empty list "
+"of physical volumes C<physvols>."
+msgstr ""
+
+# type: =head2
+#. type: =head2
+#: ../src/guestfs-actions.pod:7085
+msgid "guestfs_vglvuuids"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-structs.pod:106
+#: ../src/guestfs-actions.pod:7087

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" void guestfs_free_lvm_lv (struct guestfs_free_lvm_lv *);\n"
-" void guestfs_free_lvm_lv_list (struct guestfs_free_lvm_lv_list *);\n"
+" char **\n"
+" guestfs_vglvuuids (guestfs_h *g,\n"
+"                    const char *vgname);\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../src/guestfs-structs.pod:111
-#, no-wrap
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:7091 ../fish/guestfish-actions.pod:4788

 msgid ""
 msgid ""

-" struct guestfs_stat {\n"
-"   int64_t dev;\n"
-"   int64_t ino;\n"
-"   int64_t mode;\n"
-"   int64_t nlink;\n"
-"   int64_t uid;\n"
-"   int64_t gid;\n"
-"   int64_t rdev;\n"
-"   int64_t size;\n"
-"   int64_t blksize;\n"
-"   int64_t blocks;\n"
-"   int64_t atime;\n"
-"   int64_t mtime;\n"
-"   int64_t ctime;\n"
-" };\n"
-" \n"
+"Given a VG called C<vgname>, this returns the UUIDs of all the logical "
+"volumes created in this volume group."

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../src/guestfs-structs.pod:127
-#, no-wrap
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:7094

 msgid ""
 msgid ""

-" struct guestfs_stat_list {\n"
-"   uint32_t len; /* Number of elements in list. */\n"
-"   struct guestfs_stat *val; /* Elements. */\n"
-" };\n"
-" \n"
+"You can use this along with C<guestfs_lvs> and C<guestfs_lvuuid> calls to "
+"associate logical volumes and volume groups."
+msgstr ""
+
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:7097
+msgid "See also C<guestfs_vgpvuuids>."
+msgstr ""
+
+# type: =head2
+#. type: =head2
+#: ../src/guestfs-actions.pod:7105
+msgid "guestfs_vgpvuuids"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-structs.pod:132
+#: ../src/guestfs-actions.pod:7107

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" void guestfs_free_stat (struct guestfs_free_stat *);\n"
-" void guestfs_free_stat_list (struct guestfs_free_stat_list *);\n"
+" char **\n"
+" guestfs_vgpvuuids (guestfs_h *g,\n"
+"                    const char *vgname);\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../src/guestfs-structs.pod:137
-#, no-wrap
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:7111 ../fish/guestfish-actions.pod:4800

 msgid ""
 msgid ""

-" struct guestfs_statvfs {\n"
-"   int64_t bsize;\n"
-"   int64_t frsize;\n"
-"   int64_t blocks;\n"
-"   int64_t bfree;\n"
-"   int64_t bavail;\n"
-"   int64_t files;\n"
-"   int64_t ffree;\n"
-"   int64_t favail;\n"
-"   int64_t fsid;\n"
-"   int64_t flag;\n"
-"   int64_t namemax;\n"
-" };\n"
-" \n"
+"Given a VG called C<vgname>, this returns the UUIDs of all the physical "
+"volumes that this volume group resides on."

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../src/guestfs-structs.pod:151
-#, no-wrap
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:7114

 msgid ""
 msgid ""

-" struct guestfs_statvfs_list {\n"
-"   uint32_t len; /* Number of elements in list. */\n"
-"   struct guestfs_statvfs *val; /* Elements. */\n"
-" };\n"
-" \n"
+"You can use this along with C<guestfs_pvs> and C<guestfs_pvuuid> calls to "
+"associate physical volumes and volume groups."

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../src/guestfs-structs.pod:156
-#, no-wrap
-msgid ""
-" void guestfs_free_statvfs (struct guestfs_free_statvfs *);\n"
-" void guestfs_free_statvfs_list (struct guestfs_free_statvfs_list *);\n"
-"\n"
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:7117
+msgid "See also C<guestfs_vglvuuids>."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-structs.pod:159
-msgid "guestfs_dirent"
+#: ../src/guestfs-actions.pod:7125
+msgid "guestfs_vgremove"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-structs.pod:161
+#: ../src/guestfs-actions.pod:7127

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" struct guestfs_dirent {\n"
-"   int64_t ino;\n"
-"   char ftyp;\n"
-"   char *name;\n"
-" };\n"
-" \n"
+" int\n"
+" guestfs_vgremove (guestfs_h *g,\n"
+"                   const char *vgname);\n"
+"\n"

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../src/guestfs-structs.pod:167
-#, no-wrap
-msgid ""
-" struct guestfs_dirent_list {\n"
-"   uint32_t len; /* Number of elements in list. */\n"
-"   struct guestfs_dirent *val; /* Elements. */\n"
-" };\n"
-" \n"
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:7131 ../fish/guestfish-actions.pod:4812
+msgid "Remove an LVM volume group C<vgname>, (for example C<VG>)."

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../src/guestfs-structs.pod:172
-#, no-wrap
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:7133 ../fish/guestfish-actions.pod:4814

 msgid ""
 msgid ""

-" void guestfs_free_dirent (struct guestfs_free_dirent *);\n"
-" void guestfs_free_dirent_list (struct guestfs_free_dirent_list *);\n"
-"\n"
+"This also forcibly removes all logical volumes in the volume group (if any)."

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../src/guestfs-structs.pod:177
-#, no-wrap
-msgid ""
-" struct guestfs_version {\n"
-"   int64_t major;\n"
-"   int64_t minor;\n"
-"   int64_t release;\n"
-"   char *extra;\n"
-" };\n"
-" \n"
+# type: =head2
+#. type: =head2
+#: ../src/guestfs-actions.pod:7140
+msgid "guestfs_vgrename"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-structs.pod:184
+#: ../src/guestfs-actions.pod:7142

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" struct guestfs_version_list {\n"
-"   uint32_t len; /* Number of elements in list. */\n"
-"   struct guestfs_version *val; /* Elements. */\n"
-" };\n"
-" \n"
+" int\n"
+" guestfs_vgrename (guestfs_h *g,\n"
+"                   const char *volgroup,\n"
+"                   const char *newvolgroup);\n"
+"\n"

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../src/guestfs-structs.pod:189
-#, no-wrap
-msgid ""
-" void guestfs_free_version (struct guestfs_free_version *);\n"
-" void guestfs_free_version_list (struct guestfs_free_version_list *);\n"
-"\n"
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:7147 ../fish/guestfish-actions.pod:4821
+msgid "Rename a volume group C<volgroup> with the new name C<newvolgroup>."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-structs.pod:192
-msgid "guestfs_xattr"
+#: ../src/guestfs-actions.pod:7153
+msgid "guestfs_vgs"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-structs.pod:194
+#: ../src/guestfs-actions.pod:7155

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" struct guestfs_xattr {\n"
-"   char *attrname;\n"
-"   /* The next two fields describe a byte array. */\n"
-"   uint32_t attrval_len;\n"
-"   char *attrval;\n"
-" };\n"
-" \n"
+" char **\n"
+" guestfs_vgs (guestfs_h *g);\n"
+"\n"

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../src/guestfs-structs.pod:201
-#, no-wrap
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:7158 ../fish/guestfish-actions.pod:4827

 msgid ""
 msgid ""

-" struct guestfs_xattr_list {\n"
-"   uint32_t len; /* Number of elements in list. */\n"
-"   struct guestfs_xattr *val; /* Elements. */\n"
-" };\n"
-" \n"
+"List all the volumes groups detected.  This is the equivalent of the L<vgs(8)"
+"> command."

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../src/guestfs-structs.pod:206
-#, no-wrap
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:7161 ../fish/guestfish-actions.pod:4830

 msgid ""
 msgid ""

-" void guestfs_free_xattr (struct guestfs_free_xattr *);\n"
-" void guestfs_free_xattr_list (struct guestfs_free_xattr_list *);\n"
-"\n"
+"This returns a list of just the volume group names that were detected (eg. "
+"C<VolGroup00>)."
+msgstr ""
+
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:7164
+msgid "See also C<guestfs_vgs_full>."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-structs.pod:209
-msgid "guestfs_inotify_event"
+#: ../src/guestfs-actions.pod:7172
+msgid "guestfs_vgs_full"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-structs.pod:211
+#: ../src/guestfs-actions.pod:7174

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" struct guestfs_inotify_event {\n"
-"   int64_t in_wd;\n"
-"   uint32_t in_mask;\n"
-"   uint32_t in_cookie;\n"
-"   char *in_name;\n"
-" };\n"
-" \n"
+" struct guestfs_lvm_vg_list *\n"
+" guestfs_vgs_full (guestfs_h *g);\n"
+"\n"

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../src/guestfs-structs.pod:218
-#, no-wrap
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:7177 ../fish/guestfish-actions.pod:4839

 msgid ""
 msgid ""

-" struct guestfs_inotify_event_list {\n"
-"   uint32_t len; /* Number of elements in list. */\n"
-"   struct guestfs_inotify_event *val; /* Elements. */\n"
-" };\n"
-" \n"
+"List all the volumes groups detected.  This is the equivalent of the L<vgs(8)"
+"> command.  The \"full\" version includes all fields."

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../src/guestfs-structs.pod:223
-#, no-wrap
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:7180

 msgid ""
 msgid ""

-" void guestfs_free_inotify_event (struct guestfs_free_inotify_event *);\n"
-" void guestfs_free_inotify_event_list (struct guestfs_free_inotify_event_list *);\n"
-"\n"
+"This function returns a C<struct guestfs_lvm_vg_list *>, or NULL if there "
+"was an error.  I<The caller must call C<guestfs_free_lvm_vg_list> after use>."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-structs.pod:226
-msgid "guestfs_partition"
+#: ../src/guestfs-actions.pod:7186
+msgid "guestfs_vgscan"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-structs.pod:228
+#: ../src/guestfs-actions.pod:7188

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" struct guestfs_partition {\n"
-"   int32_t part_num;\n"
-"   uint64_t part_start;\n"
-"   uint64_t part_end;\n"
-"   uint64_t part_size;\n"
-" };\n"
-" \n"
+" int\n"
+" guestfs_vgscan (guestfs_h *g);\n"
+"\n"

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../src/guestfs-structs.pod:235
-#, no-wrap
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:7191 ../fish/guestfish-actions.pod:4846

 msgid ""
 msgid ""

-" struct guestfs_partition_list {\n"
-"   uint32_t len; /* Number of elements in list. */\n"
-"   struct guestfs_partition *val; /* Elements. */\n"
-" };\n"
-" \n"
+"This rescans all block devices and rebuilds the list of LVM physical "
+"volumes, volume groups and logical volumes."
+msgstr ""
+
+# type: =head2
+#. type: =head2
+#: ../src/guestfs-actions.pod:7198
+msgid "guestfs_vguuid"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-structs.pod:240
+#: ../src/guestfs-actions.pod:7200

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" void guestfs_free_partition (struct guestfs_free_partition *);\n"
-" void guestfs_free_partition_list (struct guestfs_free_partition_list *);\n"
+" char *\n"
+" guestfs_vguuid (guestfs_h *g,\n"
+"                 const char *vgname);\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:7204 ../fish/guestfish-actions.pod:4853
+msgid "This command returns the UUID of the LVM VG named C<vgname>."
+msgstr ""
+

 # type: =head2
 #. type: =head2
 # type: =head2
 #. type: =head2

-#: ../src/guestfs-structs.pod:243
-msgid "guestfs_application"
+#: ../src/guestfs-actions.pod:7211
+msgid "guestfs_wait_ready"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-structs.pod:245
+#: ../src/guestfs-actions.pod:7213

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" struct guestfs_application {\n"
-"   char *app_name;\n"
-"   char *app_display_name;\n"
-"   int32_t app_epoch;\n"
-"   char *app_version;\n"
-"   char *app_release;\n"
-"   char *app_install_path;\n"
-"   char *app_trans_path;\n"
-"   char *app_publisher;\n"
-"   char *app_url;\n"
-"   char *app_source_package;\n"
-"   char *app_summary;\n"
-"   char *app_description;\n"
-" };\n"
-" \n"
+" int\n"
+" guestfs_wait_ready (guestfs_h *g);\n"
+"\n"

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../src/guestfs-structs.pod:260
-#, no-wrap
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:7216
+msgid "This function is a no op."
+msgstr ""
+
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:7218

 msgid ""
 msgid ""

-" struct guestfs_application_list {\n"
-"   uint32_t len; /* Number of elements in list. */\n"
-"   struct guestfs_application *val; /* Elements. */\n"
-" };\n"
-" \n"
+"In versions of the API E<lt> 1.0.71 you had to call this function just after "
+"calling C<guestfs_launch> to wait for the launch to complete.  However this "
+"is no longer necessary because C<guestfs_launch> now does the waiting."
+msgstr ""
+
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:7223
+msgid ""
+"If you see any calls to this function in code then you can just remove them, "
+"unless you want to retain compatibility with older versions of the API."
+msgstr ""
+
+#. type: textblock
+#: ../src/guestfs-actions.pod:7229
+msgid ""
+"This function is deprecated.  In new code, use the L</guestfs_launch> call "
+"instead."
+msgstr ""
+
+# type: =head2
+#. type: =head2
+#: ../src/guestfs-actions.pod:7238
+msgid "guestfs_wc_c"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../src/guestfs-structs.pod:265
+#: ../src/guestfs-actions.pod:7240

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" void guestfs_free_application (struct guestfs_free_application *);\n"
-" void guestfs_free_application_list (struct guestfs_free_application_list *);\n"
+" int\n"
+" guestfs_wc_c (guestfs_h *g,\n"
+"               const char *path);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish.pod:5
-msgid "guestfish - the libguestfs Filesystem Interactive SHell"
+#: ../src/guestfs-actions.pod:7244 ../fish/guestfish-actions.pod:4859
+msgid ""
+"This command counts the characters in a file, using the C<wc -c> external "
+"command."
+msgstr ""
+
+# type: =head2
+#. type: =head2
+#: ../src/guestfs-actions.pod:7251
+msgid "guestfs_wc_l"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish.pod:9
+#: ../src/guestfs-actions.pod:7253

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" guestfish [--options] [commands]\n"
+" int\n"
+" guestfs_wc_l (guestfs_h *g,\n"
+"               const char *path);\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../fish/guestfish.pod:11
-#, no-wrap
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:7257 ../fish/guestfish-actions.pod:4866

 msgid ""
 msgid ""

-" guestfish\n"
-"\n"
+"This command counts the lines in a file, using the C<wc -l> external command."
+msgstr ""
+
+# type: =head2
+#. type: =head2
+#: ../src/guestfs-actions.pod:7264
+msgid "guestfs_wc_w"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish.pod:13
+#: ../src/guestfs-actions.pod:7266

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" guestfish [--ro|--rw] -a disk.img\n"
+" int\n"
+" guestfs_wc_w (guestfs_h *g,\n"
+"               const char *path);\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../fish/guestfish.pod:15
-#, no-wrap
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:7270 ../fish/guestfish-actions.pod:4873

 msgid ""
 msgid ""

-" guestfish [--ro|--rw] -a disk.img -m dev[:mountpoint]\n"
-"\n"
+"This command counts the words in a file, using the C<wc -w> external command."
+msgstr ""
+
+# type: =head2
+#. type: =head2
+#: ../src/guestfs-actions.pod:7277
+msgid "guestfs_write"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish.pod:17
+#: ../src/guestfs-actions.pod:7279

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" guestfish -d libvirt-domain\n"
+" int\n"
+" guestfs_write (guestfs_h *g,\n"
+"                const char *path,\n"
+"                const char *content,\n"
+"                size_t content_size);\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../fish/guestfish.pod:19
-#, no-wrap
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:7285 ../fish/guestfish-actions.pod:4880

 msgid ""
 msgid ""

-" guestfish [--ro|--rw] -a disk.img -i\n"
-"\n"
+"This call creates a file called C<path>.  The content of the file is the "
+"string C<content> (which can contain any 8 bit data)."
+msgstr ""
+
+# type: =head2
+#. type: =head2
+#: ../src/guestfs-actions.pod:7295
+msgid "guestfs_write_file"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish.pod:21
+#: ../src/guestfs-actions.pod:7297

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" guestfish -d libvirt-domain -i\n"
+" int\n"
+" guestfs_write_file (guestfs_h *g,\n"
+"                     const char *path,\n"
+"                     const char *content,\n"
+"                     int size);\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: =head1
-#. type: =head1
-#: ../fish/guestfish.pod:23 ../fuse/guestmount.pod:15 ../tools/virt-edit.pl:44
-#: ../tools/virt-win-reg.pl:51 ../tools/virt-tar.pl:64
-msgid "WARNING"
-msgstr ""
-

 # type: textblock
 #. type: textblock
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish.pod:25
+#: ../src/guestfs-actions.pod:7303 ../fish/guestfish-actions.pod:4890

 msgid ""
 msgid ""

-"Using guestfish in read/write mode on live virtual machines can be "
-"dangerous, potentially causing disk corruption.  Use the I<--ro> (read-only) "
-"option to use guestfish safely if the disk image or virtual machine might be "
-"live."
+"This call creates a file called C<path>.  The contents of the file is the "
+"string C<content> (which can contain any 8 bit data), with length C<size>."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish.pod:32
+#: ../src/guestfs-actions.pod:7307 ../fish/guestfish-actions.pod:4894

 msgid ""
 msgid ""

-"Guestfish is a shell and command-line tool for examining and modifying "
-"virtual machine filesystems.  It uses libguestfs and exposes all of the "
-"functionality of the guestfs API, see L<guestfs(3)>."
+"As a special case, if C<size> is C<0> then the length is calculated using "
+"C<strlen> (so in this case the content cannot contain embedded ASCII NULs)."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish.pod:36
+#: ../src/guestfs-actions.pod:7311 ../fish/guestfish-actions.pod:4898

 msgid ""
 msgid ""

-"Guestfish gives you structured access to the libguestfs API, from shell "
-"scripts or the command line or interactively.  If you want to rescue a "
-"broken virtual machine image, you should look at the L<virt-rescue(1)> "
-"command."
+"I<NB.> Owing to a bug, writing content containing ASCII NUL characters does "
+"I<not> work, even if the length is specified."

 msgstr ""
 
 msgstr ""
 

-# type: =head1
-#. type: =head1
-#: ../fish/guestfish.pod:41 ../fish/guestfish.pod:928
-#: ../fuse/guestmount.pod:39 ../tools/virt-edit.pl:58
-#: ../tools/virt-resize.pl:64 ../tools/virt-tar.pl:50
-msgid "EXAMPLES"
+#. type: textblock
+#: ../src/guestfs-actions.pod:7319
+msgid ""
+"This function is deprecated.  In new code, use the L</guestfs_write> call "
+"instead."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish.pod:43
-msgid "As an interactive shell"
+#: ../src/guestfs-actions.pod:7328
+msgid "guestfs_zegrep"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish.pod:45
+#: ../src/guestfs-actions.pod:7330

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" $ guestfish\n"
-" \n"
+" char **\n"
+" guestfs_zegrep (guestfs_h *g,\n"
+"                 const char *regex,\n"
+"                 const char *path);\n"
+"\n"

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../fish/guestfish.pod:47
-#, no-wrap
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:7335 ../fish/guestfish-actions.pod:4915

 msgid ""
 msgid ""

-" Welcome to guestfish, the libguestfs filesystem interactive shell for\n"
-" editing virtual machine filesystems.\n"
-" \n"
+"This calls the external C<zegrep> program and returns the matching lines."
+msgstr ""
+
+# type: =head2
+#. type: =head2
+#: ../src/guestfs-actions.pod:7347
+msgid "guestfs_zegrepi"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish.pod:50
+#: ../src/guestfs-actions.pod:7349

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" Type: 'help' for a list of commands\n"
-"       'man' to read the manual\n"
-"       'quit' to quit the shell\n"
-" \n"
+" char **\n"
+" guestfs_zegrepi (guestfs_h *g,\n"
+"                  const char *regex,\n"
+"                  const char *path);\n"
+"\n"

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../fish/guestfish.pod:54
-#, no-wrap
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:7354 ../fish/guestfish-actions.pod:4925

 msgid ""
 msgid ""

-" ><fs> add-ro disk.img\n"
-" ><fs> run\n"
-" ><fs> list-filesystems\n"
-" /dev/sda1: ext4\n"
-" /dev/vg_guest/lv_root: ext4\n"
-" /dev/vg_guest/lv_swap: swap\n"
-" ><fs> mount /dev/vg_guest/lv_root /\n"
-" ><fs> cat /etc/fstab\n"
-" # /etc/fstab\n"
-" # Created by anaconda\n"
-" [...]\n"
-" ><fs> exit\n"
-"\n"
+"This calls the external C<zegrep -i> program and returns the matching lines."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish.pod:67
-msgid "From shell scripts"
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../fish/guestfish.pod:69
-msgid "Create a new C</etc/motd> file in a guest or disk image:"
+#: ../src/guestfs-actions.pod:7366
+msgid "guestfs_zero"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish.pod:71
+#: ../src/guestfs-actions.pod:7368

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" guestfish <<_EOF_\n"
-" add disk.img\n"
-" run\n"
-" mount /dev/vg_guest/lv_root /\n"
-" write /etc/motd \"Welcome, new users\"\n"
-" _EOF_\n"
+" int\n"
+" guestfs_zero (guestfs_h *g,\n"
+"               const char *device);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish.pod:78
-msgid "List the LVM logical volumes in a disk image:"
+#: ../src/guestfs-actions.pod:7372 ../fish/guestfish-actions.pod:4935
+msgid "This command writes zeroes over the first few blocks of C<device>."

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../fish/guestfish.pod:80
-#, no-wrap
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:7374 ../fish/guestfish-actions.pod:4937

 msgid ""
 msgid ""

-" guestfish -a disk.img --ro <<_EOF_\n"
-" run\n"
-" lvs\n"
-" _EOF_\n"
-"\n"
+"How many blocks are zeroed isn't specified (but it's I<not> enough to "
+"securely wipe the device).  It should be sufficient to remove any partition "
+"tables, filesystem superblocks and so on."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish.pod:85
-msgid "List all the filesystems in a disk image:"
+#: ../src/guestfs-actions.pod:7378
+msgid "See also: C<guestfs_zero_device>, C<guestfs_scrub_device>."
+msgstr ""
+
+# type: =head2
+#. type: =head2
+#: ../src/guestfs-actions.pod:7389
+msgid "guestfs_zero_device"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish.pod:87
+#: ../src/guestfs-actions.pod:7391

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" guestfish -a disk.img --ro <<_EOF_\n"
-" run\n"
-" list-filesystems\n"
-" _EOF_\n"
+" int\n"
+" guestfs_zero_device (guestfs_h *g,\n"
+"                      const char *device);\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: =head2
-#. type: =head2
-#: ../fish/guestfish.pod:92
-msgid "On one command line"
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:7395
+msgid ""
+"This command writes zeroes over the entire C<device>.  Compare with "
+"C<guestfs_zero> which just zeroes the first few blocks of a device."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish.pod:94
-msgid "Update C</etc/resolv.conf> in a guest:"
+#: ../src/guestfs-actions.pod:7409
+msgid "(Added in 1.3.1)"
+msgstr ""
+
+# type: =head2
+#. type: =head2
+#: ../src/guestfs-actions.pod:7411
+msgid "guestfs_zerofree"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish.pod:96
+#: ../src/guestfs-actions.pod:7413

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" guestfish \\\n"
-"   add disk.img : run : mount /dev/vg_guest/lv_root / : \\\n"
-"   write /etc/resolv.conf \"nameserver 1.2.3.4\"\n"
+" int\n"
+" guestfs_zerofree (guestfs_h *g,\n"
+"                   const char *device);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish.pod:100
-msgid "Edit C</boot/grub/grub.conf> interactively:"
-msgstr ""
-
-# type: verbatim
-#. type: verbatim
-#: ../fish/guestfish.pod:102
-#, no-wrap
+#: ../src/guestfs-actions.pod:7417 ../fish/guestfish-actions.pod:4958

 msgid ""
 msgid ""

-" guestfish --rw --add disk.img \\\n"
-"   --mount /dev/vg_guest/lv_root \\\n"
-"   --mount /dev/sda1:/boot \\\n"
-"   edit /boot/grub/grub.conf\n"
-"\n"
+"This runs the I<zerofree> program on C<device>.  This program claims to zero "
+"unused inodes and disk blocks on an ext2/3 filesystem, thus making it "
+"possible to compress the filesystem more effectively."

 msgstr ""
 
 msgstr ""
 

-# type: =head2
-#. type: =head2
-#: ../fish/guestfish.pod:107
-msgid "Mount disks automatically"
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:7422 ../fish/guestfish-actions.pod:4963
+msgid "You should B<not> run this program if the filesystem is mounted."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish.pod:109
+#: ../src/guestfs-actions.pod:7425 ../fish/guestfish-actions.pod:4966

 msgid ""
 msgid ""

-"Use the I<-i> option to automatically mount the disks from a virtual machine:"
+"It is possible that using this program can damage the filesystem or data on "
+"the filesystem."

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../fish/guestfish.pod:112
-#, no-wrap
-msgid ""
-" guestfish --ro -a disk.img -i cat /etc/group\n"
-"\n"
+# type: =head2
+#. type: =head2
+#: ../src/guestfs-actions.pod:7432
+msgid "guestfs_zfgrep"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish.pod:114
+#: ../src/guestfs-actions.pod:7434

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" guestfish --ro -d libvirt-domain -i cat /etc/group\n"
+" char **\n"
+" guestfs_zfgrep (guestfs_h *g,\n"
+"                 const char *pattern,\n"
+"                 const char *path);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish.pod:116
-msgid "Another way to edit C</boot/grub/grub.conf> interactively is:"
+#: ../src/guestfs-actions.pod:7439 ../fish/guestfish-actions.pod:4973
+msgid ""
+"This calls the external C<zfgrep> program and returns the matching lines."
+msgstr ""
+
+# type: =head2
+#. type: =head2
+#: ../src/guestfs-actions.pod:7451
+msgid "guestfs_zfgrepi"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish.pod:118
+#: ../src/guestfs-actions.pod:7453

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" guestfish --rw -a disk.img -i edit /boot/grub/grub.conf\n"
+" char **\n"
+" guestfs_zfgrepi (guestfs_h *g,\n"
+"                  const char *pattern,\n"
+"                  const char *path);\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: =head2
-#. type: =head2
-#: ../fish/guestfish.pod:120
-msgid "As a script interpreter"
-msgstr ""
-

 # type: textblock
 #. type: textblock
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish.pod:122
-msgid "Create a 100MB disk containing an ext2-formatted partition:"
+#: ../src/guestfs-actions.pod:7458 ../fish/guestfish-actions.pod:4983
+msgid ""
+"This calls the external C<zfgrep -i> program and returns the matching lines."
+msgstr ""
+
+# type: =head2
+#. type: =head2
+#: ../src/guestfs-actions.pod:7470
+msgid "guestfs_zfile"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish.pod:124
+#: ../src/guestfs-actions.pod:7472

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" #!/usr/bin/guestfish -f\n"
-" sparse test1.img 100M\n"
-" run\n"
-" part-disk /dev/sda mbr\n"
-" mkfs ext2 /dev/sda1\n"
+" char *\n"
+" guestfs_zfile (guestfs_h *g,\n"
+"                const char *meth,\n"
+"                const char *path);\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: =head2
-#. type: =head2
-#: ../fish/guestfish.pod:130
-msgid "Start with a prepared disk"
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:7477 ../fish/guestfish-actions.pod:4993
+msgid ""
+"This command runs C<file> after first decompressing C<path> using C<method>."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish.pod:132
-msgid ""
-"An alternate way to create a 100MB disk called C<test1.img> containing a "
-"single ext2-formatted partition:"
+#: ../src/guestfs-actions.pod:7480 ../fish/guestfish-actions.pod:4996
+msgid "C<method> must be one of C<gzip>, C<compress> or C<bzip2>."

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../fish/guestfish.pod:135
-#, no-wrap
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:7482

 msgid ""
 msgid ""

-" guestfish -N fs\n"
-"\n"
+"Since 1.0.63, use C<guestfs_file> instead which can now process compressed "
+"files."

 msgstr ""
 
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../fish/guestfish.pod:137
-msgid "To list what is available do:"
+#: ../src/guestfs-actions.pod:7488
+msgid ""
+"This function is deprecated.  In new code, use the L</guestfs_file> call "
+"instead."
+msgstr ""
+
+# type: =head2
+#. type: =head2
+#: ../src/guestfs-actions.pod:7497
+msgid "guestfs_zgrep"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish.pod:139 ../fish/guestfish.pod:919
+#: ../src/guestfs-actions.pod:7499

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" guestfish -N help | less\n"
+" char **\n"
+" guestfs_zgrep (guestfs_h *g,\n"
+"                const char *regex,\n"
+"                const char *path);\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:7504 ../fish/guestfish-actions.pod:5012
+msgid ""
+"This calls the external C<zgrep> program and returns the matching lines."
+msgstr ""
+

 # type: =head2
 #. type: =head2
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish.pod:141
-msgid "Remote control"
+#: ../src/guestfs-actions.pod:7516
+msgid "guestfs_zgrepi"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish.pod:143
+#: ../src/guestfs-actions.pod:7518

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" eval \"`guestfish --listen`\"\n"
-" guestfish --remote add-ro disk.img\n"
-" guestfish --remote run\n"
-" guestfish --remote lvs\n"
+" char **\n"
+" guestfs_zgrepi (guestfs_h *g,\n"
+"                 const char *regex,\n"
+"                 const char *path);\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: =head1
-#. type: =head1
-#: ../fish/guestfish.pod:148 ../test-tool/libguestfs-test-tool.pod:37
-#: ../fuse/guestmount.pod:73 ../tools/virt-edit.pl:72
-#: ../tools/virt-win-reg.pl:96 ../tools/virt-resize.pl:254
-#: ../tools/virt-list-filesystems.pl:53 ../tools/virt-tar.pl:103
-#: ../tools/virt-make-fs.pl:153 ../tools/virt-list-partitions.pl:54
-msgid "OPTIONS"
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-actions.pod:7523 ../fish/guestfish-actions.pod:5022
+msgid ""
+"This calls the external C<zgrep -i> program and returns the matching lines."

 msgstr ""
 
 # type: =item
 #. type: =item
 msgstr ""
 
 # type: =item
 #. type: =item

-#: ../fish/guestfish.pod:152 ../fuse/guestmount.pod:131
-#: ../tools/virt-edit.pl:80 ../tools/virt-win-reg.pl:104
-#: ../tools/virt-resize.pl:262 ../tools/virt-list-filesystems.pl:61
-#: ../tools/virt-tar.pl:111 ../tools/virt-make-fs.pl:161
-#: ../tools/virt-list-partitions.pl:62
-msgid "B<--help>"
+#: ../src/guestfs-availability.pod:3
+msgid "B<augeas>"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish.pod:154
-msgid "Displays general help on options."
+#: ../src/guestfs-availability.pod:5
+msgid ""
+"The following functions: L</guestfs_aug_clear> L</guestfs_aug_close> L</"
+"guestfs_aug_defnode> L</guestfs_aug_defvar> L</guestfs_aug_get> L</"
+"guestfs_aug_init> L</guestfs_aug_insert> L</guestfs_aug_load> L</"
+"guestfs_aug_ls> L</guestfs_aug_match> L</guestfs_aug_mv> L</guestfs_aug_rm> "
+"L</guestfs_aug_save> L</guestfs_aug_set>"

 msgstr ""
 
 # type: =item
 #. type: =item
 msgstr ""
 
 # type: =item
 #. type: =item

-#: ../fish/guestfish.pod:156
-msgid "B<-h>"
-msgstr ""
-
-# type: =item
-#. type: =item
-#: ../fish/guestfish.pod:158
-msgid "B<--cmd-help>"
+#: ../src/guestfs-availability.pod:21
+msgid "B<inotify>"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish.pod:160
-msgid "Lists all available guestfish commands."
+#: ../src/guestfs-availability.pod:23
+msgid ""
+"The following functions: L</guestfs_inotify_add_watch> L</"
+"guestfs_inotify_close> L</guestfs_inotify_files> L</guestfs_inotify_init> L</"
+"guestfs_inotify_read> L</guestfs_inotify_rm_watch>"

 msgstr ""
 
 # type: =item
 #. type: =item
 msgstr ""
 
 # type: =item
 #. type: =item

-#: ../fish/guestfish.pod:162
-msgid "B<-h cmd>"
+#: ../src/guestfs-availability.pod:31
+msgid "B<linuxfsuuid>"
+msgstr ""
+
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-availability.pod:33
+msgid ""
+"The following functions: L</guestfs_mke2fs_JU> L</guestfs_mke2journal_U> L</"
+"guestfs_mkswap_U> L</guestfs_swapoff_uuid> L</guestfs_swapon_uuid>"

 msgstr ""
 
 # type: =item
 #. type: =item
 msgstr ""
 
 # type: =item
 #. type: =item

-#: ../fish/guestfish.pod:164
-msgid "B<--cmd-help cmd>"
+#: ../src/guestfs-availability.pod:40
+msgid "B<linuxmodules>"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish.pod:166
-msgid "Displays detailed help on a single command C<cmd>."
+#: ../src/guestfs-availability.pod:42
+msgid "The following functions: L</guestfs_modprobe>"

 msgstr ""
 
 # type: =item
 #. type: =item
 msgstr ""
 
 # type: =item
 #. type: =item

-#: ../fish/guestfish.pod:168
-msgid "B<-a image>"
+#: ../src/guestfs-availability.pod:45
+msgid "B<linuxxattrs>"
+msgstr ""
+
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-availability.pod:47
+msgid ""
+"The following functions: L</guestfs_getxattr> L</guestfs_getxattrs> L</"
+"guestfs_lgetxattr> L</guestfs_lgetxattrs> L</guestfs_lremovexattr> L</"
+"guestfs_lsetxattr> L</guestfs_lxattrlist> L</guestfs_removexattr> L</"
+"guestfs_setxattr>"

 msgstr ""
 
 # type: =item
 #. type: =item
 msgstr ""
 
 # type: =item
 #. type: =item

-#: ../fish/guestfish.pod:170
-msgid "B<--add image>"
+#: ../src/guestfs-availability.pod:58
+msgid "B<luks>"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish.pod:172
-msgid "Add a block device or virtual machine image to the shell."
+#: ../src/guestfs-availability.pod:60
+msgid ""
+"The following functions: L</guestfs_luks_add_key> L</guestfs_luks_close> L</"
+"guestfs_luks_format> L</guestfs_luks_format_cipher> L</"
+"guestfs_luks_kill_slot> L</guestfs_luks_open> L</guestfs_luks_open_ro>"

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../fish/guestfish.pod:174 ../fuse/guestmount.pod:81
-msgid ""
-"The format of the disk image is auto-detected.  To override this and force a "
-"particular format use the I<--format=..> option."
+# type: =item
+#. type: =item
+#: ../src/guestfs-availability.pod:69
+msgid "B<lvm2>"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish.pod:177
+#: ../src/guestfs-availability.pod:71

 msgid ""
 msgid ""

-"Using this flag is mostly equivalent to using the C<add> command, with "
-"C<readonly:true> if the I<--ro> flag was given, and with C<format:...> if "
-"the I<--format:...> flag was given."
+"The following functions: L</guestfs_is_lv> L</guestfs_lvcreate> L</"
+"guestfs_lvm_remove_all> L</guestfs_lvm_set_filter> L</guestfs_lvremove> L</"
+"guestfs_lvresize> L</guestfs_lvresize_free> L</guestfs_lvs> L</"
+"guestfs_lvs_full> L</guestfs_pvcreate> L</guestfs_pvremove> L</"
+"guestfs_pvresize> L</guestfs_pvresize_size> L</guestfs_pvs> L</"
+"guestfs_pvs_full> L</guestfs_vg_activate> L</guestfs_vg_activate_all> L</"
+"guestfs_vgcreate> L</guestfs_vgremove> L</guestfs_vgs> L</guestfs_vgs_full>"

 msgstr ""
 
 # type: =item
 #. type: =item
 msgstr ""
 
 # type: =item
 #. type: =item

-#: ../fish/guestfish.pod:181
-msgid "B<-c URI>"
+#: ../src/guestfs-availability.pod:94
+msgid "B<mknod>"
+msgstr ""
+
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-availability.pod:96
+msgid ""
+"The following functions: L</guestfs_mkfifo> L</guestfs_mknod> L</"
+"guestfs_mknod_b> L</guestfs_mknod_c>"

 msgstr ""
 
 # type: =item
 #. type: =item
 msgstr ""
 
 # type: =item
 #. type: =item

-#: ../fish/guestfish.pod:183
-msgid "B<--connect URI>"
+#: ../src/guestfs-availability.pod:102
+msgid "B<ntfs3g>"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish.pod:185 ../fuse/guestmount.pod:86
-msgid ""
-"When used in conjunction with the I<-d> option, this specifies the libvirt "
-"URI to use.  The default is to use the default libvirt connection."
+#: ../src/guestfs-availability.pod:104
+msgid "The following functions: L</guestfs_ntfs_3g_probe>"

 msgstr ""
 
 # type: =item
 #. type: =item
 msgstr ""
 
 # type: =item
 #. type: =item

-#: ../fish/guestfish.pod:189
-msgid "B<--csh>"
+#: ../src/guestfs-availability.pod:107
+msgid "B<ntfsprogs>"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish.pod:191
+#: ../src/guestfs-availability.pod:109

 msgid ""
 msgid ""

-"If using the I<--listen> option and a csh-like shell, use this option.  See "
-"section L</REMOTE CONTROL AND CSH> below."
+"The following functions: L</guestfs_ntfsresize> L</guestfs_ntfsresize_size>"

 msgstr ""
 
 # type: =item
 #. type: =item
 msgstr ""
 
 # type: =item
 #. type: =item

-#: ../fish/guestfish.pod:194
-msgid "B<-d libvirt-domain>"
+#: ../src/guestfs-availability.pod:113
+msgid "B<realpath>"
+msgstr ""
+
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-availability.pod:115
+msgid "The following functions: L</guestfs_realpath>"

 msgstr ""
 
 # type: =item
 #. type: =item
 msgstr ""
 
 # type: =item
 #. type: =item

-#: ../fish/guestfish.pod:196
-msgid "B<--domain libvirt-domain>"
+#: ../src/guestfs-availability.pod:118
+msgid "B<scrub>"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish.pod:198 ../fuse/guestmount.pod:92
+#: ../src/guestfs-availability.pod:120

 msgid ""
 msgid ""

-"Add disks from the named libvirt domain.  If the I<--ro> option is also "
-"used, then any libvirt domain can be used.  However in write mode, only "
-"libvirt domains which are shut down can be named here."
+"The following functions: L</guestfs_scrub_device> L</guestfs_scrub_file> L</"
+"guestfs_scrub_freespace>"
+msgstr ""
+
+# type: =item
+#. type: =item
+#: ../src/guestfs-availability.pod:125
+msgid "B<selinux>"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish.pod:202
-msgid ""
-"Using this flag is mostly equivalent to using the C<add-domain> command, "
-"with C<readonly:true> if the I<--ro> flag was given, and with C<format:...> "
-"if the I<--format:...> flag was given."
+#: ../src/guestfs-availability.pod:127
+msgid "The following functions: L</guestfs_getcon> L</guestfs_setcon>"

 msgstr ""
 
 # type: =item
 #. type: =item
 msgstr ""
 
 # type: =item
 #. type: =item

-#: ../fish/guestfish.pod:206
-msgid "B<-D>"
+#: ../src/guestfs-availability.pod:131
+msgid "B<xz>"
+msgstr ""
+
+# type: textblock
+#. type: textblock
+#: ../src/guestfs-availability.pod:133
+msgid "The following functions: L</guestfs_txz_in> L</guestfs_txz_out>"

 msgstr ""
 
 # type: =item
 #. type: =item
 msgstr ""
 
 # type: =item
 #. type: =item

-#: ../fish/guestfish.pod:208
-msgid "B<--no-dest-paths>"
+#: ../src/guestfs-availability.pod:137
+msgid "B<zerofree>"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish.pod:210
+#: ../src/guestfs-availability.pod:139
+msgid "The following functions: L</guestfs_zerofree>"
+msgstr ""
+
+# type: =head2
+#. type: =head2
+#: ../src/guestfs-structs.pod:1
+msgid "guestfs_int_bool"
+msgstr ""
+
+# type: verbatim
+#. type: verbatim
+#: ../src/guestfs-structs.pod:3
+#, no-wrap

 msgid ""
 msgid ""

-"Don't tab-complete paths on the guest filesystem.  It is useful to be able "
-"to hit the tab key to complete paths on the guest filesystem, but this "
-"causes extra \"hidden\" guestfs calls to be made, so this option is here to "
-"allow this feature to be disabled."
+" struct guestfs_int_bool {\n"
+"   int32_t i;\n"
+"   int32_t b;\n"
+" };\n"
+" \n"
+msgstr ""
+
+# type: verbatim
+#. type: verbatim
+#: ../src/guestfs-structs.pod:8
+#, no-wrap
+msgid ""
+" struct guestfs_int_bool_list {\n"
+"   uint32_t len; /* Number of elements in list. */\n"
+"   struct guestfs_int_bool *val; /* Elements. */\n"
+" };\n"
+" \n"
+msgstr ""
+
+# type: verbatim
+#. type: verbatim
+#: ../src/guestfs-structs.pod:13
+#, no-wrap
+msgid ""
+" void guestfs_free_int_bool (struct guestfs_free_int_bool *);\n"
+" void guestfs_free_int_bool_list (struct guestfs_free_int_bool_list *);\n"
+"\n"
+msgstr ""
+
+# type: =head2
+#. type: =head2
+#: ../src/guestfs-structs.pod:16
+msgid "guestfs_lvm_pv"
+msgstr ""
+
+# type: verbatim
+#. type: verbatim
+#: ../src/guestfs-structs.pod:18
+#, no-wrap
+msgid ""
+" struct guestfs_lvm_pv {\n"
+"   char *pv_name;\n"
+"   /* The next field is NOT nul-terminated, be careful when printing it: */\n"
+"   char pv_uuid[32];\n"
+"   char *pv_fmt;\n"
+"   uint64_t pv_size;\n"
+"   uint64_t dev_size;\n"
+"   uint64_t pv_free;\n"
+"   uint64_t pv_used;\n"
+"   char *pv_attr;\n"
+"   int64_t pv_pe_count;\n"
+"   int64_t pv_pe_alloc_count;\n"
+"   char *pv_tags;\n"
+"   uint64_t pe_start;\n"
+"   int64_t pv_mda_count;\n"
+"   uint64_t pv_mda_free;\n"
+" };\n"
+" \n"
+msgstr ""
+
+# type: verbatim
+#. type: verbatim
+#: ../src/guestfs-structs.pod:36
+#, no-wrap
+msgid ""
+" struct guestfs_lvm_pv_list {\n"
+"   uint32_t len; /* Number of elements in list. */\n"
+"   struct guestfs_lvm_pv *val; /* Elements. */\n"
+" };\n"
+" \n"
+msgstr ""
+
+# type: verbatim
+#. type: verbatim
+#: ../src/guestfs-structs.pod:41
+#, no-wrap
+msgid ""
+" void guestfs_free_lvm_pv (struct guestfs_free_lvm_pv *);\n"
+" void guestfs_free_lvm_pv_list (struct guestfs_free_lvm_pv_list *);\n"
+"\n"
+msgstr ""
+
+# type: =head2
+#. type: =head2
+#: ../src/guestfs-structs.pod:44
+msgid "guestfs_lvm_vg"
+msgstr ""
+
+# type: verbatim
+#. type: verbatim
+#: ../src/guestfs-structs.pod:46
+#, no-wrap
+msgid ""
+" struct guestfs_lvm_vg {\n"
+"   char *vg_name;\n"
+"   /* The next field is NOT nul-terminated, be careful when printing it: */\n"
+"   char vg_uuid[32];\n"
+"   char *vg_fmt;\n"
+"   char *vg_attr;\n"
+"   uint64_t vg_size;\n"
+"   uint64_t vg_free;\n"
+"   char *vg_sysid;\n"
+"   uint64_t vg_extent_size;\n"
+"   int64_t vg_extent_count;\n"
+"   int64_t vg_free_count;\n"
+"   int64_t max_lv;\n"
+"   int64_t max_pv;\n"
+"   int64_t pv_count;\n"
+"   int64_t lv_count;\n"
+"   int64_t snap_count;\n"
+"   int64_t vg_seqno;\n"
+"   char *vg_tags;\n"
+"   int64_t vg_mda_count;\n"
+"   uint64_t vg_mda_free;\n"
+" };\n"
+" \n"
+msgstr ""
+
+# type: verbatim
+#. type: verbatim
+#: ../src/guestfs-structs.pod:69
+#, no-wrap
+msgid ""
+" struct guestfs_lvm_vg_list {\n"
+"   uint32_t len; /* Number of elements in list. */\n"
+"   struct guestfs_lvm_vg *val; /* Elements. */\n"
+" };\n"
+" \n"
+msgstr ""
+
+# type: verbatim
+#. type: verbatim
+#: ../src/guestfs-structs.pod:74
+#, no-wrap
+msgid ""
+" void guestfs_free_lvm_vg (struct guestfs_free_lvm_vg *);\n"
+" void guestfs_free_lvm_vg_list (struct guestfs_free_lvm_vg_list *);\n"
+"\n"
+msgstr ""
+
+# type: =head2
+#. type: =head2
+#: ../src/guestfs-structs.pod:77
+msgid "guestfs_lvm_lv"
+msgstr ""
+
+# type: verbatim
+#. type: verbatim
+#: ../src/guestfs-structs.pod:79
+#, no-wrap
+msgid ""
+" struct guestfs_lvm_lv {\n"
+"   char *lv_name;\n"
+"   /* The next field is NOT nul-terminated, be careful when printing it: */\n"
+"   char lv_uuid[32];\n"
+"   char *lv_attr;\n"
+"   int64_t lv_major;\n"
+"   int64_t lv_minor;\n"
+"   int64_t lv_kernel_major;\n"
+"   int64_t lv_kernel_minor;\n"
+"   uint64_t lv_size;\n"
+"   int64_t seg_count;\n"
+"   char *origin;\n"
+"   /* The next field is [0..100] or -1 meaning 'not present': */\n"
+"   float snap_percent;\n"
+"   /* The next field is [0..100] or -1 meaning 'not present': */\n"
+"   float copy_percent;\n"
+"   char *move_pv;\n"
+"   char *lv_tags;\n"
+"   char *mirror_log;\n"
+"   char *modules;\n"
+" };\n"
+" \n"
+msgstr ""
+
+# type: verbatim
+#. type: verbatim
+#: ../src/guestfs-structs.pod:101
+#, no-wrap
+msgid ""
+" struct guestfs_lvm_lv_list {\n"
+"   uint32_t len; /* Number of elements in list. */\n"
+"   struct guestfs_lvm_lv *val; /* Elements. */\n"
+" };\n"
+" \n"
+msgstr ""
+
+# type: verbatim
+#. type: verbatim
+#: ../src/guestfs-structs.pod:106
+#, no-wrap
+msgid ""
+" void guestfs_free_lvm_lv (struct guestfs_free_lvm_lv *);\n"
+" void guestfs_free_lvm_lv_list (struct guestfs_free_lvm_lv_list *);\n"
+"\n"
+msgstr ""
+
+# type: verbatim
+#. type: verbatim
+#: ../src/guestfs-structs.pod:111
+#, no-wrap
+msgid ""
+" struct guestfs_stat {\n"
+"   int64_t dev;\n"
+"   int64_t ino;\n"
+"   int64_t mode;\n"
+"   int64_t nlink;\n"
+"   int64_t uid;\n"
+"   int64_t gid;\n"
+"   int64_t rdev;\n"
+"   int64_t size;\n"
+"   int64_t blksize;\n"
+"   int64_t blocks;\n"
+"   int64_t atime;\n"
+"   int64_t mtime;\n"
+"   int64_t ctime;\n"
+" };\n"
+" \n"
+msgstr ""
+
+# type: verbatim
+#. type: verbatim
+#: ../src/guestfs-structs.pod:127
+#, no-wrap
+msgid ""
+" struct guestfs_stat_list {\n"
+"   uint32_t len; /* Number of elements in list. */\n"
+"   struct guestfs_stat *val; /* Elements. */\n"
+" };\n"
+" \n"
+msgstr ""
+
+# type: verbatim
+#. type: verbatim
+#: ../src/guestfs-structs.pod:132
+#, no-wrap
+msgid ""
+" void guestfs_free_stat (struct guestfs_free_stat *);\n"
+" void guestfs_free_stat_list (struct guestfs_free_stat_list *);\n"
+"\n"
+msgstr ""
+
+# type: verbatim
+#. type: verbatim
+#: ../src/guestfs-structs.pod:137
+#, no-wrap
+msgid ""
+" struct guestfs_statvfs {\n"
+"   int64_t bsize;\n"
+"   int64_t frsize;\n"
+"   int64_t blocks;\n"
+"   int64_t bfree;\n"
+"   int64_t bavail;\n"
+"   int64_t files;\n"
+"   int64_t ffree;\n"
+"   int64_t favail;\n"
+"   int64_t fsid;\n"
+"   int64_t flag;\n"
+"   int64_t namemax;\n"
+" };\n"
+" \n"
+msgstr ""
+
+# type: verbatim
+#. type: verbatim
+#: ../src/guestfs-structs.pod:151
+#, no-wrap
+msgid ""
+" struct guestfs_statvfs_list {\n"
+"   uint32_t len; /* Number of elements in list. */\n"
+"   struct guestfs_statvfs *val; /* Elements. */\n"
+" };\n"
+" \n"
+msgstr ""
+
+# type: verbatim
+#. type: verbatim
+#: ../src/guestfs-structs.pod:156
+#, no-wrap
+msgid ""
+" void guestfs_free_statvfs (struct guestfs_free_statvfs *);\n"
+" void guestfs_free_statvfs_list (struct guestfs_free_statvfs_list *);\n"
+"\n"
+msgstr ""
+
+# type: =head2
+#. type: =head2
+#: ../src/guestfs-structs.pod:159
+msgid "guestfs_dirent"
+msgstr ""
+
+# type: verbatim
+#. type: verbatim
+#: ../src/guestfs-structs.pod:161
+#, no-wrap
+msgid ""
+" struct guestfs_dirent {\n"
+"   int64_t ino;\n"
+"   char ftyp;\n"
+"   char *name;\n"
+" };\n"
+" \n"
+msgstr ""
+
+# type: verbatim
+#. type: verbatim
+#: ../src/guestfs-structs.pod:167
+#, no-wrap
+msgid ""
+" struct guestfs_dirent_list {\n"
+"   uint32_t len; /* Number of elements in list. */\n"
+"   struct guestfs_dirent *val; /* Elements. */\n"
+" };\n"
+" \n"
+msgstr ""
+
+# type: verbatim
+#. type: verbatim
+#: ../src/guestfs-structs.pod:172
+#, no-wrap
+msgid ""
+" void guestfs_free_dirent (struct guestfs_free_dirent *);\n"
+" void guestfs_free_dirent_list (struct guestfs_free_dirent_list *);\n"
+"\n"
+msgstr ""
+
+# type: verbatim
+#. type: verbatim
+#: ../src/guestfs-structs.pod:177
+#, no-wrap
+msgid ""
+" struct guestfs_version {\n"
+"   int64_t major;\n"
+"   int64_t minor;\n"
+"   int64_t release;\n"
+"   char *extra;\n"
+" };\n"
+" \n"

 msgstr ""
 
 msgstr ""
 

-# type: =item
-#. type: =item
-#: ../fish/guestfish.pod:215 ../fuse/guestmount.pod:108
-msgid "B<--echo-keys>"
+# type: verbatim
+#. type: verbatim
+#: ../src/guestfs-structs.pod:184
+#, no-wrap
+msgid ""
+" struct guestfs_version_list {\n"
+"   uint32_t len; /* Number of elements in list. */\n"
+"   struct guestfs_version *val; /* Elements. */\n"
+" };\n"
+" \n"

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../fish/guestfish.pod:217 ../fuse/guestmount.pod:110
+# type: verbatim
+#. type: verbatim
+#: ../src/guestfs-structs.pod:189
+#, no-wrap

 msgid ""
 msgid ""

-"When prompting for keys and passphrases, guestfish normally turns echoing "
-"off so you cannot see what you are typing.  If you are not worried about "
-"Tempest attacks and there is no one else in the room you can specify this "
-"flag to see what you are typing."
+" void guestfs_free_version (struct guestfs_free_version *);\n"
+" void guestfs_free_version_list (struct guestfs_free_version_list *);\n"
+"\n"

 msgstr ""
 
 msgstr ""
 

-# type: =item
-#. type: =item
-#: ../fish/guestfish.pod:222
-msgid "B<-f file>"
+# type: =head2
+#. type: =head2
+#: ../src/guestfs-structs.pod:192
+msgid "guestfs_xattr"

 msgstr ""
 
 msgstr ""
 

-# type: =item
-#. type: =item
-#: ../fish/guestfish.pod:224
-msgid "B<--file file>"
+# type: verbatim
+#. type: verbatim
+#: ../src/guestfs-structs.pod:194
+#, no-wrap
+msgid ""
+" struct guestfs_xattr {\n"
+"   char *attrname;\n"
+"   /* The next two fields describe a byte array. */\n"
+"   uint32_t attrval_len;\n"
+"   char *attrval;\n"
+" };\n"
+" \n"

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../fish/guestfish.pod:226
-msgid "Read commands from C<file>.  To write pure guestfish scripts, use:"
+# type: verbatim
+#. type: verbatim
+#: ../src/guestfs-structs.pod:201
+#, no-wrap
+msgid ""
+" struct guestfs_xattr_list {\n"
+"   uint32_t len; /* Number of elements in list. */\n"
+"   struct guestfs_xattr *val; /* Elements. */\n"
+" };\n"
+" \n"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish.pod:229
+#: ../src/guestfs-structs.pod:206

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" #!/usr/bin/guestfish -f\n"
+" void guestfs_free_xattr (struct guestfs_free_xattr *);\n"
+" void guestfs_free_xattr_list (struct guestfs_free_xattr_list *);\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: =item
-#. type: =item
-#: ../fish/guestfish.pod:231
-msgid "B<--format=raw|qcow2|..>"
+# type: =head2
+#. type: =head2
+#: ../src/guestfs-structs.pod:209
+msgid "guestfs_inotify_event"

 msgstr ""
 
 msgstr ""
 

-# type: =item
-#. type: =item
-#: ../fish/guestfish.pod:233
-msgid "B<--format>"
+# type: verbatim
+#. type: verbatim
+#: ../src/guestfs-structs.pod:211
+#, no-wrap
+msgid ""
+" struct guestfs_inotify_event {\n"
+"   int64_t in_wd;\n"
+"   uint32_t in_mask;\n"
+"   uint32_t in_cookie;\n"
+"   char *in_name;\n"
+" };\n"
+" \n"

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../fish/guestfish.pod:235 ../fuse/guestmount.pod:117
+# type: verbatim
+#. type: verbatim
+#: ../src/guestfs-structs.pod:218
+#, no-wrap

 msgid ""
 msgid ""

-"The default for the I<-a> option is to auto-detect the format of the disk "
-"image.  Using this forces the disk format for I<-a> options which follow on "
-"the command line.  Using I<--format> with no argument switches back to auto-"
-"detection for subsequent I<-a> options."
+" struct guestfs_inotify_event_list {\n"
+"   uint32_t len; /* Number of elements in list. */\n"
+"   struct guestfs_inotify_event *val; /* Elements. */\n"
+" };\n"
+" \n"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish.pod:242
+#: ../src/guestfs-structs.pod:223

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" guestfish --format=raw -a disk.img\n"
+" void guestfs_free_inotify_event (struct guestfs_free_inotify_event *);\n"
+" void guestfs_free_inotify_event_list (struct guestfs_free_inotify_event_list *);\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../fish/guestfish.pod:244
-msgid "forces raw format (no auto-detection) for C<disk.img>."
+# type: =head2
+#. type: =head2
+#: ../src/guestfs-structs.pod:226
+msgid "guestfs_partition"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish.pod:246
+#: ../src/guestfs-structs.pod:228

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" guestfish --format=raw -a disk.img --format -a another.img\n"
-"\n"
+" struct guestfs_partition {\n"
+"   int32_t part_num;\n"
+"   uint64_t part_start;\n"
+"   uint64_t part_end;\n"
+"   uint64_t part_size;\n"
+" };\n"
+" \n"

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../fish/guestfish.pod:248
+# type: verbatim
+#. type: verbatim
+#: ../src/guestfs-structs.pod:235
+#, no-wrap

 msgid ""
 msgid ""

-"forces raw format (no auto-detection) for C<disk.img> and reverts to auto-"
-"detection for C<another.img>."
+" struct guestfs_partition_list {\n"
+"   uint32_t len; /* Number of elements in list. */\n"
+"   struct guestfs_partition *val; /* Elements. */\n"
+" };\n"
+" \n"

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../fish/guestfish.pod:251
+# type: verbatim
+#. type: verbatim
+#: ../src/guestfs-structs.pod:240
+#, no-wrap

 msgid ""
 msgid ""

-"If you have untrusted raw-format guest disk images, you should use this "
-"option to specify the disk format.  This avoids a possible security problem "
-"with malicious guests (CVE-2010-3851).  See also L</add-drive-opts>."
-msgstr ""
-
-# type: =item
-#. type: =item
-#: ../fish/guestfish.pod:256
-msgid "B<-i>"
+" void guestfs_free_partition (struct guestfs_free_partition *);\n"
+" void guestfs_free_partition_list (struct guestfs_free_partition_list *);\n"
+"\n"

 msgstr ""
 
 msgstr ""
 

-# type: =item
-#. type: =item
-#: ../fish/guestfish.pod:258
-msgid "B<--inspector>"
+# type: =head2
+#. type: =head2
+#: ../src/guestfs-structs.pod:243
+msgid "guestfs_application"

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../fish/guestfish.pod:260 ../fuse/guestmount.pod:137
+# type: verbatim
+#. type: verbatim
+#: ../src/guestfs-structs.pod:245
+#, no-wrap

 msgid ""
 msgid ""

-"Using L<virt-inspector(1)> code, inspect the disks looking for an operating "
-"system and mount filesystems as they would be mounted on the real virtual "
-"machine."
+" struct guestfs_application {\n"
+"   char *app_name;\n"
+"   char *app_display_name;\n"
+"   int32_t app_epoch;\n"
+"   char *app_version;\n"
+"   char *app_release;\n"
+"   char *app_install_path;\n"
+"   char *app_trans_path;\n"
+"   char *app_publisher;\n"
+"   char *app_url;\n"
+"   char *app_source_package;\n"
+"   char *app_summary;\n"
+"   char *app_description;\n"
+" };\n"
+" \n"

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../fish/guestfish.pod:264
-msgid "Typical usage is either:"
+# type: verbatim
+#. type: verbatim
+#: ../src/guestfs-structs.pod:260
+#, no-wrap
+msgid ""
+" struct guestfs_application_list {\n"
+"   uint32_t len; /* Number of elements in list. */\n"
+"   struct guestfs_application *val; /* Elements. */\n"
+" };\n"
+" \n"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish.pod:266
+#: ../src/guestfs-structs.pod:265

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" guestfish -d myguest -i\n"
+" void guestfs_free_application (struct guestfs_free_application *);\n"
+" void guestfs_free_application_list (struct guestfs_free_application_list *);\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish.pod:268
-msgid "(for an inactive libvirt domain called I<myguest>), or:"
+#: ../fish/guestfish.pod:5
+msgid "guestfish - the libguestfs Filesystem Interactive SHell"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish.pod:270
+#: ../fish/guestfish.pod:9

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" guestfish --ro -d myguest -i\n"
+" guestfish [--options] [commands]\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../fish/guestfish.pod:272
-msgid "(for active domains, readonly), or specify the block device directly:"
+# type: verbatim
+#. type: verbatim
+#: ../fish/guestfish.pod:11
+#, no-wrap
+msgid ""
+" guestfish\n"
+"\n"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish.pod:274
+#: ../fish/guestfish.pod:13

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" guestfish --rw -a /dev/Guests/MyGuest -i\n"
+" guestfish [--ro|--rw] -a disk.img\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../fish/guestfish.pod:276
+# type: verbatim
+#. type: verbatim
+#: ../fish/guestfish.pod:15
+#, no-wrap

 msgid ""
 msgid ""

-"Note that the command line syntax changed slightly over older versions of "
-"guestfish.  You can still use the old syntax:"
+" guestfish [--ro|--rw] -a disk.img -m dev[:mountpoint]\n"
+"\n"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish.pod:279
+#: ../fish/guestfish.pod:17

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" guestfish [--ro] -i disk.img\n"
+" guestfish -d libvirt-domain\n"

 "\n"
 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 "\n"
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish.pod:281
+#: ../fish/guestfish.pod:19

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" guestfish [--ro] -i libvirt-domain\n"
+" guestfish [--ro|--rw] -a disk.img -i\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../fish/guestfish.pod:283
+# type: verbatim
+#. type: verbatim
+#: ../fish/guestfish.pod:21
+#, no-wrap

 msgid ""
 msgid ""

-"Using this flag is mostly equivalent to using the C<inspect-os> command and "
-"then using other commands to mount the filesystems that were found."
+" guestfish -d libvirt-domain -i\n"
+"\n"

 msgstr ""
 
 msgstr ""
 

-# type: =item
-#. type: =item
-#: ../fish/guestfish.pod:287 ../fuse/guestmount.pod:141
-msgid "B<--keys-from-stdin>"
+# type: =head1
+#. type: =head1
+#: ../fish/guestfish.pod:23 ../fuse/guestmount.pod:15 ../tools/virt-edit.pl:44
+#: ../tools/virt-win-reg.pl:51 ../tools/virt-tar.pl:64
+msgid "WARNING"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish.pod:289 ../fuse/guestmount.pod:143
+#: ../fish/guestfish.pod:25

 msgid ""
 msgid ""

-"Read key or passphrase parameters from stdin.  The default is to try to read "
-"passphrases from the user by opening C</dev/tty>."
+"Using guestfish in read/write mode on live virtual machines can be "
+"dangerous, potentially causing disk corruption.  Use the I<--ro> (read-only) "
+"option to use guestfish safely if the disk image or virtual machine might be "
+"live."

 msgstr ""
 
 msgstr ""
 

-# type: =item
-#. type: =item
-#: ../fish/guestfish.pod:292
-msgid "B<--listen>"
+# type: textblock
+#. type: textblock
+#: ../fish/guestfish.pod:32
+msgid ""
+"Guestfish is a shell and command-line tool for examining and modifying "
+"virtual machine filesystems.  It uses libguestfs and exposes all of the "
+"functionality of the guestfs API, see L<guestfs(3)>."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish.pod:294
+#: ../fish/guestfish.pod:36

 msgid ""
 msgid ""

-"Fork into the background and listen for remote commands.  See section L</"
-"REMOTE CONTROL GUESTFISH OVER A SOCKET> below."
+"Guestfish gives you structured access to the libguestfs API, from shell "
+"scripts or the command line or interactively.  If you want to rescue a "
+"broken virtual machine image, you should look at the L<virt-rescue(1)> "
+"command."

 msgstr ""
 
 msgstr ""
 

-#. type: =item
-#: ../fish/guestfish.pod:297 ../fuse/guestmount.pod:146
-msgid "B<--live>"
+# type: =head1
+#. type: =head1
+#: ../fish/guestfish.pod:41 ../fish/guestfish.pod:947
+#: ../fuse/guestmount.pod:39 ../tools/virt-edit.pl:63 ../tools/virt-tar.pl:50
+msgid "EXAMPLES"

 msgstr ""
 
 msgstr ""
 

-#. type: textblock
-#: ../fish/guestfish.pod:299 ../fuse/guestmount.pod:148
+# type: =head2
+#. type: =head2
+#: ../fish/guestfish.pod:43
+msgid "As an interactive shell"
+msgstr ""
+
+# type: verbatim
+#. type: verbatim
+#: ../fish/guestfish.pod:45
+#, no-wrap

 msgid ""
 msgid ""

-"Connect to a live virtual machine.  (Experimental, see L<guestfs(3)/"
-"ATTACHING TO RUNNING DAEMONS>)."
+" $ guestfish\n"
+" \n"

 msgstr ""
 
 msgstr ""
 

-# type: =item
-#. type: =item
-#: ../fish/guestfish.pod:302
-msgid "B<-m dev[:mountpoint]>"
+# type: verbatim
+#. type: verbatim
+#: ../fish/guestfish.pod:47
+#, no-wrap
+msgid ""
+" Welcome to guestfish, the libguestfs filesystem interactive shell for\n"
+" editing virtual machine filesystems.\n"
+" \n"

 msgstr ""
 
 msgstr ""
 

-# type: =item
-#. type: =item
-#: ../fish/guestfish.pod:304
-msgid "B<--mount dev[:mountpoint]>"
+# type: verbatim
+#. type: verbatim
+#: ../fish/guestfish.pod:50
+#, no-wrap
+msgid ""
+" Type: 'help' for a list of commands\n"
+"       'man' to read the manual\n"
+"       'quit' to quit the shell\n"
+" \n"

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../fish/guestfish.pod:306
-msgid "Mount the named partition or logical volume on the given mountpoint."
+# type: verbatim
+#. type: verbatim
+#: ../fish/guestfish.pod:54
+#, no-wrap
+msgid ""
+" ><fs> add-ro disk.img\n"
+" ><fs> run\n"
+" ><fs> list-filesystems\n"
+" /dev/sda1: ext4\n"
+" /dev/vg_guest/lv_root: ext4\n"
+" /dev/vg_guest/lv_swap: swap\n"
+" ><fs> mount /dev/vg_guest/lv_root /\n"
+" ><fs> cat /etc/fstab\n"
+" # /etc/fstab\n"
+" # Created by anaconda\n"
+" [...]\n"
+" ><fs> exit\n"
+"\n"

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../fish/guestfish.pod:308
-msgid "If the mountpoint is omitted, it defaults to C</>."
+# type: =head2
+#. type: =head2
+#: ../fish/guestfish.pod:67
+msgid "From shell scripts"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish.pod:310
-msgid "You have to mount something on C</> before most commands will work."
+#: ../fish/guestfish.pod:69
+msgid "Create a new C</etc/motd> file in a guest or disk image:"

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../fish/guestfish.pod:312
+# type: verbatim
+#. type: verbatim
+#: ../fish/guestfish.pod:71
+#, no-wrap

 msgid ""
 msgid ""

-"If any I<-m> or I<--mount> options are given, the guest is automatically "
-"launched."
+" guestfish <<_EOF_\n"
+" add disk.img\n"
+" run\n"
+" mount /dev/vg_guest/lv_root /\n"
+" write /etc/motd \"Welcome, new users\"\n"
+" _EOF_\n"
+"\n"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish.pod:315
+#: ../fish/guestfish.pod:78
+msgid "List the LVM logical volumes in a disk image:"
+msgstr ""
+
+# type: verbatim
+#. type: verbatim
+#: ../fish/guestfish.pod:80
+#, no-wrap

 msgid ""
 msgid ""

-"If you don't know what filesystems a disk image contains, you can either run "
-"guestfish without this option, then list the partitions, filesystems and LVs "
-"available (see L</list-partitions>, L</list-filesystems> and L</lvs> "
-"commands), or you can use the L<virt-filesystems(1)> program."
+" guestfish -a disk.img --ro <<_EOF_\n"
+" run\n"
+" lvs\n"
+" _EOF_\n"
+"\n"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish.pod:321
-msgid ""
-"Using this flag is mostly equivalent to using the C<mount-options> command "
-"or the C<mount-ro> command if the I<--ro> flag was given."
+#: ../fish/guestfish.pod:85
+msgid "List all the filesystems in a disk image:"

 msgstr ""
 
 msgstr ""
 

-# type: =item
-#. type: =item
-#: ../fish/guestfish.pod:324
-msgid "B<-n>"
+# type: verbatim
+#. type: verbatim
+#: ../fish/guestfish.pod:87
+#, no-wrap
+msgid ""
+" guestfish -a disk.img --ro <<_EOF_\n"
+" run\n"
+" list-filesystems\n"
+" _EOF_\n"
+"\n"

 msgstr ""
 
 msgstr ""
 

-# type: =item
-#. type: =item
-#: ../fish/guestfish.pod:326
-msgid "B<--no-sync>"
+# type: =head2
+#. type: =head2
+#: ../fish/guestfish.pod:92
+msgid "On one command line"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish.pod:328
+#: ../fish/guestfish.pod:94
+msgid "Update C</etc/resolv.conf> in a guest:"
+msgstr ""
+
+# type: verbatim
+#. type: verbatim
+#: ../fish/guestfish.pod:96
+#, no-wrap

 msgid ""
 msgid ""

-"Disable autosync.  This is enabled by default.  See the discussion of "
-"autosync in the L<guestfs(3)> manpage."
+" guestfish \\\n"
+"   add disk.img : run : mount /dev/vg_guest/lv_root / : \\\n"
+"   write /etc/resolv.conf \"nameserver 1.2.3.4\"\n"
+"\n"

 msgstr ""
 
 msgstr ""
 

-# type: =item
-#. type: =item
-#: ../fish/guestfish.pod:331
-msgid "B<-N type>"
+# type: textblock
+#. type: textblock
+#: ../fish/guestfish.pod:100
+msgid "Edit C</boot/grub/grub.conf> interactively:"

 msgstr ""
 
 msgstr ""
 

-# type: =item
-#. type: =item
-#: ../fish/guestfish.pod:333
-msgid "B<--new type>"
+# type: verbatim
+#. type: verbatim
+#: ../fish/guestfish.pod:102
+#, no-wrap
+msgid ""
+" guestfish --rw --add disk.img \\\n"
+"   --mount /dev/vg_guest/lv_root \\\n"
+"   --mount /dev/sda1:/boot \\\n"
+"   edit /boot/grub/grub.conf\n"
+"\n"

 msgstr ""
 
 msgstr ""
 

-# type: =item
-#. type: =item
-#: ../fish/guestfish.pod:335
-msgid "B<-N help>"
+# type: =head2
+#. type: =head2
+#: ../fish/guestfish.pod:107
+msgid "Mount disks automatically"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish.pod:337
+#: ../fish/guestfish.pod:109

 msgid ""
 msgid ""

-"Prepare a fresh disk image formatted as \"type\".  This is an alternative to "
-"the I<-a> option: whereas I<-a> adds an existing disk, I<-N> creates a "
-"preformatted disk with a filesystem and adds it.  See L</PREPARED DISK "
-"IMAGES> below."
+"Use the I<-i> option to automatically mount the disks from a virtual machine:"

 msgstr ""
 
 msgstr ""
 

-# type: =item
-#. type: =item
-#: ../fish/guestfish.pod:342
-msgid "B<--progress-bars>"
+# type: verbatim
+#. type: verbatim
+#: ../fish/guestfish.pod:112
+#, no-wrap
+msgid ""
+" guestfish --ro -a disk.img -i cat /etc/group\n"
+"\n"
+msgstr ""
+
+# type: verbatim
+#. type: verbatim
+#: ../fish/guestfish.pod:114
+#, no-wrap
+msgid ""
+" guestfish --ro -d libvirt-domain -i cat /etc/group\n"
+"\n"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish.pod:344
-msgid "Enable progress bars, even when guestfish is used non-interactively."
+#: ../fish/guestfish.pod:116
+msgid "Another way to edit C</boot/grub/grub.conf> interactively is:"

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../fish/guestfish.pod:346
+# type: verbatim
+#. type: verbatim
+#: ../fish/guestfish.pod:118
+#, no-wrap

 msgid ""
 msgid ""

-"Progress bars are enabled by default when guestfish is used as an "
-"interactive shell."
+" guestfish --rw -a disk.img -i edit /boot/grub/grub.conf\n"
+"\n"

 msgstr ""
 
 msgstr ""
 

-# type: =item
-#. type: =item
-#: ../fish/guestfish.pod:349
-msgid "B<--no-progress-bars>"
+# type: =head2
+#. type: =head2
+#: ../fish/guestfish.pod:120
+msgid "As a script interpreter"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish.pod:351
-msgid "Disable progress bars."
-msgstr ""
-
-# type: =item
-#. type: =item
-#: ../fish/guestfish.pod:353
-msgid "B<--remote[=pid]>"
+#: ../fish/guestfish.pod:122
+msgid "Create a 100MB disk containing an ext2-formatted partition:"

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../fish/guestfish.pod:355
+# type: verbatim
+#. type: verbatim
+#: ../fish/guestfish.pod:124
+#, no-wrap

 msgid ""
 msgid ""

-"Send remote commands to C<$GUESTFISH_PID> or C<pid>.  See section L</REMOTE "
-"CONTROL GUESTFISH OVER A SOCKET> below."
-msgstr ""
-
-# type: =item
-#. type: =item
-#: ../fish/guestfish.pod:358
-msgid "B<-r>"
+" #!/usr/bin/guestfish -f\n"
+" sparse test1.img 100M\n"
+" run\n"
+" part-disk /dev/sda mbr\n"
+" mkfs ext2 /dev/sda1\n"
+"\n"

 msgstr ""
 
 msgstr ""
 

-# type: =item
-#. type: =item
-#: ../fish/guestfish.pod:360
-msgid "B<--ro>"
+# type: =head2
+#. type: =head2
+#: ../fish/guestfish.pod:130
+msgid "Start with a prepared disk"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish.pod:362
+#: ../fish/guestfish.pod:132

 msgid ""
 msgid ""

-"This changes the I<-a>, I<-d> and I<-m> options so that disks are added and "
-"mounts are done read-only."
+"An alternate way to create a 100MB disk called C<test1.img> containing a "
+"single ext2-formatted partition:"

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../fish/guestfish.pod:365
+# type: verbatim
+#. type: verbatim
+#: ../fish/guestfish.pod:135
+#, no-wrap

 msgid ""
 msgid ""

-"The option must always be used if the disk image or virtual machine might be "
-"running, and is generally recommended in cases where you don't need write "
-"access to the disk."
+" guestfish -N fs\n"
+"\n"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish.pod:369
-msgid ""
-"Note that prepared disk images created with I<-N> are not affected by this "
-"option.  Also commands like C<add> are not affected - you have to specify "
-"the C<readonly:true> option explicitly if you need it."
+#: ../fish/guestfish.pod:137
+msgid "To list what is available do:"

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../fish/guestfish.pod:373
-msgid "See also L</OPENING DISKS FOR READ AND WRITE> below."
+# type: verbatim
+#. type: verbatim
+#: ../fish/guestfish.pod:139 ../fish/guestfish.pod:938
+#, no-wrap
+msgid ""
+" guestfish -N help | less\n"
+"\n"

 msgstr ""
 
 msgstr ""
 

-# type: =item
-#. type: =item
-#: ../fish/guestfish.pod:375 ../fuse/guestmount.pod:213
-msgid "B<--selinux>"
+# type: =head2
+#. type: =head2
+#: ../fish/guestfish.pod:141
+msgid "Remote control"

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../fish/guestfish.pod:377
-msgid "Enable SELinux support for the guest.  See L<guestfs(3)/SELINUX>."
+# type: verbatim
+#. type: verbatim
+#: ../fish/guestfish.pod:143
+#, no-wrap
+msgid ""
+" eval \"`guestfish --listen`\"\n"
+" guestfish --remote add-ro disk.img\n"
+" guestfish --remote run\n"
+" guestfish --remote lvs\n"
+"\n"

 msgstr ""
 
 msgstr ""
 

-# type: =item
-#. type: =item
-#: ../fish/guestfish.pod:379
-msgid "B<-v>"
+# type: =head1
+#. type: =head1
+#: ../fish/guestfish.pod:148 ../test-tool/libguestfs-test-tool.pod:37
+#: ../fuse/guestmount.pod:83 ../tools/virt-edit.pl:81
+#: ../tools/virt-win-reg.pl:96 ../tools/virt-list-filesystems.pl:53
+#: ../tools/virt-tar.pl:103 ../tools/virt-make-fs.pl:153
+#: ../tools/virt-list-partitions.pl:54
+msgid "OPTIONS"

 msgstr ""
 
 # type: =item
 #. type: =item
 msgstr ""
 
 # type: =item
 #. type: =item

-#: ../fish/guestfish.pod:381
-msgid "B<--verbose>"
+#: ../fish/guestfish.pod:152 ../fuse/guestmount.pod:141
+#: ../tools/virt-edit.pl:89 ../tools/virt-win-reg.pl:104
+#: ../tools/virt-list-filesystems.pl:61 ../tools/virt-tar.pl:111
+#: ../tools/virt-make-fs.pl:161 ../tools/virt-list-partitions.pl:62
+msgid "B<--help>"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish.pod:383
-msgid ""
-"Enable very verbose messages.  This is particularly useful if you find a bug."
+#: ../fish/guestfish.pod:154
+msgid "Displays general help on options."

 msgstr ""
 
 # type: =item
 #. type: =item
 msgstr ""
 
 # type: =item
 #. type: =item

-#: ../fish/guestfish.pod:386
-msgid "B<-V>"
+#: ../fish/guestfish.pod:156
+msgid "B<-h>"

 msgstr ""
 
 # type: =item
 #. type: =item
 msgstr ""
 
 # type: =item
 #. type: =item

-#: ../fish/guestfish.pod:388 ../tools/virt-edit.pl:88
-#: ../tools/virt-win-reg.pl:112 ../tools/virt-resize.pl:270
-#: ../tools/virt-list-filesystems.pl:69 ../tools/virt-tar.pl:119
-#: ../tools/virt-make-fs.pl:169 ../tools/virt-list-partitions.pl:70
-msgid "B<--version>"
+#: ../fish/guestfish.pod:158
+msgid "B<--cmd-help>"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish.pod:390
-msgid "Display the guestfish / libguestfs version number and exit."
+#: ../fish/guestfish.pod:160
+msgid "Lists all available guestfish commands."

 msgstr ""
 
 # type: =item
 #. type: =item
 msgstr ""
 
 # type: =item
 #. type: =item

-#: ../fish/guestfish.pod:392
-msgid "B<-w>"
+#: ../fish/guestfish.pod:162
+msgid "B<-h cmd>"

 msgstr ""
 
 # type: =item
 #. type: =item
 msgstr ""
 
 # type: =item
 #. type: =item

-#: ../fish/guestfish.pod:394
-msgid "B<--rw>"
+#: ../fish/guestfish.pod:164
+msgid "B<--cmd-help cmd>"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish.pod:396
-msgid ""
-"This option does nothing at the moment.  See L</OPENING DISKS FOR READ AND "
-"WRITE> below."
+#: ../fish/guestfish.pod:166
+msgid "Displays detailed help on a single command C<cmd>."

 msgstr ""
 
 # type: =item
 #. type: =item
 msgstr ""
 
 # type: =item
 #. type: =item

-#: ../fish/guestfish.pod:399
-msgid "B<-x>"
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../fish/guestfish.pod:401
-msgid "Echo each command before executing it."
-msgstr ""
-
-# type: =head1
-#. type: =head1
-#: ../fish/guestfish.pod:405
-msgid "COMMANDS ON COMMAND LINE"
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../fish/guestfish.pod:407
-msgid ""
-"Any additional (non-option) arguments are treated as commands to execute."
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../fish/guestfish.pod:410
-msgid ""
-"Commands to execute should be separated by a colon (C<:>), where the colon "
-"is a separate parameter.  Thus:"
+#: ../fish/guestfish.pod:168
+msgid "B<-a image>"

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../fish/guestfish.pod:413
-#, no-wrap
-msgid ""
-" guestfish cmd [args...] : cmd [args...] : cmd [args...] ...\n"
-"\n"
+# type: =item
+#. type: =item
+#: ../fish/guestfish.pod:170
+msgid "B<--add image>"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish.pod:415
-msgid ""
-"If there are no additional arguments, then we enter a shell, either an "
-"interactive shell with a prompt (if the input is a terminal) or a non-"
-"interactive shell."
+#: ../fish/guestfish.pod:172
+msgid "Add a block device or virtual machine image to the shell."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish.pod:419
+#: ../fish/guestfish.pod:174 ../fuse/guestmount.pod:91

 msgid ""
 msgid ""

-"In either command line mode or non-interactive shell, the first command that "
-"gives an error causes the whole shell to exit.  In interactive mode (with a "
-"prompt) if a command fails, you can continue to enter commands."
-msgstr ""
-
-# type: =head1
-#. type: =head1
-#: ../fish/guestfish.pod:424
-msgid "USING launch (OR run)"
+"The format of the disk image is auto-detected.  To override this and force a "
+"particular format use the I<--format=..> option."

 msgstr ""
 
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../fish/guestfish.pod:426
+#: ../fish/guestfish.pod:177

 msgid ""
 msgid ""

-"As with L<guestfs(3)>, you must first configure your guest by adding disks, "
-"then launch it, then mount any disks you need, and finally issue actions/"
-"commands.  So the general order of the day is:"
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../fish/guestfish.pod:434
-msgid "add or -a/--add"
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../fish/guestfish.pod:438
-msgid "launch (aka run)"
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../fish/guestfish.pod:442
-msgid "mount or -m/--mount"
+"Using this flag is mostly equivalent to using the C<add> command, with "
+"C<readonly:true> if the I<--ro> flag was given, and with C<format:...> if "
+"the I<--format=...> flag was given."

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../fish/guestfish.pod:446
-msgid "any other commands"
+# type: =item
+#. type: =item
+#: ../fish/guestfish.pod:181
+msgid "B<-c URI>"

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../fish/guestfish.pod:450
-msgid ""
-"C<run> is a synonym for C<launch>.  You must C<launch> (or C<run>)  your "
-"guest before mounting or performing any other commands."
+# type: =item
+#. type: =item
+#: ../fish/guestfish.pod:183
+msgid "B<--connect URI>"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish.pod:453
+#: ../fish/guestfish.pod:185 ../fuse/guestmount.pod:96

 msgid ""
 msgid ""

-"The only exception is that if any of the I<-i>, I<-m>, I<--mount>, I<-N> or "
-"I<--new> options were given then C<run> is done automatically, simply "
-"because guestfish can't perform the action you asked for without doing this."
+"When used in conjunction with the I<-d> option, this specifies the libvirt "
+"URI to use.  The default is to use the default libvirt connection."

 msgstr ""
 
 msgstr ""
 

-# type: =head1
-#. type: =head1
-#: ../fish/guestfish.pod:458
-msgid "OPENING DISKS FOR READ AND WRITE"
+# type: =item
+#. type: =item
+#: ../fish/guestfish.pod:189
+msgid "B<--csh>"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish.pod:460
+#: ../fish/guestfish.pod:191

 msgid ""
 msgid ""

-"The guestfish (and L<guestmount(1)>) options I<--ro> and I<--rw> affect "
-"whether the other command line options I<-a>, I<-c>, I<-d>, I<-i> and I<-m> "
-"open disk images read-only or for writing."
+"If using the I<--listen> option and a csh-like shell, use this option.  See "
+"section L</REMOTE CONTROL AND CSH> below."
+msgstr ""
+
+# type: =item
+#. type: =item
+#: ../fish/guestfish.pod:194
+msgid "B<-d libvirt-domain>"
+msgstr ""
+
+# type: =item
+#. type: =item
+#: ../fish/guestfish.pod:196
+msgid "B<--domain libvirt-domain>"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish.pod:464
+#: ../fish/guestfish.pod:198 ../fuse/guestmount.pod:102

 msgid ""
 msgid ""

-"In libguestfs E<lt> 1.6.2, guestfish and guestmount defaulted to opening "
-"disk images supplied on the command line for write.  To open a disk image "
-"read-only you have to do I<-a image --ro>."
+"Add disks from the named libvirt domain.  If the I<--ro> option is also "
+"used, then any libvirt domain can be used.  However in write mode, only "
+"libvirt domains which are shut down can be named here."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish.pod:468
+#: ../fish/guestfish.pod:202

 msgid ""
 msgid ""

-"This matters: If you accidentally open a live VM disk image writable then "
-"you will cause irreversible disk corruption."
+"Using this flag is mostly equivalent to using the C<add-domain> command, "
+"with C<readonly:true> if the I<--ro> flag was given, and with C<format:...> "
+"if the I<--format:...> flag was given."

 msgstr ""
 
 msgstr ""
 

-#. type: textblock
-#: ../fish/guestfish.pod:471
-msgid ""
-"By libguestfs 1.10 we intend to change the default the other way.  Disk "
-"images will be opened read-only.  You will have to either specify "
-"I<guestfish --rw> or change a configuration file in order to get write "
-"access for disk images specified by those other command line options."
+# type: =item
+#. type: =item
+#: ../fish/guestfish.pod:206
+msgid "B<-D>"

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../fish/guestfish.pod:476
-msgid ""
-"This version of guestfish has a I<--rw> option which does nothing (it is "
-"already the default).  However it is highly recommended that you use this "
-"option to indicate that guestfish needs write access, and to prepare your "
-"scripts for the day when this option will be required for write access."
+# type: =item
+#. type: =item
+#: ../fish/guestfish.pod:208
+msgid "B<--no-dest-paths>"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish.pod:482
+#: ../fish/guestfish.pod:210

 msgid ""
 msgid ""

-"B<Note:> This does I<not> affect commands like L</add> and L</mount>, or any "
-"other libguestfs program apart from guestfish and guestmount."
+"Don't tab-complete paths on the guest filesystem.  It is useful to be able "
+"to hit the tab key to complete paths on the guest filesystem, but this "
+"causes extra \"hidden\" guestfs calls to be made, so this option is here to "
+"allow this feature to be disabled."

 msgstr ""
 
 msgstr ""
 

-# type: =head1
-#. type: =head1
-#: ../fish/guestfish.pod:485
-msgid "QUOTING"
+# type: =item
+#. type: =item
+#: ../fish/guestfish.pod:215 ../fuse/guestmount.pod:118
+msgid "B<--echo-keys>"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish.pod:487
-msgid ""
-"You can quote ordinary parameters using either single or double quotes.  For "
-"example:"
-msgstr ""
-
-# type: verbatim
-#. type: verbatim
-#: ../fish/guestfish.pod:490
-#, no-wrap
+#: ../fish/guestfish.pod:217 ../fuse/guestmount.pod:120

 msgid ""
 msgid ""

-" add \"file with a space.img\"\n"
-"\n"
+"When prompting for keys and passphrases, guestfish normally turns echoing "
+"off so you cannot see what you are typing.  If you are not worried about "
+"Tempest attacks and there is no one else in the room you can specify this "
+"flag to see what you are typing."

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../fish/guestfish.pod:492
-#, no-wrap
-msgid ""
-" rm '/file name'\n"
-"\n"
+# type: =item
+#. type: =item
+#: ../fish/guestfish.pod:222
+msgid "B<-f file>"

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../fish/guestfish.pod:494
-#, no-wrap
-msgid ""
-" rm '/\"'\n"
-"\n"
+# type: =item
+#. type: =item
+#: ../fish/guestfish.pod:224
+msgid "B<--file file>"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish.pod:496
-msgid ""
-"A few commands require a list of strings to be passed.  For these, use a "
-"whitespace-separated list, enclosed in quotes.  Strings containing "
-"whitespace to be passed through must be enclosed in single quotes.  A "
-"literal single quote must be escaped with a backslash."
+#: ../fish/guestfish.pod:226
+msgid "Read commands from C<file>.  To write pure guestfish scripts, use:"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish.pod:501
+#: ../fish/guestfish.pod:229

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" vgcreate VG \"/dev/sda1 /dev/sdb1\"\n"
-" command \"/bin/echo 'foo      bar'\"\n"
-" command \"/bin/echo \\'foo\\'\"\n"
+" #!/usr/bin/guestfish -f\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: =head1
-#. type: =head1
-#: ../fish/guestfish.pod:505
-msgid "OPTIONAL ARGUMENTS"
+# type: =item
+#. type: =item
+#: ../fish/guestfish.pod:231
+msgid "B<--format=raw|qcow2|..>"
+msgstr ""
+
+# type: =item
+#. type: =item
+#: ../fish/guestfish.pod:233
+msgid "B<--format>"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish.pod:507
+#: ../fish/guestfish.pod:235 ../fuse/guestmount.pod:127

 msgid ""
 msgid ""

-"Some commands take optional arguments.  These arguments appear in this "
-"documentation as C<[argname:..]>.  You can use them as in these examples:"
+"The default for the I<-a> option is to auto-detect the format of the disk "
+"image.  Using this forces the disk format for I<-a> options which follow on "
+"the command line.  Using I<--format> with no argument switches back to auto-"
+"detection for subsequent I<-a> options."

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish.pod:511
+#: ../fish/guestfish.pod:242

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" add-drive-opts filename\n"
+" guestfish --format=raw -a disk.img\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../fish/guestfish.pod:513
-#, no-wrap
-msgid ""
-" add-drive-opts filename readonly:true\n"
-"\n"
+# type: textblock
+#. type: textblock
+#: ../fish/guestfish.pod:244
+msgid "forces raw format (no auto-detection) for C<disk.img>."

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish.pod:515
+#: ../fish/guestfish.pod:246

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" add-drive-opts filename format:qcow2 readonly:false\n"
+" guestfish --format=raw -a disk.img --format -a another.img\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish.pod:517
-msgid ""
-"Each optional argument can appear at most once.  All optional arguments must "
-"appear after the required ones."
-msgstr ""
-
-# type: =head1
-#. type: =head1
-#: ../fish/guestfish.pod:520
-msgid "NUMBERS"
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../fish/guestfish.pod:522
+#: ../fish/guestfish.pod:248

 msgid ""
 msgid ""

-"This section applies to all commands which can take integers as parameters."
-msgstr ""
-
-# type: =head2
-#. type: =head2
-#: ../fish/guestfish.pod:525
-msgid "SIZE SUFFIX"
+"forces raw format (no auto-detection) for C<disk.img> and reverts to auto-"
+"detection for C<another.img>."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish.pod:527
+#: ../fish/guestfish.pod:251

 msgid ""
 msgid ""

-"When the command takes a parameter measured in bytes, you can use one of the "
-"following suffixes to specify kilobytes, megabytes and larger sizes:"
-msgstr ""
-
-# type: =item
-#. type: =item
-#: ../fish/guestfish.pod:533
-msgid "B<k> or B<K> or B<KiB>"
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../fish/guestfish.pod:535
-msgid "The size in kilobytes (multiplied by 1024)."
-msgstr ""
-
-# type: =item
-#. type: =item
-#: ../fish/guestfish.pod:537
-msgid "B<KB>"
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../fish/guestfish.pod:539
-msgid "The size in SI 1000 byte units."
-msgstr ""
-
-# type: =item
-#. type: =item
-#: ../fish/guestfish.pod:541
-msgid "B<M> or B<MiB>"
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../fish/guestfish.pod:543
-msgid "The size in megabytes (multiplied by 1048576)."
+"If you have untrusted raw-format guest disk images, you should use this "
+"option to specify the disk format.  This avoids a possible security problem "
+"with malicious guests (CVE-2010-3851).  See also L</add-drive-opts>."

 msgstr ""
 
 # type: =item
 #. type: =item
 msgstr ""
 
 # type: =item
 #. type: =item

-#: ../fish/guestfish.pod:545
-msgid "B<MB>"
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../fish/guestfish.pod:547
-msgid "The size in SI 1000000 byte units."
+#: ../fish/guestfish.pod:256
+msgid "B<-i>"

 msgstr ""
 
 # type: =item
 #. type: =item
 msgstr ""
 
 # type: =item
 #. type: =item

-#: ../fish/guestfish.pod:549
-msgid "B<G> or B<GiB>"
+#: ../fish/guestfish.pod:258
+msgid "B<--inspector>"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish.pod:551
-msgid "The size in gigabytes (multiplied by 2**30)."
-msgstr ""
-
-# type: =item
-#. type: =item
-#: ../fish/guestfish.pod:553
-msgid "B<GB>"
+#: ../fish/guestfish.pod:260 ../fuse/guestmount.pod:147
+msgid ""
+"Using L<virt-inspector(1)> code, inspect the disks looking for an operating "
+"system and mount filesystems as they would be mounted on the real virtual "
+"machine."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish.pod:555
-msgid "The size in SI 10**9 byte units."
+#: ../fish/guestfish.pod:264
+msgid "Typical usage is either:"

 msgstr ""
 
 msgstr ""
 

-# type: =item
-#. type: =item
-#: ../fish/guestfish.pod:557
-msgid "B<T> or B<TiB>"
+# type: verbatim
+#. type: verbatim
+#: ../fish/guestfish.pod:266
+#, no-wrap
+msgid ""
+" guestfish -d myguest -i\n"
+"\n"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish.pod:559
-msgid "The size in terabytes (multiplied by 2**40)."
+#: ../fish/guestfish.pod:268
+msgid "(for an inactive libvirt domain called I<myguest>), or:"

 msgstr ""
 
 msgstr ""
 

-# type: =item
-#. type: =item
-#: ../fish/guestfish.pod:561
-msgid "B<TB>"
+# type: verbatim
+#. type: verbatim
+#: ../fish/guestfish.pod:270
+#, no-wrap
+msgid ""
+" guestfish --ro -d myguest -i\n"
+"\n"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish.pod:563
-msgid "The size in SI 10**12 byte units."
+#: ../fish/guestfish.pod:272
+msgid "(for active domains, readonly), or specify the block device directly:"

 msgstr ""
 
 msgstr ""
 

-# type: =item
-#. type: =item
-#: ../fish/guestfish.pod:565
-msgid "B<P> or B<PiB>"
+# type: verbatim
+#. type: verbatim
+#: ../fish/guestfish.pod:274
+#, no-wrap
+msgid ""
+" guestfish --rw -a /dev/Guests/MyGuest -i\n"
+"\n"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish.pod:567
-msgid "The size in petabytes (multiplied by 2**50)."
-msgstr ""
-
-# type: =item
-#. type: =item
-#: ../fish/guestfish.pod:569
-msgid "B<PB>"
+#: ../fish/guestfish.pod:276
+msgid ""
+"Note that the command line syntax changed slightly over older versions of "
+"guestfish.  You can still use the old syntax:"

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../fish/guestfish.pod:571
-msgid "The size in SI 10**15 byte units."
+# type: verbatim
+#. type: verbatim
+#: ../fish/guestfish.pod:279
+#, no-wrap
+msgid ""
+" guestfish [--ro] -i disk.img\n"
+"\n"

 msgstr ""
 
 msgstr ""
 

-# type: =item
-#. type: =item
-#: ../fish/guestfish.pod:573
-msgid "B<E> or B<EiB>"
+# type: verbatim
+#. type: verbatim
+#: ../fish/guestfish.pod:281
+#, no-wrap
+msgid ""
+" guestfish [--ro] -i libvirt-domain\n"
+"\n"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish.pod:575
-msgid "The size in exabytes (multiplied by 2**60)."
+#: ../fish/guestfish.pod:283
+msgid ""
+"Using this flag is mostly equivalent to using the C<inspect-os> command and "
+"then using other commands to mount the filesystems that were found."

 msgstr ""
 
 # type: =item
 #. type: =item
 msgstr ""
 
 # type: =item
 #. type: =item

-#: ../fish/guestfish.pod:577
-msgid "B<EB>"
+#: ../fish/guestfish.pod:287 ../fuse/guestmount.pod:151
+msgid "B<--keys-from-stdin>"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish.pod:579
-msgid "The size in SI 10**18 byte units."
+#: ../fish/guestfish.pod:289 ../fuse/guestmount.pod:153
+msgid ""
+"Read key or passphrase parameters from stdin.  The default is to try to read "
+"passphrases from the user by opening C</dev/tty>."

 msgstr ""
 
 # type: =item
 #. type: =item
 msgstr ""
 
 # type: =item
 #. type: =item

-#: ../fish/guestfish.pod:581
-msgid "B<Z> or B<ZiB>"
+#: ../fish/guestfish.pod:292
+msgid "B<--listen>"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish.pod:583
-msgid "The size in zettabytes (multiplied by 2**70)."
+#: ../fish/guestfish.pod:294
+msgid ""
+"Fork into the background and listen for remote commands.  See section L</"
+"REMOTE CONTROL GUESTFISH OVER A SOCKET> below."

 msgstr ""
 
 msgstr ""
 

-# type: =item

 #. type: =item
 #. type: =item

-#: ../fish/guestfish.pod:585
-msgid "B<ZB>"
+#: ../fish/guestfish.pod:297 ../fuse/guestmount.pod:156
+msgid "B<--live>"

 msgstr ""
 
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../fish/guestfish.pod:587
-msgid "The size in SI 10**21 byte units."
+#: ../fish/guestfish.pod:299 ../fuse/guestmount.pod:158
+msgid ""
+"Connect to a live virtual machine.  (Experimental, see L<guestfs(3)/"
+"ATTACHING TO RUNNING DAEMONS>)."

 msgstr ""
 
 msgstr ""
 

-# type: =item

 #. type: =item
 #. type: =item

-#: ../fish/guestfish.pod:589
-msgid "B<Y> or B<YiB>"
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../fish/guestfish.pod:591
-msgid "The size in yottabytes (multiplied by 2**80)."
+#: ../fish/guestfish.pod:302 ../fuse/guestmount.pod:161
+msgid "B<-m dev[:mountpoint[:options]]>"

 msgstr ""
 
 msgstr ""
 

-# type: =item

 #. type: =item
 #. type: =item

-#: ../fish/guestfish.pod:593
-msgid "B<YB>"
+#: ../fish/guestfish.pod:304 ../fuse/guestmount.pod:163
+msgid "B<--mount dev[:mountpoint[:options]]>"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish.pod:595
-msgid "The size in SI 10**24 byte units."
+#: ../fish/guestfish.pod:306
+msgid "Mount the named partition or logical volume on the given mountpoint."

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../fish/guestfish.pod:601
-#, no-wrap
-msgid ""
-" truncate-size /file 1G\n"
-"\n"
+# type: textblock
+#. type: textblock
+#: ../fish/guestfish.pod:308
+msgid "If the mountpoint is omitted, it defaults to C</>."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish.pod:603
-msgid "would truncate the file to 1 gigabyte."
+#: ../fish/guestfish.pod:310
+msgid "You have to mount something on C</> before most commands will work."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish.pod:605
+#: ../fish/guestfish.pod:312

 msgid ""
 msgid ""

-"Be careful because a few commands take sizes in kilobytes or megabytes (eg. "
-"the parameter to L</memsize> is specified in megabytes already).  Adding a "
-"suffix will probably not do what you expect."
+"If any I<-m> or I<--mount> options are given, the guest is automatically "
+"launched."

 msgstr ""
 
 msgstr ""
 

-# type: =head2
-#. type: =head2
-#: ../fish/guestfish.pod:609
-msgid "OCTAL AND HEXADECIMAL NUMBERS"
+# type: textblock
+#. type: textblock
+#: ../fish/guestfish.pod:315
+msgid ""
+"If you don't know what filesystems a disk image contains, you can either run "
+"guestfish without this option, then list the partitions, filesystems and LVs "
+"available (see L</list-partitions>, L</list-filesystems> and L</lvs> "
+"commands), or you can use the L<virt-filesystems(1)> program."

 msgstr ""
 
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../fish/guestfish.pod:611
+#: ../fish/guestfish.pod:321 ../fuse/guestmount.pod:171

 msgid ""
 msgid ""

-"For specifying the radix (base) use the C convention: C<0> to prefix an "
-"octal number or C<0x> to prefix a hexadecimal number.  For example:"
+"The third (and rarely used) part of the mount parameter is the list of mount "
+"options used to mount the underlying filesystem.  If this is not given, then "
+"the mount options are either the empty string or C<ro> (the latter if the "
+"I<--ro> flag is used).  By specifying the mount options, you override this "
+"default choice.  Probably the only time you would use this is to enable ACLs "
+"and/or extended attributes if the filesystem can support them:"

 msgstr ""
 
 msgstr ""
 

-# type: verbatim

 #. type: verbatim
 #. type: verbatim

-#: ../fish/guestfish.pod:614
+#: ../fish/guestfish.pod:329 ../fuse/guestmount.pod:179

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" 1234      decimal number 1234\n"
-" 02322     octal number, equivalent to decimal 1234\n"
-" 0x4d2     hexadecimal number, equivalent to decimal 1234\n"
+" -m /dev/sda1:/:acl,user_xattr\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../fish/guestfish.pod:618
-msgid ""
-"When using the C<chmod> command, you almost always want to specify an octal "
-"number for the mode, and you must prefix it with C<0> (unlike the Unix "
-"L<chmod(1)> program):"
+#: ../fish/guestfish.pod:331
+msgid "Using this flag is equivalent to using the C<mount-options> command."

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../fish/guestfish.pod:622
-#, no-wrap
-msgid ""
-" chmod 0777 /public  # OK\n"
-" chmod 777 /public   # WRONG! This is mode 777 decimal = 01411 octal.\n"
-"\n"
+# type: =item
+#. type: =item
+#: ../fish/guestfish.pod:333
+msgid "B<-n>"
+msgstr ""
+
+# type: =item
+#. type: =item
+#: ../fish/guestfish.pod:335
+msgid "B<--no-sync>"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish.pod:625
+#: ../fish/guestfish.pod:337

 msgid ""
 msgid ""

-"Commands that return numbers usually print them in decimal, but some "
-"commands print numbers in other radices (eg. C<umask> prints the mode in "
-"octal, preceeded by C<0>)."
+"Disable autosync.  This is enabled by default.  See the discussion of "
+"autosync in the L<guestfs(3)> manpage."

 msgstr ""
 
 msgstr ""
 

-# type: =head1
-#. type: =head1
-#: ../fish/guestfish.pod:629
-msgid "WILDCARDS AND GLOBBING"
+# type: =item
+#. type: =item
+#: ../fish/guestfish.pod:340
+msgid "B<-N type>"
+msgstr ""
+
+# type: =item
+#. type: =item
+#: ../fish/guestfish.pod:342
+msgid "B<--new type>"
+msgstr ""
+
+# type: =item
+#. type: =item
+#: ../fish/guestfish.pod:344
+msgid "B<-N help>"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish.pod:631
+#: ../fish/guestfish.pod:346

 msgid ""
 msgid ""

-"Neither guestfish nor the underlying guestfs API performs wildcard expansion "
-"(globbing) by default.  So for example the following will not do what you "
-"expect:"
+"Prepare a fresh disk image formatted as \"type\".  This is an alternative to "
+"the I<-a> option: whereas I<-a> adds an existing disk, I<-N> creates a "
+"preformatted disk with a filesystem and adds it.  See L</PREPARED DISK "
+"IMAGES> below."

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../fish/guestfish.pod:635
-#, no-wrap
-msgid ""
-" rm-rf /home/*\n"
-"\n"
+# type: =item
+#. type: =item
+#: ../fish/guestfish.pod:351
+msgid "B<--progress-bars>"
+msgstr ""
+
+# type: textblock
+#. type: textblock
+#: ../fish/guestfish.pod:353
+msgid "Enable progress bars, even when guestfish is used non-interactively."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish.pod:637
+#: ../fish/guestfish.pod:355

 msgid ""
 msgid ""

-"Assuming you don't have a directory called literally C</home/*> then the "
-"above command will return an error."
+"Progress bars are enabled by default when guestfish is used as an "
+"interactive shell."
+msgstr ""
+
+# type: =item
+#. type: =item
+#: ../fish/guestfish.pod:358
+msgid "B<--no-progress-bars>"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish.pod:640
-msgid "To perform wildcard expansion, use the C<glob> command."
+#: ../fish/guestfish.pod:360
+msgid "Disable progress bars."

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../fish/guestfish.pod:642
-#, no-wrap
-msgid ""
-" glob rm-rf /home/*\n"
-"\n"
+# type: =item
+#. type: =item
+#: ../fish/guestfish.pod:362
+msgid "B<--remote[=pid]>"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish.pod:644
+#: ../fish/guestfish.pod:364

 msgid ""
 msgid ""

-"runs C<rm-rf> on each path that matches (ie. potentially running the command "
-"many times), equivalent to:"
+"Send remote commands to C<$GUESTFISH_PID> or C<pid>.  See section L</REMOTE "
+"CONTROL GUESTFISH OVER A SOCKET> below."

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../fish/guestfish.pod:647
-#, no-wrap
-msgid ""
-" rm-rf /home/jim\n"
-" rm-rf /home/joe\n"
-" rm-rf /home/mary\n"
-"\n"
+# type: =item
+#. type: =item
+#: ../fish/guestfish.pod:367
+msgid "B<-r>"
+msgstr ""
+
+# type: =item
+#. type: =item
+#: ../fish/guestfish.pod:369
+msgid "B<--ro>"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish.pod:651
-msgid "C<glob> only works on simple guest paths and not on device names."
+#: ../fish/guestfish.pod:371
+msgid ""
+"This changes the I<-a>, I<-d> and I<-m> options so that disks are added and "
+"mounts are done read-only."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish.pod:653
+#: ../fish/guestfish.pod:374

 msgid ""
 msgid ""

-"If you have several parameters, each containing a wildcard, then glob will "
-"perform a Cartesian product."
+"The option must always be used if the disk image or virtual machine might be "
+"running, and is generally recommended in cases where you don't need write "
+"access to the disk."

 msgstr ""
 
 msgstr ""
 

-# type: =head1
-#. type: =head1
-#: ../fish/guestfish.pod:656
-msgid "COMMENTS"
+# type: textblock
+#. type: textblock
+#: ../fish/guestfish.pod:378
+msgid ""
+"Note that prepared disk images created with I<-N> are not affected by this "
+"option.  Also commands like C<add> are not affected - you have to specify "
+"the C<readonly:true> option explicitly if you need it."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish.pod:658
-msgid ""
-"Any line which starts with a I<#> character is treated as a comment and "
-"ignored.  The I<#> can optionally be preceeded by whitespace, but B<not> by "
-"a command.  For example:"
+#: ../fish/guestfish.pod:382
+msgid "See also L</OPENING DISKS FOR READ AND WRITE> below."

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../fish/guestfish.pod:662
-#, no-wrap
-msgid ""
-" # this is a comment\n"
-"         # this is a comment\n"
-" foo # NOT a comment\n"
-"\n"
+# type: =item
+#. type: =item
+#: ../fish/guestfish.pod:384 ../fuse/guestmount.pod:235
+msgid "B<--selinux>"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish.pod:666
-msgid "Blank lines are also ignored."
+#: ../fish/guestfish.pod:386
+msgid "Enable SELinux support for the guest.  See L<guestfs(3)/SELINUX>."

 msgstr ""
 
 msgstr ""
 

-# type: =head1
-#. type: =head1
-#: ../fish/guestfish.pod:668
-msgid "RUNNING COMMANDS LOCALLY"
+# type: =item
+#. type: =item
+#: ../fish/guestfish.pod:388
+msgid "B<-v>"
+msgstr ""
+
+# type: =item
+#. type: =item
+#: ../fish/guestfish.pod:390
+msgid "B<--verbose>"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish.pod:670
+#: ../fish/guestfish.pod:392

 msgid ""
 msgid ""

-"Any line which starts with a I<!> character is treated as a command sent to "
-"the local shell (C</bin/sh> or whatever L<system(3)> uses).  For example:"
+"Enable very verbose messages.  This is particularly useful if you find a bug."

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../fish/guestfish.pod:674
-#, no-wrap
-msgid ""
-" !mkdir local\n"
-" tgz-out /remote local/remote-data.tar.gz\n"
-"\n"
+# type: =item
+#. type: =item
+#: ../fish/guestfish.pod:395
+msgid "B<-V>"
+msgstr ""
+
+# type: =item
+#. type: =item
+#: ../fish/guestfish.pod:397 ../tools/virt-edit.pl:97
+#: ../tools/virt-win-reg.pl:112 ../tools/virt-list-filesystems.pl:69
+#: ../tools/virt-tar.pl:119 ../tools/virt-make-fs.pl:169
+#: ../tools/virt-list-partitions.pl:70
+msgid "B<--version>"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish.pod:677
-msgid ""
-"will create a directory C<local> on the host, and then export the contents "
-"of C</remote> on the mounted filesystem to C<local/remote-data.tar.gz>.  "
-"(See C<tgz-out>)."
+#: ../fish/guestfish.pod:399
+msgid "Display the guestfish / libguestfs version number and exit."
+msgstr ""
+
+# type: =item
+#. type: =item
+#: ../fish/guestfish.pod:401
+msgid "B<-w>"
+msgstr ""
+
+# type: =item
+#. type: =item
+#: ../fish/guestfish.pod:403
+msgid "B<--rw>"

 msgstr ""
 
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../fish/guestfish.pod:681
+#: ../fish/guestfish.pod:405 ../fuse/guestmount.pod:249

 msgid ""
 msgid ""

-"To change the local directory, use the C<lcd> command.  C<!cd> will have no "
-"effect, due to the way that subprocesses work in Unix."
+"This changes the I<-a>, I<-d> and I<-m> options so that disks are added and "
+"mounts are done read-write."

 msgstr ""
 
 msgstr ""
 

-#. type: =head2
-#: ../fish/guestfish.pod:684
-msgid "LOCAL COMMANDS WITH INLINE EXECUTION"
+#. type: textblock
+#: ../fish/guestfish.pod:408
+msgid "See L</OPENING DISKS FOR READ AND WRITE> below."
+msgstr ""
+
+# type: =item
+#. type: =item
+#: ../fish/guestfish.pod:410
+msgid "B<-x>"

 msgstr ""
 
 msgstr ""
 

+# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../fish/guestfish.pod:686
-msgid ""
-"If a line starts with I<E<lt>!> then the shell command is executed (as for "
-"I<!>), but subsequently any output (stdout) of the shell command is parsed "
-"and executed as guestfish commands."
+#: ../fish/guestfish.pod:412
+msgid "Echo each command before executing it."
+msgstr ""
+
+# type: =head1
+#. type: =head1
+#: ../fish/guestfish.pod:416
+msgid "COMMANDS ON COMMAND LINE"

 msgstr ""
 
 msgstr ""
 

+# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../fish/guestfish.pod:690
+#: ../fish/guestfish.pod:418

 msgid ""
 msgid ""

-"Thus you can use shell script to construct arbitrary guestfish commands "
-"which are then parsed by guestfish."
+"Any additional (non-option) arguments are treated as commands to execute."

 msgstr ""
 
 msgstr ""
 

+# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../fish/guestfish.pod:693
+#: ../fish/guestfish.pod:421

 msgid ""
 msgid ""

-"For example it is tedious to create a sequence of files (eg. C</foo.1> "
-"through C</foo.100>) using guestfish commands alone.  However this is simple "
-"if we use a shell script to create the guestfish commands for us:"
+"Commands to execute should be separated by a colon (C<:>), where the colon "
+"is a separate parameter.  Thus:"

 msgstr ""
 
 msgstr ""
 

+# type: verbatim

 #. type: verbatim
 #. type: verbatim

-#: ../fish/guestfish.pod:698
+#: ../fish/guestfish.pod:424

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" <! for n in `seq 1 100`; do echo write /foo.$n $n; done\n"
+" guestfish cmd [args...] : cmd [args...] : cmd [args...] ...\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

+# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../fish/guestfish.pod:700
-msgid "or with names like C</foo.001>:"
-msgstr ""
-
-#. type: verbatim
-#: ../fish/guestfish.pod:702
-#, no-wrap
+#: ../fish/guestfish.pod:426

 msgid ""
 msgid ""

-" <! for n in `seq 1 100`; do printf \"write /foo.%03d %d\\n\" $n $n; done\n"
-"\n"
+"If there are no additional arguments, then we enter a shell, either an "
+"interactive shell with a prompt (if the input is a terminal) or a non-"
+"interactive shell."

 msgstr ""
 
 msgstr ""
 

+# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../fish/guestfish.pod:704
+#: ../fish/guestfish.pod:430

 msgid ""
 msgid ""

-"When using guestfish interactively it can be helpful to just run the shell "
-"script first (ie. remove the initial C<E<lt>> character so it is just an "
-"ordinary I<!> local command), see what guestfish commands it would run, and "
-"when you are happy with those prepend the C<E<lt>> character to run the "
-"guestfish commands for real."
+"In either command line mode or non-interactive shell, the first command that "
+"gives an error causes the whole shell to exit.  In interactive mode (with a "
+"prompt) if a command fails, you can continue to enter commands."

 msgstr ""
 
 # type: =head1
 #. type: =head1
 msgstr ""
 
 # type: =head1
 #. type: =head1

-#: ../fish/guestfish.pod:710
-msgid "PIPES"
+#: ../fish/guestfish.pod:435
+msgid "USING launch (OR run)"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish.pod:712
+#: ../fish/guestfish.pod:437

 msgid ""
 msgid ""

-"Use C<command E<lt>spaceE<gt> | command> to pipe the output of the first "
-"command (a guestfish command) to the second command (any host command).  For "
-"example:"
+"As with L<guestfs(3)>, you must first configure your guest by adding disks, "
+"then launch it, then mount any disks you need, and finally issue actions/"
+"commands.  So the general order of the day is:"

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../fish/guestfish.pod:716
-#, no-wrap
-msgid ""
-" cat /etc/passwd | awk -F: '$3 == 0 { print }'\n"
-"\n"
+# type: textblock
+#. type: textblock
+#: ../fish/guestfish.pod:445
+msgid "add or -a/--add"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish.pod:718
-msgid ""
-"(where C<cat> is the guestfish cat command, but C<awk> is the host awk "
-"program).  The above command would list all accounts in the guest filesystem "
-"which have UID 0, ie. root accounts including backdoors.  Other examples:"
+#: ../fish/guestfish.pod:449
+msgid "launch (aka run)"

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../fish/guestfish.pod:723
-#, no-wrap
-msgid ""
-" hexdump /bin/ls | head\n"
-" list-devices | tail -1\n"
-" tgz-out / - | tar ztf -\n"
-"\n"
+# type: textblock
+#. type: textblock
+#: ../fish/guestfish.pod:453
+msgid "mount or -m/--mount"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish.pod:727
-msgid ""
-"The space before the pipe symbol is required, any space after the pipe "
-"symbol is optional.  Everything after the pipe symbol is just passed "
-"straight to the host shell, so it can contain redirections, globs and "
-"anything else that makes sense on the host side."
+#: ../fish/guestfish.pod:457
+msgid "any other commands"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish.pod:732
+#: ../fish/guestfish.pod:461

 msgid ""
 msgid ""

-"To use a literal argument which begins with a pipe symbol, you have to quote "
-"it, eg:"
+"C<run> is a synonym for C<launch>.  You must C<launch> (or C<run>)  your "
+"guest before mounting or performing any other commands."

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../fish/guestfish.pod:735
-#, no-wrap
+# type: textblock
+#. type: textblock
+#: ../fish/guestfish.pod:464

 msgid ""
 msgid ""

-" echo \"|\"\n"
-"\n"
+"The only exception is that if any of the I<-i>, I<-m>, I<--mount>, I<-N> or "
+"I<--new> options were given then C<run> is done automatically, simply "
+"because guestfish can't perform the action you asked for without doing this."

 msgstr ""
 
 # type: =head1
 #. type: =head1
 msgstr ""
 
 # type: =head1
 #. type: =head1

-#: ../fish/guestfish.pod:737
-msgid "HOME DIRECTORIES"
+#: ../fish/guestfish.pod:469
+msgid "OPENING DISKS FOR READ AND WRITE"

 msgstr ""
 
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../fish/guestfish.pod:739
+#: ../fish/guestfish.pod:471

 msgid ""
 msgid ""

-"If a parameter starts with the character C<~> then the tilde may be expanded "
-"as a home directory path (either C<~> for the current user's home directory, "
-"or C<~user> for another user)."
+"The guestfish, L<guestmount(1)> and L<virt-rescue(1)> options I<--ro> and "
+"I<--rw> affect whether the other command line options I<-a>, I<-c>, I<-d>, "
+"I<-i> and I<-m> open disk images read-only or for writing."

 msgstr ""
 
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../fish/guestfish.pod:743
+#: ../fish/guestfish.pod:476

 msgid ""
 msgid ""

-"Note that home directory expansion happens for users known I<on the host>, "
-"not in the guest filesystem."
+"In libguestfs E<le> 1.10, guestfish, guestmount and virt-rescue defaulted to "
+"opening disk images supplied on the command line for write.  To open a disk "
+"image read-only you have to do I<-a image --ro>."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish.pod:746
+#: ../fish/guestfish.pod:480

 msgid ""
 msgid ""

-"To use a literal argument which begins with a tilde, you have to quote it, "
-"eg:"
+"This matters: If you accidentally open a live VM disk image writable then "
+"you will cause irreversible disk corruption."

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../fish/guestfish.pod:749
-#, no-wrap
+#. type: textblock
+#: ../fish/guestfish.pod:483

 msgid ""
 msgid ""

-" echo \"~\"\n"
-"\n"
+"By libguestfs 1.12 we intend to change the default the other way.  Disk "
+"images will be opened read-only.  You will have to either specify "
+"I<guestfish --rw>, I<guestmount --rw>, I<virt-rescue --rw>, or change the "
+"configuration file C</etc/libguestfs-tools.conf> in order to get write "
+"access for disk images specified by those other command line options."
+msgstr ""
+
+#. type: textblock
+#: ../fish/guestfish.pod:490
+msgid ""
+"This version of guestfish, guestmount and virt-rescue has a I<--rw> option "
+"which does nothing (it is already the default).  However it is highly "
+"recommended that you use this option to indicate that you need write access, "
+"and prepare your scripts for the day when this option will be required for "
+"write access."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish.pod:753
+#: ../fish/guestfish.pod:496

 msgid ""
 msgid ""

-"Libguestfs has some support for Linux guests encrypted according to the "
-"Linux Unified Key Setup (LUKS) standard, which includes nearly all whole "
-"disk encryption systems used by modern Linux guests.  Currently only LVM-on-"
-"LUKS is supported."
+"B<Note:> This does I<not> affect commands like L</add> and L</mount>, or any "
+"other libguestfs program apart from guestfish and guestmount."
+msgstr ""
+
+# type: =head1
+#. type: =head1
+#: ../fish/guestfish.pod:499
+msgid "QUOTING"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish.pod:758
-msgid "Identify encrypted block devices and partitions using L</vfs-type>:"
+#: ../fish/guestfish.pod:501
+msgid ""
+"You can quote ordinary parameters using either single or double quotes.  For "
+"example:"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish.pod:760
+#: ../fish/guestfish.pod:504

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" ><fs> vfs-type /dev/sda2\n"
-" crypto_LUKS\n"
+" add \"file with a space.img\"\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../fish/guestfish.pod:763
-msgid ""
-"Then open those devices using L</luks-open>.  This creates a device-mapper "
-"device called C</dev/mapper/luksdev>."
-msgstr ""
-

 # type: verbatim
 #. type: verbatim
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish.pod:766
+#: ../fish/guestfish.pod:506

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" ><fs> luks-open /dev/sda2 luksdev\n"
-" Enter key or passphrase (\"key\"): <enter the passphrase>\n"
+" rm '/file name'\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../fish/guestfish.pod:769
-msgid ""
-"Finally you have to tell LVM to scan for volume groups on the newly created "
-"mapper device:"
-msgstr ""
-

 # type: verbatim
 #. type: verbatim
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish.pod:772
+#: ../fish/guestfish.pod:508

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" vgscan\n"
-" vg-activate-all true\n"
+" rm '/\"'\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish.pod:775
-msgid "The logical volume(s) can now be mounted in the usual way."
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../fish/guestfish.pod:777
+#: ../fish/guestfish.pod:510

 msgid ""
 msgid ""

-"Before closing a LUKS device you must unmount any logical volumes on it and "
-"deactivate the volume groups by calling C<vg-activate false VG> on each "
-"one.  Then you can close the mapper device:"
+"A few commands require a list of strings to be passed.  For these, use a "
+"whitespace-separated list, enclosed in quotes.  Strings containing "
+"whitespace to be passed through must be enclosed in single quotes.  A "
+"literal single quote must be escaped with a backslash."

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish.pod:781
+#: ../fish/guestfish.pod:515

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" vg-activate false /dev/VG\n"
-" luks-close /dev/mapper/luksdev\n"
+" vgcreate VG \"/dev/sda1 /dev/sdb1\"\n"
+" command \"/bin/echo 'foo      bar'\"\n"
+" command \"/bin/echo \\'foo\\'\"\n"

 "\n"
 msgstr ""
 
 # type: =head1
 #. type: =head1
 "\n"
 msgstr ""
 
 # type: =head1
 #. type: =head1

-#: ../fish/guestfish.pod:784
-msgid "WINDOWS PATHS"
+#: ../fish/guestfish.pod:519
+msgid "OPTIONAL ARGUMENTS"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish.pod:786
-msgid ""
-"If a path is prefixed with C<win:> then you can use Windows-style paths "
-"(with some limitations).  The following commands are equivalent:"
-msgstr ""
-
-# type: verbatim
-#. type: verbatim
-#: ../fish/guestfish.pod:789
-#, no-wrap
+#: ../fish/guestfish.pod:521

 msgid ""
 msgid ""

-" file /WINDOWS/system32/config/system.LOG\n"
-"\n"
+"Some commands take optional arguments.  These arguments appear in this "
+"documentation as C<[argname:..]>.  You can use them as in these examples:"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish.pod:791
+#: ../fish/guestfish.pod:525

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" file win:/windows/system32/config/system.log\n"
+" add-drive-opts filename\n"

 "\n"
 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 "\n"
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish.pod:793
+#: ../fish/guestfish.pod:527

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" file win:\\windows\\system32\\config\\system.log\n"
+" add-drive-opts filename readonly:true\n"

 "\n"
 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 "\n"
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish.pod:795
+#: ../fish/guestfish.pod:529

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" file WIN:C:\\Windows\\SYSTEM32\\conFIG\\SYSTEM.LOG\n"
+" add-drive-opts filename format:qcow2 readonly:false\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish.pod:797
+#: ../fish/guestfish.pod:531

 msgid ""
 msgid ""

-"This syntax implicitly calls C<case-sensitive-path> (q.v.) so it also "
-"handles case insensitivity like Windows would.  This only works in argument "
-"positions that expect a path."
+"Each optional argument can appear at most once.  All optional arguments must "
+"appear after the required ones."

 msgstr ""
 
 # type: =head1
 #. type: =head1
 msgstr ""
 
 # type: =head1
 #. type: =head1

-#: ../fish/guestfish.pod:801
-msgid "UPLOADING AND DOWNLOADING FILES"
+#: ../fish/guestfish.pod:534
+msgid "NUMBERS"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish.pod:803
+#: ../fish/guestfish.pod:536

 msgid ""
 msgid ""

-"For commands such as C<upload>, C<download>, C<tar-in>, C<tar-out> and "
-"others which upload from or download to a local file, you can use the "
-"special filename C<-> to mean \"from stdin\" or \"to stdout\".  For example:"
+"This section applies to all commands which can take integers as parameters."

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../fish/guestfish.pod:807
-#, no-wrap
-msgid ""
-" upload - /foo\n"
-"\n"
+# type: =head2
+#. type: =head2
+#: ../fish/guestfish.pod:539
+msgid "SIZE SUFFIX"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish.pod:809
+#: ../fish/guestfish.pod:541

 msgid ""
 msgid ""

-"reads stdin and creates from that a file C</foo> in the disk image, and:"
+"When the command takes a parameter measured in bytes, you can use one of the "
+"following suffixes to specify kilobytes, megabytes and larger sizes:"

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../fish/guestfish.pod:812
-#, no-wrap
-msgid ""
-" tar-out /etc - | tar tf -\n"
-"\n"
+# type: =item
+#. type: =item
+#: ../fish/guestfish.pod:547
+msgid "B<k> or B<K> or B<KiB>"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish.pod:814
-msgid ""
-"writes the tarball to stdout and then pipes that into the external \"tar\" "
-"command (see L</PIPES>)."
+#: ../fish/guestfish.pod:549
+msgid "The size in kilobytes (multiplied by 1024)."
+msgstr ""
+
+# type: =item
+#. type: =item
+#: ../fish/guestfish.pod:551
+msgid "B<KB>"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish.pod:817
-msgid ""
-"When using C<-> to read from stdin, the input is read up to the end of "
-"stdin.  You can also use a special \"heredoc\"-like syntax to read up to "
-"some arbitrary end marker:"
+#: ../fish/guestfish.pod:553
+msgid "The size in SI 1000 byte units."

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../fish/guestfish.pod:821
-#, no-wrap
-msgid ""
-" upload -<<END /foo\n"
-" input line 1\n"
-" input line 2\n"
-" input line 3\n"
-" END\n"
-"\n"
+# type: =item
+#. type: =item
+#: ../fish/guestfish.pod:555
+msgid "B<M> or B<MiB>"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish.pod:827
-msgid ""
-"Any string of characters can be used instead of C<END>.  The end marker must "
-"appear on a line of its own, without any preceeding or following characters "
-"(not even spaces)."
+#: ../fish/guestfish.pod:557
+msgid "The size in megabytes (multiplied by 1048576)."
+msgstr ""
+
+# type: =item
+#. type: =item
+#: ../fish/guestfish.pod:559
+msgid "B<MB>"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish.pod:831
-msgid ""
-"Note that the C<-E<lt>E<lt>> syntax only applies to parameters used to "
-"upload local files (so-called \"FileIn\" parameters in the generator)."
+#: ../fish/guestfish.pod:561
+msgid "The size in SI 1000000 byte units."

 msgstr ""
 
 msgstr ""
 

-# type: =head1
-#. type: =head1
-#: ../fish/guestfish.pod:834
-msgid "EXIT ON ERROR BEHAVIOUR"
+# type: =item
+#. type: =item
+#: ../fish/guestfish.pod:563
+msgid "B<G> or B<GiB>"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish.pod:836
-msgid ""
-"By default, guestfish will ignore any errors when in interactive mode (ie. "
-"taking commands from a human over a tty), and will exit on the first error "
-"in non-interactive mode (scripts, commands given on the command line)."
+#: ../fish/guestfish.pod:565
+msgid "The size in gigabytes (multiplied by 2**30)."
+msgstr ""
+
+# type: =item
+#. type: =item
+#: ../fish/guestfish.pod:567
+msgid "B<GB>"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish.pod:841
-msgid ""
-"If you prefix a command with a I<-> character, then that command will not "
-"cause guestfish to exit, even if that (one) command returns an error."
+#: ../fish/guestfish.pod:569
+msgid "The size in SI 10**9 byte units."

 msgstr ""
 
 msgstr ""
 

-# type: =head1
-#. type: =head1
-#: ../fish/guestfish.pod:845
-msgid "REMOTE CONTROL GUESTFISH OVER A SOCKET"
+# type: =item
+#. type: =item
+#: ../fish/guestfish.pod:571
+msgid "B<T> or B<TiB>"
+msgstr ""
+
+# type: textblock
+#. type: textblock
+#: ../fish/guestfish.pod:573
+msgid "The size in terabytes (multiplied by 2**40)."
+msgstr ""
+
+# type: =item
+#. type: =item
+#: ../fish/guestfish.pod:575
+msgid "B<TB>"
+msgstr ""
+
+# type: textblock
+#. type: textblock
+#: ../fish/guestfish.pod:577
+msgid "The size in SI 10**12 byte units."
+msgstr ""
+
+# type: =item
+#. type: =item
+#: ../fish/guestfish.pod:579
+msgid "B<P> or B<PiB>"
+msgstr ""
+
+# type: textblock
+#. type: textblock
+#: ../fish/guestfish.pod:581
+msgid "The size in petabytes (multiplied by 2**50)."
+msgstr ""
+
+# type: =item
+#. type: =item
+#: ../fish/guestfish.pod:583
+msgid "B<PB>"
+msgstr ""
+
+# type: textblock
+#. type: textblock
+#: ../fish/guestfish.pod:585
+msgid "The size in SI 10**15 byte units."
+msgstr ""
+
+# type: =item
+#. type: =item
+#: ../fish/guestfish.pod:587
+msgid "B<E> or B<EiB>"
+msgstr ""
+
+# type: textblock
+#. type: textblock
+#: ../fish/guestfish.pod:589
+msgid "The size in exabytes (multiplied by 2**60)."
+msgstr ""
+
+# type: =item
+#. type: =item
+#: ../fish/guestfish.pod:591
+msgid "B<EB>"
+msgstr ""
+
+# type: textblock
+#. type: textblock
+#: ../fish/guestfish.pod:593
+msgid "The size in SI 10**18 byte units."
+msgstr ""
+
+# type: =item
+#. type: =item
+#: ../fish/guestfish.pod:595
+msgid "B<Z> or B<ZiB>"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish.pod:847
-msgid ""
-"Guestfish can be remote-controlled over a socket.  This is useful "
-"particularly in shell scripts where you want to make several different "
-"changes to a filesystem, but you don't want the overhead of starting up a "
-"guestfish process each time."
+#: ../fish/guestfish.pod:597
+msgid "The size in zettabytes (multiplied by 2**70)."
+msgstr ""
+
+# type: =item
+#. type: =item
+#: ../fish/guestfish.pod:599
+msgid "B<ZB>"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish.pod:852
-msgid "Start a guestfish server process using:"
+#: ../fish/guestfish.pod:601
+msgid "The size in SI 10**21 byte units."

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../fish/guestfish.pod:854
-#, no-wrap
-msgid ""
-" eval \"`guestfish --listen`\"\n"
-"\n"
+# type: =item
+#. type: =item
+#: ../fish/guestfish.pod:603
+msgid "B<Y> or B<YiB>"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish.pod:856
-msgid "and then send it commands by doing:"
+#: ../fish/guestfish.pod:605
+msgid "The size in yottabytes (multiplied by 2**80)."

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../fish/guestfish.pod:858
-#, no-wrap
-msgid ""
-" guestfish --remote cmd [...]\n"
-"\n"
+# type: =item
+#. type: =item
+#: ../fish/guestfish.pod:607
+msgid "B<YB>"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish.pod:860
-msgid "To cause the server to exit, send it the exit command:"
+#: ../fish/guestfish.pod:609
+msgid "The size in SI 10**24 byte units."

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish.pod:862
+#: ../fish/guestfish.pod:615

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" guestfish --remote exit\n"
+" truncate-size /file 1G\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish.pod:864
+#: ../fish/guestfish.pod:617
+msgid "would truncate the file to 1 gigabyte."
+msgstr ""
+
+# type: textblock
+#. type: textblock
+#: ../fish/guestfish.pod:619

 msgid ""
 msgid ""

-"Note that the server will normally exit if there is an error in a command.  "
-"You can change this in the usual way.  See section L</EXIT ON ERROR "
-"BEHAVIOUR>."
+"Be careful because a few commands take sizes in kilobytes or megabytes (eg. "
+"the parameter to L</memsize> is specified in megabytes already).  Adding a "
+"suffix will probably not do what you expect."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish.pod:868
-msgid "CONTROLLING MULTIPLE GUESTFISH PROCESSES"
+#: ../fish/guestfish.pod:623
+msgid "OCTAL AND HEXADECIMAL NUMBERS"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish.pod:870
+#: ../fish/guestfish.pod:625

 msgid ""
 msgid ""

-"The C<eval> statement sets the environment variable C<$GUESTFISH_PID>, which "
-"is how the I<--remote> option knows where to send the commands.  You can "
-"have several guestfish listener processes running using:"
+"For specifying the radix (base) use the C convention: C<0> to prefix an "
+"octal number or C<0x> to prefix a hexadecimal number.  For example:"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish.pod:874
+#: ../fish/guestfish.pod:628

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" eval \"`guestfish --listen`\"\n"
-" pid1=$GUESTFISH_PID\n"
-" eval \"`guestfish --listen`\"\n"
-" pid2=$GUESTFISH_PID\n"
-" ...\n"
-" guestfish --remote=$pid1 cmd\n"
-" guestfish --remote=$pid2 cmd\n"
+" 1234      decimal number 1234\n"
+" 02322     octal number, equivalent to decimal 1234\n"
+" 0x4d2     hexadecimal number, equivalent to decimal 1234\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: =head2
-#. type: =head2
-#: ../fish/guestfish.pod:882
-msgid "REMOTE CONTROL AND CSH"
-msgstr ""
-

 # type: textblock
 #. type: textblock
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish.pod:884
+#: ../fish/guestfish.pod:632

 msgid ""
 msgid ""

-"When using csh-like shells (csh, tcsh etc) you have to add the I<--csh> "
-"option:"
+"When using the C<chmod> command, you almost always want to specify an octal "
+"number for the mode, and you must prefix it with C<0> (unlike the Unix "
+"L<chmod(1)> program):"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish.pod:887
+#: ../fish/guestfish.pod:636

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" eval \"`guestfish --listen --csh`\"\n"
+" chmod 0777 /public  # OK\n"
+" chmod 777 /public   # WRONG! This is mode 777 decimal = 01411 octal.\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: =head2
-#. type: =head2
-#: ../fish/guestfish.pod:889
-msgid "REMOTE CONTROL DETAILS"
-msgstr ""
-

 # type: textblock
 #. type: textblock
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish.pod:891
+#: ../fish/guestfish.pod:639

 msgid ""
 msgid ""

-"Remote control happens over a Unix domain socket called C</tmp/.guestfish-"
-"$UID/socket-$PID>, where C<$UID> is the effective user ID of the process, "
-"and C<$PID> is the process ID of the server."
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../fish/guestfish.pod:895
-msgid "Guestfish client and server versions must match exactly."
+"Commands that return numbers usually print them in decimal, but some "
+"commands print numbers in other radices (eg. C<umask> prints the mode in "
+"octal, preceeded by C<0>)."

 msgstr ""
 
 # type: =head1
 #. type: =head1
 msgstr ""
 
 # type: =head1
 #. type: =head1

-#: ../fish/guestfish.pod:897
-msgid "PREPARED DISK IMAGES"
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../fish/guestfish.pod:899
-msgid ""
-"Use the I<-N type> or I<--new type> parameter to select one of a set of "
-"preformatted disk images that guestfish can make for you to save typing.  "
-"This is particularly useful for testing purposes.  This option is used "
-"instead of the I<-a> option, and like I<-a> can appear multiple times (and "
-"can be mixed with I<-a>)."
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../fish/guestfish.pod:905
-msgid ""
-"The new disk is called C<test1.img> for the first I<-N>, C<test2.img> for "
-"the second and so on.  Existing files in the current directory are "
-"I<overwritten>."
+#: ../fish/guestfish.pod:643
+msgid "WILDCARDS AND GLOBBING"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish.pod:909
+#: ../fish/guestfish.pod:645

 msgid ""
 msgid ""

-"The type briefly describes how the disk should be sized, partitioned, how "
-"filesystem(s) should be created, and how content should be added.  "
-"Optionally the type can be followed by extra parameters, separated by C<:> "
-"(colon) characters.  For example, I<-N fs> creates a default 100MB, sparsely-"
-"allocated disk, containing a single partition, with the partition formatted "
-"as ext2.  I<-N fs:ext4:1G> is the same, but for an ext4 filesystem on a 1GB "
-"disk instead."
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../fish/guestfish.pod:917
-msgid "To list the available types and any extra parameters they take, run:"
+"Neither guestfish nor the underlying guestfs API performs wildcard expansion "
+"(globbing) by default.  So for example the following will not do what you "
+"expect:"

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../fish/guestfish.pod:921
+# type: verbatim
+#. type: verbatim
+#: ../fish/guestfish.pod:649
+#, no-wrap

 msgid ""
 msgid ""

-"Note that the prepared filesystem is not mounted.  You would usually have to "
-"use the C<mount /dev/sda1 /> command or add the I<-m /dev/sda1> option."
+" rm-rf /home/*\n"
+"\n"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish.pod:925
+#: ../fish/guestfish.pod:651

 msgid ""
 msgid ""

-"If any I<-N> or I<--new> options are given, the guest is automatically "
-"launched."
+"Assuming you don't have a directory called literally C</home/*> then the "
+"above command will return an error."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish.pod:930
-msgid "Create a 100MB disk with an ext4-formatted partition:"
+#: ../fish/guestfish.pod:654
+msgid "To perform wildcard expansion, use the C<glob> command."

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish.pod:932
+#: ../fish/guestfish.pod:656

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" guestfish -N fs:ext4\n"
+" glob rm-rf /home/*\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish.pod:934
-msgid "Create a 32MB disk with a VFAT-formatted partition, and mount it:"
+#: ../fish/guestfish.pod:658
+msgid ""
+"runs C<rm-rf> on each path that matches (ie. potentially running the command "
+"many times), equivalent to:"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish.pod:936
+#: ../fish/guestfish.pod:661

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" guestfish -N fs:vfat:32M -m /dev/sda1\n"
+" rm-rf /home/jim\n"
+" rm-rf /home/joe\n"
+" rm-rf /home/mary\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish.pod:938
-msgid "Create a blank 200MB disk:"
+#: ../fish/guestfish.pod:665
+msgid "C<glob> only works on simple guest paths and not on device names."

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../fish/guestfish.pod:940
-#, no-wrap
+# type: textblock
+#. type: textblock
+#: ../fish/guestfish.pod:667

 msgid ""
 msgid ""

-" guestfish -N disk:200M\n"
-"\n"
+"If you have several parameters, each containing a wildcard, then glob will "
+"perform a Cartesian product."

 msgstr ""
 
 # type: =head1
 #. type: =head1
 msgstr ""
 
 # type: =head1
 #. type: =head1

-#: ../fish/guestfish.pod:942
-msgid "PROGRESS BARS"
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../fish/guestfish.pod:944
-msgid ""
-"Some (not all) long-running commands send progress notification messages as "
-"they are running.  Guestfish turns these messages into progress bars."
+#: ../fish/guestfish.pod:670
+msgid "COMMENTS"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish.pod:948
+#: ../fish/guestfish.pod:672

 msgid ""
 msgid ""

-"When a command that supports progress bars takes longer than two seconds to "
-"run, and if progress bars are enabled, then you will see one appearing below "
-"the command:"
+"Any line which starts with a I<#> character is treated as a comment and "
+"ignored.  The I<#> can optionally be preceeded by whitespace, but B<not> by "
+"a command.  For example:"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish.pod:952
+#: ../fish/guestfish.pod:676

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" ><fs> copy-size /large-file /another-file 2048M\n"
-" / 10% [#####-----------------------------------------] 00:30\n"
+" # this is a comment\n"
+"         # this is a comment\n"
+" foo # NOT a comment\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish.pod:955
-msgid ""
-"The spinner on the left hand side moves round once for every progress "
-"notification received from the backend.  This is a (reasonably) golden "
-"assurance that the command is \"doing something\" even if the progress bar "
-"is not moving, because the command is able to send the progress "
-"notifications.  When the bar reaches 100% and the command finishes, the "
-"spinner disappears."
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../fish/guestfish.pod:962
-msgid ""
-"Progress bars are enabled by default when guestfish is used interactively.  "
-"You can enable them even for non-interactive modes using I<--progress-bars>, "
-"and you can disable them completely using I<--no-progress-bars>."
+#: ../fish/guestfish.pod:680
+msgid "Blank lines are also ignored."

 msgstr ""
 
 # type: =head1
 #. type: =head1
 msgstr ""
 
 # type: =head1
 #. type: =head1

-#: ../fish/guestfish.pod:967
-msgid "GUESTFISH COMMANDS"
+#: ../fish/guestfish.pod:682
+msgid "RUNNING COMMANDS LOCALLY"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish.pod:969
+#: ../fish/guestfish.pod:684

 msgid ""
 msgid ""

-"The commands in this section are guestfish convenience commands, in other "
-"words, they are not part of the L<guestfs(3)> API."
-msgstr ""
-
-# type: =head2
-#. type: =head2
-#: ../fish/guestfish.pod:972
-msgid "help"
+"Any line which starts with a I<!> character is treated as a command sent to "
+"the local shell (C</bin/sh> or whatever L<system(3)> uses).  For example:"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish.pod:974
+#: ../fish/guestfish.pod:688

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" help\n"
-" help cmd\n"
+" !mkdir local\n"
+" tgz-out /remote local/remote-data.tar.gz\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish.pod:977
-msgid "Without any parameter, this provides general help."
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../fish/guestfish.pod:979
-msgid "With a C<cmd> parameter, this displays detailed help for that command."
-msgstr ""
-
-# type: =head2
-#. type: =head2
-#: ../fish/guestfish.pod:981
-msgid "quit | exit"
+#: ../fish/guestfish.pod:691
+msgid ""
+"will create a directory C<local> on the host, and then export the contents "
+"of C</remote> on the mounted filesystem to C<local/remote-data.tar.gz>.  "
+"(See C<tgz-out>)."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish.pod:983
-msgid "This exits guestfish.  You can also use C<^D> key."
+#: ../fish/guestfish.pod:695
+msgid ""
+"To change the local directory, use the C<lcd> command.  C<!cd> will have no "
+"effect, due to the way that subprocesses work in Unix."

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../fish/guestfish.pod:985
-msgid "@FISH_COMMANDS@"
+#. type: =head2
+#: ../fish/guestfish.pod:698
+msgid "LOCAL COMMANDS WITH INLINE EXECUTION"

 msgstr ""
 
 msgstr ""
 

-# type: =head1
-#. type: =head1
-#: ../fish/guestfish.pod:987
-msgid "COMMANDS"
+#. type: textblock
+#: ../fish/guestfish.pod:700
+msgid ""
+"If a line starts with I<E<lt>!> then the shell command is executed (as for "
+"I<!>), but subsequently any output (stdout) of the shell command is parsed "
+"and executed as guestfish commands."

 msgstr ""
 
 msgstr ""
 

-# type: =head1
-#. type: =head1
-#: ../fish/guestfish.pod:991 ../test-tool/libguestfs-test-tool.pod:83
-msgid "EXIT CODE"
+#. type: textblock
+#: ../fish/guestfish.pod:704
+msgid ""
+"Thus you can use shell script to construct arbitrary guestfish commands "
+"which are then parsed by guestfish."

 msgstr ""
 
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../fish/guestfish.pod:993
+#: ../fish/guestfish.pod:707

 msgid ""
 msgid ""

-"guestfish returns 0 if the commands completed without error, or 1 if there "
-"was an error."
+"For example it is tedious to create a sequence of files (eg. C</foo.1> "
+"through C</foo.100>) using guestfish commands alone.  However this is simple "
+"if we use a shell script to create the guestfish commands for us:"

 msgstr ""
 
 msgstr ""
 

-# type: =item
-#. type: =item
-#: ../fish/guestfish.pod:1000
-msgid "EDITOR"
+#. type: verbatim
+#: ../fish/guestfish.pod:712
+#, no-wrap
+msgid ""
+" <! for n in `seq 1 100`; do echo write /foo.$n $n; done\n"
+"\n"

 msgstr ""
 
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../fish/guestfish.pod:1002
-msgid ""
-"The C<edit> command uses C<$EDITOR> as the editor.  If not set, it uses "
-"C<vi>."
+#: ../fish/guestfish.pod:714
+msgid "or with names like C</foo.001>:"

 msgstr ""
 
 msgstr ""
 

-# type: =item
-#. type: =item
-#: ../fish/guestfish.pod:1005
-msgid "GUESTFISH_PID"
+#. type: verbatim
+#: ../fish/guestfish.pod:716
+#, no-wrap
+msgid ""
+" <! for n in `seq 1 100`; do printf \"write /foo.%03d %d\\n\" $n $n; done\n"
+"\n"

 msgstr ""
 
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../fish/guestfish.pod:1007
+#: ../fish/guestfish.pod:718

 msgid ""
 msgid ""

-"Used with the I<--remote> option to specify the remote guestfish process to "
-"control.  See section L</REMOTE CONTROL GUESTFISH OVER A SOCKET>."
+"When using guestfish interactively it can be helpful to just run the shell "
+"script first (ie. remove the initial C<E<lt>> character so it is just an "
+"ordinary I<!> local command), see what guestfish commands it would run, and "
+"when you are happy with those prepend the C<E<lt>> character to run the "
+"guestfish commands for real."

 msgstr ""
 
 msgstr ""
 

-# type: =item
-#. type: =item
-#: ../fish/guestfish.pod:1011
-msgid "HEXEDITOR"
+# type: =head1
+#. type: =head1
+#: ../fish/guestfish.pod:724
+msgid "PIPES"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish.pod:1013
+#: ../fish/guestfish.pod:726

 msgid ""
 msgid ""

-"The L</hexedit> command uses C<$HEXEDITOR> as the external hex editor.  If "
-"not specified, the external L<hexedit(1)> program is used."
+"Use C<command E<lt>spaceE<gt> | command> to pipe the output of the first "
+"command (a guestfish command) to the second command (any host command).  For "
+"example:"

 msgstr ""
 
 msgstr ""
 

-# type: =item
-#. type: =item
-#: ../fish/guestfish.pod:1017
-msgid "HOME"
+# type: verbatim
+#. type: verbatim
+#: ../fish/guestfish.pod:730
+#, no-wrap
+msgid ""
+" cat /etc/passwd | awk -F: '$3 == 0 { print }'\n"
+"\n"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish.pod:1019
+#: ../fish/guestfish.pod:732

 msgid ""
 msgid ""

-"If compiled with GNU readline support, various files in the home directory "
-"can be used.  See L</FILES>."
+"(where C<cat> is the guestfish cat command, but C<awk> is the host awk "
+"program).  The above command would list all accounts in the guest filesystem "
+"which have UID 0, ie. root accounts including backdoors.  Other examples:"

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../fish/guestfish.pod:1028
+# type: verbatim
+#. type: verbatim
+#: ../fish/guestfish.pod:737
+#, no-wrap

 msgid ""
 msgid ""

-"Set C<LIBGUESTFS_DEBUG=1> to enable verbose messages.  This has the same "
-"effect as using the B<-v> option."
+" hexdump /bin/ls | head\n"
+" list-devices | tail -1\n"
+" tgz-out / - | tar ztf -\n"
+"\n"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish.pod:1040
+#: ../fish/guestfish.pod:741

 msgid ""
 msgid ""

-"Set the path that guestfish uses to search for kernel and initrd.img.  See "
-"the discussion of paths in L<guestfs(3)>."
+"The space before the pipe symbol is required, any space after the pipe "
+"symbol is optional.  Everything after the pipe symbol is just passed "
+"straight to the host shell, so it can contain redirections, globs and "
+"anything else that makes sense on the host side."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish.pod:1051
-msgid "Set C<LIBGUESTFS_TRACE=1> to enable command traces."
-msgstr ""
-
-# type: =item
-#. type: =item
-#: ../fish/guestfish.pod:1053
-msgid "PAGER"
+#: ../fish/guestfish.pod:746
+msgid ""
+"To use a literal argument which begins with a pipe symbol, you have to quote "
+"it, eg:"

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../fish/guestfish.pod:1055
+# type: verbatim
+#. type: verbatim
+#: ../fish/guestfish.pod:749
+#, no-wrap

 msgid ""
 msgid ""

-"The C<more> command uses C<$PAGER> as the pager.  If not set, it uses "
-"C<more>."
+" echo \"|\"\n"
+"\n"

 msgstr ""
 
 # type: =head1
 #. type: =head1
 msgstr ""
 
 # type: =head1
 #. type: =head1

-#: ../fish/guestfish.pod:1071 ../test-tool/libguestfs-test-tool.pod:88
-msgid "FILES"
-msgstr ""
-
-# type: =item
-#. type: =item
-#: ../fish/guestfish.pod:1075
-msgid "$HOME/.guestfish"
+#: ../fish/guestfish.pod:751
+msgid "HOME DIRECTORIES"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish.pod:1077
+#: ../fish/guestfish.pod:753

 msgid ""
 msgid ""

-"If compiled with GNU readline support, then the command history is saved in "
-"this file."
-msgstr ""
-
-# type: =item
-#. type: =item
-#: ../fish/guestfish.pod:1080
-msgid "$HOME/.inputrc"
-msgstr ""
-
-# type: =item
-#. type: =item
-#: ../fish/guestfish.pod:1082
-msgid "/etc/inputrc"
+"If a parameter starts with the character C<~> then the tilde may be expanded "
+"as a home directory path (either C<~> for the current user's home directory, "
+"or C<~user> for another user)."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish.pod:1084
+#: ../fish/guestfish.pod:757

 msgid ""
 msgid ""

-"If compiled with GNU readline support, then these files can be used to "
-"configure readline.  For further information, please see L<readline(3)/"
-"INITIALIZATION FILE>."
+"Note that home directory expansion happens for users known I<on the host>, "
+"not in the guest filesystem."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish.pod:1088
-msgid "To write rules which only apply to guestfish, use:"
+#: ../fish/guestfish.pod:760
+msgid ""
+"To use a literal argument which begins with a tilde, you have to quote it, "
+"eg:"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish.pod:1090
+#: ../fish/guestfish.pod:763

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" $if guestfish\n"
-" ...\n"
-" $endif\n"
+" echo \"~\"\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish.pod:1094
+#: ../fish/guestfish.pod:767

 msgid ""
 msgid ""

-"Variables that you can set in inputrc that change the behaviour of guestfish "
-"in useful ways include:"
-msgstr ""
-
-# type: =item
-#. type: =item
-#: ../fish/guestfish.pod:1099
-msgid "completion-ignore-case (default: on)"
+"Libguestfs has some support for Linux guests encrypted according to the "
+"Linux Unified Key Setup (LUKS) standard, which includes nearly all whole "
+"disk encryption systems used by modern Linux guests.  Currently only LVM-on-"
+"LUKS is supported."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish.pod:1101
-msgid ""
-"By default, guestfish will ignore case when tab-completing paths on the "
-"disk.  Use:"
+#: ../fish/guestfish.pod:772
+msgid "Identify encrypted block devices and partitions using L</vfs-type>:"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish.pod:1104
+#: ../fish/guestfish.pod:774

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" set completion-ignore-case off\n"
+" ><fs> vfs-type /dev/sda2\n"
+" crypto_LUKS\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish.pod:1106
-msgid "to make guestfish case sensitive."
-msgstr ""
-
-# type: =item
-#. type: =item
-#: ../fish/guestfish.pod:1110
-msgid "test1.img"
+#: ../fish/guestfish.pod:777
+msgid ""
+"Then open those devices using L</luks-open>.  This creates a device-mapper "
+"device called C</dev/mapper/luksdev>."

 msgstr ""
 
 msgstr ""
 

-# type: =item
-#. type: =item
-#: ../fish/guestfish.pod:1112
-msgid "test2.img (etc)"
+# type: verbatim
+#. type: verbatim
+#: ../fish/guestfish.pod:780
+#, no-wrap
+msgid ""
+" ><fs> luks-open /dev/sda2 luksdev\n"
+" Enter key or passphrase (\"key\"): <enter the passphrase>\n"
+"\n"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish.pod:1114
+#: ../fish/guestfish.pod:783

 msgid ""
 msgid ""

-"When using the C<-N> or C<--new> option, the prepared disk or filesystem "
-"will be created in the file C<test1.img> in the current directory.  The "
-"second use of C<-N> will use C<test2.img> and so on.  Any existing file with "
-"the same name will be overwritten."
+"Finally you have to tell LVM to scan for volume groups on the newly created "
+"mapper device:"

 msgstr ""
 
 msgstr ""
 

-#. type: textblock
-#: ../fish/guestfish.pod:1123
+# type: verbatim
+#. type: verbatim
+#: ../fish/guestfish.pod:786
+#, no-wrap

 msgid ""
 msgid ""

-"L<guestfs(3)>, L<http://libguestfs.org/>, L<virt-cat(1)>, L<virt-copy-in(1)"
-">, L<virt-copy-out(1)>, L<virt-df(1)>, L<virt-edit(1)>, L<virt-filesystems(1)"
-">, L<virt-inspector(1)>, L<virt-list-filesystems(1)>, L<virt-list-partitions"
-"(1)>, L<virt-ls(1)>, L<virt-make-fs(1)>, L<virt-rescue(1)>, L<virt-resize(1)"
-">, L<virt-tar(1)>, L<virt-tar-in(1)>, L<virt-tar-out(1)>, L<virt-win-reg(1)"
-">, L<hexedit(1)>."
+" vgscan\n"
+" vg-activate-all true\n"
+"\n"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish.pod:1153 ../test-tool/libguestfs-test-tool.pod:124
-#: ../fuse/guestmount.pod:258 ../tools/virt-edit.pl:372
-#: ../tools/virt-win-reg.pl:606 ../tools/virt-resize.pl:1512
-#: ../tools/virt-list-filesystems.pl:210 ../tools/virt-tar.pl:309
-#: ../tools/virt-make-fs.pl:572 ../tools/virt-list-partitions.pl:277
-msgid ""
-"This program is free software; you can redistribute it and/or modify it "
-"under the terms of the GNU General Public License as published by the Free "
-"Software Foundation; either version 2 of the License, or (at your option) "
-"any later version."
+#: ../fish/guestfish.pod:789
+msgid "The logical volume(s) can now be mounted in the usual way."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish.pod:1158 ../test-tool/libguestfs-test-tool.pod:129
-#: ../fuse/guestmount.pod:263 ../tools/virt-edit.pl:377
-#: ../tools/virt-win-reg.pl:611 ../tools/virt-resize.pl:1517
-#: ../tools/virt-list-filesystems.pl:215 ../tools/virt-tar.pl:314
-#: ../tools/virt-make-fs.pl:577 ../tools/virt-list-partitions.pl:282
+#: ../fish/guestfish.pod:791

 msgid ""
 msgid ""

-"This program is distributed in the hope that it will be useful, but WITHOUT "
-"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
-"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
-"more details."
+"Before closing a LUKS device you must unmount any logical volumes on it and "
+"deactivate the volume groups by calling C<vg-activate false VG> on each "
+"one.  Then you can close the mapper device:"
+msgstr ""
+
+# type: verbatim
+#. type: verbatim
+#: ../fish/guestfish.pod:795
+#, no-wrap
+msgid ""
+" vg-activate false /dev/VG\n"
+" luks-close /dev/mapper/luksdev\n"
+"\n"
+msgstr ""
+
+# type: =head1
+#. type: =head1
+#: ../fish/guestfish.pod:798 ../tools/virt-edit.pl:342
+msgid "WINDOWS PATHS"

 msgstr ""
 
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../fish/guestfish.pod:1163 ../test-tool/libguestfs-test-tool.pod:134
-#: ../fuse/guestmount.pod:268 ../tools/virt-edit.pl:382
-#: ../tools/virt-win-reg.pl:616 ../tools/virt-resize.pl:1522
-#: ../tools/virt-list-filesystems.pl:220 ../tools/virt-tar.pl:319
-#: ../tools/virt-make-fs.pl:582 ../tools/virt-list-partitions.pl:287
+#: ../fish/guestfish.pod:800

 msgid ""
 msgid ""

-"You should have received a copy of the GNU General Public License along with "
-"this program; if not, write to the Free Software Foundation, Inc., 675 Mass "
-"Ave, Cambridge, MA 02139, USA."
+"If a path is prefixed with C<win:> then you can use Windows-style drive "
+"letters and paths (with some limitations).  The following commands are "
+"equivalent:"

 msgstr ""
 
 msgstr ""
 

-# type: =head2
-#. type: =head2
-#: ../fish/guestfish-actions.pod:1
-msgid "add-cdrom"
+# type: verbatim
+#. type: verbatim
+#: ../fish/guestfish.pod:804
+#, no-wrap
+msgid ""
+" file /WINDOWS/system32/config/system.LOG\n"
+"\n"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:3
+#: ../fish/guestfish.pod:806

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" add-cdrom filename\n"
+" file win:\\windows\\system32\\config\\system.log\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../fish/guestfish-actions.pod:15
+#. type: verbatim
+#: ../fish/guestfish.pod:808
+#, no-wrap

 msgid ""
 msgid ""

-"This call checks for the existence of C<filename>.  This stops you from "
-"specifying other types of drive which are supported by qemu such as C<nbd:> "
-"and C<http:> URLs.  To specify those, use the general L</config> call "
-"instead."
+" file WIN:C:\\Windows\\SYSTEM32\\CONFIG\\SYSTEM.LOG\n"
+"\n"

 msgstr ""
 
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../fish/guestfish-actions.pod:22
+#: ../fish/guestfish.pod:810

 msgid ""
 msgid ""

-"If you just want to add an ISO file (often you use this as an efficient way "
-"to transfer large files into the guest), then you should probably use L</add-"
-"drive-ro> instead."
-msgstr ""
-
-# type: =head2
-#. type: =head2
-#: ../fish/guestfish-actions.pod:35
-msgid "add-domain"
-msgstr ""
-
-# type: =head2
-#. type: =head2
-#: ../fish/guestfish-actions.pod:37
-msgid "domain"
+"The parameter is rewritten \"behind the scenes\" by looking up the position "
+"where the drive is mounted, prepending that to the path, changing all "
+"backslash characters to forward slash, then resolving the result using L</"
+"case-sensitive-path>.  For example if the E: drive was mounted on C</e> then "
+"the parameter might be rewritten like this:"

 msgstr ""
 
 #. type: verbatim
 msgstr ""
 
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:39
+#: ../fish/guestfish.pod:816

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" add-domain dom [libvirturi:..] [readonly:..] [iface:..] [live:..]\n"
+" win:e:\\foo\\bar => /e/FOO/bar\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../fish/guestfish-actions.pod:41
-msgid ""
-"This function adds the disk(s) attached to the named libvirt domain C<dom>.  "
-"It works by connecting to libvirt, requesting the domain and domain XML from "
-"libvirt, parsing it for disks, and calling L</add-drive-opts> on each one."
+#: ../fish/guestfish.pod:818
+msgid "This only works in argument positions that expect a path."

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../fish/guestfish-actions.pod:71
-msgid ""
-"The other optional parameters are passed directly through to L</add-drive-"
-"opts>."
+# type: =head1
+#. type: =head1
+#: ../fish/guestfish.pod:820
+msgid "UPLOADING AND DOWNLOADING FILES"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish-actions.pod:74 ../fish/guestfish-actions.pod:138
-#: ../fish/guestfish-actions.pod:2947
+#: ../fish/guestfish.pod:822

 msgid ""
 msgid ""

-"This command has one or more optional arguments.  See L</OPTIONAL ARGUMENTS>."
-msgstr ""
-
-# type: =head2
-#. type: =head2
-#: ../fish/guestfish-actions.pod:76
-msgid "add-drive"
+"For commands such as C<upload>, C<download>, C<tar-in>, C<tar-out> and "
+"others which upload from or download to a local file, you can use the "
+"special filename C<-> to mean \"from stdin\" or \"to stdout\".  For example:"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:78
+#: ../fish/guestfish.pod:826

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" add-drive filename\n"
+" upload - /foo\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish-actions.pod:80
-msgid ""
-"This function is the equivalent of calling L</add-drive-opts> with no "
-"optional parameters, so the disk is added writable, with the format being "
-"detected automatically."
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../fish/guestfish-actions.pod:84
+#: ../fish/guestfish.pod:828

 msgid ""
 msgid ""

-"Automatic detection of the format opens you up to a potential security hole "
-"when dealing with untrusted raw-format images.  See CVE-2010-3851 and "
-"RHBZ#642934.  Specifying the format closes this security hole.  Therefore "
-"you should think about replacing calls to this function with calls to L</add-"
-"drive-opts>, and specifying the format."
-msgstr ""
-
-# type: =head2
-#. type: =head2
-#: ../fish/guestfish-actions.pod:91
-msgid "add-drive-opts"
-msgstr ""
-
-# type: =head2
-#. type: =head2
-#: ../fish/guestfish-actions.pod:93
-msgid "add"
+"reads stdin and creates from that a file C</foo> in the disk image, and:"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:95
+#: ../fish/guestfish.pod:831

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" add-drive-opts filename [readonly:..] [format:..] [iface:..]\n"
+" tar-out /etc - | tar tf -\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish-actions.pod:122
+#: ../fish/guestfish.pod:833

 msgid ""
 msgid ""

-"This forces the image format.  If you omit this (or use L</add-drive> or L</"
-"add-drive-ro>) then the format is automatically detected.  Possible formats "
-"include C<raw> and C<qcow2>."
+"writes the tarball to stdout and then pipes that into the external \"tar\" "
+"command (see L</PIPES>)."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish-actions.pod:133
+#: ../fish/guestfish.pod:836

 msgid ""
 msgid ""

-"This rarely-used option lets you emulate the behaviour of the deprecated L</"
-"add-drive-with-if> call (q.v.)"
-msgstr ""
-
-# type: =head2
-#. type: =head2
-#: ../fish/guestfish-actions.pod:140
-msgid "add-drive-ro"
-msgstr ""
-
-# type: =head2
-#. type: =head2
-#: ../fish/guestfish-actions.pod:142
-msgid "add-ro"
+"When using C<-> to read from stdin, the input is read up to the end of "
+"stdin.  You can also use a special \"heredoc\"-like syntax to read up to "
+"some arbitrary end marker:"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:144
+#: ../fish/guestfish.pod:840

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" add-drive-ro filename\n"
+" upload -<<END /foo\n"
+" input line 1\n"
+" input line 2\n"
+" input line 3\n"
+" END\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish-actions.pod:146
+#: ../fish/guestfish.pod:846

 msgid ""
 msgid ""

-"This function is the equivalent of calling L</add-drive-opts> with the "
-"optional parameter C<GUESTFS_ADD_DRIVE_OPTS_READONLY> set to 1, so the disk "
-"is added read-only, with the format being detected automatically."
+"Any string of characters can be used instead of C<END>.  The end marker must "
+"appear on a line of its own, without any preceeding or following characters "
+"(not even spaces)."

 msgstr ""
 
 msgstr ""
 

-# type: =head2
-#. type: =head2
-#: ../fish/guestfish-actions.pod:151
-msgid "add-drive-ro-with-if"
+# type: textblock
+#. type: textblock
+#: ../fish/guestfish.pod:850
+msgid ""
+"Note that the C<-E<lt>E<lt>> syntax only applies to parameters used to "
+"upload local files (so-called \"FileIn\" parameters in the generator)."

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../fish/guestfish-actions.pod:153
-#, no-wrap
-msgid ""
-" add-drive-ro-with-if filename iface\n"
-"\n"
+# type: =head1
+#. type: =head1
+#: ../fish/guestfish.pod:853
+msgid "EXIT ON ERROR BEHAVIOUR"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish-actions.pod:155
+#: ../fish/guestfish.pod:855

 msgid ""
 msgid ""

-"This is the same as L</add-drive-ro> but it allows you to specify the QEMU "
-"interface emulation to use at run time."
+"By default, guestfish will ignore any errors when in interactive mode (ie. "
+"taking commands from a human over a tty), and will exit on the first error "
+"in non-interactive mode (scripts, commands given on the command line)."

 msgstr ""
 
 msgstr ""
 

-# type: =head2
-#. type: =head2
-#: ../fish/guestfish-actions.pod:165
-msgid "add-drive-with-if"
+# type: textblock
+#. type: textblock
+#: ../fish/guestfish.pod:860
+msgid ""
+"If you prefix a command with a I<-> character, then that command will not "
+"cause guestfish to exit, even if that (one) command returns an error."

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../fish/guestfish-actions.pod:167
-#, no-wrap
-msgid ""
-" add-drive-with-if filename iface\n"
-"\n"
+# type: =head1
+#. type: =head1
+#: ../fish/guestfish.pod:864
+msgid "REMOTE CONTROL GUESTFISH OVER A SOCKET"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish-actions.pod:169
+#: ../fish/guestfish.pod:866

 msgid ""
 msgid ""

-"This is the same as L</add-drive> but it allows you to specify the QEMU "
-"interface emulation to use at run time."
+"Guestfish can be remote-controlled over a socket.  This is useful "
+"particularly in shell scripts where you want to make several different "
+"changes to a filesystem, but you don't want the overhead of starting up a "
+"guestfish process each time."

 msgstr ""
 
 msgstr ""
 

-# type: =head2
-#. type: =head2
-#: ../fish/guestfish-actions.pod:179
-msgid "aug-clear"
+# type: textblock
+#. type: textblock
+#: ../fish/guestfish.pod:871
+msgid "Start a guestfish server process using:"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:181
+#: ../fish/guestfish.pod:873

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" aug-clear augpath\n"
+" eval \"`guestfish --listen`\"\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: =head2
-#. type: =head2
-#: ../fish/guestfish-actions.pod:186
-msgid "aug-close"
+# type: textblock
+#. type: textblock
+#: ../fish/guestfish.pod:875
+msgid "and then send it commands by doing:"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:188
+#: ../fish/guestfish.pod:877

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" aug-close\n"
+" guestfish --remote cmd [...]\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish-actions.pod:190
-msgid ""
-"Close the current Augeas handle and free up any resources used by it.  After "
-"calling this, you have to call L</aug-init> again before you can use any "
-"other Augeas functions."
-msgstr ""
-
-# type: =head2
-#. type: =head2
-#: ../fish/guestfish-actions.pod:195
-msgid "aug-defnode"
+#: ../fish/guestfish.pod:879
+msgid "To cause the server to exit, send it the exit command:"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:197
+#: ../fish/guestfish.pod:881

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" aug-defnode name expr val\n"
+" guestfish --remote exit\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish-actions.pod:202
+#: ../fish/guestfish.pod:883

 msgid ""
 msgid ""

-"If C<expr> evaluates to an empty nodeset, a node is created, equivalent to "
-"calling L</aug-set> C<expr>, C<value>.  C<name> will be the nodeset "
-"containing that single node."
+"Note that the server will normally exit if there is an error in a command.  "
+"You can change this in the usual way.  See section L</EXIT ON ERROR "
+"BEHAVIOUR>."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:210
-msgid "aug-defvar"
+#: ../fish/guestfish.pod:887
+msgid "CONTROLLING MULTIPLE GUESTFISH PROCESSES"
+msgstr ""
+
+# type: textblock
+#. type: textblock
+#: ../fish/guestfish.pod:889
+msgid ""
+"The C<eval> statement sets the environment variable C<$GUESTFISH_PID>, which "
+"is how the I<--remote> option knows where to send the commands.  You can "
+"have several guestfish listener processes running using:"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:212
+#: ../fish/guestfish.pod:893

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" aug-defvar name expr\n"
+" eval \"`guestfish --listen`\"\n"
+" pid1=$GUESTFISH_PID\n"
+" eval \"`guestfish --listen`\"\n"
+" pid2=$GUESTFISH_PID\n"
+" ...\n"
+" guestfish --remote=$pid1 cmd\n"
+" guestfish --remote=$pid2 cmd\n"

 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2
 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:221
-msgid "aug-get"
+#: ../fish/guestfish.pod:901
+msgid "REMOTE CONTROL AND CSH"
+msgstr ""
+
+# type: textblock
+#. type: textblock
+#: ../fish/guestfish.pod:903
+msgid ""
+"When using csh-like shells (csh, tcsh etc) you have to add the I<--csh> "
+"option:"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:223
+#: ../fish/guestfish.pod:906

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" aug-get augpath\n"
+" eval \"`guestfish --listen --csh`\"\n"

 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2
 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:228
-msgid "aug-init"
+#: ../fish/guestfish.pod:908
+msgid "REMOTE CONTROL DETAILS"

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../fish/guestfish-actions.pod:230
-#, no-wrap
+# type: textblock
+#. type: textblock
+#: ../fish/guestfish.pod:910

 msgid ""
 msgid ""

-" aug-init root flags\n"
-"\n"
+"Remote control happens over a Unix domain socket called C</tmp/.guestfish-"
+"$UID/socket-$PID>, where C<$UID> is the effective user ID of the process, "
+"and C<$PID> is the process ID of the server."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish-actions.pod:236
-msgid "You must call this before using any other L</aug-*> commands."
+#: ../fish/guestfish.pod:914
+msgid "Guestfish client and server versions must match exactly."
+msgstr ""
+
+# type: =head1
+#. type: =head1
+#: ../fish/guestfish.pod:916
+msgid "PREPARED DISK IMAGES"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish-actions.pod:271
-msgid "Do not load the tree in L</aug-init>."
+#: ../fish/guestfish.pod:918
+msgid ""
+"Use the I<-N type> or I<--new type> parameter to select one of a set of "
+"preformatted disk images that guestfish can make for you to save typing.  "
+"This is particularly useful for testing purposes.  This option is used "
+"instead of the I<-a> option, and like I<-a> can appear multiple times (and "
+"can be mixed with I<-a>)."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish-actions.pod:275
-msgid "To close the handle, you can call L</aug-close>."
+#: ../fish/guestfish.pod:924
+msgid ""
+"The new disk is called C<test1.img> for the first I<-N>, C<test2.img> for "
+"the second and so on.  Existing files in the current directory are "
+"I<overwritten>."

 msgstr ""
 
 msgstr ""
 

-# type: =head2
-#. type: =head2
-#: ../fish/guestfish-actions.pod:279
-msgid "aug-insert"
+# type: textblock
+#. type: textblock
+#: ../fish/guestfish.pod:928
+msgid ""
+"The type briefly describes how the disk should be sized, partitioned, how "
+"filesystem(s) should be created, and how content should be added.  "
+"Optionally the type can be followed by extra parameters, separated by C<:> "
+"(colon) characters.  For example, I<-N fs> creates a default 100MB, sparsely-"
+"allocated disk, containing a single partition, with the partition formatted "
+"as ext2.  I<-N fs:ext4:1G> is the same, but for an ext4 filesystem on a 1GB "
+"disk instead."
+msgstr ""
+
+# type: textblock
+#. type: textblock
+#: ../fish/guestfish.pod:936
+msgid "To list the available types and any extra parameters they take, run:"
+msgstr ""
+
+# type: textblock
+#. type: textblock
+#: ../fish/guestfish.pod:940
+msgid ""
+"Note that the prepared filesystem is not mounted.  You would usually have to "
+"use the C<mount /dev/sda1 /> command or add the I<-m /dev/sda1> option."
+msgstr ""
+
+# type: textblock
+#. type: textblock
+#: ../fish/guestfish.pod:944
+msgid ""
+"If any I<-N> or I<--new> options are given, the guest is automatically "
+"launched."
+msgstr ""
+
+# type: textblock
+#. type: textblock
+#: ../fish/guestfish.pod:949
+msgid "Create a 100MB disk with an ext4-formatted partition:"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:281
+#: ../fish/guestfish.pod:951

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" aug-insert augpath label true|false\n"
+" guestfish -N fs:ext4\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: =head2
-#. type: =head2
-#: ../fish/guestfish-actions.pod:291
-msgid "aug-load"
+# type: textblock
+#. type: textblock
+#: ../fish/guestfish.pod:953
+msgid "Create a 32MB disk with a VFAT-formatted partition, and mount it:"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:293
+#: ../fish/guestfish.pod:955

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" aug-load\n"
+" guestfish -N fs:vfat:32M -m /dev/sda1\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: =head2
-#. type: =head2
-#: ../fish/guestfish-actions.pod:300
-msgid "aug-ls"
+# type: textblock
+#. type: textblock
+#: ../fish/guestfish.pod:957
+msgid "Create a blank 200MB disk:"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:302
+#: ../fish/guestfish.pod:959

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" aug-ls augpath\n"
+" guestfish -N disk:200M\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

+# type: =head1
+#. type: =head1
+#: ../fish/guestfish.pod:961
+msgid "PROGRESS BARS"
+msgstr ""
+

 # type: textblock
 #. type: textblock
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish-actions.pod:304
+#: ../fish/guestfish.pod:963

 msgid ""
 msgid ""

-"This is just a shortcut for listing L</aug-match> C<path/*> and sorting the "
-"resulting nodes into alphabetical order."
+"Some (not all) long-running commands send progress notification messages as "
+"they are running.  Guestfish turns these messages into progress bars."

 msgstr ""
 
 msgstr ""
 

-# type: =head2
-#. type: =head2
-#: ../fish/guestfish-actions.pod:307
-msgid "aug-match"
+# type: textblock
+#. type: textblock
+#: ../fish/guestfish.pod:967
+msgid ""
+"When a command that supports progress bars takes longer than two seconds to "
+"run, and if progress bars are enabled, then you will see one appearing below "
+"the command:"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:309
+#: ../fish/guestfish.pod:971

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" aug-match augpath\n"
+" ><fs> copy-size /large-file /another-file 2048M\n"
+" / 10% [#####-----------------------------------------] 00:30\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: =head2
-#. type: =head2
-#: ../fish/guestfish-actions.pod:315
-msgid "aug-mv"
+# type: textblock
+#. type: textblock
+#: ../fish/guestfish.pod:974
+msgid ""
+"The spinner on the left hand side moves round once for every progress "
+"notification received from the backend.  This is a (reasonably) golden "
+"assurance that the command is \"doing something\" even if the progress bar "
+"is not moving, because the command is able to send the progress "
+"notifications.  When the bar reaches 100% and the command finishes, the "
+"spinner disappears."

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../fish/guestfish-actions.pod:317
-#, no-wrap
+# type: textblock
+#. type: textblock
+#: ../fish/guestfish.pod:981

 msgid ""
 msgid ""

-" aug-mv src dest\n"
-"\n"
+"Progress bars are enabled by default when guestfish is used interactively.  "
+"You can enable them even for non-interactive modes using I<--progress-bars>, "
+"and you can disable them completely using I<--no-progress-bars>."

 msgstr ""
 
 msgstr ""
 

-# type: =head2
-#. type: =head2
-#: ../fish/guestfish-actions.pod:322
-msgid "aug-rm"
+# type: =head1
+#. type: =head1
+#: ../fish/guestfish.pod:986
+msgid "GUESTFISH COMMANDS"

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../fish/guestfish-actions.pod:324
-#, no-wrap
+# type: textblock
+#. type: textblock
+#: ../fish/guestfish.pod:988

 msgid ""
 msgid ""

-" aug-rm augpath\n"
-"\n"
+"The commands in this section are guestfish convenience commands, in other "
+"words, they are not part of the L<guestfs(3)> API."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:330
-msgid "aug-save"
+#: ../fish/guestfish.pod:991
+msgid "help"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:332
+#: ../fish/guestfish.pod:993

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" aug-save\n"
+" help\n"
+" help cmd\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish-actions.pod:336
-msgid ""
-"The flags which were passed to L</aug-init> affect exactly how files are "
-"saved."
+#: ../fish/guestfish.pod:996
+msgid "Without any parameter, this provides general help."
+msgstr ""
+
+# type: textblock
+#. type: textblock
+#: ../fish/guestfish.pod:998
+msgid "With a C<cmd> parameter, this displays detailed help for that command."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:339
-msgid "aug-set"
+#: ../fish/guestfish.pod:1000
+msgid "quit | exit"

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../fish/guestfish-actions.pod:341
-#, no-wrap
-msgid ""
-" aug-set augpath val\n"
-"\n"
+# type: textblock
+#. type: textblock
+#: ../fish/guestfish.pod:1002
+msgid "This exits guestfish.  You can also use C<^D> key."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish-actions.pod:345
-msgid ""
-"In the Augeas API, it is possible to clear a node by setting the value to "
-"NULL.  Due to an oversight in the libguestfs API you cannot do that with "
-"this call.  Instead you must use the L</aug-clear> call."
+#: ../fish/guestfish.pod:1004
+msgid "@FISH_COMMANDS@"

 msgstr ""
 
 msgstr ""
 

-# type: =head2
-#. type: =head2
-#: ../fish/guestfish-actions.pod:350
-msgid "available"
+# type: =head1
+#. type: =head1
+#: ../fish/guestfish.pod:1006
+msgid "COMMANDS"

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../fish/guestfish-actions.pod:352
-#, no-wrap
+# type: =head1
+#. type: =head1
+#: ../fish/guestfish.pod:1010 ../test-tool/libguestfs-test-tool.pod:77
+msgid "EXIT CODE"
+msgstr ""
+
+# type: textblock
+#. type: textblock
+#: ../fish/guestfish.pod:1012

 msgid ""
 msgid ""

-" available 'groups ...'\n"
-"\n"
+"guestfish returns 0 if the commands completed without error, or 1 if there "
+"was an error."
+msgstr ""
+
+# type: =item
+#. type: =item
+#: ../fish/guestfish.pod:1019
+msgid "EDITOR"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish-actions.pod:358
+#: ../fish/guestfish.pod:1021

 msgid ""
 msgid ""

-"The libguestfs groups, and the functions that those groups correspond to, "
-"are listed in L<guestfs(3)/AVAILABILITY>.  You can also fetch this list at "
-"runtime by calling L</available-all-groups>."
+"The C<edit> command uses C<$EDITOR> as the editor.  If not set, it uses "
+"C<vi>."

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../fish/guestfish-actions.pod:382
-msgid "You must call L</launch> before calling this function."
+# type: =item
+#. type: =item
+#: ../fish/guestfish.pod:1024
+msgid "GUESTFISH_PID"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish-actions.pod:404
+#: ../fish/guestfish.pod:1026

 msgid ""
 msgid ""

-"This call was added in version C<1.0.80>.  In previous versions of "
-"libguestfs all you could do would be to speculatively execute a command to "
-"find out if the daemon implemented it.  See also L</version>."
+"Used with the I<--remote> option to specify the remote guestfish process to "
+"control.  See section L</REMOTE CONTROL GUESTFISH OVER A SOCKET>."

 msgstr ""
 
 msgstr ""
 

-# type: =head2
-#. type: =head2
-#: ../fish/guestfish-actions.pod:411
-msgid "available-all-groups"
+# type: =item
+#. type: =item
+#: ../fish/guestfish.pod:1030
+msgid "HEXEDITOR"

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../fish/guestfish-actions.pod:413
-#, no-wrap
+# type: textblock
+#. type: textblock
+#: ../fish/guestfish.pod:1032

 msgid ""
 msgid ""

-" available-all-groups\n"
-"\n"
+"The L</hexedit> command uses C<$HEXEDITOR> as the external hex editor.  If "
+"not specified, the external L<hexedit(1)> program is used."
+msgstr ""
+
+# type: =item
+#. type: =item
+#: ../fish/guestfish.pod:1036
+msgid "HOME"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish-actions.pod:415
+#: ../fish/guestfish.pod:1038

 msgid ""
 msgid ""

-"This command returns a list of all optional groups that this daemon knows "
-"about.  Note this returns both supported and unsupported groups.  To find "
-"out which ones the daemon can actually support you have to call L</"
-"available> on each member of the returned list."
+"If compiled with GNU readline support, various files in the home directory "
+"can be used.  See L</FILES>."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish-actions.pod:421
-msgid "See also L</available> and L<guestfs(3)/AVAILABILITY>."
-msgstr ""
-
-# type: =head2
-#. type: =head2
-#: ../fish/guestfish-actions.pod:423
-msgid "base64-in"
+#: ../fish/guestfish.pod:1047
+msgid ""
+"Set C<LIBGUESTFS_DEBUG=1> to enable verbose messages.  This has the same "
+"effect as using the B<-v> option."

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../fish/guestfish-actions.pod:425
-#, no-wrap
+# type: textblock
+#. type: textblock
+#: ../fish/guestfish.pod:1059

 msgid ""
 msgid ""

-" base64-in (base64file|-) filename\n"
-"\n"
+"Set the path that guestfish uses to search for kernel and initrd.img.  See "
+"the discussion of paths in L<guestfs(3)>."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish-actions.pod:430 ../fish/guestfish-actions.pod:439
-#: ../fish/guestfish-actions.pod:663 ../fish/guestfish-actions.pod:832
-#: ../fish/guestfish-actions.pod:851 ../fish/guestfish-actions.pod:1228
-#: ../fish/guestfish-actions.pod:4341 ../fish/guestfish-actions.pod:4353
-#: ../fish/guestfish-actions.pod:4364 ../fish/guestfish-actions.pod:4375
-#: ../fish/guestfish-actions.pod:4427 ../fish/guestfish-actions.pod:4436
-#: ../fish/guestfish-actions.pod:4490 ../fish/guestfish-actions.pod:4513
-msgid "Use C<-> instead of a filename to read/write from stdin/stdout."
+#: ../fish/guestfish.pod:1070
+msgid "Set C<LIBGUESTFS_TRACE=1> to enable command traces."

 msgstr ""
 
 msgstr ""
 

-# type: =head2
-#. type: =head2
-#: ../fish/guestfish-actions.pod:432
-msgid "base64-out"
+# type: =item
+#. type: =item
+#: ../fish/guestfish.pod:1072
+msgid "PAGER"

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../fish/guestfish-actions.pod:434
-#, no-wrap
+# type: textblock
+#. type: textblock
+#: ../fish/guestfish.pod:1074

 msgid ""
 msgid ""

-" base64-out filename (base64file|-)\n"
-"\n"
+"The C<more> command uses C<$PAGER> as the pager.  If not set, it uses "
+"C<more>."

 msgstr ""
 
 msgstr ""
 

-# type: =head2
-#. type: =head2
-#: ../fish/guestfish-actions.pod:441
-msgid "blockdev-flushbufs"
+# type: =head1
+#. type: =head1
+#: ../fish/guestfish.pod:1090 ../fuse/guestmount.pod:262
+msgid "FILES"

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../fish/guestfish-actions.pod:443
-#, no-wrap
-msgid ""
-" blockdev-flushbufs device\n"
-"\n"
+#. type: =item
+#: ../fish/guestfish.pod:1094 ../fuse/guestmount.pod:266
+msgid "$HOME/.libguestfs-tools.rc"

 msgstr ""
 
 msgstr ""
 

-# type: =head2
-#. type: =head2
-#: ../fish/guestfish-actions.pod:450
-msgid "blockdev-getbsz"
+#. type: =item
+#: ../fish/guestfish.pod:1096 ../fuse/guestmount.pod:268
+msgid "/etc/libguestfs-tools.conf"

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../fish/guestfish-actions.pod:452
-#, no-wrap
+#. type: textblock
+#: ../fish/guestfish.pod:1098 ../fuse/guestmount.pod:270

 msgid ""
 msgid ""

-" blockdev-getbsz device\n"
-"\n"
+"This configuration file controls the default read-only or read-write mode "
+"(I<--ro> or I<--rw>)."

 msgstr ""
 
 msgstr ""
 

-# type: =head2
-#. type: =head2
-#: ../fish/guestfish-actions.pod:461
-msgid "blockdev-getro"
+#. type: textblock
+#: ../fish/guestfish.pod:1101
+msgid "See L</OPENING DISKS FOR READ AND WRITE>."

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../fish/guestfish-actions.pod:463
-#, no-wrap
+# type: =item
+#. type: =item
+#: ../fish/guestfish.pod:1103
+msgid "$HOME/.guestfish"
+msgstr ""
+
+# type: textblock
+#. type: textblock
+#: ../fish/guestfish.pod:1105

 msgid ""
 msgid ""

-" blockdev-getro device\n"
-"\n"
+"If compiled with GNU readline support, then the command history is saved in "
+"this file."

 msgstr ""
 
 msgstr ""
 

-# type: =head2
-#. type: =head2
-#: ../fish/guestfish-actions.pod:470
-msgid "blockdev-getsize64"
+# type: =item
+#. type: =item
+#: ../fish/guestfish.pod:1108
+msgid "$HOME/.inputrc"

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../fish/guestfish-actions.pod:472
-#, no-wrap
-msgid ""
-" blockdev-getsize64 device\n"
-"\n"
+# type: =item
+#. type: =item
+#: ../fish/guestfish.pod:1110
+msgid "/etc/inputrc"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish-actions.pod:476
-msgid "See also L</blockdev-getsz>."
+#: ../fish/guestfish.pod:1112
+msgid ""
+"If compiled with GNU readline support, then these files can be used to "
+"configure readline.  For further information, please see L<readline(3)/"
+"INITIALIZATION FILE>."

 msgstr ""
 
 msgstr ""
 

-# type: =head2
-#. type: =head2
-#: ../fish/guestfish-actions.pod:480
-msgid "blockdev-getss"
+# type: textblock
+#. type: textblock
+#: ../fish/guestfish.pod:1116
+msgid "To write rules which only apply to guestfish, use:"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:482
+#: ../fish/guestfish.pod:1118

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" blockdev-getss device\n"
+" $if guestfish\n"
+" ...\n"
+" $endif\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish-actions.pod:487
+#: ../fish/guestfish.pod:1122

 msgid ""
 msgid ""

-"(Note, this is not the size in sectors, use L</blockdev-getsz> for that)."
+"Variables that you can set in inputrc that change the behaviour of guestfish "
+"in useful ways include:"

 msgstr ""
 
 msgstr ""
 

-# type: =head2
-#. type: =head2
-#: ../fish/guestfish-actions.pod:492
-msgid "blockdev-getsz"
+# type: =item
+#. type: =item
+#: ../fish/guestfish.pod:1127
+msgid "completion-ignore-case (default: on)"
+msgstr ""
+
+# type: textblock
+#. type: textblock
+#: ../fish/guestfish.pod:1129
+msgid ""
+"By default, guestfish will ignore case when tab-completing paths on the "
+"disk.  Use:"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:494
+#: ../fish/guestfish.pod:1132

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" blockdev-getsz device\n"
+" set completion-ignore-case off\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish-actions.pod:499
-msgid ""
-"See also L</blockdev-getss> for the real sector size of the device, and L</"
-"blockdev-getsize64> for the more useful I<size in bytes>."
-msgstr ""
-
-# type: =head2
-#. type: =head2
-#: ../fish/guestfish-actions.pod:505
-msgid "blockdev-rereadpt"
+#: ../fish/guestfish.pod:1134
+msgid "to make guestfish case sensitive."

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../fish/guestfish-actions.pod:507
-#, no-wrap
-msgid ""
-" blockdev-rereadpt device\n"
-"\n"
+# type: =item
+#. type: =item
+#: ../fish/guestfish.pod:1138
+msgid "test1.img"

 msgstr ""
 
 msgstr ""
 

-# type: =head2
-#. type: =head2
-#: ../fish/guestfish-actions.pod:513
-msgid "blockdev-setbsz"
+# type: =item
+#. type: =item
+#: ../fish/guestfish.pod:1140
+msgid "test2.img (etc)"

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../fish/guestfish-actions.pod:515
-#, no-wrap
+#. type: textblock
+#: ../fish/guestfish.pod:1142

 msgid ""
 msgid ""

-" blockdev-setbsz device blocksize\n"
-"\n"
+"When using the I<-N> or I<--new> option, the prepared disk or filesystem "
+"will be created in the file C<test1.img> in the current directory.  The "
+"second use of I<-N> will use C<test2.img> and so on.  Any existing file with "
+"the same name will be overwritten."

 msgstr ""
 
 msgstr ""
 

-# type: =head2
-#. type: =head2
-#: ../fish/guestfish-actions.pod:524
-msgid "blockdev-setro"
+#. type: textblock
+#: ../fish/guestfish.pod:1151
+msgid ""
+"L<guestfs(3)>, L<http://libguestfs.org/>, L<virt-cat(1)>, L<virt-copy-in(1)"
+">, L<virt-copy-out(1)>, L<virt-df(1)>, L<virt-edit(1)>, L<virt-filesystems(1)"
+">, L<virt-inspector(1)>, L<virt-list-filesystems(1)>, L<virt-list-partitions"
+"(1)>, L<virt-ls(1)>, L<virt-make-fs(1)>, L<virt-rescue(1)>, L<virt-resize(1)"
+">, L<virt-tar(1)>, L<virt-tar-in(1)>, L<virt-tar-out(1)>, L<virt-win-reg(1)"
+">, L<hexedit(1)>."

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../fish/guestfish-actions.pod:526
-#, no-wrap
+# type: textblock
+#. type: textblock
+#: ../fish/guestfish.pod:1181 ../test-tool/libguestfs-test-tool.pod:102
+#: ../fuse/guestmount.pod:297 ../tools/virt-edit.pl:518
+#: ../tools/virt-win-reg.pl:606 ../tools/virt-list-filesystems.pl:210
+#: ../tools/virt-tar.pl:309 ../tools/virt-make-fs.pl:572
+#: ../tools/virt-list-partitions.pl:277

 msgid ""
 msgid ""

-" blockdev-setro device\n"
-"\n"
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version."

 msgstr ""
 
 msgstr ""
 

-# type: =head2
-#. type: =head2
-#: ../fish/guestfish-actions.pod:532
-msgid "blockdev-setrw"
+# type: textblock
+#. type: textblock
+#: ../fish/guestfish.pod:1186 ../test-tool/libguestfs-test-tool.pod:107
+#: ../fuse/guestmount.pod:302 ../tools/virt-edit.pl:523
+#: ../tools/virt-win-reg.pl:611 ../tools/virt-list-filesystems.pl:215
+#: ../tools/virt-tar.pl:314 ../tools/virt-make-fs.pl:577
+#: ../tools/virt-list-partitions.pl:282
+msgid ""
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
+"more details."

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../fish/guestfish-actions.pod:534
-#, no-wrap
+# type: textblock
+#. type: textblock
+#: ../fish/guestfish.pod:1191 ../test-tool/libguestfs-test-tool.pod:112
+#: ../fuse/guestmount.pod:307 ../tools/virt-edit.pl:528
+#: ../tools/virt-win-reg.pl:616 ../tools/virt-list-filesystems.pl:220
+#: ../tools/virt-tar.pl:319 ../tools/virt-make-fs.pl:582
+#: ../tools/virt-list-partitions.pl:287

 msgid ""
 msgid ""

-" blockdev-setrw device\n"
-"\n"
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 675 Mass "
+"Ave, Cambridge, MA 02139, USA."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:540
-msgid "case-sensitive-path"
+#: ../fish/guestfish-actions.pod:1
+msgid "add-cdrom"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:542
+#: ../fish/guestfish-actions.pod:3

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" case-sensitive-path path\n"
+" add-cdrom filename\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish-actions.pod:566
+#: ../fish/guestfish-actions.pod:15

 msgid ""
 msgid ""

-"Thus L</case-sensitive-path> (\"/Windows/System32\")  might return C<\"/"
-"WINDOWS/system32\"> (the exact return value would depend on details of how "
-"the directories were originally created under Windows)."
+"This call checks for the existence of C<filename>.  This stops you from "
+"specifying other types of drive which are supported by qemu such as C<nbd:> "
+"and C<http:> URLs.  To specify those, use the general L</config> call "
+"instead."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish-actions.pod:574
-msgid "See also L</realpath>."
-msgstr ""
-
-# type: =head2
-#. type: =head2
-#: ../fish/guestfish-actions.pod:576
-msgid "cat"
-msgstr ""
-
-# type: verbatim
-#. type: verbatim
-#: ../fish/guestfish-actions.pod:578
-#, no-wrap
+#: ../fish/guestfish-actions.pod:22

 msgid ""
 msgid ""

-" cat path\n"
-"\n"
+"If you just want to add an ISO file (often you use this as an efficient way "
+"to transfer large files into the guest), then you should probably use L</add-"
+"drive-ro> instead."

 msgstr ""
 
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../fish/guestfish-actions.pod:582
+#: ../fish/guestfish-actions.pod:28 ../fish/guestfish-actions.pod:158
+#: ../fish/guestfish-actions.pod:172

 msgid ""
 msgid ""

-"Note that this function cannot correctly handle binary files (specifically, "
-"files containing C<\\0> character which is treated as end of string).  For "
-"those you need to use the L</read-file> or L</download> functions which have "
-"a more complex interface."
+"This function is deprecated.  In new code, use the L</add_drive_opts> call "
+"instead."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:590
-msgid "checksum"
+#: ../fish/guestfish-actions.pod:35
+msgid "add-domain"
+msgstr ""
+
+# type: =head2
+#. type: =head2
+#: ../fish/guestfish-actions.pod:37
+msgid "domain"

 msgstr ""
 
 msgstr ""
 

-# type: verbatim

 #. type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:592
+#: ../fish/guestfish-actions.pod:39

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" checksum csumtype path\n"
+" add-domain dom [libvirturi:..] [readonly:..] [iface:..] [live:..]\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish-actions.pod:635
-msgid "To get the checksum for a device, use L</checksum-device>."
+#: ../fish/guestfish-actions.pod:41
+msgid ""
+"This function adds the disk(s) attached to the named libvirt domain C<dom>.  "
+"It works by connecting to libvirt, requesting the domain and domain XML from "
+"libvirt, parsing it for disks, and calling L</add-drive-opts> on each one."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish-actions.pod:637
-msgid "To get the checksums for many files, use L</checksums-out>."
-msgstr ""
-
-# type: =head2
-#. type: =head2
-#: ../fish/guestfish-actions.pod:639
-msgid "checksum-device"
-msgstr ""
-
-# type: verbatim
-#. type: verbatim
-#: ../fish/guestfish-actions.pod:641
-#, no-wrap
+#: ../fish/guestfish-actions.pod:71

 msgid ""
 msgid ""

-" checksum-device csumtype device\n"
-"\n"
+"The other optional parameters are passed directly through to L</add-drive-"
+"opts>."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish-actions.pod:643
+#: ../fish/guestfish-actions.pod:74 ../fish/guestfish-actions.pod:138
+#: ../fish/guestfish-actions.pod:3044

 msgid ""
 msgid ""

-"This call computes the MD5, SHAx or CRC checksum of the contents of the "
-"device named C<device>.  For the types of checksums supported see the L</"
-"checksum> command."
+"This command has one or more optional arguments.  See L</OPTIONAL ARGUMENTS>."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:647
-msgid "checksums-out"
+#: ../fish/guestfish-actions.pod:76
+msgid "add-drive"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:649
+#: ../fish/guestfish-actions.pod:78

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" checksums-out csumtype directory (sumsfile|-)\n"
+" add-drive filename\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: =head2
-#. type: =head2
-#: ../fish/guestfish-actions.pod:665
-msgid "chmod"
+# type: textblock
+#. type: textblock
+#: ../fish/guestfish-actions.pod:80
+msgid ""
+"This function is the equivalent of calling L</add-drive-opts> with no "
+"optional parameters, so the disk is added writable, with the format being "
+"detected automatically."

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../fish/guestfish-actions.pod:667
-#, no-wrap
+# type: textblock
+#. type: textblock
+#: ../fish/guestfish-actions.pod:84

 msgid ""
 msgid ""

-" chmod mode path\n"
-"\n"
+"Automatic detection of the format opens you up to a potential security hole "
+"when dealing with untrusted raw-format images.  See CVE-2010-3851 and "
+"RHBZ#642934.  Specifying the format closes this security hole.  Therefore "
+"you should think about replacing calls to this function with calls to L</add-"
+"drive-opts>, and specifying the format."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:678
-msgid "chown"
-msgstr ""
-
-# type: verbatim
-#. type: verbatim
-#: ../fish/guestfish-actions.pod:680
-#, no-wrap
-msgid ""
-" chown owner group path\n"
-"\n"
+#: ../fish/guestfish-actions.pod:91
+msgid "add-drive-opts"

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:688
-msgid "command"
+#: ../fish/guestfish-actions.pod:93
+msgid "add"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:690
+#: ../fish/guestfish-actions.pod:95

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" command 'arguments ...'\n"
+" add-drive-opts filename [readonly:..] [format:..] [iface:..]\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish-actions.pod:697
+#: ../fish/guestfish-actions.pod:122

 msgid ""
 msgid ""

-"The single parameter is an argv-style list of arguments.  The first element "
-"is the name of the program to run.  Subsequent elements are parameters.  The "
-"list must be non-empty (ie. must contain a program name).  Note that the "
-"command runs directly, and is I<not> invoked via the shell (see L</sh>)."
+"This forces the image format.  If you omit this (or use L</add-drive> or L</"
+"add-drive-ro>) then the format is automatically detected.  Possible formats "
+"include C<raw> and C<qcow2>."
+msgstr ""
+
+# type: textblock
+#. type: textblock
+#: ../fish/guestfish-actions.pod:133
+msgid ""
+"This rarely-used option lets you emulate the behaviour of the deprecated L</"
+"add-drive-with-if> call (q.v.)"

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:725
-msgid "command-lines"
+#: ../fish/guestfish-actions.pod:140
+msgid "add-drive-ro"
+msgstr ""
+
+# type: =head2
+#. type: =head2
+#: ../fish/guestfish-actions.pod:142
+msgid "add-ro"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:727
+#: ../fish/guestfish-actions.pod:144

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" command-lines 'arguments ...'\n"
+" add-drive-ro filename\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish-actions.pod:729
+#: ../fish/guestfish-actions.pod:146

 msgid ""
 msgid ""

-"This is the same as L</command>, but splits the result into a list of lines."
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../fish/guestfish-actions.pod:732
-msgid "See also: L</sh-lines>"
+"This function is the equivalent of calling L</add-drive-opts> with the "
+"optional parameter C<GUESTFS_ADD_DRIVE_OPTS_READONLY> set to 1, so the disk "
+"is added read-only, with the format being detected automatically."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:737
-msgid "config"
+#: ../fish/guestfish-actions.pod:151
+msgid "add-drive-ro-with-if"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:739
+#: ../fish/guestfish-actions.pod:153

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" config qemuparam qemuvalue\n"
+" add-drive-ro-with-if filename iface\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: =head2
-#. type: =head2
-#: ../fish/guestfish-actions.pod:750
-msgid "copy-size"
-msgstr ""
-
-# type: verbatim
-#. type: verbatim
-#: ../fish/guestfish-actions.pod:752
-#, no-wrap
+# type: textblock
+#. type: textblock
+#: ../fish/guestfish-actions.pod:155

 msgid ""
 msgid ""

-" copy-size src dest size\n"
-"\n"
+"This is the same as L</add-drive-ro> but it allows you to specify the QEMU "
+"interface emulation to use at run time."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:760
-msgid "cp"
+#: ../fish/guestfish-actions.pod:165
+msgid "add-drive-with-if"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:762
+#: ../fish/guestfish-actions.pod:167

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" cp src dest\n"
+" add-drive-with-if filename iface\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

+# type: textblock
+#. type: textblock
+#: ../fish/guestfish-actions.pod:169
+msgid ""
+"This is the same as L</add-drive> but it allows you to specify the QEMU "
+"interface emulation to use at run time."
+msgstr ""
+

 # type: =head2
 #. type: =head2
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:767
-msgid "cp-a"
+#: ../fish/guestfish-actions.pod:179
+msgid "aug-clear"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:769
+#: ../fish/guestfish-actions.pod:181

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" cp-a src dest\n"
+" aug-clear augpath\n"

 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2
 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:774
-msgid "dd"
+#: ../fish/guestfish-actions.pod:186
+msgid "aug-close"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:776
+#: ../fish/guestfish-actions.pod:188

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" dd src dest\n"
+" aug-close\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish-actions.pod:783
+#: ../fish/guestfish-actions.pod:190

 msgid ""
 msgid ""

-"If the destination is a device, it must be as large or larger than the "
-"source file or device, otherwise the copy will fail.  This command cannot do "
-"partial copies (see L</copy-size>)."
+"Close the current Augeas handle and free up any resources used by it.  After "
+"calling this, you have to call L</aug-init> again before you can use any "
+"other Augeas functions."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:787
-msgid "df"
+#: ../fish/guestfish-actions.pod:195
+msgid "aug-defnode"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:789
+#: ../fish/guestfish-actions.pod:197

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" df\n"
+" aug-defnode name expr val\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish-actions.pod:793 ../fish/guestfish-actions.pod:804
+#: ../fish/guestfish-actions.pod:202

 msgid ""
 msgid ""

-"This command is mostly useful for interactive sessions.  It is I<not> "
-"intended that you try to parse the output string.  Use L</statvfs> from "
-"programs."
+"If C<expr> evaluates to an empty nodeset, a node is created, equivalent to "
+"calling L</aug-set> C<expr>, C<value>.  C<name> will be the nodeset "
+"containing that single node."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:797
-msgid "df-h"
+#: ../fish/guestfish-actions.pod:210
+msgid "aug-defvar"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:799
+#: ../fish/guestfish-actions.pod:212

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" df-h\n"
+" aug-defvar name expr\n"

 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2
 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:808
-msgid "dmesg"
+#: ../fish/guestfish-actions.pod:221
+msgid "aug-get"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:810
+#: ../fish/guestfish-actions.pod:223

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" dmesg\n"
+" aug-get augpath\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../fish/guestfish-actions.pod:816
-msgid ""
-"Another way to get the same information is to enable verbose messages with "
-"L</set-verbose> or by setting the environment variable C<LIBGUESTFS_DEBUG=1> "
-"before running the program."
-msgstr ""
-

 # type: =head2
 #. type: =head2
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:821
-msgid "download"
+#: ../fish/guestfish-actions.pod:228
+msgid "aug-init"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:823
+#: ../fish/guestfish-actions.pod:230

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" download remotefilename (filename|-)\n"
+" aug-init root flags\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish-actions.pod:830
-msgid "See also L</upload>, L</cat>."
-msgstr ""
-
-# type: =head2
-#. type: =head2
-#: ../fish/guestfish-actions.pod:834
-msgid "download-offset"
-msgstr ""
-
-# type: verbatim
-#. type: verbatim
-#: ../fish/guestfish-actions.pod:836
-#, no-wrap
-msgid ""
-" download-offset remotefilename (filename|-) offset size\n"
-"\n"
+#: ../fish/guestfish-actions.pod:236
+msgid "You must call this before using any other L</aug-*> commands."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish-actions.pod:844
-msgid ""
-"Note that there is no limit on the amount of data that can be downloaded "
-"with this call, unlike with L</pread>, and this call always reads the full "
-"amount unless an error occurs."
+#: ../fish/guestfish-actions.pod:271
+msgid "Do not load the tree in L</aug-init>."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish-actions.pod:849
-msgid "See also L</download>, L</pread>."
+#: ../fish/guestfish-actions.pod:275
+msgid "To close the handle, you can call L</aug-close>."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:853
-msgid "drop-caches"
+#: ../fish/guestfish-actions.pod:279
+msgid "aug-insert"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:855
+#: ../fish/guestfish-actions.pod:281

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" drop-caches whattodrop\n"
+" aug-insert augpath label true|false\n"

 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2
 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:867
-msgid "du"
+#: ../fish/guestfish-actions.pod:291
+msgid "aug-load"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:869
+#: ../fish/guestfish-actions.pod:293

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" du path\n"
+" aug-load\n"

 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2
 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:881
-msgid "e2fsck-f"
+#: ../fish/guestfish-actions.pod:300
+msgid "aug-ls"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:883
+#: ../fish/guestfish-actions.pod:302

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" e2fsck-f device\n"
+" aug-ls augpath\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish-actions.pod:889
+#: ../fish/guestfish-actions.pod:304

 msgid ""
 msgid ""

-"This command is only needed because of L</resize2fs> (q.v.).  Normally you "
-"should use L</fsck>."
+"This is just a shortcut for listing L</aug-match> C<path/*> and sorting the "
+"resulting nodes into alphabetical order."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:892
-msgid "echo-daemon"
+#: ../fish/guestfish-actions.pod:307
+msgid "aug-match"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:894
+#: ../fish/guestfish-actions.pod:309

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" echo-daemon 'words ...'\n"
+" aug-match augpath\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../fish/guestfish-actions.pod:901
-msgid "See also L</ping-daemon>."
-msgstr ""
-

 # type: =head2
 #. type: =head2
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:903
-msgid "egrep"
+#: ../fish/guestfish-actions.pod:315
+msgid "aug-mv"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:905
+#: ../fish/guestfish-actions.pod:317

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" egrep regex path\n"
+" aug-mv src dest\n"

 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2
 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:913
-msgid "egrepi"
+#: ../fish/guestfish-actions.pod:322
+msgid "aug-rm"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:915
+#: ../fish/guestfish-actions.pod:324

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" egrepi regex path\n"
+" aug-rm augpath\n"

 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2
 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:923
-msgid "equal"
+#: ../fish/guestfish-actions.pod:330
+msgid "aug-save"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:925
+#: ../fish/guestfish-actions.pod:332

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" equal file1 file2\n"
+" aug-save\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

+# type: textblock
+#. type: textblock
+#: ../fish/guestfish-actions.pod:336
+msgid ""
+"The flags which were passed to L</aug-init> affect exactly how files are "
+"saved."
+msgstr ""
+

 # type: =head2
 #. type: =head2
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:932
-msgid "exists"
+#: ../fish/guestfish-actions.pod:339
+msgid "aug-set"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:934
+#: ../fish/guestfish-actions.pod:341

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" exists path\n"
+" aug-set augpath val\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish-actions.pod:939
-msgid "See also L</is-file>, L</is-dir>, L</stat>."
+#: ../fish/guestfish-actions.pod:345
+msgid ""
+"In the Augeas API, it is possible to clear a node by setting the value to "
+"NULL.  Due to an oversight in the libguestfs API you cannot do that with "
+"this call.  Instead you must use the L</aug-clear> call."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:941
-msgid "fallocate"
+#: ../fish/guestfish-actions.pod:350
+msgid "available"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:943
+#: ../fish/guestfish-actions.pod:352

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" fallocate path len\n"
+" available 'groups ...'\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: =head2
-#. type: =head2
-#: ../fish/guestfish-actions.pod:960
-msgid "fallocate64"
-msgstr ""
-
-# type: verbatim
-#. type: verbatim
-#: ../fish/guestfish-actions.pod:962
-#, no-wrap
+# type: textblock
+#. type: textblock
+#: ../fish/guestfish-actions.pod:358

 msgid ""
 msgid ""

-" fallocate64 path len\n"
-"\n"
+"The libguestfs groups, and the functions that those groups correspond to, "
+"are listed in L<guestfs(3)/AVAILABILITY>.  You can also fetch this list at "
+"runtime by calling L</available-all-groups>."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish-actions.pod:968
-msgid ""
-"Note that this call allocates disk blocks for the file.  To create a sparse "
-"file use L</truncate-size> instead."
+#: ../fish/guestfish-actions.pod:382
+msgid "You must call L</launch> before calling this function."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish-actions.pod:971
+#: ../fish/guestfish-actions.pod:404

 msgid ""
 msgid ""

-"The deprecated call L</fallocate> does the same, but owing to an oversight "
-"it only allowed 30 bit lengths to be specified, effectively limiting the "
-"maximum size of files created through that call to 1GB."
+"This call was added in version C<1.0.80>.  In previous versions of "
+"libguestfs all you could do would be to speculatively execute a command to "
+"find out if the daemon implemented it.  See also L</version>."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:980
-msgid "fgrep"
+#: ../fish/guestfish-actions.pod:411
+msgid "available-all-groups"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:982
+#: ../fish/guestfish-actions.pod:413

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" fgrep pattern path\n"
+" available-all-groups\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: =head2
-#. type: =head2
-#: ../fish/guestfish-actions.pod:990
-msgid "fgrepi"
-msgstr ""
-
-# type: verbatim
-#. type: verbatim
-#: ../fish/guestfish-actions.pod:992
-#, no-wrap
+# type: textblock
+#. type: textblock
+#: ../fish/guestfish-actions.pod:415

 msgid ""
 msgid ""

-" fgrepi pattern path\n"
-"\n"
+"This command returns a list of all optional groups that this daemon knows "
+"about.  Note this returns both supported and unsupported groups.  To find "
+"out which ones the daemon can actually support you have to call L</"
+"available> on each member of the returned list."
+msgstr ""
+
+# type: textblock
+#. type: textblock
+#: ../fish/guestfish-actions.pod:421
+msgid "See also L</available> and L<guestfs(3)/AVAILABILITY>."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:1000
-msgid "file"
+#: ../fish/guestfish-actions.pod:423
+msgid "base64-in"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:1002
+#: ../fish/guestfish-actions.pod:425

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" file path\n"
+" base64-in (base64file|-) filename\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish-actions.pod:1014
-msgid ""
-"This command can also be used on C</dev/> devices (and partitions, LV "
-"names).  You can for example use this to determine if a device contains a "
-"filesystem, although it's usually better to use L</vfs-type>."
+#: ../fish/guestfish-actions.pod:430 ../fish/guestfish-actions.pod:439
+#: ../fish/guestfish-actions.pod:663 ../fish/guestfish-actions.pod:832
+#: ../fish/guestfish-actions.pod:851 ../fish/guestfish-actions.pod:1225
+#: ../fish/guestfish-actions.pod:4486 ../fish/guestfish-actions.pod:4498
+#: ../fish/guestfish-actions.pod:4509 ../fish/guestfish-actions.pod:4520
+#: ../fish/guestfish-actions.pod:4572 ../fish/guestfish-actions.pod:4581
+#: ../fish/guestfish-actions.pod:4635 ../fish/guestfish-actions.pod:4658
+msgid "Use C<-> instead of a filename to read/write from stdin/stdout."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:1024
-msgid "file-architecture"
+#: ../fish/guestfish-actions.pod:432
+msgid "base64-out"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:1026
+#: ../fish/guestfish-actions.pod:434

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" file-architecture filename\n"
+" base64-out filename (base64file|-)\n"

 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2
 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:1129
-msgid "filesize"
+#: ../fish/guestfish-actions.pod:441
+msgid "blockdev-flushbufs"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:1131
+#: ../fish/guestfish-actions.pod:443

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" filesize file\n"
+" blockdev-flushbufs device\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../fish/guestfish-actions.pod:1135
-msgid ""
-"To get other stats about a file, use L</stat>, L</lstat>, L</is-dir>, L</is-"
-"file> etc.  To get the size of block devices, use L</blockdev-getsize64>."
-msgstr ""
-

 # type: =head2
 #. type: =head2
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:1139
-msgid "fill"
+#: ../fish/guestfish-actions.pod:450
+msgid "blockdev-getbsz"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:1141
+#: ../fish/guestfish-actions.pod:452

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" fill c len path\n"
+" blockdev-getbsz device\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../fish/guestfish-actions.pod:1147
-msgid ""
-"To fill a file with zero bytes (sparsely), it is much more efficient to use "
-"L</truncate-size>.  To create a file with a pattern of repeating bytes use "
-"L</fill-pattern>."
-msgstr ""
-

 # type: =head2
 #. type: =head2
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:1152
-msgid "fill-pattern"
+#: ../fish/guestfish-actions.pod:461
+msgid "blockdev-getro"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:1154
+#: ../fish/guestfish-actions.pod:463

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" fill-pattern pattern len path\n"
+" blockdev-getro device\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../fish/guestfish-actions.pod:1156
-msgid ""
-"This function is like L</fill> except that it creates a new file of length "
-"C<len> containing the repeating pattern of bytes in C<pattern>.  The pattern "
-"is truncated if necessary to ensure the length of the file is exactly C<len> "
-"bytes."
-msgstr ""
-

 # type: =head2
 #. type: =head2
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:1161
-msgid "find"
+#: ../fish/guestfish-actions.pod:470
+msgid "blockdev-getsize64"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:1163
+#: ../fish/guestfish-actions.pod:472

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" find directory\n"
+" blockdev-getsize64 device\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish-actions.pod:1177
-msgid "then the returned list from L</find> C</tmp> would be 4 elements:"
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../fish/guestfish-actions.pod:1190
-msgid "See also L</find0>."
+#: ../fish/guestfish-actions.pod:476
+msgid "See also L</blockdev-getsz>."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:1195
-msgid "find0"
+#: ../fish/guestfish-actions.pod:480
+msgid "blockdev-getss"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:1197
+#: ../fish/guestfish-actions.pod:482

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" find0 directory (files|-)\n"
+" blockdev-getss device\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish-actions.pod:1203
+#: ../fish/guestfish-actions.pod:487

 msgid ""
 msgid ""

-"This command works the same way as L</find> with the following exceptions:"
+"(Note, this is not the size in sectors, use L</blockdev-getsz> for that)."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:1230
-msgid "findfs-label"
+#: ../fish/guestfish-actions.pod:492
+msgid "blockdev-getsz"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:1232
+#: ../fish/guestfish-actions.pod:494

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" findfs-label label\n"
+" blockdev-getsz device\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish-actions.pod:1238
-msgid "To find the label of a filesystem, use L</vfs-label>."
+#: ../fish/guestfish-actions.pod:499
+msgid ""
+"See also L</blockdev-getss> for the real sector size of the device, and L</"
+"blockdev-getsize64> for the more useful I<size in bytes>."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:1240
-msgid "findfs-uuid"
+#: ../fish/guestfish-actions.pod:505
+msgid "blockdev-rereadpt"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:1242
+#: ../fish/guestfish-actions.pod:507

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" findfs-uuid uuid\n"
+" blockdev-rereadpt device\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../fish/guestfish-actions.pod:1248
-msgid "To find the UUID of a filesystem, use L</vfs-uuid>."
-msgstr ""
-

 # type: =head2
 #. type: =head2
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:1250
-msgid "fsck"
+#: ../fish/guestfish-actions.pod:513
+msgid "blockdev-setbsz"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:1252
+#: ../fish/guestfish-actions.pod:515

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" fsck fstype device\n"
+" blockdev-setbsz device blocksize\n"

 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2
 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:1282
-msgid "get-append"
+#: ../fish/guestfish-actions.pod:524
+msgid "blockdev-setro"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:1284
+#: ../fish/guestfish-actions.pod:526

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" get-append\n"
+" blockdev-setro device\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

+# type: =head2

 #. type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:1291
-msgid "get-attach-method"
+#: ../fish/guestfish-actions.pod:532
+msgid "blockdev-setrw"

 msgstr ""
 
 msgstr ""
 

+# type: verbatim

 #. type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:1293
+#: ../fish/guestfish-actions.pod:534

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" get-attach-method\n"
+" blockdev-setrw device\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-#. type: textblock
-#: ../fish/guestfish-actions.pod:1295
-msgid "Return the current attach method.  See L</set-attach-method>."
-msgstr ""
-

 # type: =head2
 #. type: =head2
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:1297
-msgid "get-autosync"
+#: ../fish/guestfish-actions.pod:540
+msgid "case-sensitive-path"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:1299
+#: ../fish/guestfish-actions.pod:542

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" get-autosync\n"
+" case-sensitive-path path\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: =head2
-#. type: =head2
-#: ../fish/guestfish-actions.pod:1303
-msgid "get-direct"
+# type: textblock
+#. type: textblock
+#: ../fish/guestfish-actions.pod:566
+msgid ""
+"Thus L</case-sensitive-path> (\"/Windows/System32\")  might return C<\"/"
+"WINDOWS/system32\"> (the exact return value would depend on details of how "
+"the directories were originally created under Windows)."

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../fish/guestfish-actions.pod:1305
-#, no-wrap
-msgid ""
-" get-direct\n"
-"\n"
+# type: textblock
+#. type: textblock
+#: ../fish/guestfish-actions.pod:574
+msgid "See also L</realpath>."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:1309
-msgid "get-e2label"
+#: ../fish/guestfish-actions.pod:576
+msgid "cat"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:1311
+#: ../fish/guestfish-actions.pod:578

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" get-e2label device\n"
+" cat path\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

+# type: textblock
+#. type: textblock
+#: ../fish/guestfish-actions.pod:582
+msgid ""
+"Note that this function cannot correctly handle binary files (specifically, "
+"files containing C<\\0> character which is treated as end of string).  For "
+"those you need to use the L</read-file> or L</download> functions which have "
+"a more complex interface."
+msgstr ""
+

 # type: =head2
 #. type: =head2
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:1323
-msgid "get-e2uuid"
+#: ../fish/guestfish-actions.pod:590
+msgid "checksum"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:1325
+#: ../fish/guestfish-actions.pod:592

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" get-e2uuid device\n"
+" checksum csumtype path\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

+# type: textblock
+#. type: textblock
+#: ../fish/guestfish-actions.pod:635
+msgid "To get the checksum for a device, use L</checksum-device>."
+msgstr ""
+
+# type: textblock
+#. type: textblock
+#: ../fish/guestfish-actions.pod:637
+msgid "To get the checksums for many files, use L</checksums-out>."
+msgstr ""
+

 # type: =head2
 #. type: =head2
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:1337
-msgid "get-memsize"
+#: ../fish/guestfish-actions.pod:639
+msgid "checksum-device"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:1339
+#: ../fish/guestfish-actions.pod:641

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" get-memsize\n"
+" checksum-device csumtype device\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish-actions.pod:1344
+#: ../fish/guestfish-actions.pod:643

 msgid ""
 msgid ""

-"If L</set-memsize> was not called on this handle, and if "
-"C<LIBGUESTFS_MEMSIZE> was not set, then this returns the compiled-in default "
-"value for memsize."
+"This call computes the MD5, SHAx or CRC checksum of the contents of the "
+"device named C<device>.  For the types of checksums supported see the L</"
+"checksum> command."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:1351
-msgid "get-network"
+#: ../fish/guestfish-actions.pod:647
+msgid "checksums-out"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:1353
+#: ../fish/guestfish-actions.pod:649

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" get-network\n"
+" checksums-out csumtype directory (sumsfile|-)\n"

 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2
 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:1357
-msgid "get-path"
+#: ../fish/guestfish-actions.pod:665
+msgid "chmod"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:1359
+#: ../fish/guestfish-actions.pod:667

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" get-path\n"
+" chmod mode path\n"

 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2
 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:1366
-msgid "get-pid"
-msgstr ""
-
-# type: =head2
-#. type: =head2
-#: ../fish/guestfish-actions.pod:1368
-msgid "pid"
+#: ../fish/guestfish-actions.pod:678
+msgid "chown"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:1370
+#: ../fish/guestfish-actions.pod:680

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" get-pid\n"
+" chown owner group path\n"

 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2
 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:1377
-msgid "get-qemu"
+#: ../fish/guestfish-actions.pod:688
+msgid "command"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:1379
+#: ../fish/guestfish-actions.pod:690

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" get-qemu\n"
+" command 'arguments ...'\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: =head2
-#. type: =head2
-#: ../fish/guestfish-actions.pod:1386
-msgid "get-recovery-proc"
-msgstr ""
-
-# type: verbatim
-#. type: verbatim
-#: ../fish/guestfish-actions.pod:1388
-#, no-wrap
+# type: textblock
+#. type: textblock
+#: ../fish/guestfish-actions.pod:697

 msgid ""
 msgid ""

-" get-recovery-proc\n"
-"\n"
+"The single parameter is an argv-style list of arguments.  The first element "
+"is the name of the program to run.  Subsequent elements are parameters.  The "
+"list must be non-empty (ie. must contain a program name).  Note that the "
+"command runs directly, and is I<not> invoked via the shell (see L</sh>)."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:1392
-msgid "get-selinux"
+#: ../fish/guestfish-actions.pod:725
+msgid "command-lines"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:1394
+#: ../fish/guestfish-actions.pod:727

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" get-selinux\n"
+" command-lines 'arguments ...'\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish-actions.pod:1396
+#: ../fish/guestfish-actions.pod:729

 msgid ""
 msgid ""

-"This returns the current setting of the selinux flag which is passed to the "
-"appliance at boot time.  See L</set-selinux>."
+"This is the same as L</command>, but splits the result into a list of lines."
+msgstr ""
+
+# type: textblock
+#. type: textblock
+#: ../fish/guestfish-actions.pod:732
+msgid "See also: L</sh-lines>"

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:1402
-msgid "get-state"
+#: ../fish/guestfish-actions.pod:737
+msgid "config"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:1404
+#: ../fish/guestfish-actions.pod:739

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" get-state\n"
+" config qemuparam qemuvalue\n"

 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2
 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:1411
-msgid "get-trace"
+#: ../fish/guestfish-actions.pod:750
+msgid "copy-size"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:1413
+#: ../fish/guestfish-actions.pod:752

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" get-trace\n"
+" copy-size src dest size\n"

 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2
 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:1417
-msgid "get-umask"
+#: ../fish/guestfish-actions.pod:760
+msgid "cp"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:1419
+#: ../fish/guestfish-actions.pod:762

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" get-umask\n"
+" cp src dest\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../fish/guestfish-actions.pod:1421
-msgid ""
-"Return the current umask.  By default the umask is C<022> unless it has been "
-"set by calling L</umask>."
-msgstr ""
-

 # type: =head2
 #. type: =head2
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:1424
-msgid "get-verbose"
+#: ../fish/guestfish-actions.pod:767
+msgid "cp-a"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:1426
+#: ../fish/guestfish-actions.pod:769

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" get-verbose\n"
+" cp-a src dest\n"

 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2
 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:1430
-msgid "getcon"
+#: ../fish/guestfish-actions.pod:774
+msgid "dd"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:1432
+#: ../fish/guestfish-actions.pod:776

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" getcon\n"
+" dd src dest\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish-actions.pod:1436
-msgid "See the documentation about SELINUX in L<guestfs(3)>, and L</setcon>"
+#: ../fish/guestfish-actions.pod:783
+msgid ""
+"If the destination is a device, it must be as large or larger than the "
+"source file or device, otherwise the copy will fail.  This command cannot do "
+"partial copies (see L</copy-size>)."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:1439
-msgid "getxattr"
+#: ../fish/guestfish-actions.pod:787
+msgid "df"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:1441
+#: ../fish/guestfish-actions.pod:789

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" getxattr path name\n"
+" df\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish-actions.pod:1443
-msgid ""
-"Get a single extended attribute from file C<path> named C<name>.  This call "
-"follows symlinks.  If you want to lookup an extended attribute for the "
-"symlink itself, use L</lgetxattr>."
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../fish/guestfish-actions.pod:1447 ../fish/guestfish-actions.pod:2353
+#: ../fish/guestfish-actions.pod:793 ../fish/guestfish-actions.pod:804

 msgid ""
 msgid ""

-"Normally it is better to get all extended attributes from a file in one go "
-"by calling L</getxattrs>.  However some Linux filesystem implementations are "
-"buggy and do not provide a way to list out attributes.  For these "
-"filesystems (notably ntfs-3g)  you have to know the names of the extended "
-"attributes you want in advance and call this function."
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../fish/guestfish-actions.pod:1457
-msgid "See also: L</getxattrs>, L</lgetxattr>, L<attr(5)>."
+"This command is mostly useful for interactive sessions.  It is I<not> "
+"intended that you try to parse the output string.  Use L</statvfs> from "
+"programs."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:1459
-msgid "getxattrs"
+#: ../fish/guestfish-actions.pod:797
+msgid "df-h"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:1461
+#: ../fish/guestfish-actions.pod:799

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" getxattrs path\n"
+" df-h\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../fish/guestfish-actions.pod:1469
-msgid "See also: L</lgetxattrs>, L<attr(5)>."
-msgstr ""
-

 # type: =head2
 #. type: =head2
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:1471
-msgid "glob-expand"
+#: ../fish/guestfish-actions.pod:808
+msgid "dmesg"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:1473
+#: ../fish/guestfish-actions.pod:810

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" glob-expand pattern\n"
+" dmesg\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

+# type: textblock
+#. type: textblock
+#: ../fish/guestfish-actions.pod:816
+msgid ""
+"Another way to get the same information is to enable verbose messages with "
+"L</set-verbose> or by setting the environment variable C<LIBGUESTFS_DEBUG=1> "
+"before running the program."
+msgstr ""
+

 # type: =head2
 #. type: =head2
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:1486
-msgid "grep"
+#: ../fish/guestfish-actions.pod:821
+msgid "download"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:1488
+#: ../fish/guestfish-actions.pod:823

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" grep regex path\n"
+" download remotefilename (filename|-)\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

+# type: textblock
+#. type: textblock
+#: ../fish/guestfish-actions.pod:830
+msgid "See also L</upload>, L</cat>."
+msgstr ""
+

 # type: =head2
 #. type: =head2
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:1496
-msgid "grepi"
+#: ../fish/guestfish-actions.pod:834
+msgid "download-offset"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:1498
+#: ../fish/guestfish-actions.pod:836

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" grepi regex path\n"
+" download-offset remotefilename (filename|-) offset size\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: =head2
-#. type: =head2
-#: ../fish/guestfish-actions.pod:1506
-msgid "grub-install"
+# type: textblock
+#. type: textblock
+#: ../fish/guestfish-actions.pod:844
+msgid ""
+"Note that there is no limit on the amount of data that can be downloaded "
+"with this call, unlike with L</pread>, and this call always reads the full "
+"amount unless an error occurs."

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../fish/guestfish-actions.pod:1508
-#, no-wrap
-msgid ""
-" grub-install root device\n"
-"\n"
+# type: textblock
+#. type: textblock
+#: ../fish/guestfish-actions.pod:849
+msgid "See also L</download>, L</pread>."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:1524
-msgid "head"
+#: ../fish/guestfish-actions.pod:853
+msgid "drop-caches"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:1526
+#: ../fish/guestfish-actions.pod:855

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" head path\n"
+" drop-caches whattodrop\n"

 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2
 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:1534
-msgid "head-n"
+#: ../fish/guestfish-actions.pod:867
+msgid "du"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:1536
+#: ../fish/guestfish-actions.pod:869

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" head-n nrlines path\n"
+" du path\n"

 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2
 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:1549
-msgid "hexdump"
+#: ../fish/guestfish-actions.pod:881
+msgid "e2fsck-f"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:1551
+#: ../fish/guestfish-actions.pod:883

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" hexdump path\n"
+" e2fsck-f device\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

+# type: textblock
+#. type: textblock
+#: ../fish/guestfish-actions.pod:889
+msgid ""
+"This command is only needed because of L</resize2fs> (q.v.).  Normally you "
+"should use L</fsck>."
+msgstr ""
+

 # type: =head2
 #. type: =head2
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:1559
-msgid "initrd-cat"
+#: ../fish/guestfish-actions.pod:892
+msgid "echo-daemon"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:1561
+#: ../fish/guestfish-actions.pod:894

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" initrd-cat initrdpath filename\n"
+" echo-daemon 'words ...'\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish-actions.pod:1573
-msgid "See also L</initrd-list>."
+#: ../fish/guestfish-actions.pod:901
+msgid "See also L</ping-daemon>."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:1578
-msgid "initrd-list"
+#: ../fish/guestfish-actions.pod:903
+msgid "egrep"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:1580
+#: ../fish/guestfish-actions.pod:905

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" initrd-list path\n"
+" egrep regex path\n"

 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2
 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:1592
-msgid "inotify-add-watch"
+#: ../fish/guestfish-actions.pod:913
+msgid "egrepi"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:1594
+#: ../fish/guestfish-actions.pod:915

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" inotify-add-watch path mask\n"
+" egrepi regex path\n"

 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2
 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:1606
-msgid "inotify-close"
+#: ../fish/guestfish-actions.pod:923
+msgid "equal"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:1608
+#: ../fish/guestfish-actions.pod:925

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" inotify-close\n"
+" equal file1 file2\n"

 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2
 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:1614
-msgid "inotify-files"
+#: ../fish/guestfish-actions.pod:932
+msgid "exists"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:1616
+#: ../fish/guestfish-actions.pod:934

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" inotify-files\n"
+" exists path\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish-actions.pod:1618
-msgid ""
-"This function is a helpful wrapper around L</inotify-read> which just "
-"returns a list of pathnames of objects that were touched.  The returned "
-"pathnames are sorted and deduplicated."
+#: ../fish/guestfish-actions.pod:939
+msgid "See also L</is-file>, L</is-dir>, L</stat>."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:1622
-msgid "inotify-init"
+#: ../fish/guestfish-actions.pod:941
+msgid "fallocate"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:1624
+#: ../fish/guestfish-actions.pod:943

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" inotify-init maxevents\n"
+" fallocate path len\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../fish/guestfish-actions.pod:1630
+#: ../fish/guestfish-actions.pod:953

 msgid ""
 msgid ""

-"C<maxevents> is the maximum number of events which will be queued up between "
-"calls to L</inotify-read> or L</inotify-files>.  If this is passed as C<0>, "
-"then the kernel (or previously set)  default is used.  For Linux 2.6.29 the "
-"default was 16384 events.  Beyond this limit, the kernel throws away events, "
-"but records the fact that it threw them away by setting a flag "
-"C<IN_Q_OVERFLOW> in the returned structure list (see L</inotify-read>)."
+"This function is deprecated.  In new code, use the L</fallocate64> call "
+"instead."

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../fish/guestfish-actions.pod:1640
+# type: =head2
+#. type: =head2
+#: ../fish/guestfish-actions.pod:960
+msgid "fallocate64"
+msgstr ""
+
+# type: verbatim
+#. type: verbatim
+#: ../fish/guestfish-actions.pod:962
+#, no-wrap

 msgid ""
 msgid ""

-"Before any events are generated, you have to add some watches to the "
-"internal watch list.  See: L</inotify-add-watch>, L</inotify-rm-watch> and "
-"L</inotify-watch-all>."
+" fallocate64 path len\n"
+"\n"

 msgstr ""
 
 # type: textblock
 msgstr ""
 
 # type: textblock

-#. type: textblock
-#: ../fish/guestfish-actions.pod:1646
-msgid ""
-"Queued up events should be read periodically by calling L</inotify-read> (or "
-"L</inotify-files> which is just a helpful wrapper around L</inotify-read>).  "
-"If you don't read the events out often enough then you risk the internal "
-"queue overflowing."
+#. type: textblock
+#: ../fish/guestfish-actions.pod:968
+msgid ""
+"Note that this call allocates disk blocks for the file.  To create a sparse "
+"file use L</truncate-size> instead."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish-actions.pod:1653
+#: ../fish/guestfish-actions.pod:971

 msgid ""
 msgid ""

-"The handle should be closed after use by calling L</inotify-close>.  This "
-"also removes any watches automatically."
+"The deprecated call L</fallocate> does the same, but owing to an oversight "
+"it only allowed 30 bit lengths to be specified, effectively limiting the "
+"maximum size of files created through that call to 1GB."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:1662
-msgid "inotify-read"
+#: ../fish/guestfish-actions.pod:980
+msgid "fgrep"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:1664
+#: ../fish/guestfish-actions.pod:982

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" inotify-read\n"
+" fgrep pattern path\n"

 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2
 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:1677
-msgid "inotify-rm-watch"
+#: ../fish/guestfish-actions.pod:990
+msgid "fgrepi"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:1679
+#: ../fish/guestfish-actions.pod:992

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" inotify-rm-watch wd\n"
+" fgrepi pattern path\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../fish/guestfish-actions.pod:1681
-msgid "Remove a previously defined inotify watch.  See L</inotify-add-watch>."
-msgstr ""
-

 # type: =head2
 #. type: =head2
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:1684
-msgid "inspect-get-arch"
+#: ../fish/guestfish-actions.pod:1000
+msgid "file"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:1686
+#: ../fish/guestfish-actions.pod:1002

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" inspect-get-arch root\n"
+" file path\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../fish/guestfish-actions.pod:1688 ../fish/guestfish-actions.pod:1704
-#: ../fish/guestfish-actions.pod:1778 ../fish/guestfish-actions.pod:1796
-#: ../fish/guestfish-actions.pod:1830 ../fish/guestfish-actions.pod:1845
-#: ../fish/guestfish-actions.pod:1866 ../fish/guestfish-actions.pod:1881
-#: ../fish/guestfish-actions.pod:1908 ../fish/guestfish-actions.pod:1930
-#: ../fish/guestfish-actions.pod:1954 ../fish/guestfish-actions.pod:1984
-#: ../fish/guestfish-actions.pod:2019 ../fish/guestfish-actions.pod:2035
-#: ../fish/guestfish-actions.pod:2048 ../fish/guestfish-actions.pod:2061
-#: ../fish/guestfish-actions.pod:2076
-msgid ""
-"This function should only be called with a root device string as returned by "
-"L</inspect-os>."
-msgstr ""
-
-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../fish/guestfish-actions.pod:1691
+#: ../fish/guestfish-actions.pod:1018

 msgid ""
 msgid ""

-"This returns the architecture of the inspected operating system.  The "
-"possible return values are listed under L</file-architecture>."
+"See also: L<file(1)>, L</vfs-type>, L</lstat>, L</is-file>, L</is-blockdev> "
+"(etc)."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:1700
-msgid "inspect-get-distro"
+#: ../fish/guestfish-actions.pod:1021
+msgid "file-architecture"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:1702
+#: ../fish/guestfish-actions.pod:1023

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" inspect-get-distro root\n"
+" file-architecture filename\n"

 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2
 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:1774
-msgid "inspect-get-filesystems"
+#: ../fish/guestfish-actions.pod:1126
+msgid "filesize"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:1776
+#: ../fish/guestfish-actions.pod:1128

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" inspect-get-filesystems root\n"
+" filesize file\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish-actions.pod:1789
+#: ../fish/guestfish-actions.pod:1132

 msgid ""
 msgid ""

-"Please read L<guestfs(3)/INSPECTION> for more details.  See also L</inspect-"
-"get-mountpoints>."
+"To get other stats about a file, use L</stat>, L</lstat>, L</is-dir>, L</is-"
+"file> etc.  To get the size of block devices, use L</blockdev-getsize64>."

 msgstr ""
 
 msgstr ""
 

+# type: =head2

 #. type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:1792
-msgid "inspect-get-format"
+#: ../fish/guestfish-actions.pod:1136
+msgid "fill"

 msgstr ""
 
 msgstr ""
 

+# type: verbatim

 #. type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:1794
+#: ../fish/guestfish-actions.pod:1138

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" inspect-get-format root\n"
+" fill c len path\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: =head2
-#. type: =head2
-#: ../fish/guestfish-actions.pod:1826
-msgid "inspect-get-hostname"
-msgstr ""
-
-# type: verbatim
-#. type: verbatim
-#: ../fish/guestfish-actions.pod:1828
-#, no-wrap
+# type: textblock
+#. type: textblock
+#: ../fish/guestfish-actions.pod:1144

 msgid ""
 msgid ""

-" inspect-get-hostname root\n"
-"\n"
+"To fill a file with zero bytes (sparsely), it is much more efficient to use "
+"L</truncate-size>.  To create a file with a pattern of repeating bytes use "
+"L</fill-pattern>."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:1841
-msgid "inspect-get-major-version"
+#: ../fish/guestfish-actions.pod:1149
+msgid "fill-pattern"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:1843
+#: ../fish/guestfish-actions.pod:1151

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" inspect-get-major-version root\n"
+" fill-pattern pattern len path\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

+# type: textblock
+#. type: textblock
+#: ../fish/guestfish-actions.pod:1153
+msgid ""
+"This function is like L</fill> except that it creates a new file of length "
+"C<len> containing the repeating pattern of bytes in C<pattern>.  The pattern "
+"is truncated if necessary to ensure the length of the file is exactly C<len> "
+"bytes."
+msgstr ""
+

 # type: =head2
 #. type: =head2
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:1862
-msgid "inspect-get-minor-version"
+#: ../fish/guestfish-actions.pod:1158
+msgid "find"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:1864
+#: ../fish/guestfish-actions.pod:1160

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" inspect-get-minor-version root\n"
+" find directory\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish-actions.pod:1874
-msgid ""
-"Please read L<guestfs(3)/INSPECTION> for more details.  See also L</inspect-"
-"get-major-version>."
+#: ../fish/guestfish-actions.pod:1174
+msgid "then the returned list from L</find> C</tmp> would be 4 elements:"
+msgstr ""
+
+# type: textblock
+#. type: textblock
+#: ../fish/guestfish-actions.pod:1187
+msgid "See also L</find0>."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:1877
-msgid "inspect-get-mountpoints"
+#: ../fish/guestfish-actions.pod:1192
+msgid "find0"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:1879
+#: ../fish/guestfish-actions.pod:1194

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" inspect-get-mountpoints root\n"
+" find0 directory (files|-)\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish-actions.pod:1901
+#: ../fish/guestfish-actions.pod:1200

 msgid ""
 msgid ""

-"Please read L<guestfs(3)/INSPECTION> for more details.  See also L</inspect-"
-"get-filesystems>."
+"This command works the same way as L</find> with the following exceptions:"

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:1904
-msgid "inspect-get-package-format"
+#: ../fish/guestfish-actions.pod:1227
+msgid "findfs-label"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:1906
+#: ../fish/guestfish-actions.pod:1229

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" inspect-get-package-format root\n"
+" findfs-label label\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish-actions.pod:1911
-msgid ""
-"This function and L</inspect-get-package-management> return the package "
-"format and package management tool used by the inspected operating system.  "
-"For example for Fedora these functions would return C<rpm> (package format) "
-"and C<yum> (package management)."
+#: ../fish/guestfish-actions.pod:1235
+msgid "To find the label of a filesystem, use L</vfs-label>."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:1926
-msgid "inspect-get-package-management"
+#: ../fish/guestfish-actions.pod:1237
+msgid "findfs-uuid"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:1928
+#: ../fish/guestfish-actions.pod:1239

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" inspect-get-package-management root\n"
+" findfs-uuid uuid\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish-actions.pod:1933
-msgid ""
-"L</inspect-get-package-format> and this function return the package format "
-"and package management tool used by the inspected operating system.  For "
-"example for Fedora these functions would return C<rpm> (package format) and "
-"C<yum> (package management)."
+#: ../fish/guestfish-actions.pod:1245
+msgid "To find the UUID of a filesystem, use L</vfs-uuid>."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:1950
-msgid "inspect-get-product-name"
+#: ../fish/guestfish-actions.pod:1247
+msgid "fsck"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:1952
+#: ../fish/guestfish-actions.pod:1249

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" inspect-get-product-name root\n"
+" fsck fstype device\n"

 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2
 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:1967
-msgid "inspect-get-roots"
+#: ../fish/guestfish-actions.pod:1279
+msgid "get-append"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:1969
+#: ../fish/guestfish-actions.pod:1281

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" inspect-get-roots\n"
+" get-append\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../fish/guestfish-actions.pod:1971
+#. type: =head2
+#: ../fish/guestfish-actions.pod:1288
+msgid "get-attach-method"
+msgstr ""
+
+#. type: verbatim
+#: ../fish/guestfish-actions.pod:1290
+#, no-wrap

 msgid ""
 msgid ""

-"This function is a convenient way to get the list of root devices, as "
-"returned from a previous call to L</inspect-os>, but without redoing the "
-"whole inspection process."
+" get-attach-method\n"
+"\n"

 msgstr ""
 
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../fish/guestfish-actions.pod:1975
-msgid ""
-"This returns an empty list if either no root devices were found or the "
-"caller has not called L</inspect-os>."
+#: ../fish/guestfish-actions.pod:1292
+msgid "Return the current attach method.  See L</set-attach-method>."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:1980
-msgid "inspect-get-type"
+#: ../fish/guestfish-actions.pod:1294
+msgid "get-autosync"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:1982
+#: ../fish/guestfish-actions.pod:1296

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" inspect-get-type root\n"
+" get-autosync\n"

 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2
 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:2015
-msgid "inspect-get-windows-systemroot"
+#: ../fish/guestfish-actions.pod:1300
+msgid "get-direct"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:2017
+#: ../fish/guestfish-actions.pod:1302

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" inspect-get-windows-systemroot root\n"
+" get-direct\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

+# type: =head2

 #. type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:2031
-msgid "inspect-is-live"
+#: ../fish/guestfish-actions.pod:1306
+msgid "get-e2label"

 msgstr ""
 
 msgstr ""
 

+# type: verbatim

 #. type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:2033
+#: ../fish/guestfish-actions.pod:1308

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" inspect-is-live root\n"
+" get-e2label device\n"

 "\n"
 msgstr ""
 
 #. type: textblock
 "\n"
 msgstr ""
 
 #. type: textblock

-#: ../fish/guestfish-actions.pod:2038
+#: ../fish/guestfish-actions.pod:1313

 msgid ""
 msgid ""

-"If L</inspect-get-format> returns C<installer> (this is an install disk), "
-"then this returns true if a live image was detected on the disk."
+"This function is deprecated.  In new code, use the L</vfs_label> call "
+"instead."

 msgstr ""
 
 msgstr ""
 

+# type: =head2

 #. type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:2044
-msgid "inspect-is-multipart"
+#: ../fish/guestfish-actions.pod:1320
+msgid "get-e2uuid"

 msgstr ""
 
 msgstr ""
 

+# type: verbatim

 #. type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:2046
+#: ../fish/guestfish-actions.pod:1322

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" inspect-is-multipart root\n"
+" get-e2uuid device\n"

 "\n"
 msgstr ""
 
 #. type: textblock
 "\n"
 msgstr ""
 
 #. type: textblock

-#: ../fish/guestfish-actions.pod:2051
+#: ../fish/guestfish-actions.pod:1327

 msgid ""
 msgid ""

-"If L</inspect-get-format> returns C<installer> (this is an install disk), "
-"then this returns true if the disk is part of a set."
+"This function is deprecated.  In new code, use the L</vfs_uuid> call instead."

 msgstr ""
 
 msgstr ""
 

+# type: =head2

 #. type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:2057
-msgid "inspect-is-netinst"
+#: ../fish/guestfish-actions.pod:1334
+msgid "get-memsize"

 msgstr ""
 
 msgstr ""
 

+# type: verbatim

 #. type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:2059
+#: ../fish/guestfish-actions.pod:1336

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" inspect-is-netinst root\n"
+" get-memsize\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

+# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../fish/guestfish-actions.pod:2064
+#: ../fish/guestfish-actions.pod:1341

 msgid ""
 msgid ""

-"If L</inspect-get-format> returns C<installer> (this is an install disk), "
-"then this returns true if the disk is a network installer, ie. not a self-"
-"contained install CD but one which is likely to require network access to "
-"complete the install."
+"If L</set-memsize> was not called on this handle, and if "
+"C<LIBGUESTFS_MEMSIZE> was not set, then this returns the compiled-in default "
+"value for memsize."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:2072
-msgid "inspect-list-applications"
+#: ../fish/guestfish-actions.pod:1348
+msgid "get-network"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:2074
+#: ../fish/guestfish-actions.pod:1350

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" inspect-list-applications root\n"
+" get-network\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../fish/guestfish-actions.pod:2081
+# type: =head2
+#. type: =head2
+#: ../fish/guestfish-actions.pod:1354
+msgid "get-path"
+msgstr ""
+
+# type: verbatim
+#. type: verbatim
+#: ../fish/guestfish-actions.pod:1356
+#, no-wrap

 msgid ""
 msgid ""

-"I<Note:> This call works differently from other parts of the inspection "
-"API.  You have to call L</inspect-os>, then L</inspect-get-mountpoints>, "
-"then mount up the disks, before calling this.  Listing applications is a "
-"significantly more difficult operation which requires access to the full "
-"filesystem.  Also note that unlike the other L</inspect-get-*> calls which "
-"are just returning data cached in the libguestfs handle, this call actually "
-"reads parts of the mounted filesystems during the call."
+" get-path\n"
+"\n"

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:2171
-msgid "inspect-os"
+#: ../fish/guestfish-actions.pod:1363
+msgid "get-pid"
+msgstr ""
+
+# type: =head2
+#. type: =head2
+#: ../fish/guestfish-actions.pod:1365
+msgid "pid"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:2173
+#: ../fish/guestfish-actions.pod:1367

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" inspect-os\n"
+" get-pid\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../fish/guestfish-actions.pod:2188
-msgid ""
-"You can pass the root string(s) returned to other L</inspect-get-*> "
-"functions in order to query further information about each operating system, "
-"such as the name and version."
+# type: =head2
+#. type: =head2
+#: ../fish/guestfish-actions.pod:1374
+msgid "get-qemu"

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../fish/guestfish-actions.pod:2193
+# type: verbatim
+#. type: verbatim
+#: ../fish/guestfish-actions.pod:1376
+#, no-wrap

 msgid ""
 msgid ""

-"This function uses other libguestfs features such as L</mount-ro> and L</"
-"umount-all> in order to mount and unmount filesystems and look at the "
-"contents.  This should be called with no disks currently mounted.  The "
-"function may also use Augeas, so any existing Augeas handle will be closed."
+" get-qemu\n"
+"\n"
+msgstr ""
+
+# type: =head2
+#. type: =head2
+#: ../fish/guestfish-actions.pod:1383
+msgid "get-recovery-proc"

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../fish/guestfish-actions.pod:2205 ../fish/guestfish-actions.pod:2381
-#: ../fish/guestfish-actions.pod:2427
-msgid "See also L</list-filesystems>."
+# type: verbatim
+#. type: verbatim
+#: ../fish/guestfish-actions.pod:1385
+#, no-wrap
+msgid ""
+" get-recovery-proc\n"
+"\n"

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:2207
-msgid "is-blockdev"
+#: ../fish/guestfish-actions.pod:1389
+msgid "get-selinux"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:2209
+#: ../fish/guestfish-actions.pod:1391

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" is-blockdev path\n"
+" get-selinux\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish-actions.pod:2214 ../fish/guestfish-actions.pod:2232
-#: ../fish/guestfish-actions.pod:2251 ../fish/guestfish-actions.pod:2260
-#: ../fish/guestfish-actions.pod:2270 ../fish/guestfish-actions.pod:2304
-#: ../fish/guestfish-actions.pod:2313
-msgid "See also L</stat>."
+#: ../fish/guestfish-actions.pod:1393
+msgid ""
+"This returns the current setting of the selinux flag which is passed to the "
+"appliance at boot time.  See L</set-selinux>."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:2216
-msgid "is-busy"
+#: ../fish/guestfish-actions.pod:1399
+msgid "get-state"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:2218
+#: ../fish/guestfish-actions.pod:1401

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" is-busy\n"
+" get-state\n"

 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2
 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:2225
-msgid "is-chardev"
+#: ../fish/guestfish-actions.pod:1408
+msgid "get-trace"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:2227
+#: ../fish/guestfish-actions.pod:1410

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" is-chardev path\n"
+" get-trace\n"

 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2
 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:2234
-msgid "is-config"
+#: ../fish/guestfish-actions.pod:1414
+msgid "get-umask"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:2236
+#: ../fish/guestfish-actions.pod:1416

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" is-config\n"
+" get-umask\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

+# type: textblock
+#. type: textblock
+#: ../fish/guestfish-actions.pod:1418
+msgid ""
+"Return the current umask.  By default the umask is C<022> unless it has been "
+"set by calling L</umask>."
+msgstr ""
+

 # type: =head2
 #. type: =head2
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:2243
-msgid "is-dir"
+#: ../fish/guestfish-actions.pod:1421
+msgid "get-verbose"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:2245
+#: ../fish/guestfish-actions.pod:1423

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" is-dir path\n"
+" get-verbose\n"

 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2
 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:2253
-msgid "is-fifo"
+#: ../fish/guestfish-actions.pod:1427
+msgid "getcon"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:2255
+#: ../fish/guestfish-actions.pod:1429

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" is-fifo path\n"
+" getcon\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

+# type: textblock
+#. type: textblock
+#: ../fish/guestfish-actions.pod:1433
+msgid "See the documentation about SELINUX in L<guestfs(3)>, and L</setcon>"
+msgstr ""
+

 # type: =head2
 #. type: =head2
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:2262
-msgid "is-file"
+#: ../fish/guestfish-actions.pod:1436
+msgid "getxattr"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:2264
+#: ../fish/guestfish-actions.pod:1438

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" is-file path\n"
+" getxattr path name\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

+# type: textblock
+#. type: textblock
+#: ../fish/guestfish-actions.pod:1440
+msgid ""
+"Get a single extended attribute from file C<path> named C<name>.  This call "
+"follows symlinks.  If you want to lookup an extended attribute for the "
+"symlink itself, use L</lgetxattr>."
+msgstr ""
+
+# type: textblock
+#. type: textblock
+#: ../fish/guestfish-actions.pod:1444 ../fish/guestfish-actions.pod:2450
+msgid ""
+"Normally it is better to get all extended attributes from a file in one go "
+"by calling L</getxattrs>.  However some Linux filesystem implementations are "
+"buggy and do not provide a way to list out attributes.  For these "
+"filesystems (notably ntfs-3g)  you have to know the names of the extended "
+"attributes you want in advance and call this function."
+msgstr ""
+
+# type: textblock
+#. type: textblock
+#: ../fish/guestfish-actions.pod:1454
+msgid "See also: L</getxattrs>, L</lgetxattr>, L<attr(5)>."
+msgstr ""
+

 # type: =head2
 #. type: =head2
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:2272
-msgid "is-launching"
+#: ../fish/guestfish-actions.pod:1456
+msgid "getxattrs"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:2274
+#: ../fish/guestfish-actions.pod:1458

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" is-launching\n"
+" getxattrs path\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

+# type: textblock
+#. type: textblock
+#: ../fish/guestfish-actions.pod:1466
+msgid "See also: L</lgetxattrs>, L<attr(5)>."
+msgstr ""
+

 # type: =head2
 #. type: =head2
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:2281
-msgid "is-lv"
+#: ../fish/guestfish-actions.pod:1468
+msgid "glob-expand"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:2283
+#: ../fish/guestfish-actions.pod:1470

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" is-lv device\n"
+" glob-expand pattern\n"

 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2
 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:2288
-msgid "is-ready"
+#: ../fish/guestfish-actions.pod:1483
+msgid "grep"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:2290
+#: ../fish/guestfish-actions.pod:1485

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" is-ready\n"
+" grep regex path\n"

 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2
 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:2297
-msgid "is-socket"
+#: ../fish/guestfish-actions.pod:1493
+msgid "grepi"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:2299
+#: ../fish/guestfish-actions.pod:1495

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" is-socket path\n"
+" grepi regex path\n"

 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2
 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:2306
-msgid "is-symlink"
+#: ../fish/guestfish-actions.pod:1503
+msgid "grub-install"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:2308
+#: ../fish/guestfish-actions.pod:1505

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" is-symlink path\n"
+" grub-install root device\n"

 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2
 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:2315
-msgid "kill-subprocess"
+#: ../fish/guestfish-actions.pod:1521
+msgid "head"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:2317
+#: ../fish/guestfish-actions.pod:1523

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" kill-subprocess\n"
+" head path\n"

 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2
 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:2321
-msgid "launch"
+#: ../fish/guestfish-actions.pod:1531
+msgid "head-n"
+msgstr ""
+
+# type: verbatim
+#. type: verbatim
+#: ../fish/guestfish-actions.pod:1533
+#, no-wrap
+msgid ""
+" head-n nrlines path\n"
+"\n"

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:2323
-msgid "run"
+#: ../fish/guestfish-actions.pod:1546
+msgid "hexdump"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:2325
+#: ../fish/guestfish-actions.pod:1548

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" launch\n"
+" hexdump path\n"

 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2
 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:2333
-msgid "lchown"
+#: ../fish/guestfish-actions.pod:1556
+msgid "initrd-cat"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:2335
+#: ../fish/guestfish-actions.pod:1558

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" lchown owner group path\n"
+" initrd-cat initrdpath filename\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish-actions.pod:2337
-msgid ""
-"Change the file owner to C<owner> and group to C<group>.  This is like L</"
-"chown> but if C<path> is a symlink then the link itself is changed, not the "
-"target."
+#: ../fish/guestfish-actions.pod:1570
+msgid "See also L</initrd-list>."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:2345
-msgid "lgetxattr"
+#: ../fish/guestfish-actions.pod:1575
+msgid "initrd-list"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:2347
+#: ../fish/guestfish-actions.pod:1577

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" lgetxattr path name\n"
+" initrd-list path\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../fish/guestfish-actions.pod:2363
-msgid "See also: L</lgetxattrs>, L</getxattr>, L<attr(5)>."
-msgstr ""
-

 # type: =head2
 #. type: =head2
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:2365
-msgid "lgetxattrs"
+#: ../fish/guestfish-actions.pod:1589
+msgid "inotify-add-watch"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:2367
+#: ../fish/guestfish-actions.pod:1591

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" lgetxattrs path\n"
+" inotify-add-watch path mask\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../fish/guestfish-actions.pod:2369
-msgid ""
-"This is the same as L</getxattrs>, but if C<path> is a symbolic link, then "
-"it returns the extended attributes of the link itself."
-msgstr ""
-

 # type: =head2
 #. type: =head2
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:2373
-msgid "list-devices"
+#: ../fish/guestfish-actions.pod:1603
+msgid "inotify-close"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:2375
+#: ../fish/guestfish-actions.pod:1605

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" list-devices\n"
+" inotify-close\n"

 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2
 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:2383
-msgid "list-filesystems"
+#: ../fish/guestfish-actions.pod:1611
+msgid "inotify-files"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:2385
+#: ../fish/guestfish-actions.pod:1613

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" list-filesystems\n"
+" inotify-files\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish-actions.pod:2404
-msgid ""
-"This command runs other libguestfs commands, which might include L</mount> "
-"and L</umount>, and therefore you should use this soon after launch and only "
-"when nothing is mounted."
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../fish/guestfish-actions.pod:2408
+#: ../fish/guestfish-actions.pod:1615

 msgid ""
 msgid ""

-"Not all of the filesystems returned will be mountable.  In particular, swap "
-"partitions are returned in the list.  Also this command does not check that "
-"each filesystem found is valid and mountable, and some filesystems might be "
-"mountable but require special options.  Filesystems may not all belong to a "
-"single logical operating system (use L</inspect-os> to look for OSes)."
+"This function is a helpful wrapper around L</inotify-read> which just "
+"returns a list of pathnames of objects that were touched.  The returned "
+"pathnames are sorted and deduplicated."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:2416
-msgid "list-partitions"
+#: ../fish/guestfish-actions.pod:1619
+msgid "inotify-init"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:2418
+#: ../fish/guestfish-actions.pod:1621

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" list-partitions\n"
+" inotify-init maxevents\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish-actions.pod:2424
+#: ../fish/guestfish-actions.pod:1627

 msgid ""
 msgid ""

-"This does not return logical volumes.  For that you will need to call L</"
-"lvs>."
+"C<maxevents> is the maximum number of events which will be queued up between "
+"calls to L</inotify-read> or L</inotify-files>.  If this is passed as C<0>, "
+"then the kernel (or previously set)  default is used.  For Linux 2.6.29 the "
+"default was 16384 events.  Beyond this limit, the kernel throws away events, "
+"but records the fact that it threw them away by setting a flag "
+"C<IN_Q_OVERFLOW> in the returned structure list (see L</inotify-read>)."

 msgstr ""
 
 msgstr ""
 

-# type: =head2
-#. type: =head2
-#: ../fish/guestfish-actions.pod:2429
-msgid "ll"
+# type: textblock
+#. type: textblock
+#: ../fish/guestfish-actions.pod:1637
+msgid ""
+"Before any events are generated, you have to add some watches to the "
+"internal watch list.  See: L</inotify-add-watch>, L</inotify-rm-watch> and "
+"L</inotify-watch-all>."

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../fish/guestfish-actions.pod:2431
-#, no-wrap
+# type: textblock
+#. type: textblock
+#: ../fish/guestfish-actions.pod:1643

 msgid ""
 msgid ""

-" ll directory\n"
-"\n"
+"Queued up events should be read periodically by calling L</inotify-read> (or "
+"L</inotify-files> which is just a helpful wrapper around L</inotify-read>).  "
+"If you don't read the events out often enough then you risk the internal "
+"queue overflowing."
+msgstr ""
+
+# type: textblock
+#. type: textblock
+#: ../fish/guestfish-actions.pod:1650
+msgid ""
+"The handle should be closed after use by calling L</inotify-close>.  This "
+"also removes any watches automatically."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:2439
-msgid "ln"
+#: ../fish/guestfish-actions.pod:1659
+msgid "inotify-read"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:2441
+#: ../fish/guestfish-actions.pod:1661

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" ln target linkname\n"
+" inotify-read\n"

 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2
 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:2445
-msgid "ln-f"
+#: ../fish/guestfish-actions.pod:1674
+msgid "inotify-rm-watch"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:2447
+#: ../fish/guestfish-actions.pod:1676

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" ln-f target linkname\n"
+" inotify-rm-watch wd\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

+# type: textblock
+#. type: textblock
+#: ../fish/guestfish-actions.pod:1678
+msgid "Remove a previously defined inotify watch.  See L</inotify-add-watch>."
+msgstr ""
+

 # type: =head2
 #. type: =head2
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:2452
-msgid "ln-s"
+#: ../fish/guestfish-actions.pod:1681
+msgid "inspect-get-arch"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:2454
+#: ../fish/guestfish-actions.pod:1683

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" ln-s target linkname\n"
+" inspect-get-arch root\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

+# type: textblock
+#. type: textblock
+#: ../fish/guestfish-actions.pod:1685 ../fish/guestfish-actions.pod:1701
+#: ../fish/guestfish-actions.pod:1787 ../fish/guestfish-actions.pod:1823
+#: ../fish/guestfish-actions.pod:1841 ../fish/guestfish-actions.pod:1875
+#: ../fish/guestfish-actions.pod:1890 ../fish/guestfish-actions.pod:1911
+#: ../fish/guestfish-actions.pod:1926 ../fish/guestfish-actions.pod:1959
+#: ../fish/guestfish-actions.pod:1981 ../fish/guestfish-actions.pod:2005
+#: ../fish/guestfish-actions.pod:2022 ../fish/guestfish-actions.pod:2065
+#: ../fish/guestfish-actions.pod:2100 ../fish/guestfish-actions.pod:2116
+#: ../fish/guestfish-actions.pod:2132 ../fish/guestfish-actions.pod:2145
+#: ../fish/guestfish-actions.pod:2158 ../fish/guestfish-actions.pod:2173
+msgid ""
+"This function should only be called with a root device string as returned by "
+"L</inspect-os>."
+msgstr ""
+
+# type: textblock
+#. type: textblock
+#: ../fish/guestfish-actions.pod:1688
+msgid ""
+"This returns the architecture of the inspected operating system.  The "
+"possible return values are listed under L</file-architecture>."
+msgstr ""
+

 # type: =head2
 #. type: =head2
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:2458
-msgid "ln-sf"
+#: ../fish/guestfish-actions.pod:1697
+msgid "inspect-get-distro"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:2460
+#: ../fish/guestfish-actions.pod:1699

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" ln-sf target linkname\n"
+" inspect-get-distro root\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: =head2

 #. type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:2465
-msgid "lremovexattr"
+#: ../fish/guestfish-actions.pod:1783
+msgid "inspect-get-drive-mappings"

 msgstr ""
 
 msgstr ""
 

-# type: verbatim

 #. type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:2467
+#: ../fish/guestfish-actions.pod:1785

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" lremovexattr xattr path\n"
+" inspect-get-drive-mappings root\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../fish/guestfish-actions.pod:2469
+#: ../fish/guestfish-actions.pod:1815

 msgid ""
 msgid ""

-"This is the same as L</removexattr>, but if C<path> is a symbolic link, then "
-"it removes an extended attribute of the link itself."
+"Please read L<guestfs(3)/INSPECTION> for more details.  See also L</inspect-"
+"get-mountpoints>, L</inspect-get-filesystems>."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:2473
-msgid "ls"
+#: ../fish/guestfish-actions.pod:1819
+msgid "inspect-get-filesystems"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:2475
+#: ../fish/guestfish-actions.pod:1821

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" ls directory\n"
+" inspect-get-filesystems root\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish-actions.pod:2481
+#: ../fish/guestfish-actions.pod:1834

 msgid ""
 msgid ""

-"This command is mostly useful for interactive sessions.  Programs should "
-"probably use L</readdir> instead."
+"Please read L<guestfs(3)/INSPECTION> for more details.  See also L</inspect-"
+"get-mountpoints>."
+msgstr ""
+
+#. type: =head2
+#: ../fish/guestfish-actions.pod:1837
+msgid "inspect-get-format"
+msgstr ""
+
+#. type: verbatim
+#: ../fish/guestfish-actions.pod:1839
+#, no-wrap
+msgid ""
+" inspect-get-format root\n"
+"\n"

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:2484
-msgid "lsetxattr"
+#: ../fish/guestfish-actions.pod:1871
+msgid "inspect-get-hostname"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:2486
+#: ../fish/guestfish-actions.pod:1873

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" lsetxattr xattr val vallen path\n"
+" inspect-get-hostname root\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../fish/guestfish-actions.pod:2488
+# type: =head2
+#. type: =head2
+#: ../fish/guestfish-actions.pod:1886
+msgid "inspect-get-major-version"
+msgstr ""
+
+# type: verbatim
+#. type: verbatim
+#: ../fish/guestfish-actions.pod:1888
+#, no-wrap

 msgid ""
 msgid ""

-"This is the same as L</setxattr>, but if C<path> is a symbolic link, then it "
-"sets an extended attribute of the link itself."
+" inspect-get-major-version root\n"
+"\n"

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:2492
-msgid "lstat"
+#: ../fish/guestfish-actions.pod:1907
+msgid "inspect-get-minor-version"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:2494
+#: ../fish/guestfish-actions.pod:1909

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" lstat path\n"
+" inspect-get-minor-version root\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish-actions.pod:2498
+#: ../fish/guestfish-actions.pod:1919

 msgid ""
 msgid ""

-"This is the same as L</stat> except that if C<path> is a symbolic link, then "
-"the link is stat-ed, not the file it refers to."
+"Please read L<guestfs(3)/INSPECTION> for more details.  See also L</inspect-"
+"get-major-version>."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:2504
-msgid "lstatlist"
+#: ../fish/guestfish-actions.pod:1922
+msgid "inspect-get-mountpoints"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:2506
+#: ../fish/guestfish-actions.pod:1924

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" lstatlist path 'names ...'\n"
+" inspect-get-mountpoints root\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../fish/guestfish-actions.pod:2508
+#: ../fish/guestfish-actions.pod:1946

 msgid ""
 msgid ""

-"This call allows you to perform the L</lstat> operation on multiple files, "
-"where all files are in the directory C<path>.  C<names> is the list of files "
-"from this directory."
+"For operating systems like Windows which still use drive letters, this call "
+"will only return an entry for the first drive \"mounted on\" C</>.  For "
+"information about the mapping of drive letters to partitions, see L</inspect-"
+"get-drive-mappings>."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish-actions.pod:2517
+#: ../fish/guestfish-actions.pod:1952

 msgid ""
 msgid ""

-"This call is intended for programs that want to efficiently list a directory "
-"contents without making many round-trips.  See also L</lxattrlist> for a "
-"similarly efficient call for getting extended attributes.  Very long "
-"directory listings might cause the protocol message size to be exceeded, "
-"causing this call to fail.  The caller must split up such requests into "
-"smaller groups of names."
+"Please read L<guestfs(3)/INSPECTION> for more details.  See also L</inspect-"
+"get-filesystems>."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:2525
-msgid "luks-add-key"
+#: ../fish/guestfish-actions.pod:1955
+msgid "inspect-get-package-format"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:2527
+#: ../fish/guestfish-actions.pod:1957

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" luks-add-key device keyslot\n"
+" inspect-get-package-format root\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish-actions.pod:2534
-msgid ""
-"Note that if C<keyslot> already contains a key, then this command will "
-"fail.  You have to use L</luks-kill-slot> first to remove that key."
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../fish/guestfish-actions.pod:2538 ../fish/guestfish-actions.pod:2560
-#: ../fish/guestfish-actions.pod:2573 ../fish/guestfish-actions.pod:2587
-#: ../fish/guestfish-actions.pod:2610 ../fish/guestfish-actions.pod:2620
+#: ../fish/guestfish-actions.pod:1962

 msgid ""
 msgid ""

-"This command has one or more key or passphrase parameters.  Guestfish will "
-"prompt for these separately."
+"This function and L</inspect-get-package-management> return the package "
+"format and package management tool used by the inspected operating system.  "
+"For example for Fedora these functions would return C<rpm> (package format) "
+"and C<yum> (package management)."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:2541
-msgid "luks-close"
+#: ../fish/guestfish-actions.pod:1977
+msgid "inspect-get-package-management"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:2543
+#: ../fish/guestfish-actions.pod:1979

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" luks-close device\n"
+" inspect-get-package-management root\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish-actions.pod:2545
+#: ../fish/guestfish-actions.pod:1984

 msgid ""
 msgid ""

-"This closes a LUKS device that was created earlier by L</luks-open> or L</"
-"luks-open-ro>.  The C<device> parameter must be the name of the LUKS mapping "
-"device (ie. C</dev/mapper/mapname>) and I<not> the name of the underlying "
-"block device."
+"L</inspect-get-package-format> and this function return the package format "
+"and package management tool used by the inspected operating system.  For "
+"example for Fedora these functions would return C<rpm> (package format) and "
+"C<yum> (package management)."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:2551
-msgid "luks-format"
+#: ../fish/guestfish-actions.pod:2001
+msgid "inspect-get-product-name"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:2553
+#: ../fish/guestfish-actions.pod:2003

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" luks-format device keyslot\n"
+" inspect-get-product-name root\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: =head2

 #. type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:2566
-msgid "luks-format-cipher"
+#: ../fish/guestfish-actions.pod:2018
+msgid "inspect-get-product-variant"

 msgstr ""
 
 msgstr ""
 

-# type: verbatim

 #. type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:2568
+#: ../fish/guestfish-actions.pod:2020

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" luks-format-cipher device keyslot cipher\n"
+" inspect-get-product-variant root\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../fish/guestfish-actions.pod:2570
+#: ../fish/guestfish-actions.pod:2044

 msgid ""
 msgid ""

-"This command is the same as L</luks-format> but it also allows you to set "
-"the C<cipher> used."
+"Please read L<guestfs(3)/INSPECTION> for more details.  See also L</inspect-"
+"get-product-name>, L</inspect-get-major-version>."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:2579
-msgid "luks-kill-slot"
+#: ../fish/guestfish-actions.pod:2048
+msgid "inspect-get-roots"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:2581
+#: ../fish/guestfish-actions.pod:2050

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" luks-kill-slot device keyslot\n"
+" inspect-get-roots\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: =head2
-#. type: =head2
-#: ../fish/guestfish-actions.pod:2590
-msgid "luks-open"
-msgstr ""
-
-# type: verbatim
-#. type: verbatim
-#: ../fish/guestfish-actions.pod:2592
-#, no-wrap
+# type: textblock
+#. type: textblock
+#: ../fish/guestfish-actions.pod:2052

 msgid ""
 msgid ""

-" luks-open device mapname\n"
-"\n"
+"This function is a convenient way to get the list of root devices, as "
+"returned from a previous call to L</inspect-os>, but without redoing the "
+"whole inspection process."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish-actions.pod:2606
+#: ../fish/guestfish-actions.pod:2056

 msgid ""
 msgid ""

-"If this block device contains LVM volume groups, then calling L</vgscan> "
-"followed by L</vg-activate-all> will make them visible."
+"This returns an empty list if either no root devices were found or the "
+"caller has not called L</inspect-os>."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:2613
-msgid "luks-open-ro"
+#: ../fish/guestfish-actions.pod:2061
+msgid "inspect-get-type"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:2615
+#: ../fish/guestfish-actions.pod:2063

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" luks-open-ro device mapname\n"
+" inspect-get-type root\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../fish/guestfish-actions.pod:2617
-msgid ""
-"This is the same as L</luks-open> except that a read-only mapping is created."
-msgstr ""
-
-# type: =head2

 #. type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:2623
-msgid "lvcreate"
+#: ../fish/guestfish-actions.pod:2096
+msgid "inspect-get-windows-current-control-set"

 msgstr ""
 
 msgstr ""
 

-# type: verbatim

 #. type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:2625
+#: ../fish/guestfish-actions.pod:2098

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" lvcreate logvol volgroup mbytes\n"
+" inspect-get-windows-current-control-set root\n"

 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2
 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:2630
-msgid "lvm-canonical-lv-name"
+#: ../fish/guestfish-actions.pod:2112
+msgid "inspect-get-windows-systemroot"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:2632
+#: ../fish/guestfish-actions.pod:2114

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" lvm-canonical-lv-name lvname\n"
+" inspect-get-windows-systemroot root\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../fish/guestfish-actions.pod:2641
-msgid "See also L</is-lv>."
-msgstr ""
-
-# type: =head2

 #. type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:2643
-msgid "lvm-clear-filter"
+#: ../fish/guestfish-actions.pod:2128
+msgid "inspect-is-live"

 msgstr ""
 
 msgstr ""
 

-# type: verbatim

 #. type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:2645
+#: ../fish/guestfish-actions.pod:2130

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" lvm-clear-filter\n"
+" inspect-is-live root\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../fish/guestfish-actions.pod:2647
+#: ../fish/guestfish-actions.pod:2135

 msgid ""
 msgid ""

-"This undoes the effect of L</lvm-set-filter>.  LVM will be able to see every "
-"block device."
+"If L</inspect-get-format> returns C<installer> (this is an install disk), "
+"then this returns true if a live image was detected on the disk."

 msgstr ""
 
 msgstr ""
 

-# type: =head2

 #. type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:2653
-msgid "lvm-remove-all"
+#: ../fish/guestfish-actions.pod:2141
+msgid "inspect-is-multipart"

 msgstr ""
 
 msgstr ""
 

-# type: verbatim

 #. type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:2655
+#: ../fish/guestfish-actions.pod:2143

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" lvm-remove-all\n"
+" inspect-is-multipart root\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: =head2
-#. type: =head2
-#: ../fish/guestfish-actions.pod:2663
-msgid "lvm-set-filter"
-msgstr ""
-
-# type: verbatim
-#. type: verbatim
-#: ../fish/guestfish-actions.pod:2665
-#, no-wrap
+#. type: textblock
+#: ../fish/guestfish-actions.pod:2148

 msgid ""
 msgid ""

-" lvm-set-filter 'devices ...'\n"
-"\n"
+"If L</inspect-get-format> returns C<installer> (this is an install disk), "
+"then this returns true if the disk is part of a set."

 msgstr ""
 
 msgstr ""
 

-# type: =head2

 #. type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:2690
-msgid "lvremove"
+#: ../fish/guestfish-actions.pod:2154
+msgid "inspect-is-netinst"

 msgstr ""
 
 msgstr ""
 

-# type: verbatim

 #. type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:2692
+#: ../fish/guestfish-actions.pod:2156

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" lvremove device\n"
+" inspect-is-netinst root\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

+#. type: textblock
+#: ../fish/guestfish-actions.pod:2161
+msgid ""
+"If L</inspect-get-format> returns C<installer> (this is an install disk), "
+"then this returns true if the disk is a network installer, ie. not a self-"
+"contained install CD but one which is likely to require network access to "
+"complete the install."
+msgstr ""
+

 # type: =head2
 #. type: =head2
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:2700
-msgid "lvrename"
+#: ../fish/guestfish-actions.pod:2169
+msgid "inspect-list-applications"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:2702
+#: ../fish/guestfish-actions.pod:2171

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" lvrename logvol newlogvol\n"
+" inspect-list-applications root\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

+# type: textblock
+#. type: textblock
+#: ../fish/guestfish-actions.pod:2178
+msgid ""
+"I<Note:> This call works differently from other parts of the inspection "
+"API.  You have to call L</inspect-os>, then L</inspect-get-mountpoints>, "
+"then mount up the disks, before calling this.  Listing applications is a "
+"significantly more difficult operation which requires access to the full "
+"filesystem.  Also note that unlike the other L</inspect-get-*> calls which "
+"are just returning data cached in the libguestfs handle, this call actually "
+"reads parts of the mounted filesystems during the call."
+msgstr ""
+

 # type: =head2
 #. type: =head2
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:2706
-msgid "lvresize"
+#: ../fish/guestfish-actions.pod:2268
+msgid "inspect-os"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:2708
+#: ../fish/guestfish-actions.pod:2270

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" lvresize device mbytes\n"
+" inspect-os\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: =head2
-#. type: =head2
-#: ../fish/guestfish-actions.pod:2714
-msgid "lvresize-free"
+# type: textblock
+#. type: textblock
+#: ../fish/guestfish-actions.pod:2285
+msgid ""
+"You can pass the root string(s) returned to other L</inspect-get-*> "
+"functions in order to query further information about each operating system, "
+"such as the name and version."

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../fish/guestfish-actions.pod:2716
-#, no-wrap
+# type: textblock
+#. type: textblock
+#: ../fish/guestfish-actions.pod:2290

 msgid ""
 msgid ""

-" lvresize-free lv percent\n"
-"\n"
+"This function uses other libguestfs features such as L</mount-ro> and L</"
+"umount-all> in order to mount and unmount filesystems and look at the "
+"contents.  This should be called with no disks currently mounted.  The "
+"function may also use Augeas, so any existing Augeas handle will be closed."
+msgstr ""
+
+# type: textblock
+#. type: textblock
+#: ../fish/guestfish-actions.pod:2302 ../fish/guestfish-actions.pod:2478
+#: ../fish/guestfish-actions.pod:2524
+msgid "See also L</list-filesystems>."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:2724
-msgid "lvs"
+#: ../fish/guestfish-actions.pod:2304
+msgid "is-blockdev"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:2726
+#: ../fish/guestfish-actions.pod:2306

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" lvs\n"
+" is-blockdev path\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish-actions.pod:2734
-msgid "See also L</lvs-full>, L</list-filesystems>."
+#: ../fish/guestfish-actions.pod:2311 ../fish/guestfish-actions.pod:2329
+#: ../fish/guestfish-actions.pod:2348 ../fish/guestfish-actions.pod:2357
+#: ../fish/guestfish-actions.pod:2367 ../fish/guestfish-actions.pod:2401
+#: ../fish/guestfish-actions.pod:2410
+msgid "See also L</stat>."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:2736
-msgid "lvs-full"
+#: ../fish/guestfish-actions.pod:2313
+msgid "is-busy"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:2738
+#: ../fish/guestfish-actions.pod:2315

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" lvs-full\n"
+" is-busy\n"

 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2
 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:2743
-msgid "lvuuid"
+#: ../fish/guestfish-actions.pod:2322
+msgid "is-chardev"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:2745
+#: ../fish/guestfish-actions.pod:2324

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" lvuuid device\n"
+" is-chardev path\n"

 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2
 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:2749
-msgid "lxattrlist"
+#: ../fish/guestfish-actions.pod:2331
+msgid "is-config"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:2751
+#: ../fish/guestfish-actions.pod:2333

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" lxattrlist path 'names ...'\n"
+" is-config\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../fish/guestfish-actions.pod:2767
-msgid ""
-"This call is intended for programs that want to efficiently list a directory "
-"contents without making many round-trips.  See also L</lstatlist> for a "
-"similarly efficient call for getting standard stats.  Very long directory "
-"listings might cause the protocol message size to be exceeded, causing this "
-"call to fail.  The caller must split up such requests into smaller groups of "
-"names."
-msgstr ""
-

 # type: =head2
 #. type: =head2
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:2775
-msgid "mkdir"
+#: ../fish/guestfish-actions.pod:2340
+msgid "is-dir"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:2777
+#: ../fish/guestfish-actions.pod:2342

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" mkdir path\n"
+" is-dir path\n"

 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2
 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:2781
-msgid "mkdir-mode"
+#: ../fish/guestfish-actions.pod:2350
+msgid "is-fifo"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:2783
+#: ../fish/guestfish-actions.pod:2352

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" mkdir-mode path mode\n"
+" is-fifo path\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../fish/guestfish-actions.pod:2792
-msgid "See also L</mkdir>, L</umask>"
-msgstr ""
-

 # type: =head2
 #. type: =head2
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:2794
-msgid "mkdir-p"
+#: ../fish/guestfish-actions.pod:2359
+msgid "is-file"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:2796
+#: ../fish/guestfish-actions.pod:2361

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" mkdir-p path\n"
+" is-file path\n"

 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2
 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:2801
-msgid "mkdtemp"
+#: ../fish/guestfish-actions.pod:2369
+msgid "is-launching"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:2803
+#: ../fish/guestfish-actions.pod:2371

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" mkdtemp template\n"
+" is-launching\n"

 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2
 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:2824
-msgid "mke2fs-J"
+#: ../fish/guestfish-actions.pod:2378
+msgid "is-lv"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:2826
+#: ../fish/guestfish-actions.pod:2380

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" mke2fs-J fstype blocksize device journal\n"
+" is-lv device\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../fish/guestfish-actions.pod:2834
-msgid "See also L</mke2journal>."
-msgstr ""
-

 # type: =head2
 #. type: =head2
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:2836
-msgid "mke2fs-JL"
+#: ../fish/guestfish-actions.pod:2385
+msgid "is-ready"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:2838
+#: ../fish/guestfish-actions.pod:2387

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" mke2fs-JL fstype blocksize device label\n"
+" is-ready\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../fish/guestfish-actions.pod:2843
-msgid "See also L</mke2journal-L>."
-msgstr ""
-

 # type: =head2
 #. type: =head2
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:2845
-msgid "mke2fs-JU"
+#: ../fish/guestfish-actions.pod:2394
+msgid "is-socket"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:2847
+#: ../fish/guestfish-actions.pod:2396

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" mke2fs-JU fstype blocksize device uuid\n"
+" is-socket path\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../fish/guestfish-actions.pod:2852
-msgid "See also L</mke2journal-U>."
-msgstr ""
-

 # type: =head2
 #. type: =head2
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:2854
-msgid "mke2journal"
+#: ../fish/guestfish-actions.pod:2403
+msgid "is-symlink"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:2856
+#: ../fish/guestfish-actions.pod:2405

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" mke2journal blocksize device\n"
+" is-symlink path\n"

 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2
 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:2863
-msgid "mke2journal-L"
+#: ../fish/guestfish-actions.pod:2412
+msgid "kill-subprocess"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:2865
+#: ../fish/guestfish-actions.pod:2414

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" mke2journal-L blocksize label device\n"
+" kill-subprocess\n"

 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2
 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:2869
-msgid "mke2journal-U"
+#: ../fish/guestfish-actions.pod:2418
+msgid "launch"
+msgstr ""
+
+# type: =head2
+#. type: =head2
+#: ../fish/guestfish-actions.pod:2420
+msgid "run"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:2871
+#: ../fish/guestfish-actions.pod:2422

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" mke2journal-U blocksize uuid device\n"
+" launch\n"

 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2
 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:2875
-msgid "mkfifo"
+#: ../fish/guestfish-actions.pod:2430
+msgid "lchown"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:2877
+#: ../fish/guestfish-actions.pod:2432

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" mkfifo mode path\n"
+" lchown owner group path\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish-actions.pod:2879
+#: ../fish/guestfish-actions.pod:2434

 msgid ""
 msgid ""

-"This call creates a FIFO (named pipe) called C<path> with mode C<mode>.  It "
-"is just a convenient wrapper around L</mknod>."
+"Change the file owner to C<owner> and group to C<group>.  This is like L</"
+"chown> but if C<path> is a symlink then the link itself is changed, not the "
+"target."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:2885
-msgid "mkfs"
+#: ../fish/guestfish-actions.pod:2442
+msgid "lgetxattr"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:2887
+#: ../fish/guestfish-actions.pod:2444

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" mkfs fstype device\n"
+" lgetxattr path name\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

+# type: textblock
+#. type: textblock
+#: ../fish/guestfish-actions.pod:2460
+msgid "See also: L</lgetxattrs>, L</getxattr>, L<attr(5)>."
+msgstr ""
+

 # type: =head2
 #. type: =head2
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:2893
-msgid "mkfs-b"
+#: ../fish/guestfish-actions.pod:2462
+msgid "lgetxattrs"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:2895
+#: ../fish/guestfish-actions.pod:2464

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" mkfs-b fstype blocksize device\n"
+" lgetxattrs path\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish-actions.pod:2897
-msgid ""
-"This call is similar to L</mkfs>, but it allows you to control the block "
-"size of the resulting filesystem.  Supported block sizes depend on the "
-"filesystem type, but typically they are C<1024>, C<2048> or C<4096> only."
-msgstr ""
-
-# type: =head2
-#. type: =head2
-#: ../fish/guestfish-actions.pod:2912
-msgid "mkfs-opts"
-msgstr ""
-
-#. type: verbatim
-#: ../fish/guestfish-actions.pod:2914
-#, no-wrap
+#: ../fish/guestfish-actions.pod:2466

 msgid ""
 msgid ""

-" mkfs-opts fstype device [blocksize:..] [features:..]\n"
-"\n"
+"This is the same as L</getxattrs>, but if C<path> is a symbolic link, then "
+"it returns the extended attributes of the link itself."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:2949
-msgid "mkmountpoint"
+#: ../fish/guestfish-actions.pod:2470
+msgid "list-devices"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:2951
+#: ../fish/guestfish-actions.pod:2472

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" mkmountpoint exemptpath\n"
+" list-devices\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../fish/guestfish-actions.pod:2953
-msgid ""
-"L</mkmountpoint> and L</rmmountpoint> are specialized calls that can be used "
-"to create extra mountpoints before mounting the first filesystem."
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../fish/guestfish-actions.pod:2977
-msgid ""
-"L</mkmountpoint> is not compatible with L</umount-all>.  You may get "
-"unexpected errors if you try to mix these calls.  It is safest to manually "
-"unmount filesystems and remove mountpoints after use."
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../fish/guestfish-actions.pod:2981
-msgid ""
-"L</umount-all> unmounts filesystems by sorting the paths longest first, so "
-"for this to work for manual mountpoints, you must ensure that the innermost "
-"mountpoints have the longest pathnames, as in the example code above."
-msgstr ""
-
-#. type: textblock
-#: ../fish/guestfish-actions.pod:2988
-msgid ""
-"Autosync [see L</set-autosync>, this is set by default on handles] can cause "
-"L</umount-all> to be called when the handle is closed which can also trigger "
-"these issues."
-msgstr ""
-

 # type: =head2
 #. type: =head2
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:2992
-msgid "mknod"
+#: ../fish/guestfish-actions.pod:2480
+msgid "list-filesystems"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:2994
+#: ../fish/guestfish-actions.pod:2482

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" mknod mode devmajor devminor path\n"
+" list-filesystems\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish-actions.pod:3004
-msgid ""
-"Note that, just like L<mknod(2)>, the mode must be bitwise OR'd with "
-"S_IFBLK, S_IFCHR, S_IFIFO or S_IFSOCK (otherwise this call just creates a "
-"regular file).  These constants are available in the standard Linux header "
-"files, or you can use L</mknod-b>, L</mknod-c> or L</mkfifo> which are "
-"wrappers around this command which bitwise OR in the appropriate constant "
-"for you."
-msgstr ""
-
-# type: =head2
-#. type: =head2
-#: ../fish/guestfish-actions.pod:3014
-msgid "mknod-b"
-msgstr ""
-
-# type: verbatim
-#. type: verbatim
-#: ../fish/guestfish-actions.pod:3016
-#, no-wrap
+#: ../fish/guestfish-actions.pod:2501

 msgid ""
 msgid ""

-" mknod-b mode devmajor devminor path\n"
-"\n"
+"This command runs other libguestfs commands, which might include L</mount> "
+"and L</umount>, and therefore you should use this soon after launch and only "
+"when nothing is mounted."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish-actions.pod:3018
+#: ../fish/guestfish-actions.pod:2505

 msgid ""
 msgid ""

-"This call creates a block device node called C<path> with mode C<mode> and "
-"device major/minor C<devmajor> and C<devminor>.  It is just a convenient "
-"wrapper around L</mknod>."
+"Not all of the filesystems returned will be mountable.  In particular, swap "
+"partitions are returned in the list.  Also this command does not check that "
+"each filesystem found is valid and mountable, and some filesystems might be "
+"mountable but require special options.  Filesystems may not all belong to a "
+"single logical operating system (use L</inspect-os> to look for OSes)."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:3024
-msgid "mknod-c"
+#: ../fish/guestfish-actions.pod:2513
+msgid "list-partitions"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:3026
+#: ../fish/guestfish-actions.pod:2515

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" mknod-c mode devmajor devminor path\n"
+" list-partitions\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish-actions.pod:3028
+#: ../fish/guestfish-actions.pod:2521

 msgid ""
 msgid ""

-"This call creates a char device node called C<path> with mode C<mode> and "
-"device major/minor C<devmajor> and C<devminor>.  It is just a convenient "
-"wrapper around L</mknod>."
+"This does not return logical volumes.  For that you will need to call L</"
+"lvs>."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:3034
-msgid "mkswap"
+#: ../fish/guestfish-actions.pod:2526
+msgid "ll"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:3036
+#: ../fish/guestfish-actions.pod:2528

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" mkswap device\n"
+" ll directory\n"

 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2
 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:3040
-msgid "mkswap-L"
+#: ../fish/guestfish-actions.pod:2536
+msgid "ln"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:3042
+#: ../fish/guestfish-actions.pod:2538

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" mkswap-L label device\n"
+" ln target linkname\n"

 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2
 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:3050
-msgid "mkswap-U"
+#: ../fish/guestfish-actions.pod:2542
+msgid "ln-f"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:3052
+#: ../fish/guestfish-actions.pod:2544

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" mkswap-U uuid device\n"
+" ln-f target linkname\n"

 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2
 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:3056
-msgid "mkswap-file"
+#: ../fish/guestfish-actions.pod:2549
+msgid "ln-s"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:3058
+#: ../fish/guestfish-actions.pod:2551

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" mkswap-file path\n"
+" ln-s target linkname\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../fish/guestfish-actions.pod:3062
-msgid ""
-"This command just writes a swap file signature to an existing file.  To "
-"create the file itself, use something like L</fallocate>."
-msgstr ""
-

 # type: =head2
 #. type: =head2
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:3065
-msgid "modprobe"
+#: ../fish/guestfish-actions.pod:2555
+msgid "ln-sf"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:3067
+#: ../fish/guestfish-actions.pod:2557

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" modprobe modulename\n"
+" ln-sf target linkname\n"

 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2
 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:3074
-msgid "mount"
+#: ../fish/guestfish-actions.pod:2562
+msgid "lremovexattr"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:3076
+#: ../fish/guestfish-actions.pod:2564

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" mount device mountpoint\n"
+" lremovexattr xattr path\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish-actions.pod:3092
+#: ../fish/guestfish-actions.pod:2566

 msgid ""
 msgid ""

-"B<Important note:> When you use this call, the filesystem options C<sync> "
-"and C<noatime> are set implicitly.  This was originally done because we "
-"thought it would improve reliability, but it turns out that I<-o sync> has a "
-"very large negative performance impact and negligible effect on "
-"reliability.  Therefore we recommend that you avoid using L</mount> in any "
-"code that needs performance, and instead use L</mount-options> (use an empty "
-"string for the first parameter if you don't want any options)."
+"This is the same as L</removexattr>, but if C<path> is a symbolic link, then "
+"it removes an extended attribute of the link itself."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:3102
-msgid "mount-loop"
+#: ../fish/guestfish-actions.pod:2570
+msgid "ls"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:3104
+#: ../fish/guestfish-actions.pod:2572

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" mount-loop file mountpoint\n"
+" ls directory\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

+# type: textblock
+#. type: textblock
+#: ../fish/guestfish-actions.pod:2578
+msgid ""
+"This command is mostly useful for interactive sessions.  Programs should "
+"probably use L</readdir> instead."
+msgstr ""
+

 # type: =head2
 #. type: =head2
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:3110
-msgid "mount-options"
+#: ../fish/guestfish-actions.pod:2581
+msgid "lsetxattr"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:3112
+#: ../fish/guestfish-actions.pod:2583

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" mount-options options device mountpoint\n"
+" lsetxattr xattr val vallen path\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish-actions.pod:3114
+#: ../fish/guestfish-actions.pod:2585

 msgid ""
 msgid ""

-"This is the same as the L</mount> command, but it allows you to set the "
-"mount options as for the L<mount(8)> I<-o> flag."
+"This is the same as L</setxattr>, but if C<path> is a symbolic link, then it "
+"sets an extended attribute of the link itself."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:3122
-msgid "mount-ro"
+#: ../fish/guestfish-actions.pod:2589
+msgid "lstat"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:3124
+#: ../fish/guestfish-actions.pod:2591

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" mount-ro device mountpoint\n"
+" lstat path\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish-actions.pod:3126
+#: ../fish/guestfish-actions.pod:2595

 msgid ""
 msgid ""

-"This is the same as the L</mount> command, but it mounts the filesystem with "
-"the read-only (I<-o ro>) flag."
+"This is the same as L</stat> except that if C<path> is a symbolic link, then "
+"the link is stat-ed, not the file it refers to."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:3129
-msgid "mount-vfs"
+#: ../fish/guestfish-actions.pod:2601
+msgid "lstatlist"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:3131
+#: ../fish/guestfish-actions.pod:2603

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" mount-vfs options vfstype device mountpoint\n"
+" lstatlist path 'names ...'\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish-actions.pod:3133
+#: ../fish/guestfish-actions.pod:2605

 msgid ""
 msgid ""

-"This is the same as the L</mount> command, but it allows you to set both the "
-"mount options and the vfstype as for the L<mount(8)> I<-o> and I<-t> flags."
+"This call allows you to perform the L</lstat> operation on multiple files, "
+"where all files are in the directory C<path>.  C<names> is the list of files "
+"from this directory."
+msgstr ""
+
+# type: textblock
+#. type: textblock
+#: ../fish/guestfish-actions.pod:2614
+msgid ""
+"This call is intended for programs that want to efficiently list a directory "
+"contents without making many round-trips.  See also L</lxattrlist> for a "
+"similarly efficient call for getting extended attributes.  Very long "
+"directory listings might cause the protocol message size to be exceeded, "
+"causing this call to fail.  The caller must split up such requests into "
+"smaller groups of names."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:3137
-msgid "mountpoints"
+#: ../fish/guestfish-actions.pod:2622
+msgid "luks-add-key"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:3139
+#: ../fish/guestfish-actions.pod:2624

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" mountpoints\n"
+" luks-add-key device keyslot\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish-actions.pod:3141
+#: ../fish/guestfish-actions.pod:2631

 msgid ""
 msgid ""

-"This call is similar to L</mounts>.  That call returns a list of devices.  "
-"This one returns a hash table (map) of device name to directory where the "
-"device is mounted."
+"Note that if C<keyslot> already contains a key, then this command will "
+"fail.  You have to use L</luks-kill-slot> first to remove that key."
+msgstr ""
+
+# type: textblock
+#. type: textblock
+#: ../fish/guestfish-actions.pod:2635 ../fish/guestfish-actions.pod:2657
+#: ../fish/guestfish-actions.pod:2670 ../fish/guestfish-actions.pod:2684
+#: ../fish/guestfish-actions.pod:2707 ../fish/guestfish-actions.pod:2717
+msgid ""
+"This command has one or more key or passphrase parameters.  Guestfish will "
+"prompt for these separately."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:3145
-msgid "mounts"
+#: ../fish/guestfish-actions.pod:2638
+msgid "luks-close"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:3147
+#: ../fish/guestfish-actions.pod:2640

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" mounts\n"
+" luks-close device\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish-actions.pod:3154
-msgid "See also: L</mountpoints>"
+#: ../fish/guestfish-actions.pod:2642
+msgid ""
+"This closes a LUKS device that was created earlier by L</luks-open> or L</"
+"luks-open-ro>.  The C<device> parameter must be the name of the LUKS mapping "
+"device (ie. C</dev/mapper/mapname>) and I<not> the name of the underlying "
+"block device."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:3156
-msgid "mv"
+#: ../fish/guestfish-actions.pod:2648
+msgid "luks-format"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:3158
+#: ../fish/guestfish-actions.pod:2650

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" mv src dest\n"
+" luks-format device keyslot\n"

 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2
 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:3163
-msgid "ntfs-3g-probe"
+#: ../fish/guestfish-actions.pod:2663
+msgid "luks-format-cipher"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:3165
+#: ../fish/guestfish-actions.pod:2665

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" ntfs-3g-probe true|false device\n"
+" luks-format-cipher device keyslot cipher\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

+# type: textblock
+#. type: textblock
+#: ../fish/guestfish-actions.pod:2667
+msgid ""
+"This command is the same as L</luks-format> but it also allows you to set "
+"the C<cipher> used."
+msgstr ""
+

 # type: =head2
 #. type: =head2
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:3179
-msgid "ntfsresize"
+#: ../fish/guestfish-actions.pod:2676
+msgid "luks-kill-slot"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:3181
+#: ../fish/guestfish-actions.pod:2678

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" ntfsresize device\n"
+" luks-kill-slot device keyslot\n"

 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2
 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:3187
-msgid "ntfsresize-size"
+#: ../fish/guestfish-actions.pod:2687
+msgid "luks-open"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:3189
+#: ../fish/guestfish-actions.pod:2689

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" ntfsresize-size device size\n"
+" luks-open device mapname\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish-actions.pod:3191
+#: ../fish/guestfish-actions.pod:2703

 msgid ""
 msgid ""

-"This command is the same as L</ntfsresize> except that it allows you to "
-"specify the new size (in bytes) explicitly."
+"If this block device contains LVM volume groups, then calling L</vgscan> "
+"followed by L</vg-activate-all> will make them visible."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:3194
-msgid "part-add"
+#: ../fish/guestfish-actions.pod:2710
+msgid "luks-open-ro"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:3196
+#: ../fish/guestfish-actions.pod:2712

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" part-add device prlogex startsect endsect\n"
+" luks-open-ro device mapname\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish-actions.pod:3198
-msgid ""
-"This command adds a partition to C<device>.  If there is no partition table "
-"on the device, call L</part-init> first."
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../fish/guestfish-actions.pod:3210
+#: ../fish/guestfish-actions.pod:2714

 msgid ""
 msgid ""

-"Creating a partition which covers the whole disk is not so easy.  Use L</"
-"part-disk> to do that."
+"This is the same as L</luks-open> except that a read-only mapping is created."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:3213
-msgid "part-del"
+#: ../fish/guestfish-actions.pod:2720
+msgid "lvcreate"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:3215
+#: ../fish/guestfish-actions.pod:2722

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" part-del device partnum\n"
+" lvcreate logvol volgroup mbytes\n"

 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2
 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:3223
-msgid "part-disk"
+#: ../fish/guestfish-actions.pod:2727
+msgid "lvm-canonical-lv-name"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:3225
+#: ../fish/guestfish-actions.pod:2729

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" part-disk device parttype\n"
+" lvm-canonical-lv-name lvname\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish-actions.pod:3227
-msgid ""
-"This command is simply a combination of L</part-init> followed by L</part-"
-"add> to create a single primary partition covering the whole disk."
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../fish/guestfish-actions.pod:3231
-msgid ""
-"C<parttype> is the partition table type, usually C<mbr> or C<gpt>, but other "
-"possible values are described in L</part-init>."
+#: ../fish/guestfish-actions.pod:2738
+msgid "See also L</is-lv>."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:3237
-msgid "part-get-bootable"
+#: ../fish/guestfish-actions.pod:2740
+msgid "lvm-clear-filter"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:3239
+#: ../fish/guestfish-actions.pod:2742

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" part-get-bootable device partnum\n"
+" lvm-clear-filter\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish-actions.pod:3244
-msgid "See also L</part-set-bootable>."
+#: ../fish/guestfish-actions.pod:2744
+msgid ""
+"This undoes the effect of L</lvm-set-filter>.  LVM will be able to see every "
+"block device."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:3246
-msgid "part-get-mbr-id"
+#: ../fish/guestfish-actions.pod:2750
+msgid "lvm-remove-all"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:3248
+#: ../fish/guestfish-actions.pod:2752

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" part-get-mbr-id device partnum\n"
+" lvm-remove-all\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../fish/guestfish-actions.pod:3253 ../fish/guestfish-actions.pod:3391
-msgid ""
-"Note that only MBR (old DOS-style) partitions have type bytes.  You will get "
-"undefined results for other partition table types (see L</part-get-"
-"parttype>)."
-msgstr ""
-

 # type: =head2
 #. type: =head2
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:3257
-msgid "part-get-parttype"
+#: ../fish/guestfish-actions.pod:2760
+msgid "lvm-set-filter"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:3259
+#: ../fish/guestfish-actions.pod:2762

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" part-get-parttype device\n"
+" lvm-set-filter 'devices ...'\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../fish/guestfish-actions.pod:3264
-msgid ""
-"Common return values include: C<msdos> (a DOS/Windows style MBR partition "
-"table), C<gpt> (a GPT/EFI-style partition table).  Other values are "
-"possible, although unusual.  See L</part-init> for a full list."
-msgstr ""
-

 # type: =head2
 #. type: =head2
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:3269
-msgid "part-init"
+#: ../fish/guestfish-actions.pod:2787
+msgid "lvremove"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:3271
+#: ../fish/guestfish-actions.pod:2789

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" part-init device parttype\n"
+" lvremove device\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../fish/guestfish-actions.pod:3277
+# type: =head2
+#. type: =head2
+#: ../fish/guestfish-actions.pod:2797
+msgid "lvrename"
+msgstr ""
+
+# type: verbatim
+#. type: verbatim
+#: ../fish/guestfish-actions.pod:2799
+#, no-wrap

 msgid ""
 msgid ""

-"Initially there are no partitions.  Following this, you should call L</part-"
-"add> for each partition required."
+" lvrename logvol newlogvol\n"
+"\n"

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:3340
-msgid "part-list"
+#: ../fish/guestfish-actions.pod:2803
+msgid "lvresize"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:3342
+#: ../fish/guestfish-actions.pod:2805

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" part-list device\n"
+" lvresize device mbytes\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../fish/guestfish-actions.pod:3357
+# type: =head2
+#. type: =head2
+#: ../fish/guestfish-actions.pod:2811
+msgid "lvresize-free"
+msgstr ""
+
+# type: verbatim
+#. type: verbatim
+#: ../fish/guestfish-actions.pod:2813
+#, no-wrap

 msgid ""
 msgid ""

-"Start of the partition I<in bytes>.  To get sectors you have to divide by "
-"the device's sector size, see L</blockdev-getss>."
+" lvresize-free lv percent\n"
+"\n"

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:3370
-msgid "part-set-bootable"
+#: ../fish/guestfish-actions.pod:2821
+msgid "lvs"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:3372
+#: ../fish/guestfish-actions.pod:2823

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" part-set-bootable device partnum true|false\n"
+" lvs\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

+# type: textblock
+#. type: textblock
+#: ../fish/guestfish-actions.pod:2831
+msgid "See also L</lvs-full>, L</list-filesystems>."
+msgstr ""
+

 # type: =head2
 #. type: =head2
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:3381
-msgid "part-set-mbr-id"
+#: ../fish/guestfish-actions.pod:2833
+msgid "lvs-full"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:3383
+#: ../fish/guestfish-actions.pod:2835

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" part-set-mbr-id device partnum idbyte\n"
+" lvs-full\n"

 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2
 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:3395
-msgid "part-set-name"
+#: ../fish/guestfish-actions.pod:2840
+msgid "lvuuid"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:3397
+#: ../fish/guestfish-actions.pod:2842

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" part-set-name device partnum name\n"
+" lvuuid device\n"

 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2
 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:3405
-msgid "part-to-dev"
+#: ../fish/guestfish-actions.pod:2846
+msgid "lxattrlist"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:3407
+#: ../fish/guestfish-actions.pod:2848

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" part-to-dev partition\n"
+" lxattrlist path 'names ...'\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish-actions.pod:3413
+#: ../fish/guestfish-actions.pod:2864

 msgid ""
 msgid ""

-"The named partition must exist, for example as a string returned from L</"
-"list-partitions>."
+"This call is intended for programs that want to efficiently list a directory "
+"contents without making many round-trips.  See also L</lstatlist> for a "
+"similarly efficient call for getting standard stats.  Very long directory "
+"listings might cause the protocol message size to be exceeded, causing this "
+"call to fail.  The caller must split up such requests into smaller groups of "
+"names."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:3416
-msgid "ping-daemon"
+#: ../fish/guestfish-actions.pod:2872
+msgid "mkdir"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:3418
+#: ../fish/guestfish-actions.pod:2874

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" ping-daemon\n"
+" mkdir path\n"

 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2
 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:3425
-msgid "pread"
+#: ../fish/guestfish-actions.pod:2878
+msgid "mkdir-mode"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:3427
+#: ../fish/guestfish-actions.pod:2880

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" pread path count offset\n"
+" mkdir-mode path mode\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish-actions.pod:3435
-msgid "See also L</pwrite>, L</pread-device>."
+#: ../fish/guestfish-actions.pod:2889
+msgid "See also L</mkdir>, L</umask>"

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:3440
-msgid "pread-device"
+#: ../fish/guestfish-actions.pod:2891
+msgid "mkdir-p"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:3442
+#: ../fish/guestfish-actions.pod:2893

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" pread-device device count offset\n"
+" mkdir-p path\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../fish/guestfish-actions.pod:3450
-msgid "See also L</pread>."
-msgstr ""
-

 # type: =head2
 #. type: =head2
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:3455
-msgid "pvcreate"
+#: ../fish/guestfish-actions.pod:2898
+msgid "mkdtemp"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:3457
+#: ../fish/guestfish-actions.pod:2900

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" pvcreate device\n"
+" mkdtemp template\n"

 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2
 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:3463
-msgid "pvremove"
+#: ../fish/guestfish-actions.pod:2921
+msgid "mke2fs-J"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:3465
+#: ../fish/guestfish-actions.pod:2923

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" pvremove device\n"
+" mke2fs-J fstype blocksize device journal\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

+# type: textblock
+#. type: textblock
+#: ../fish/guestfish-actions.pod:2931
+msgid "See also L</mke2journal>."
+msgstr ""
+

 # type: =head2
 #. type: =head2
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:3474
-msgid "pvresize"
+#: ../fish/guestfish-actions.pod:2933
+msgid "mke2fs-JL"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:3476
+#: ../fish/guestfish-actions.pod:2935

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" pvresize device\n"
+" mke2fs-JL fstype blocksize device label\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

+# type: textblock
+#. type: textblock
+#: ../fish/guestfish-actions.pod:2940
+msgid "See also L</mke2journal-L>."
+msgstr ""
+

 # type: =head2
 #. type: =head2
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:3481
-msgid "pvresize-size"
+#: ../fish/guestfish-actions.pod:2942
+msgid "mke2fs-JU"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:3483
+#: ../fish/guestfish-actions.pod:2944

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" pvresize-size device size\n"
+" mke2fs-JU fstype blocksize device uuid\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish-actions.pod:3485
-msgid ""
-"This command is the same as L</pvresize> except that it allows you to "
-"specify the new size (in bytes) explicitly."
+#: ../fish/guestfish-actions.pod:2949
+msgid "See also L</mke2journal-U>."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:3488
-msgid "pvs"
+#: ../fish/guestfish-actions.pod:2951
+msgid "mke2journal"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:3490
+#: ../fish/guestfish-actions.pod:2953

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" pvs\n"
+" mke2journal blocksize device\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../fish/guestfish-actions.pod:3498
-msgid "See also L</pvs-full>."
-msgstr ""
-

 # type: =head2
 #. type: =head2
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:3500
-msgid "pvs-full"
+#: ../fish/guestfish-actions.pod:2960
+msgid "mke2journal-L"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:3502
+#: ../fish/guestfish-actions.pod:2962

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" pvs-full\n"
+" mke2journal-L blocksize label device\n"

 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2
 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:3507
-msgid "pvuuid"
+#: ../fish/guestfish-actions.pod:2966
+msgid "mke2journal-U"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:3509
+#: ../fish/guestfish-actions.pod:2968

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" pvuuid device\n"
+" mke2journal-U blocksize uuid device\n"

 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2
 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:3513
-msgid "pwrite"
+#: ../fish/guestfish-actions.pod:2972
+msgid "mkfifo"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:3515
+#: ../fish/guestfish-actions.pod:2974

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" pwrite path content offset\n"
+" mkfifo mode path\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish-actions.pod:3526
-msgid "See also L</pread>, L</pwrite-device>."
+#: ../fish/guestfish-actions.pod:2976
+msgid ""
+"This call creates a FIFO (named pipe) called C<path> with mode C<mode>.  It "
+"is just a convenient wrapper around L</mknod>."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:3531
-msgid "pwrite-device"
+#: ../fish/guestfish-actions.pod:2982
+msgid "mkfs"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:3533
+#: ../fish/guestfish-actions.pod:2984

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" pwrite-device device content offset\n"
+" mkfs fstype device\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../fish/guestfish-actions.pod:3543
-msgid "See also L</pwrite>."
-msgstr ""
-

 # type: =head2
 #. type: =head2
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:3548
-msgid "read-file"
+#: ../fish/guestfish-actions.pod:2990
+msgid "mkfs-b"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:3550
+#: ../fish/guestfish-actions.pod:2992

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" read-file path\n"
+" mkfs-b fstype blocksize device\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish-actions.pod:3555
+#: ../fish/guestfish-actions.pod:2994

 msgid ""
 msgid ""

-"Unlike L</cat>, this function can correctly handle files that contain "
-"embedded ASCII NUL characters.  However unlike L</download>, this function "
-"is limited in the total size of file that can be handled."
+"This call is similar to L</mkfs>, but it allows you to control the block "
+"size of the resulting filesystem.  Supported block sizes depend on the "
+"filesystem type, but typically they are C<1024>, C<2048> or C<4096> only."
+msgstr ""
+
+#. type: textblock
+#: ../fish/guestfish-actions.pod:3002
+msgid ""
+"This function is deprecated.  In new code, use the L</mkfs_opts> call "
+"instead."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:3563
-msgid "read-lines"
+#: ../fish/guestfish-actions.pod:3009
+msgid "mkfs-opts"

 msgstr ""
 
 msgstr ""
 

-# type: verbatim

 #. type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:3565
+#: ../fish/guestfish-actions.pod:3011

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" read-lines path\n"
+" mkfs-opts fstype device [blocksize:..] [features:..]\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../fish/guestfish-actions.pod:3572
-msgid ""
-"Note that this function cannot correctly handle binary files (specifically, "
-"files containing C<\\0> character which is treated as end of line).  For "
-"those you need to use the L</read-file> function which has a more complex "
-"interface."
-msgstr ""
-

 # type: =head2
 #. type: =head2
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:3577
-msgid "readdir"
+#: ../fish/guestfish-actions.pod:3046
+msgid "mkmountpoint"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:3579
+#: ../fish/guestfish-actions.pod:3048

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" readdir dir\n"
+" mkmountpoint exemptpath\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish-actions.pod:3631
+#: ../fish/guestfish-actions.pod:3050

 msgid ""
 msgid ""

-"This function is primarily intended for use by programs.  To get a simple "
-"list of names, use L</ls>.  To get a printable directory for human "
-"consumption, use L</ll>."
+"L</mkmountpoint> and L</rmmountpoint> are specialized calls that can be used "
+"to create extra mountpoints before mounting the first filesystem."

 msgstr ""
 
 msgstr ""
 

-# type: =head2
-#. type: =head2
-#: ../fish/guestfish-actions.pod:3635
-msgid "readlink"
+# type: textblock
+#. type: textblock
+#: ../fish/guestfish-actions.pod:3074
+msgid ""
+"L</mkmountpoint> is not compatible with L</umount-all>.  You may get "
+"unexpected errors if you try to mix these calls.  It is safest to manually "
+"unmount filesystems and remove mountpoints after use."

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../fish/guestfish-actions.pod:3637
-#, no-wrap
+# type: textblock
+#. type: textblock
+#: ../fish/guestfish-actions.pod:3078

 msgid ""
 msgid ""

-" readlink path\n"
-"\n"
+"L</umount-all> unmounts filesystems by sorting the paths longest first, so "
+"for this to work for manual mountpoints, you must ensure that the innermost "
+"mountpoints have the longest pathnames, as in the example code above."
+msgstr ""
+
+#. type: textblock
+#: ../fish/guestfish-actions.pod:3085
+msgid ""
+"Autosync [see L</set-autosync>, this is set by default on handles] can cause "
+"L</umount-all> to be called when the handle is closed which can also trigger "
+"these issues."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:3641
-msgid "readlinklist"
+#: ../fish/guestfish-actions.pod:3089
+msgid "mknod"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:3643
+#: ../fish/guestfish-actions.pod:3091

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" readlinklist path 'names ...'\n"
+" mknod mode devmajor devminor path\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

+# type: textblock
+#. type: textblock
+#: ../fish/guestfish-actions.pod:3101
+msgid ""
+"Note that, just like L<mknod(2)>, the mode must be bitwise OR'd with "
+"S_IFBLK, S_IFCHR, S_IFIFO or S_IFSOCK (otherwise this call just creates a "
+"regular file).  These constants are available in the standard Linux header "
+"files, or you can use L</mknod-b>, L</mknod-c> or L</mkfifo> which are "
+"wrappers around this command which bitwise OR in the appropriate constant "
+"for you."
+msgstr ""
+

 # type: =head2
 #. type: =head2
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:3667
-msgid "realpath"
+#: ../fish/guestfish-actions.pod:3111
+msgid "mknod-b"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:3669
+#: ../fish/guestfish-actions.pod:3113

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" realpath path\n"
+" mknod-b mode devmajor devminor path\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

+# type: textblock
+#. type: textblock
+#: ../fish/guestfish-actions.pod:3115
+msgid ""
+"This call creates a block device node called C<path> with mode C<mode> and "
+"device major/minor C<devmajor> and C<devminor>.  It is just a convenient "
+"wrapper around L</mknod>."
+msgstr ""
+

 # type: =head2
 #. type: =head2
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:3674
-msgid "removexattr"
+#: ../fish/guestfish-actions.pod:3121
+msgid "mknod-c"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:3676
+#: ../fish/guestfish-actions.pod:3123

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" removexattr xattr path\n"
+" mknod-c mode devmajor devminor path\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish-actions.pod:3681
-msgid "See also: L</lremovexattr>, L<attr(5)>."
+#: ../fish/guestfish-actions.pod:3125
+msgid ""
+"This call creates a char device node called C<path> with mode C<mode> and "
+"device major/minor C<devmajor> and C<devminor>.  It is just a convenient "
+"wrapper around L</mknod>."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:3683
-msgid "resize2fs"
+#: ../fish/guestfish-actions.pod:3131
+msgid "mkswap"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:3685
+#: ../fish/guestfish-actions.pod:3133

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" resize2fs device\n"
+" mkswap device\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../fish/guestfish-actions.pod:3690
-msgid ""
-"I<Note:> It is sometimes required that you run L</e2fsck-f> on the C<device> "
-"before calling this command.  For unknown reasons C<resize2fs> sometimes "
-"gives an error about this and sometimes not.  In any case, it is always safe "
-"to call L</e2fsck-f> before calling this function."
-msgstr ""
-
+# type: =head2

 #. type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:3696
-msgid "resize2fs-M"
+#: ../fish/guestfish-actions.pod:3137
+msgid "mkswap-L"

 msgstr ""
 
 msgstr ""
 

+# type: verbatim

 #. type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:3698
+#: ../fish/guestfish-actions.pod:3139

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" resize2fs-M device\n"
+" mkswap-L label device\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-#. type: textblock
-#: ../fish/guestfish-actions.pod:3700
-msgid ""
-"This command is the same as L</resize2fs>, but the filesystem is resized to "
-"its minimum size.  This works like the C<-M> option to the C<resize2fs> "
-"command."
+# type: =head2
+#. type: =head2
+#: ../fish/guestfish-actions.pod:3147
+msgid "mkswap-U"

 msgstr ""
 
 msgstr ""
 

-#. type: textblock
-#: ../fish/guestfish-actions.pod:3704
+# type: verbatim
+#. type: verbatim
+#: ../fish/guestfish-actions.pod:3149
+#, no-wrap

 msgid ""
 msgid ""

-"To get the resulting size of the filesystem you should call L</tune2fs-l> "
-"and read the C<Block size> and C<Block count> values.  These two numbers, "
-"multiplied together, give the resulting size of the minimal filesystem in "
-"bytes."
+" mkswap-U uuid device\n"
+"\n"

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:3709
-msgid "resize2fs-size"
+#: ../fish/guestfish-actions.pod:3153
+msgid "mkswap-file"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:3711
+#: ../fish/guestfish-actions.pod:3155

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" resize2fs-size device size\n"
+" mkswap-file path\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish-actions.pod:3713
+#: ../fish/guestfish-actions.pod:3159

 msgid ""
 msgid ""

-"This command is the same as L</resize2fs> except that it allows you to "
-"specify the new size (in bytes) explicitly."
+"This command just writes a swap file signature to an existing file.  To "
+"create the file itself, use something like L</fallocate>."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:3716
-msgid "rm"
+#: ../fish/guestfish-actions.pod:3162
+msgid "modprobe"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:3718
+#: ../fish/guestfish-actions.pod:3164

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" rm path\n"
+" modprobe modulename\n"

 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2
 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:3722
-msgid "rm-rf"
+#: ../fish/guestfish-actions.pod:3171
+msgid "mount"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:3724
+#: ../fish/guestfish-actions.pod:3173

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" rm-rf path\n"
+" mount device mountpoint\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

+# type: textblock
+#. type: textblock
+#: ../fish/guestfish-actions.pod:3189
+msgid ""
+"B<Important note:> When you use this call, the filesystem options C<sync> "
+"and C<noatime> are set implicitly.  This was originally done because we "
+"thought it would improve reliability, but it turns out that I<-o sync> has a "
+"very large negative performance impact and negligible effect on "
+"reliability.  Therefore we recommend that you avoid using L</mount> in any "
+"code that needs performance, and instead use L</mount-options> (use an empty "
+"string for the first parameter if you don't want any options)."
+msgstr ""
+
+#. type: textblock
+#: ../fish/guestfish-actions.pod:3199
+msgid ""
+"This function is deprecated.  In new code, use the L</mount_options> call "
+"instead."
+msgstr ""
+

 # type: =head2
 #. type: =head2
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:3730
-msgid "rmdir"
+#: ../fish/guestfish-actions.pod:3206
+msgid "mount-loop"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:3732
+#: ../fish/guestfish-actions.pod:3208

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" rmdir path\n"
+" mount-loop file mountpoint\n"

 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2
 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:3736
-msgid "rmmountpoint"
+#: ../fish/guestfish-actions.pod:3214
+msgid "mount-options"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:3738
+#: ../fish/guestfish-actions.pod:3216

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" rmmountpoint exemptpath\n"
+" mount-options options device mountpoint\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish-actions.pod:3740
+#: ../fish/guestfish-actions.pod:3218

 msgid ""
 msgid ""

-"This calls removes a mountpoint that was previously created with L</"
-"mkmountpoint>.  See L</mkmountpoint> for full details."
+"This is the same as the L</mount> command, but it allows you to set the "
+"mount options as for the L<mount(8)> I<-o> flag."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:3744
-msgid "scrub-device"
+#: ../fish/guestfish-actions.pod:3226
+msgid "mount-ro"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:3746
+#: ../fish/guestfish-actions.pod:3228

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" scrub-device device\n"
+" mount-ro device mountpoint\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

+# type: textblock
+#. type: textblock
+#: ../fish/guestfish-actions.pod:3230
+msgid ""
+"This is the same as the L</mount> command, but it mounts the filesystem with "
+"the read-only (I<-o ro>) flag."
+msgstr ""
+

 # type: =head2
 #. type: =head2
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:3757
-msgid "scrub-file"
+#: ../fish/guestfish-actions.pod:3233
+msgid "mount-vfs"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:3759
+#: ../fish/guestfish-actions.pod:3235

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" scrub-file file\n"
+" mount-vfs options vfstype device mountpoint\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

+# type: textblock
+#. type: textblock
+#: ../fish/guestfish-actions.pod:3237
+msgid ""
+"This is the same as the L</mount> command, but it allows you to set both the "
+"mount options and the vfstype as for the L<mount(8)> I<-o> and I<-t> flags."
+msgstr ""
+

 # type: =head2
 #. type: =head2
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:3769
-msgid "scrub-freespace"
+#: ../fish/guestfish-actions.pod:3241
+msgid "mountpoints"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:3771
+#: ../fish/guestfish-actions.pod:3243

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" scrub-freespace dir\n"
+" mountpoints\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish-actions.pod:3773
+#: ../fish/guestfish-actions.pod:3245

 msgid ""
 msgid ""

-"This command creates the directory C<dir> and then fills it with files until "
-"the filesystem is full, and scrubs the files as for L</scrub-file>, and "
-"deletes them.  The intention is to scrub any free space on the partition "
-"containing C<dir>."
-msgstr ""
-
-# type: =head2
-#. type: =head2
-#: ../fish/guestfish-actions.pod:3782
-msgid "set-append"
+"This call is similar to L</mounts>.  That call returns a list of devices.  "
+"This one returns a hash table (map) of device name to directory where the "
+"device is mounted."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:3784
-msgid "append"
+#: ../fish/guestfish-actions.pod:3249
+msgid "mounts"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:3786
+#: ../fish/guestfish-actions.pod:3251

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" set-append append\n"
+" mounts\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-#. type: =head2
-#: ../fish/guestfish-actions.pod:3797
-msgid "set-attach-method"
+# type: textblock
+#. type: textblock
+#: ../fish/guestfish-actions.pod:3258
+msgid "See also: L</mountpoints>"

 msgstr ""
 
 msgstr ""
 

+# type: =head2

 #. type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:3799
-msgid "attach-method"
+#: ../fish/guestfish-actions.pod:3260
+msgid "mv"

 msgstr ""
 
 msgstr ""
 

+# type: verbatim

 #. type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:3801
+#: ../fish/guestfish-actions.pod:3262

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" set-attach-method attachmethod\n"
+" mv src dest\n"

 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2
 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:3823
-msgid "set-autosync"
-msgstr ""
-
-# type: =head2
-#. type: =head2
-#: ../fish/guestfish-actions.pod:3825
-msgid "autosync"
+#: ../fish/guestfish-actions.pod:3267
+msgid "ntfs-3g-probe"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:3827
+#: ../fish/guestfish-actions.pod:3269

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" set-autosync true|false\n"
+" ntfs-3g-probe true|false device\n"

 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2
 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:3837
-msgid "set-direct"
-msgstr ""
-
-# type: =head2
-#. type: =head2
-#: ../fish/guestfish-actions.pod:3839
-msgid "direct"
+#: ../fish/guestfish-actions.pod:3283
+msgid "ntfsresize"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:3841
+#: ../fish/guestfish-actions.pod:3285

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" set-direct true|false\n"
+" ntfsresize device\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../fish/guestfish-actions.pod:3847
-msgid ""
-"One consequence of this is that log messages aren't caught by the library "
-"and handled by L</set-log-message-callback>, but go straight to stdout."
-msgstr ""
-

 # type: =head2
 #. type: =head2
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:3856
-msgid "set-e2label"
+#: ../fish/guestfish-actions.pod:3300
+msgid "ntfsresize-size"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:3858
+#: ../fish/guestfish-actions.pod:3302

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" set-e2label device label\n"
+" ntfsresize-size device size\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish-actions.pod:3864
+#: ../fish/guestfish-actions.pod:3304

 msgid ""
 msgid ""

-"You can use either L</tune2fs-l> or L</get-e2label> to return the existing "
-"label on a filesystem."
+"This command is the same as L</ntfsresize> except that it allows you to "
+"specify the new size (in bytes) explicitly."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:3867
-msgid "set-e2uuid"
+#: ../fish/guestfish-actions.pod:3307
+msgid "part-add"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:3869
+#: ../fish/guestfish-actions.pod:3309

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" set-e2uuid device uuid\n"
+" part-add device prlogex startsect endsect\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish-actions.pod:3876
+#: ../fish/guestfish-actions.pod:3311

 msgid ""
 msgid ""

-"You can use either L</tune2fs-l> or L</get-e2uuid> to return the existing "
-"UUID of a filesystem."
+"This command adds a partition to C<device>.  If there is no partition table "
+"on the device, call L</part-init> first."
+msgstr ""
+
+# type: textblock
+#. type: textblock
+#: ../fish/guestfish-actions.pod:3323
+msgid ""
+"Creating a partition which covers the whole disk is not so easy.  Use L</"
+"part-disk> to do that."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:3879
-msgid "set-memsize"
+#: ../fish/guestfish-actions.pod:3326
+msgid "part-del"
+msgstr ""
+
+# type: verbatim
+#. type: verbatim
+#: ../fish/guestfish-actions.pod:3328
+#, no-wrap
+msgid ""
+" part-del device partnum\n"
+"\n"

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:3881
-msgid "memsize"
+#: ../fish/guestfish-actions.pod:3336
+msgid "part-disk"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:3883
+#: ../fish/guestfish-actions.pod:3338

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" set-memsize memsize\n"
+" part-disk device parttype\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish-actions.pod:3885
+#: ../fish/guestfish-actions.pod:3340

 msgid ""
 msgid ""

-"This sets the memory size in megabytes allocated to the qemu subprocess.  "
-"This only has any effect if called before L</launch>."
+"This command is simply a combination of L</part-init> followed by L</part-"
+"add> to create a single primary partition covering the whole disk."

 msgstr ""
 
 msgstr ""
 

-# type: =head2
-#. type: =head2
-#: ../fish/guestfish-actions.pod:3896
-msgid "set-network"
+# type: textblock
+#. type: textblock
+#: ../fish/guestfish-actions.pod:3344
+msgid ""
+"C<parttype> is the partition table type, usually C<mbr> or C<gpt>, but other "
+"possible values are described in L</part-init>."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:3898
-msgid "network"
+#: ../fish/guestfish-actions.pod:3350
+msgid "part-get-bootable"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:3900
+#: ../fish/guestfish-actions.pod:3352

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" set-network true|false\n"
+" part-get-bootable device partnum\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish-actions.pod:3908
-msgid ""
-"You must call this before calling L</launch>, otherwise it has no effect."
-msgstr ""
-
-# type: =head2
-#. type: =head2
-#: ../fish/guestfish-actions.pod:3911
-msgid "set-path"
+#: ../fish/guestfish-actions.pod:3357
+msgid "See also L</part-set-bootable>."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:3913
-msgid "path"
+#: ../fish/guestfish-actions.pod:3359
+msgid "part-get-mbr-id"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:3915
+#: ../fish/guestfish-actions.pod:3361

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" set-path searchpath\n"
+" part-get-mbr-id device partnum\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: =head2
-#. type: =head2
-#: ../fish/guestfish-actions.pod:3924
-msgid "set-qemu"
+# type: textblock
+#. type: textblock
+#: ../fish/guestfish-actions.pod:3366 ../fish/guestfish-actions.pod:3504
+msgid ""
+"Note that only MBR (old DOS-style) partitions have type bytes.  You will get "
+"undefined results for other partition table types (see L</part-get-"
+"parttype>)."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:3926
-msgid "qemu"
+#: ../fish/guestfish-actions.pod:3370
+msgid "part-get-parttype"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:3928
+#: ../fish/guestfish-actions.pod:3372

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" set-qemu qemu\n"
+" part-get-parttype device\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: =head2
-#. type: =head2
-#: ../fish/guestfish-actions.pod:3948
-msgid "set-recovery-proc"
+# type: textblock
+#. type: textblock
+#: ../fish/guestfish-actions.pod:3377
+msgid ""
+"Common return values include: C<msdos> (a DOS/Windows style MBR partition "
+"table), C<gpt> (a GPT/EFI-style partition table).  Other values are "
+"possible, although unusual.  See L</part-init> for a full list."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:3950
-msgid "recovery-proc"
+#: ../fish/guestfish-actions.pod:3382
+msgid "part-init"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:3952
+#: ../fish/guestfish-actions.pod:3384

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" set-recovery-proc true|false\n"
+" part-init device parttype\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish-actions.pod:3954
-msgid ""
-"If this is called with the parameter C<false> then L</launch> does not "
-"create a recovery process.  The purpose of the recovery process is to stop "
-"runaway qemu processes in the case where the main program aborts abruptly."
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../fish/guestfish-actions.pod:3959
+#: ../fish/guestfish-actions.pod:3390

 msgid ""
 msgid ""

-"This only has any effect if called before L</launch>, and the default is "
-"true."
-msgstr ""
-
-# type: =head2
-#. type: =head2
-#: ../fish/guestfish-actions.pod:3968
-msgid "set-selinux"
+"Initially there are no partitions.  Following this, you should call L</part-"
+"add> for each partition required."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:3970
-msgid "selinux"
+#: ../fish/guestfish-actions.pod:3453
+msgid "part-list"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:3972
+#: ../fish/guestfish-actions.pod:3455

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" set-selinux true|false\n"
+" part-list device\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: =head2
-#. type: =head2
-#: ../fish/guestfish-actions.pod:3983
-msgid "set-trace"
+# type: textblock
+#. type: textblock
+#: ../fish/guestfish-actions.pod:3470
+msgid ""
+"Start of the partition I<in bytes>.  To get sectors you have to divide by "
+"the device's sector size, see L</blockdev-getss>."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:3985
-msgid "trace"
+#: ../fish/guestfish-actions.pod:3483
+msgid "part-set-bootable"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:3987
+#: ../fish/guestfish-actions.pod:3485

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" set-trace true|false\n"
+" part-set-bootable device partnum true|false\n"

 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2
 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:4003
-msgid "set-verbose"
-msgstr ""
-
-# type: =head2
-#. type: =head2
-#: ../fish/guestfish-actions.pod:4005
-msgid "verbose"
+#: ../fish/guestfish-actions.pod:3494
+msgid "part-set-mbr-id"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:4007
+#: ../fish/guestfish-actions.pod:3496

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" set-verbose true|false\n"
+" part-set-mbr-id device partnum idbyte\n"

 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2
 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:4014
-msgid "setcon"
+#: ../fish/guestfish-actions.pod:3508
+msgid "part-set-name"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:4016
+#: ../fish/guestfish-actions.pod:3510

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" setcon context\n"
+" part-set-name device partnum name\n"

 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2
 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:4023
-msgid "setxattr"
+#: ../fish/guestfish-actions.pod:3518
+msgid "part-to-dev"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:4025
+#: ../fish/guestfish-actions.pod:3520

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" setxattr xattr val vallen path\n"
+" part-to-dev partition\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish-actions.pod:4031
-msgid "See also: L</lsetxattr>, L<attr(5)>."
+#: ../fish/guestfish-actions.pod:3526
+msgid ""
+"The named partition must exist, for example as a string returned from L</"
+"list-partitions>."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:4033
-msgid "sfdisk"
+#: ../fish/guestfish-actions.pod:3529
+msgid "ping-daemon"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:4035
+#: ../fish/guestfish-actions.pod:3531

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" sfdisk device cyls heads sectors 'lines ...'\n"
+" ping-daemon\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../fish/guestfish-actions.pod:4057
-msgid "See also: L</sfdisk-l>, L</sfdisk-N>, L</part-init>"
-msgstr ""
-

 # type: =head2
 #. type: =head2
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:4063
-msgid "sfdiskM"
+#: ../fish/guestfish-actions.pod:3538
+msgid "pread"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:4065
+#: ../fish/guestfish-actions.pod:3540

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" sfdiskM device 'lines ...'\n"
+" pread path count offset\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish-actions.pod:4067
-msgid ""
-"This is a simplified interface to the L</sfdisk> command, where partition "
-"sizes are specified in megabytes only (rounded to the nearest cylinder) and "
-"you don't need to specify the cyls, heads and sectors parameters which were "
-"rarely if ever used anyway."
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../fish/guestfish-actions.pod:4073
-msgid "See also: L</sfdisk>, the L<sfdisk(8)> manpage and L</part-disk>"
+#: ../fish/guestfish-actions.pod:3548
+msgid "See also L</pwrite>, L</pread-device>."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:4079
-msgid "sfdisk-N"
+#: ../fish/guestfish-actions.pod:3553
+msgid "pread-device"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:4081
+#: ../fish/guestfish-actions.pod:3555

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" sfdisk-N device partnum cyls heads sectors line\n"
+" pread-device device count offset\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish-actions.pod:4086
-msgid ""
-"For other parameters, see L</sfdisk>.  You should usually pass C<0> for the "
-"cyls/heads/sectors parameters."
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../fish/guestfish-actions.pod:4089
-msgid "See also: L</part-add>"
+#: ../fish/guestfish-actions.pod:3563
+msgid "See also L</pread>."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:4094
-msgid "sfdisk-disk-geometry"
+#: ../fish/guestfish-actions.pod:3568
+msgid "pvcreate"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:4096
+#: ../fish/guestfish-actions.pod:3570

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" sfdisk-disk-geometry device\n"
+" pvcreate device\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../fish/guestfish-actions.pod:4098
-msgid ""
-"This displays the disk geometry of C<device> read from the partition table.  "
-"Especially in the case where the underlying block device has been resized, "
-"this can be different from the kernel's idea of the geometry (see L</sfdisk-"
-"kernel-geometry>)."
-msgstr ""
-

 # type: =head2
 #. type: =head2
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:4106
-msgid "sfdisk-kernel-geometry"
+#: ../fish/guestfish-actions.pod:3576
+msgid "pvremove"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:4108
+#: ../fish/guestfish-actions.pod:3578

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" sfdisk-kernel-geometry device\n"
+" pvremove device\n"

 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2
 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:4115
-msgid "sfdisk-l"
+#: ../fish/guestfish-actions.pod:3587
+msgid "pvresize"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:4117
+#: ../fish/guestfish-actions.pod:3589

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" sfdisk-l device\n"
+" pvresize device\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../fish/guestfish-actions.pod:4123
-msgid "See also: L</part-list>"
-msgstr ""
-

 # type: =head2
 #. type: =head2
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:4125
-msgid "sh"
+#: ../fish/guestfish-actions.pod:3594
+msgid "pvresize-size"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:4127
+#: ../fish/guestfish-actions.pod:3596

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" sh command\n"
+" pvresize-size device size\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish-actions.pod:4132
-msgid "This is like L</command>, but passes the command to:"
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../fish/guestfish-actions.pod:4140
-msgid "All the provisos about L</command> apply to this call."
+#: ../fish/guestfish-actions.pod:3598
+msgid ""
+"This command is the same as L</pvresize> except that it allows you to "
+"specify the new size (in bytes) explicitly."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:4142
-msgid "sh-lines"
+#: ../fish/guestfish-actions.pod:3601
+msgid "pvs"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:4144
+#: ../fish/guestfish-actions.pod:3603

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" sh-lines command\n"
+" pvs\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish-actions.pod:4146
-msgid "This is the same as L</sh>, but splits the result into a list of lines."
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../fish/guestfish-actions.pod:4149
-msgid "See also: L</command-lines>"
+#: ../fish/guestfish-actions.pod:3611
+msgid "See also L</pvs-full>."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:4151
-msgid "sleep"
+#: ../fish/guestfish-actions.pod:3613
+msgid "pvs-full"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:4153
+#: ../fish/guestfish-actions.pod:3615

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" sleep secs\n"
+" pvs-full\n"

 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2
 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:4157
-msgid "stat"
+#: ../fish/guestfish-actions.pod:3620
+msgid "pvuuid"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:4159
+#: ../fish/guestfish-actions.pod:3622

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" stat path\n"
+" pvuuid device\n"

 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2
 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:4165
-msgid "statvfs"
+#: ../fish/guestfish-actions.pod:3626
+msgid "pwrite"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:4167
+#: ../fish/guestfish-actions.pod:3628

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" statvfs path\n"
+" pwrite path content offset\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

+# type: textblock
+#. type: textblock
+#: ../fish/guestfish-actions.pod:3639
+msgid "See also L</pread>, L</pwrite-device>."
+msgstr ""
+

 # type: =head2
 #. type: =head2
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:4175
-msgid "strings"
+#: ../fish/guestfish-actions.pod:3644
+msgid "pwrite-device"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:4177
+#: ../fish/guestfish-actions.pod:3646

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" strings path\n"
+" pwrite-device device content offset\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

+# type: textblock
+#. type: textblock
+#: ../fish/guestfish-actions.pod:3656
+msgid "See also L</pwrite>."
+msgstr ""
+

 # type: =head2
 #. type: =head2
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:4185
-msgid "strings-e"
+#: ../fish/guestfish-actions.pod:3661
+msgid "read-file"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:4187
+#: ../fish/guestfish-actions.pod:3663

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" strings-e encoding path\n"
+" read-file path\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish-actions.pod:4189
+#: ../fish/guestfish-actions.pod:3668

 msgid ""
 msgid ""

-"This is like the L</strings> command, but allows you to specify the encoding "
-"of strings that are looked for in the source file C<path>."
+"Unlike L</cat>, this function can correctly handle files that contain "
+"embedded ASCII NUL characters.  However unlike L</download>, this function "
+"is limited in the total size of file that can be handled."
+msgstr ""
+
+# type: =head2
+#. type: =head2
+#: ../fish/guestfish-actions.pod:3676
+msgid "read-lines"
+msgstr ""
+
+# type: verbatim
+#. type: verbatim
+#: ../fish/guestfish-actions.pod:3678
+#, no-wrap
+msgid ""
+" read-lines path\n"
+"\n"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish-actions.pod:4199
+#: ../fish/guestfish-actions.pod:3685

 msgid ""
 msgid ""

-"Single 7-bit-byte characters like ASCII and the ASCII-compatible parts of "
-"ISO-8859-X (this is what L</strings> uses)."
+"Note that this function cannot correctly handle binary files (specifically, "
+"files containing C<\\0> character which is treated as end of line).  For "
+"those you need to use the L</read-file> function which has a more complex "
+"interface."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:4231
-msgid "swapoff-device"
+#: ../fish/guestfish-actions.pod:3690
+msgid "readdir"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:4233
+#: ../fish/guestfish-actions.pod:3692

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" swapoff-device device\n"
+" readdir dir\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish-actions.pod:4235
+#: ../fish/guestfish-actions.pod:3744

 msgid ""
 msgid ""

-"This command disables the libguestfs appliance swap device or partition "
-"named C<device>.  See L</swapon-device>."
+"This function is primarily intended for use by programs.  To get a simple "
+"list of names, use L</ls>.  To get a printable directory for human "
+"consumption, use L</ll>."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:4239
-msgid "swapoff-file"
+#: ../fish/guestfish-actions.pod:3748
+msgid "readlink"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:4241
+#: ../fish/guestfish-actions.pod:3750

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" swapoff-file file\n"
+" readlink path\n"

 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2
 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:4245
-msgid "swapoff-label"
+#: ../fish/guestfish-actions.pod:3754
+msgid "readlinklist"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:4247
+#: ../fish/guestfish-actions.pod:3756

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" swapoff-label label\n"
+" readlinklist path 'names ...'\n"

 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2
 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:4252
-msgid "swapoff-uuid"
+#: ../fish/guestfish-actions.pod:3780
+msgid "realpath"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:4254
+#: ../fish/guestfish-actions.pod:3782

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" swapoff-uuid uuid\n"
+" realpath path\n"

 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2
 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:4259
-msgid "swapon-device"
+#: ../fish/guestfish-actions.pod:3787
+msgid "removexattr"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:4261
+#: ../fish/guestfish-actions.pod:3789

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" swapon-device device\n"
+" removexattr xattr path\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish-actions.pod:4263
-msgid ""
-"This command enables the libguestfs appliance to use the swap device or "
-"partition named C<device>.  The increased memory is made available for all "
-"commands, for example those run using L</command> or L</sh>."
+#: ../fish/guestfish-actions.pod:3794
+msgid "See also: L</lremovexattr>, L<attr(5)>."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:4275
-msgid "swapon-file"
+#: ../fish/guestfish-actions.pod:3796
+msgid "resize2fs"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:4277
+#: ../fish/guestfish-actions.pod:3798

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" swapon-file file\n"
+" resize2fs device\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish-actions.pod:4279
+#: ../fish/guestfish-actions.pod:3803

 msgid ""
 msgid ""

-"This command enables swap to a file.  See L</swapon-device> for other notes."
+"I<Note:> It is sometimes required that you run L</e2fsck-f> on the C<device> "
+"before calling this command.  For unknown reasons C<resize2fs> sometimes "
+"gives an error about this and sometimes not.  In any case, it is always safe "
+"to call L</e2fsck-f> before calling this function."

 msgstr ""
 
 msgstr ""
 

-# type: =head2

 #. type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:4282
-msgid "swapon-label"
+#: ../fish/guestfish-actions.pod:3809
+msgid "resize2fs-M"

 msgstr ""
 
 msgstr ""
 

-# type: verbatim

 #. type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:4284
+#: ../fish/guestfish-actions.pod:3811

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" swapon-label label\n"
+" resize2fs-M device\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../fish/guestfish-actions.pod:4286
+#: ../fish/guestfish-actions.pod:3813

 msgid ""
 msgid ""

-"This command enables swap to a labeled swap partition.  See L</swapon-"
-"device> for other notes."
+"This command is the same as L</resize2fs>, but the filesystem is resized to "
+"its minimum size.  This works like the I<-M> option to the C<resize2fs> "
+"command."
+msgstr ""
+
+#. type: textblock
+#: ../fish/guestfish-actions.pod:3817
+msgid ""
+"To get the resulting size of the filesystem you should call L</tune2fs-l> "
+"and read the C<Block size> and C<Block count> values.  These two numbers, "
+"multiplied together, give the resulting size of the minimal filesystem in "
+"bytes."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:4289
-msgid "swapon-uuid"
+#: ../fish/guestfish-actions.pod:3822
+msgid "resize2fs-size"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:4291
+#: ../fish/guestfish-actions.pod:3824

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" swapon-uuid uuid\n"
+" resize2fs-size device size\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish-actions.pod:4293
+#: ../fish/guestfish-actions.pod:3826

 msgid ""
 msgid ""

-"This command enables swap to a swap partition with the given UUID.  See L</"
-"swapon-device> for other notes."
+"This command is the same as L</resize2fs> except that it allows you to "
+"specify the new size (in bytes) explicitly."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:4296
-msgid "sync"
+#: ../fish/guestfish-actions.pod:3829
+msgid "rm"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:4298
+#: ../fish/guestfish-actions.pod:3831

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" sync\n"
+" rm path\n"

 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2
 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:4306
-msgid "tail"
+#: ../fish/guestfish-actions.pod:3835
+msgid "rm-rf"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:4308
+#: ../fish/guestfish-actions.pod:3837

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" tail path\n"
+" rm-rf path\n"

 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2
 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:4316
-msgid "tail-n"
+#: ../fish/guestfish-actions.pod:3843
+msgid "rmdir"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:4318
+#: ../fish/guestfish-actions.pod:3845

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" tail-n nrlines path\n"
+" rmdir path\n"

 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2
 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:4331
-msgid "tar-in"
+#: ../fish/guestfish-actions.pod:3849
+msgid "rmmountpoint"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:4333
+#: ../fish/guestfish-actions.pod:3851

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" tar-in (tarfile|-) directory\n"
+" rmmountpoint exemptpath\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish-actions.pod:4338
-msgid "To upload a compressed tarball, use L</tgz-in> or L</txz-in>."
+#: ../fish/guestfish-actions.pod:3853
+msgid ""
+"This calls removes a mountpoint that was previously created with L</"
+"mkmountpoint>.  See L</mkmountpoint> for full details."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:4343
-msgid "tar-out"
+#: ../fish/guestfish-actions.pod:3857
+msgid "scrub-device"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:4345
+#: ../fish/guestfish-actions.pod:3859

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" tar-out directory (tarfile|-)\n"
+" scrub-device device\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../fish/guestfish-actions.pod:4350
-msgid "To download a compressed tarball, use L</tgz-out> or L</txz-out>."
-msgstr ""
-

 # type: =head2
 #. type: =head2
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:4355
-msgid "tgz-in"
+#: ../fish/guestfish-actions.pod:3870
+msgid "scrub-file"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:4357
+#: ../fish/guestfish-actions.pod:3872

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" tgz-in (tarball|-) directory\n"
+" scrub-file file\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../fish/guestfish-actions.pod:4362
-msgid "To upload an uncompressed tarball, use L</tar-in>."
-msgstr ""
-

 # type: =head2
 #. type: =head2
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:4366
-msgid "tgz-out"
+#: ../fish/guestfish-actions.pod:3882
+msgid "scrub-freespace"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:4368
+#: ../fish/guestfish-actions.pod:3884

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" tgz-out directory (tarball|-)\n"
+" scrub-freespace dir\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish-actions.pod:4373
-msgid "To download an uncompressed tarball, use L</tar-out>."
+#: ../fish/guestfish-actions.pod:3886
+msgid ""
+"This command creates the directory C<dir> and then fills it with files until "
+"the filesystem is full, and scrubs the files as for L</scrub-file>, and "
+"deletes them.  The intention is to scrub any free space on the partition "
+"containing C<dir>."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:4377
-msgid "touch"
+#: ../fish/guestfish-actions.pod:3895
+msgid "set-append"
+msgstr ""
+
+# type: =head2
+#. type: =head2
+#: ../fish/guestfish-actions.pod:3897
+msgid "append"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:4379
+#: ../fish/guestfish-actions.pod:3899

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" touch path\n"
+" set-append append\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: =head2

 #. type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:4388
-msgid "truncate"
+#: ../fish/guestfish-actions.pod:3910
+msgid "set-attach-method"
+msgstr ""
+
+#. type: =head2
+#: ../fish/guestfish-actions.pod:3912
+msgid "attach-method"

 msgstr ""
 
 msgstr ""
 

-# type: verbatim

 #. type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:4390
+#: ../fish/guestfish-actions.pod:3914

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" truncate path\n"
+" set-attach-method attachmethod\n"

 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2
 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:4395
-msgid "truncate-size"
+#: ../fish/guestfish-actions.pod:3936
+msgid "set-autosync"
+msgstr ""
+
+# type: =head2
+#. type: =head2
+#: ../fish/guestfish-actions.pod:3938
+msgid "autosync"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:4397
+#: ../fish/guestfish-actions.pod:3940

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" truncate-size path size\n"
+" set-autosync true|false\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../fish/guestfish-actions.pod:4402
-msgid ""
-"If the current file size is less than C<size> then the file is extended to "
-"the required size with zero bytes.  This creates a sparse file (ie. disk "
-"blocks are not allocated for the file until you write to it).  To create a "
-"non-sparse file of zeroes, use L</fallocate64> instead."
+# type: =head2
+#. type: =head2
+#: ../fish/guestfish-actions.pod:3950
+msgid "set-direct"

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:4408
-msgid "tune2fs-l"
+#: ../fish/guestfish-actions.pod:3952
+msgid "direct"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:4410
+#: ../fish/guestfish-actions.pod:3954

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" tune2fs-l device\n"
+" set-direct true|false\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

+# type: textblock
+#. type: textblock
+#: ../fish/guestfish-actions.pod:3960
+msgid ""
+"One consequence of this is that log messages aren't caught by the library "
+"and handled by L</set-log-message-callback>, but go straight to stdout."
+msgstr ""
+

 # type: =head2
 #. type: =head2
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:4420
-msgid "txz-in"
+#: ../fish/guestfish-actions.pod:3969
+msgid "set-e2label"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:4422
+#: ../fish/guestfish-actions.pod:3971

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" txz-in (tarball|-) directory\n"
+" set-e2label device label\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

+# type: textblock
+#. type: textblock
+#: ../fish/guestfish-actions.pod:3977
+msgid ""
+"You can use either L</tune2fs-l> or L</get-e2label> to return the existing "
+"label on a filesystem."
+msgstr ""
+

 # type: =head2
 #. type: =head2
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:4429
-msgid "txz-out"
+#: ../fish/guestfish-actions.pod:3980
+msgid "set-e2uuid"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:4431
+#: ../fish/guestfish-actions.pod:3982

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" txz-out directory (tarball|-)\n"
+" set-e2uuid device uuid\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

+# type: textblock
+#. type: textblock
+#: ../fish/guestfish-actions.pod:3989
+msgid ""
+"You can use either L</tune2fs-l> or L</get-e2uuid> to return the existing "
+"UUID of a filesystem."
+msgstr ""
+

 # type: =head2
 #. type: =head2
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:4438
-msgid "umask"
+#: ../fish/guestfish-actions.pod:3992
+msgid "set-memsize"
+msgstr ""
+
+# type: =head2
+#. type: =head2
+#: ../fish/guestfish-actions.pod:3994
+msgid "memsize"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:4440
+#: ../fish/guestfish-actions.pod:3996

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" umask mask\n"
+" set-memsize memsize\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish-actions.pod:4454
-msgid "See also L</get-umask>, L<umask(2)>, L</mknod>, L</mkdir>."
+#: ../fish/guestfish-actions.pod:3998
+msgid ""
+"This sets the memory size in megabytes allocated to the qemu subprocess.  "
+"This only has any effect if called before L</launch>."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:4459
-msgid "umount"
+#: ../fish/guestfish-actions.pod:4009
+msgid "set-network"

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:4461
-msgid "unmount"
+#: ../fish/guestfish-actions.pod:4011
+msgid "network"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:4463
+#: ../fish/guestfish-actions.pod:4013

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" umount pathordevice\n"
+" set-network true|false\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

+# type: textblock
+#. type: textblock
+#: ../fish/guestfish-actions.pod:4021
+msgid ""
+"You must call this before calling L</launch>, otherwise it has no effect."
+msgstr ""
+

 # type: =head2
 #. type: =head2
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:4469
-msgid "umount-all"
+#: ../fish/guestfish-actions.pod:4024
+msgid "set-path"

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:4471
-msgid "unmount-all"
+#: ../fish/guestfish-actions.pod:4026
+msgid "path"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:4473
+#: ../fish/guestfish-actions.pod:4028

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" umount-all\n"
+" set-path searchpath\n"

 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2
 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:4479
-msgid "upload"
+#: ../fish/guestfish-actions.pod:4037
+msgid "set-qemu"
+msgstr ""
+
+# type: =head2
+#. type: =head2
+#: ../fish/guestfish-actions.pod:4039
+msgid "qemu"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:4481
+#: ../fish/guestfish-actions.pod:4041

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" upload (filename|-) remotefilename\n"
+" set-qemu qemu\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../fish/guestfish-actions.pod:4488
-msgid "See also L</download>."
+# type: =head2
+#. type: =head2
+#: ../fish/guestfish-actions.pod:4061
+msgid "set-recovery-proc"

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:4492
-msgid "upload-offset"
+#: ../fish/guestfish-actions.pod:4063
+msgid "recovery-proc"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:4494
+#: ../fish/guestfish-actions.pod:4065

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" upload-offset (filename|-) remotefilename offset\n"
+" set-recovery-proc true|false\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish-actions.pod:4506
+#: ../fish/guestfish-actions.pod:4067

 msgid ""
 msgid ""

-"Note that there is no limit on the amount of data that can be uploaded with "
-"this call, unlike with L</pwrite>, and this call always writes the full "
-"amount unless an error occurs."
+"If this is called with the parameter C<false> then L</launch> does not "
+"create a recovery process.  The purpose of the recovery process is to stop "
+"runaway qemu processes in the case where the main program aborts abruptly."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish-actions.pod:4511
-msgid "See also L</upload>, L</pwrite>."
+#: ../fish/guestfish-actions.pod:4072
+msgid ""
+"This only has any effect if called before L</launch>, and the default is "
+"true."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:4515
-msgid "utimens"
-msgstr ""
-
-# type: verbatim
-#. type: verbatim
-#: ../fish/guestfish-actions.pod:4517
-#, no-wrap
-msgid ""
-" utimens path atsecs atnsecs mtsecs mtnsecs\n"
-"\n"
+#: ../fish/guestfish-actions.pod:4081
+msgid "set-selinux"

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:4536
-msgid "version"
+#: ../fish/guestfish-actions.pod:4083
+msgid "selinux"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:4538
+#: ../fish/guestfish-actions.pod:4085

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" version\n"
+" set-selinux true|false\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../fish/guestfish-actions.pod:4565
-msgid ""
-"I<Note:> Don't use this call to test for availability of features.  In "
-"enterprise distributions we backport features from later versions into "
-"earlier versions, making this an unreliable way to test for features.  Use "
-"L</available> instead."
+# type: =head2
+#. type: =head2
+#: ../fish/guestfish-actions.pod:4096
+msgid "set-trace"

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:4571
-msgid "vfs-label"
+#: ../fish/guestfish-actions.pod:4098
+msgid "trace"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:4573
+#: ../fish/guestfish-actions.pod:4100

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" vfs-label device\n"
+" set-trace true|false\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../fish/guestfish-actions.pod:4580
-msgid "To find a filesystem from the label, use L</findfs-label>."
+#: ../fish/guestfish-actions.pod:4112
+msgid ""
+"Trace messages are normally sent to C<stderr>, unless you register a "
+"callback to send them somewhere else (see L</set-event-callback>)."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:4582
-msgid "vfs-type"
-msgstr ""
-
-# type: verbatim
-#. type: verbatim
-#: ../fish/guestfish-actions.pod:4584
-#, no-wrap
-msgid ""
-" vfs-type device\n"
-"\n"
+#: ../fish/guestfish-actions.pod:4116
+msgid "set-verbose"

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:4594
-msgid "vfs-uuid"
+#: ../fish/guestfish-actions.pod:4118
+msgid "verbose"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:4596
+#: ../fish/guestfish-actions.pod:4120

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" vfs-uuid device\n"
+" set-verbose true|false\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../fish/guestfish-actions.pod:4603
-msgid "To find a filesystem from the UUID, use L</findfs-uuid>."
+#: ../fish/guestfish-actions.pod:4127
+msgid ""
+"Verbose messages are normally sent to C<stderr>, unless you register a "
+"callback to send them somewhere else (see L</set-event-callback>)."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:4605
-msgid "vg-activate"
+#: ../fish/guestfish-actions.pod:4131
+msgid "setcon"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:4607
+#: ../fish/guestfish-actions.pod:4133

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" vg-activate true|false 'volgroups ...'\n"
+" setcon context\n"

 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2
 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:4620
-msgid "vg-activate-all"
+#: ../fish/guestfish-actions.pod:4140
+msgid "setxattr"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:4622
+#: ../fish/guestfish-actions.pod:4142

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" vg-activate-all true|false\n"
+" setxattr xattr val vallen path\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

+# type: textblock
+#. type: textblock
+#: ../fish/guestfish-actions.pod:4148
+msgid "See also: L</lsetxattr>, L<attr(5)>."
+msgstr ""
+

 # type: =head2
 #. type: =head2
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:4632
-msgid "vgcreate"
+#: ../fish/guestfish-actions.pod:4150
+msgid "sfdisk"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:4634
+#: ../fish/guestfish-actions.pod:4152

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" vgcreate volgroup 'physvols ...'\n"
+" sfdisk device cyls heads sectors 'lines ...'\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

+# type: textblock
+#. type: textblock
+#: ../fish/guestfish-actions.pod:4174
+msgid "See also: L</sfdisk-l>, L</sfdisk-N>, L</part-init>"
+msgstr ""
+
+#. type: textblock
+#: ../fish/guestfish-actions.pod:4180 ../fish/guestfish-actions.pod:4203
+#: ../fish/guestfish-actions.pod:4225
+msgid ""
+"This function is deprecated.  In new code, use the L</part_add> call instead."
+msgstr ""
+

 # type: =head2
 #. type: =head2
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:4639
-msgid "vglvuuids"
+#: ../fish/guestfish-actions.pod:4187
+msgid "sfdiskM"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:4641
+#: ../fish/guestfish-actions.pod:4189

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" vglvuuids vgname\n"
+" sfdiskM device 'lines ...'\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish-actions.pod:4646
+#: ../fish/guestfish-actions.pod:4191

 msgid ""
 msgid ""

-"You can use this along with L</lvs> and L</lvuuid> calls to associate "
-"logical volumes and volume groups."
+"This is a simplified interface to the L</sfdisk> command, where partition "
+"sizes are specified in megabytes only (rounded to the nearest cylinder) and "
+"you don't need to specify the cyls, heads and sectors parameters which were "
+"rarely if ever used anyway."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish-actions.pod:4649
-msgid "See also L</vgpvuuids>."
+#: ../fish/guestfish-actions.pod:4197
+msgid "See also: L</sfdisk>, the L<sfdisk(8)> manpage and L</part-disk>"

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:4651
-msgid "vgpvuuids"
+#: ../fish/guestfish-actions.pod:4210
+msgid "sfdisk-N"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:4653
+#: ../fish/guestfish-actions.pod:4212

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" vgpvuuids vgname\n"
+" sfdisk-N device partnum cyls heads sectors line\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish-actions.pod:4658
+#: ../fish/guestfish-actions.pod:4217

 msgid ""
 msgid ""

-"You can use this along with L</pvs> and L</pvuuid> calls to associate "
-"physical volumes and volume groups."
+"For other parameters, see L</sfdisk>.  You should usually pass C<0> for the "
+"cyls/heads/sectors parameters."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish-actions.pod:4661
-msgid "See also L</vglvuuids>."
+#: ../fish/guestfish-actions.pod:4220
+msgid "See also: L</part-add>"

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:4663
-msgid "vgremove"
+#: ../fish/guestfish-actions.pod:4232
+msgid "sfdisk-disk-geometry"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:4665
+#: ../fish/guestfish-actions.pod:4234

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" vgremove vgname\n"
+" sfdisk-disk-geometry device\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

+# type: textblock
+#. type: textblock
+#: ../fish/guestfish-actions.pod:4236
+msgid ""
+"This displays the disk geometry of C<device> read from the partition table.  "
+"Especially in the case where the underlying block device has been resized, "
+"this can be different from the kernel's idea of the geometry (see L</sfdisk-"
+"kernel-geometry>)."
+msgstr ""
+

 # type: =head2
 #. type: =head2
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:4672
-msgid "vgrename"
+#: ../fish/guestfish-actions.pod:4244
+msgid "sfdisk-kernel-geometry"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:4674
+#: ../fish/guestfish-actions.pod:4246

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" vgrename volgroup newvolgroup\n"
+" sfdisk-kernel-geometry device\n"

 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2
 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:4678
-msgid "vgs"
+#: ../fish/guestfish-actions.pod:4253
+msgid "sfdisk-l"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:4680
+#: ../fish/guestfish-actions.pod:4255

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" vgs\n"
+" sfdisk-l device\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish-actions.pod:4688
-msgid "See also L</vgs-full>."
+#: ../fish/guestfish-actions.pod:4261
+msgid "See also: L</part-list>"
+msgstr ""
+
+#. type: textblock
+#: ../fish/guestfish-actions.pod:4263
+msgid ""
+"This function is deprecated.  In new code, use the L</part_list> call "
+"instead."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:4690
-msgid "vgs-full"
+#: ../fish/guestfish-actions.pod:4270
+msgid "sh"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:4692
+#: ../fish/guestfish-actions.pod:4272

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" vgs-full\n"
+" sh command\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

+# type: textblock
+#. type: textblock
+#: ../fish/guestfish-actions.pod:4277
+msgid "This is like L</command>, but passes the command to:"
+msgstr ""
+
+# type: textblock
+#. type: textblock
+#: ../fish/guestfish-actions.pod:4285
+msgid "All the provisos about L</command> apply to this call."
+msgstr ""
+

 # type: =head2
 #. type: =head2
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:4697
-msgid "vgscan"
+#: ../fish/guestfish-actions.pod:4287
+msgid "sh-lines"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:4699
+#: ../fish/guestfish-actions.pod:4289

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" vgscan\n"
+" sh-lines command\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

+# type: textblock
+#. type: textblock
+#: ../fish/guestfish-actions.pod:4291
+msgid "This is the same as L</sh>, but splits the result into a list of lines."
+msgstr ""
+
+# type: textblock
+#. type: textblock
+#: ../fish/guestfish-actions.pod:4294
+msgid "See also: L</command-lines>"
+msgstr ""
+

 # type: =head2
 #. type: =head2
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:4704
-msgid "vguuid"
+#: ../fish/guestfish-actions.pod:4296
+msgid "sleep"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:4706
+#: ../fish/guestfish-actions.pod:4298

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" vguuid vgname\n"
+" sleep secs\n"

 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2
 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:4710
-msgid "wc-c"
+#: ../fish/guestfish-actions.pod:4302
+msgid "stat"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:4712
+#: ../fish/guestfish-actions.pod:4304

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" wc-c path\n"
+" stat path\n"

 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2
 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:4717
-msgid "wc-l"
+#: ../fish/guestfish-actions.pod:4310
+msgid "statvfs"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:4719
+#: ../fish/guestfish-actions.pod:4312

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" wc-l path\n"
+" statvfs path\n"

 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2
 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:4724
-msgid "wc-w"
+#: ../fish/guestfish-actions.pod:4320
+msgid "strings"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:4726
+#: ../fish/guestfish-actions.pod:4322

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" wc-w path\n"
+" strings path\n"

 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2
 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:4731
-msgid "write"
+#: ../fish/guestfish-actions.pod:4330
+msgid "strings-e"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:4733
+#: ../fish/guestfish-actions.pod:4332

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" write path content\n"
+" strings-e encoding path\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

+# type: textblock
+#. type: textblock
+#: ../fish/guestfish-actions.pod:4334
+msgid ""
+"This is like the L</strings> command, but allows you to specify the encoding "
+"of strings that are looked for in the source file C<path>."
+msgstr ""
+
+# type: textblock
+#. type: textblock
+#: ../fish/guestfish-actions.pod:4344
+msgid ""
+"Single 7-bit-byte characters like ASCII and the ASCII-compatible parts of "
+"ISO-8859-X (this is what L</strings> uses)."
+msgstr ""
+

 # type: =head2
 #. type: =head2
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:4741
-msgid "write-file"
+#: ../fish/guestfish-actions.pod:4376
+msgid "swapoff-device"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:4743
+#: ../fish/guestfish-actions.pod:4378

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" write-file path content size\n"
+" swapoff-device device\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

+# type: textblock
+#. type: textblock
+#: ../fish/guestfish-actions.pod:4380
+msgid ""
+"This command disables the libguestfs appliance swap device or partition "
+"named C<device>.  See L</swapon-device>."
+msgstr ""
+

 # type: =head2
 #. type: =head2
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:4766
-msgid "zegrep"
+#: ../fish/guestfish-actions.pod:4384
+msgid "swapoff-file"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:4768
+#: ../fish/guestfish-actions.pod:4386

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" zegrep regex path\n"
+" swapoff-file file\n"

 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2
 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:4776
-msgid "zegrepi"
+#: ../fish/guestfish-actions.pod:4390
+msgid "swapoff-label"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:4778
+#: ../fish/guestfish-actions.pod:4392

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" zegrepi regex path\n"
+" swapoff-label label\n"

 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2
 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:4786
-msgid "zero"
+#: ../fish/guestfish-actions.pod:4397
+msgid "swapoff-uuid"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:4788
+#: ../fish/guestfish-actions.pod:4399

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" zero device\n"
+" swapoff-uuid uuid\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../fish/guestfish-actions.pod:4796
-msgid "See also: L</zero-device>, L</scrub-device>."
-msgstr ""
-

 # type: =head2
 #. type: =head2
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:4798
-msgid "zero-device"
+#: ../fish/guestfish-actions.pod:4404
+msgid "swapon-device"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:4800
+#: ../fish/guestfish-actions.pod:4406

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" zero-device device\n"
+" swapon-device device\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish-actions.pod:4802
+#: ../fish/guestfish-actions.pod:4408

 msgid ""
 msgid ""

-"This command writes zeroes over the entire C<device>.  Compare with L</zero> "
-"which just zeroes the first few blocks of a device."
+"This command enables the libguestfs appliance to use the swap device or "
+"partition named C<device>.  The increased memory is made available for all "
+"commands, for example those run using L</command> or L</sh>."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:4809
-msgid "zerofree"
+#: ../fish/guestfish-actions.pod:4420
+msgid "swapon-file"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:4811
+#: ../fish/guestfish-actions.pod:4422

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" zerofree device\n"
+" swapon-file file\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: =head2
-#. type: =head2
-#: ../fish/guestfish-actions.pod:4824
-msgid "zfgrep"
-msgstr ""
-
-# type: verbatim
-#. type: verbatim
-#: ../fish/guestfish-actions.pod:4826
-#, no-wrap
+# type: textblock
+#. type: textblock
+#: ../fish/guestfish-actions.pod:4424

 msgid ""
 msgid ""

-" zfgrep pattern path\n"
-"\n"
+"This command enables swap to a file.  See L</swapon-device> for other notes."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:4834
-msgid "zfgrepi"
+#: ../fish/guestfish-actions.pod:4427
+msgid "swapon-label"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:4836
+#: ../fish/guestfish-actions.pod:4429

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" zfgrepi pattern path\n"
+" swapon-label label\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

+# type: textblock
+#. type: textblock
+#: ../fish/guestfish-actions.pod:4431
+msgid ""
+"This command enables swap to a labeled swap partition.  See L</swapon-"
+"device> for other notes."
+msgstr ""
+

 # type: =head2
 #. type: =head2
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:4844
-msgid "zfile"
+#: ../fish/guestfish-actions.pod:4434
+msgid "swapon-uuid"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:4846
+#: ../fish/guestfish-actions.pod:4436

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" zfile meth path\n"
+" swapon-uuid uuid\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish-actions.pod:4853
+#: ../fish/guestfish-actions.pod:4438

 msgid ""
 msgid ""

-"Since 1.0.63, use L</file> instead which can now process compressed files."
+"This command enables swap to a swap partition with the given UUID.  See L</"
+"swapon-device> for other notes."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:4863
-msgid "zgrep"
+#: ../fish/guestfish-actions.pod:4441
+msgid "sync"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:4865
+#: ../fish/guestfish-actions.pod:4443

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" zgrep regex path\n"
+" sync\n"

 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2
 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-actions.pod:4873
-msgid "zgrepi"
+#: ../fish/guestfish-actions.pod:4451
+msgid "tail"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-actions.pod:4875
+#: ../fish/guestfish-actions.pod:4453

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" zgrepi regex path\n"
+" tail path\n"

 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2
 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-commands.pod:1
-msgid "alloc"
+#: ../fish/guestfish-actions.pod:4461
+msgid "tail-n"
+msgstr ""
+
+# type: verbatim
+#. type: verbatim
+#: ../fish/guestfish-actions.pod:4463
+#, no-wrap
+msgid ""
+" tail-n nrlines path\n"
+"\n"

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-commands.pod:3
-msgid "allocate"
+#: ../fish/guestfish-actions.pod:4476
+msgid "tar-in"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-commands.pod:5
+#: ../fish/guestfish-actions.pod:4478

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" alloc filename size\n"
+" tar-in (tarfile|-) directory\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish-commands.pod:7
-msgid ""
-"This creates an empty (zeroed) file of the given size, and then adds so it "
-"can be further examined."
+#: ../fish/guestfish-actions.pod:4483
+msgid "To upload a compressed tarball, use L</tgz-in> or L</txz-in>."

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../fish/guestfish-commands.pod:10 ../fish/guestfish-commands.pod:168
-msgid "For more advanced image creation, see L<qemu-img(1)> utility."
+# type: =head2
+#. type: =head2
+#: ../fish/guestfish-actions.pod:4488
+msgid "tar-out"

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../fish/guestfish-commands.pod:12 ../fish/guestfish-commands.pod:170
-msgid "Size can be specified using standard suffixes, eg. C<1M>."
+# type: verbatim
+#. type: verbatim
+#: ../fish/guestfish-actions.pod:4490
+#, no-wrap
+msgid ""
+" tar-out directory (tarfile|-)\n"
+"\n"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish-commands.pod:14
-msgid ""
-"To create a sparse file, use L</sparse> instead.  To create a prepared disk "
-"image, see L</PREPARED DISK IMAGES>."
+#: ../fish/guestfish-actions.pod:4495
+msgid "To download a compressed tarball, use L</tgz-out> or L</txz-out>."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-commands.pod:17
-msgid "copy-in"
+#: ../fish/guestfish-actions.pod:4500
+msgid "tgz-in"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-commands.pod:19
+#: ../fish/guestfish-actions.pod:4502

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" copy-in local [local ...] /remotedir\n"
+" tgz-in (tarball|-) directory\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish-commands.pod:21
-msgid ""
-"C<copy-in> copies local files or directories recursively into the disk "
-"image, placing them in the directory called C</remotedir> (which must "
-"exist).  This guestfish meta-command turns into a sequence of L</tar-in> and "
-"other commands as necessary."
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../fish/guestfish-commands.pod:26
-msgid ""
-"Multiple local files and directories can be specified, but the last "
-"parameter must always be a remote directory.  Wildcards cannot be used."
+#: ../fish/guestfish-actions.pod:4507
+msgid "To upload an uncompressed tarball, use L</tar-in>."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-commands.pod:30
-msgid "copy-out"
+#: ../fish/guestfish-actions.pod:4511
+msgid "tgz-out"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-commands.pod:32
+#: ../fish/guestfish-actions.pod:4513

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" copy-out remote [remote ...] localdir\n"
+" tgz-out directory (tarball|-)\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish-commands.pod:34
-msgid ""
-"C<copy-out> copies remote files or directories recursively out of the disk "
-"image, placing them on the host disk in a local directory called C<localdir> "
-"(which must exist).  This guestfish meta-command turns into a sequence of L</"
-"download>, L</tar-out> and other commands as necessary."
+#: ../fish/guestfish-actions.pod:4518
+msgid "To download an uncompressed tarball, use L</tar-out>."

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../fish/guestfish-commands.pod:40
-msgid ""
-"Multiple remote files and directories can be specified, but the last "
-"parameter must always be a local directory.  To download to the current "
-"directory, use C<.> as in:"
+# type: =head2
+#. type: =head2
+#: ../fish/guestfish-actions.pod:4522
+msgid "touch"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-commands.pod:44
+#: ../fish/guestfish-actions.pod:4524

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" copy-out /home .\n"
+" touch path\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../fish/guestfish-commands.pod:46
-msgid ""
-"Wildcards cannot be used in the ordinary command, but you can use them with "
-"the help of L</glob> like this:"
+# type: =head2
+#. type: =head2
+#: ../fish/guestfish-actions.pod:4533
+msgid "truncate"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-commands.pod:49
+#: ../fish/guestfish-actions.pod:4535

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" glob copy-out /home/* .\n"
+" truncate path\n"

 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2
 "\n"
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-commands.pod:51
-msgid "echo"
+#: ../fish/guestfish-actions.pod:4540
+msgid "truncate-size"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-commands.pod:53
+#: ../fish/guestfish-actions.pod:4542

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" echo [params ...]\n"
+" truncate-size path size\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish-commands.pod:55
-msgid "This echos the parameters to the terminal."
+#: ../fish/guestfish-actions.pod:4547
+msgid ""
+"If the current file size is less than C<size> then the file is extended to "
+"the required size with zero bytes.  This creates a sparse file (ie. disk "
+"blocks are not allocated for the file until you write to it).  To create a "
+"non-sparse file of zeroes, use L</fallocate64> instead."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-commands.pod:57
-msgid "edit"
+#: ../fish/guestfish-actions.pod:4553
+msgid "tune2fs-l"

 msgstr ""
 
 msgstr ""
 

-# type: =head2
-#. type: =head2
-#: ../fish/guestfish-commands.pod:59
-msgid "vi"
+# type: verbatim
+#. type: verbatim
+#: ../fish/guestfish-actions.pod:4555
+#, no-wrap
+msgid ""
+" tune2fs-l device\n"
+"\n"

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-commands.pod:61
-msgid "emacs"
+#: ../fish/guestfish-actions.pod:4565
+msgid "txz-in"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-commands.pod:63
+#: ../fish/guestfish-actions.pod:4567

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" edit filename\n"
+" txz-in (tarball|-) directory\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../fish/guestfish-commands.pod:65
-msgid ""
-"This is used to edit a file.  It downloads the file, edits it locally using "
-"your editor, then uploads the result."
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../fish/guestfish-commands.pod:68
-msgid ""
-"The editor is C<$EDITOR>.  However if you use the alternate commands C<vi> "
-"or C<emacs> you will get those corresponding editors."
-msgstr ""
-

 # type: =head2
 #. type: =head2
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-commands.pod:72
-msgid "glob"
+#: ../fish/guestfish-actions.pod:4574
+msgid "txz-out"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-commands.pod:74
+#: ../fish/guestfish-actions.pod:4576

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" glob command args...\n"
+" txz-out directory (tarball|-)\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../fish/guestfish-commands.pod:76
-msgid ""
-"Expand wildcards in any paths in the args list, and run C<command> "
-"repeatedly on each matching path."
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../fish/guestfish-commands.pod:79
-msgid "See L</WILDCARDS AND GLOBBING>."
-msgstr ""
-

 # type: =head2
 #. type: =head2
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-commands.pod:81
-msgid "hexedit"
+#: ../fish/guestfish-actions.pod:4583
+msgid "umask"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-commands.pod:83
+#: ../fish/guestfish-actions.pod:4585

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" hexedit <filename|device>\n"
-" hexedit <filename|device> <max>\n"
-" hexedit <filename|device> <start> <max>\n"
+" umask mask\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish-commands.pod:87
-msgid ""
-"Use hexedit (a hex editor) to edit all or part of a binary file or block "
-"device."
+#: ../fish/guestfish-actions.pod:4599
+msgid "See also L</get-umask>, L<umask(2)>, L</mknod>, L</mkdir>."

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../fish/guestfish-commands.pod:90
-msgid ""
-"This command works by downloading potentially the whole file or device, "
-"editing it locally, then uploading it.  If the file or device is large, you "
-"have to specify which part you wish to edit by using C<max> and/or C<start> "
-"C<max> parameters.  C<start> and C<max> are specified in bytes, with the "
-"usual modifiers allowed such as C<1M> (1 megabyte)."
+# type: =head2
+#. type: =head2
+#: ../fish/guestfish-actions.pod:4604
+msgid "umount"

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../fish/guestfish-commands.pod:97
-msgid "For example to edit the first few sectors of a disk you might do:"
+# type: =head2
+#. type: =head2
+#: ../fish/guestfish-actions.pod:4606
+msgid "unmount"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-commands.pod:100
+#: ../fish/guestfish-actions.pod:4608

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" hexedit /dev/sda 1M\n"
+" umount pathordevice\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../fish/guestfish-commands.pod:102
-msgid ""
-"which would allow you to edit anywhere within the first megabyte of the disk."
+# type: =head2
+#. type: =head2
+#: ../fish/guestfish-actions.pod:4614
+msgid "umount-all"

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../fish/guestfish-commands.pod:105
-msgid "To edit the superblock of an ext2 filesystem on C</dev/sda1>, do:"
+# type: =head2
+#. type: =head2
+#: ../fish/guestfish-actions.pod:4616
+msgid "unmount-all"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-commands.pod:107
+#: ../fish/guestfish-actions.pod:4618

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" hexedit /dev/sda1 0x400 0x400\n"
+" umount-all\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../fish/guestfish-commands.pod:109
-msgid "(assuming the superblock is in the standard location)."
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../fish/guestfish-commands.pod:111
-msgid ""
-"This command requires the external L<hexedit(1)> program.  You can specify "
-"another program to use by setting the C<HEXEDITOR> environment variable."
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../fish/guestfish-commands.pod:115
-msgid "See also L</hexdump>."
-msgstr ""
-

 # type: =head2
 #. type: =head2
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-commands.pod:117
-msgid "lcd"
+#: ../fish/guestfish-actions.pod:4624
+msgid "upload"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-commands.pod:119
+#: ../fish/guestfish-actions.pod:4626

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" lcd directory\n"
-"\n"
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../fish/guestfish-commands.pod:121
-msgid ""
-"Change the local directory, ie. the current directory of guestfish itself."
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../fish/guestfish-commands.pod:124
-msgid "Note that C<!cd> won't do what you might expect."
+" upload (filename|-) remotefilename\n"
+"\n"

 msgstr ""
 
 msgstr ""
 

-# type: =head2
-#. type: =head2
-#: ../fish/guestfish-commands.pod:126
-msgid "man"
+# type: textblock
+#. type: textblock
+#: ../fish/guestfish-actions.pod:4633
+msgid "See also L</download>."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-commands.pod:128
-msgid "manual"
+#: ../fish/guestfish-actions.pod:4637
+msgid "upload-offset"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-commands.pod:130
+#: ../fish/guestfish-actions.pod:4639

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-"  man\n"
+" upload-offset (filename|-) remotefilename offset\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish-commands.pod:132
-msgid "Opens the manual page for guestfish."
+#: ../fish/guestfish-actions.pod:4651
+msgid ""
+"Note that there is no limit on the amount of data that can be uploaded with "
+"this call, unlike with L</pwrite>, and this call always writes the full "
+"amount unless an error occurs."

 msgstr ""
 
 msgstr ""
 

-# type: =head2
-#. type: =head2
-#: ../fish/guestfish-commands.pod:134
-msgid "more"
+# type: textblock
+#. type: textblock
+#: ../fish/guestfish-actions.pod:4656
+msgid "See also L</upload>, L</pwrite>."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-commands.pod:136
-msgid "less"
+#: ../fish/guestfish-actions.pod:4660
+msgid "utimens"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-commands.pod:138
+#: ../fish/guestfish-actions.pod:4662

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" more filename\n"
+" utimens path atsecs atnsecs mtsecs mtnsecs\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

+# type: =head2
+#. type: =head2
+#: ../fish/guestfish-actions.pod:4681
+msgid "version"
+msgstr ""
+

 # type: verbatim
 #. type: verbatim
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-commands.pod:140
+#: ../fish/guestfish-actions.pod:4683

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" less filename\n"
+" version\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish-commands.pod:142
-msgid "This is used to view a file."
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../fish/guestfish-commands.pod:144
+#: ../fish/guestfish-actions.pod:4710

 msgid ""
 msgid ""

-"The default viewer is C<$PAGER>.  However if you use the alternate command "
-"C<less> you will get the C<less> command specifically."
+"I<Note:> Don't use this call to test for availability of features.  In "
+"enterprise distributions we backport features from later versions into "
+"earlier versions, making this an unreliable way to test for features.  Use "
+"L</available> instead."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-commands.pod:147
-msgid "reopen"
+#: ../fish/guestfish-actions.pod:4716
+msgid "vfs-label"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-commands.pod:149
+#: ../fish/guestfish-actions.pod:4718

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-"  reopen\n"
+" vfs-label device\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish-commands.pod:151
-msgid ""
-"Close and reopen the libguestfs handle.  It is not necessary to use this "
-"normally, because the handle is closed properly when guestfish exits.  "
-"However this is occasionally useful for testing."
+#: ../fish/guestfish-actions.pod:4725
+msgid "To find a filesystem from the label, use L</findfs-label>."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-commands.pod:155
-msgid "sparse"
+#: ../fish/guestfish-actions.pod:4727
+msgid "vfs-type"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-commands.pod:157
+#: ../fish/guestfish-actions.pod:4729

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" sparse filename size\n"
+" vfs-type device\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../fish/guestfish-commands.pod:159
-msgid ""
-"This creates an empty sparse file of the given size, and then adds so it can "
-"be further examined."
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../fish/guestfish-commands.pod:162
-msgid ""
-"In all respects it works the same as the L</alloc> command, except that the "
-"image file is allocated sparsely, which means that disk blocks are not "
-"assigned to the file until they are needed.  Sparse disk files only use "
-"space when written to, but they are slower and there is a danger you could "
-"run out of real disk space during a write operation."
-msgstr ""
-

 # type: =head2
 #. type: =head2
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-commands.pod:172
-msgid "supported"
+#: ../fish/guestfish-actions.pod:4739
+msgid "vfs-uuid"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-commands.pod:174
+#: ../fish/guestfish-actions.pod:4741

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" supported\n"
+" vfs-uuid device\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fish/guestfish-commands.pod:176
-msgid ""
-"This command returns a list of the optional groups known to the daemon, and "
-"indicates which ones are supported by this build of the libguestfs appliance."
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../fish/guestfish-commands.pod:180
-msgid "See also L<guestfs(3)/AVAILABILITY>."
+#: ../fish/guestfish-actions.pod:4748
+msgid "To find a filesystem from the UUID, use L</findfs-uuid>."

 msgstr ""
 
 # type: =head2
 #. type: =head2
 msgstr ""
 
 # type: =head2
 #. type: =head2

-#: ../fish/guestfish-commands.pod:182
-msgid "time"
+#: ../fish/guestfish-actions.pod:4750
+msgid "vg-activate"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fish/guestfish-commands.pod:184
+#: ../fish/guestfish-actions.pod:4752

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" time command args...\n"
+" vg-activate true|false 'volgroups ...'\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../fish/guestfish-commands.pod:186
-msgid ""
-"Run the command as usual, but print the elapsed time afterwards.  This can "
-"be useful for benchmarking operations."
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../test-tool/libguestfs-test-tool.pod:5
-msgid "libguestfs-test-tool - End user tests for libguestfs"
+# type: =head2
+#. type: =head2
+#: ../fish/guestfish-actions.pod:4765
+msgid "vg-activate-all"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../test-tool/libguestfs-test-tool.pod:9
+#: ../fish/guestfish-actions.pod:4767

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" libguestfs-test-tool [--options]\n"
+" vg-activate-all true|false\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../test-tool/libguestfs-test-tool.pod:13
+# type: =head2
+#. type: =head2
+#: ../fish/guestfish-actions.pod:4777
+msgid "vgcreate"
+msgstr ""
+
+# type: verbatim
+#. type: verbatim
+#: ../fish/guestfish-actions.pod:4779
+#, no-wrap

 msgid ""
 msgid ""

-"libguestfs-test-tool is a test program shipped with libguestfs to end users "
-"and developers, to allow them to check basic libguestfs functionality is "
-"working.  This is needed because libguestfs occasionally breaks for reasons "
-"beyond our control: usually because of changes in the underlying qemu or "
-"kernel packages, or the host environment."
+" vgcreate volgroup 'physvols ...'\n"
+"\n"

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../test-tool/libguestfs-test-tool.pod:20
-msgid "If you suspect a problem in libguestfs, then just run:"
+# type: =head2
+#. type: =head2
+#: ../fish/guestfish-actions.pod:4784
+msgid "vglvuuids"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../test-tool/libguestfs-test-tool.pod:22
+#: ../fish/guestfish-actions.pod:4786

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" libguestfs-test-tool\n"
+" vglvuuids vgname\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../test-tool/libguestfs-test-tool.pod:24
-msgid "It will print lots of diagnostic messages."
+#: ../fish/guestfish-actions.pod:4791
+msgid ""
+"You can use this along with L</lvs> and L</lvuuid> calls to associate "
+"logical volumes and volume groups."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../test-tool/libguestfs-test-tool.pod:26
-msgid "If it runs to completion successfully, you will see this near the end:"
+#: ../fish/guestfish-actions.pod:4794
+msgid "See also L</vgpvuuids>."
+msgstr ""
+
+# type: =head2
+#. type: =head2
+#: ../fish/guestfish-actions.pod:4796
+msgid "vgpvuuids"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../test-tool/libguestfs-test-tool.pod:28
+#: ../fish/guestfish-actions.pod:4798

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" ===== TEST FINISHED OK =====\n"
+" vgpvuuids vgname\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../test-tool/libguestfs-test-tool.pod:30
-msgid "and the test tool will exit with code 0."
+#: ../fish/guestfish-actions.pod:4803
+msgid ""
+"You can use this along with L</pvs> and L</pvuuid> calls to associate "
+"physical volumes and volume groups."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../test-tool/libguestfs-test-tool.pod:32
-msgid ""
-"If it fails (and/or exits with non-zero error code), please paste the "
-"B<complete, unedited> output of the test tool into a bug report.  More "
-"information about reporting bugs can be found on the L<http://libguestfs.org/"
-"> website."
+#: ../fish/guestfish-actions.pod:4806
+msgid "See also L</vglvuuids>."

 msgstr ""
 
 msgstr ""
 

-# type: =item
-#. type: =item
-#: ../test-tool/libguestfs-test-tool.pod:41
-msgid "I<--help>"
+# type: =head2
+#. type: =head2
+#: ../fish/guestfish-actions.pod:4808
+msgid "vgremove"

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../test-tool/libguestfs-test-tool.pod:43
-msgid "Display short usage information and exit."
+# type: verbatim
+#. type: verbatim
+#: ../fish/guestfish-actions.pod:4810
+#, no-wrap
+msgid ""
+" vgremove vgname\n"
+"\n"

 msgstr ""
 
 msgstr ""
 

-# type: =item
-#. type: =item
-#: ../test-tool/libguestfs-test-tool.pod:45
-msgid "I<--helper /path/to/libguestfs-test-tool-helper>"
+# type: =head2
+#. type: =head2
+#: ../fish/guestfish-actions.pod:4817
+msgid "vgrename"

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../test-tool/libguestfs-test-tool.pod:47
+# type: verbatim
+#. type: verbatim
+#: ../fish/guestfish-actions.pod:4819
+#, no-wrap

 msgid ""
 msgid ""

-"Pass an alternate name for the helper program.  libguestfs-test-tool will "
-"normally look in the C<$libexec> directory that was configured when the tool "
-"was built."
+" vgrename volgroup newvolgroup\n"
+"\n"

 msgstr ""
 
 msgstr ""
 

-# type: =item
-#. type: =item
-#: ../test-tool/libguestfs-test-tool.pod:51
-msgid "I<--qemu qemu_binary>"
+# type: =head2
+#. type: =head2
+#: ../fish/guestfish-actions.pod:4823
+msgid "vgs"

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../test-tool/libguestfs-test-tool.pod:53
+# type: verbatim
+#. type: verbatim
+#: ../fish/guestfish-actions.pod:4825
+#, no-wrap

 msgid ""
 msgid ""

-"If you have downloaded another qemu binary, point this option at the full "
-"path of the binary to try it."
-msgstr ""
-
-# type: =item
-#. type: =item
-#: ../test-tool/libguestfs-test-tool.pod:56
-msgid "I<--qemudir qemu_source_dir>"
+" vgs\n"
+"\n"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../test-tool/libguestfs-test-tool.pod:58
-msgid ""
-"If you have compiled qemu from source, point this option at the source "
-"directory to try it."
+#: ../fish/guestfish-actions.pod:4833
+msgid "See also L</vgs-full>."

 msgstr ""
 
 msgstr ""
 

-# type: =item
-#. type: =item
-#: ../test-tool/libguestfs-test-tool.pod:61
-msgid "I<--timeout N>"
+# type: =head2
+#. type: =head2
+#: ../fish/guestfish-actions.pod:4835
+msgid "vgs-full"

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../test-tool/libguestfs-test-tool.pod:63
+# type: verbatim
+#. type: verbatim
+#: ../fish/guestfish-actions.pod:4837
+#, no-wrap

 msgid ""
 msgid ""

-"Set the launch timeout to C<N> seconds.  The default is 120 seconds which "
-"does not usually need to be adjusted unless your machine is very slow."
+" vgs-full\n"
+"\n"

 msgstr ""
 
 msgstr ""
 

-# type: =head1
-#. type: =head1
-#: ../test-tool/libguestfs-test-tool.pod:69
-msgid "TRYING OUT A DIFFERENT VERSION OF QEMU"
+# type: =head2
+#. type: =head2
+#: ../fish/guestfish-actions.pod:4842
+msgid "vgscan"

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../test-tool/libguestfs-test-tool.pod:71
+# type: verbatim
+#. type: verbatim
+#: ../fish/guestfish-actions.pod:4844
+#, no-wrap

 msgid ""
 msgid ""

-"If you have compiled another version of qemu from source and would like to "
-"try that, then you can use the I<--qemudir> option to point to the qemu "
-"source directory."
+" vgscan\n"
+"\n"

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../test-tool/libguestfs-test-tool.pod:75
-msgid ""
-"If you have downloaded a qemu binary from somewhere, use the I<--qemu> "
-"option to point to the binary."
+# type: =head2
+#. type: =head2
+#: ../fish/guestfish-actions.pod:4849
+msgid "vguuid"

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../test-tool/libguestfs-test-tool.pod:78
+# type: verbatim
+#. type: verbatim
+#: ../fish/guestfish-actions.pod:4851
+#, no-wrap

 msgid ""
 msgid ""

-"When using an alternate qemu with libguestfs, usually you would need to "
-"write a qemu wrapper script (see section I<QEMU WRAPPERS> in L<guestfs(3)"
-">).  libguestfs-test-tool writes a temporary qemu wrapper script when you "
-"use either of the I<--qemudir> or I<--qemu> options."
+" vguuid vgname\n"
+"\n"

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../test-tool/libguestfs-test-tool.pod:85
+# type: =head2
+#. type: =head2
+#: ../fish/guestfish-actions.pod:4855
+msgid "wc-c"
+msgstr ""
+
+# type: verbatim
+#. type: verbatim
+#: ../fish/guestfish-actions.pod:4857
+#, no-wrap

 msgid ""
 msgid ""

-"libguestfs-test-tool returns I<0> if the tests completed without error, or "
-"I<1> if there was an error."
+" wc-c path\n"
+"\n"

 msgstr ""
 
 msgstr ""
 

-# type: =item
-#. type: =item
-#: ../test-tool/libguestfs-test-tool.pod:92
-msgid "/usr/libexec/libguestfs-test-tool-helper"
+# type: =head2
+#. type: =head2
+#: ../fish/guestfish-actions.pod:4862
+msgid "wc-l"

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../test-tool/libguestfs-test-tool.pod:94
+# type: verbatim
+#. type: verbatim
+#: ../fish/guestfish-actions.pod:4864
+#, no-wrap

 msgid ""
 msgid ""

-"This helper program is run inside the appliance and provides additional "
-"tests."
+" wc-l path\n"
+"\n"

 msgstr ""
 
 msgstr ""
 

-# type: =item
-#. type: =item
-#: ../test-tool/libguestfs-test-tool.pod:97
-msgid "/usr/bin/mkisofs"
+# type: =head2
+#. type: =head2
+#: ../fish/guestfish-actions.pod:4869
+msgid "wc-w"

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../test-tool/libguestfs-test-tool.pod:99
+# type: verbatim
+#. type: verbatim
+#: ../fish/guestfish-actions.pod:4871
+#, no-wrap

 msgid ""
 msgid ""

-"The C<mkisofs> command is required in order to construct a CD-ROM ISO file "
-"which is used as part of the tests."
+" wc-w path\n"
+"\n"

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../test-tool/libguestfs-test-tool.pod:106
+# type: =head2
+#. type: =head2
+#: ../fish/guestfish-actions.pod:4876
+msgid "write"
+msgstr ""
+
+# type: verbatim
+#. type: verbatim
+#: ../fish/guestfish-actions.pod:4878
+#, no-wrap

 msgid ""
 msgid ""

-"For the full list of environment variables which may affect libguestfs, "
-"please see the L<guestfs(3)> manual page."
+" write path content\n"
+"\n"

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../test-tool/libguestfs-test-tool.pod:111
-msgid "L<guestfs(3)>, L<http://libguestfs.org/>, L<http://qemu.org/>."
+# type: =head2
+#. type: =head2
+#: ../fish/guestfish-actions.pod:4886
+msgid "write-file"

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../test-tool/libguestfs-test-tool.pod:121
-msgid "Copyright (C) 2009 Red Hat Inc.  L<http://libguestfs.org/>"
+# type: verbatim
+#. type: verbatim
+#: ../fish/guestfish-actions.pod:4888
+#, no-wrap
+msgid ""
+" write-file path content size\n"
+"\n"

 msgstr ""
 
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../fuse/guestmount.pod:5
+#: ../fish/guestfish-actions.pod:4904

 msgid ""
 msgid ""

-"guestmount - Mount a guest filesystem on the host using FUSE and libguestfs"
+"This function is deprecated.  In new code, use the L</write> call instead."
+msgstr ""
+
+# type: =head2
+#. type: =head2
+#: ../fish/guestfish-actions.pod:4911
+msgid "zegrep"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fuse/guestmount.pod:9
+#: ../fish/guestfish-actions.pod:4913

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" guestmount [--options] -a disk.img -m device [--ro] mountpoint\n"
+" zegrep regex path\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

+# type: =head2
+#. type: =head2
+#: ../fish/guestfish-actions.pod:4921
+msgid "zegrepi"
+msgstr ""
+

 # type: verbatim
 #. type: verbatim
 # type: verbatim
 #. type: verbatim

-#: ../fuse/guestmount.pod:11
+#: ../fish/guestfish-actions.pod:4923

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" guestmount [--options] -a disk.img -i [--ro] mountpoint\n"
+" zegrepi regex path\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

+# type: =head2
+#. type: =head2
+#: ../fish/guestfish-actions.pod:4931
+msgid "zero"
+msgstr ""
+

 # type: verbatim
 #. type: verbatim
 # type: verbatim
 #. type: verbatim

-#: ../fuse/guestmount.pod:13
+#: ../fish/guestfish-actions.pod:4933

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" guestmount [--options] -d Guest -i [--ro] mountpoint\n"
+" zero device\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fuse/guestmount.pod:17
-msgid ""
-"You must I<not> use C<guestmount> in read-write mode on live virtual "
-"machines.  If you do this, you risk disk corruption in the VM."
+#: ../fish/guestfish-actions.pod:4941
+msgid "See also: L</zero-device>, L</scrub-device>."

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../fuse/guestmount.pod:22
-msgid ""
-"The guestmount program can be used to mount virtual machine filesystems and "
-"other disk images on the host.  It uses libguestfs for access to the guest "
-"filesystem, and FUSE (the \"filesystem in userspace\") to make it appear as "
-"a mountable device."
+# type: =head2
+#. type: =head2
+#: ../fish/guestfish-actions.pod:4943
+msgid "zero-device"

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../fuse/guestmount.pod:27
+# type: verbatim
+#. type: verbatim
+#: ../fish/guestfish-actions.pod:4945
+#, no-wrap

 msgid ""
 msgid ""

-"Along with other options, you have to give at least one device (I<-a> "
-"option) or libvirt domain (I<-d> option), and at least one mountpoint (I<-m> "
-"option) or use the I<-i> inspection option.  How this works is better "
-"explained in the L<guestfish(1)> manual page, or by looking at the examples "
-"below."
+" zero-device device\n"
+"\n"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fuse/guestmount.pod:33
+#: ../fish/guestfish-actions.pod:4947

 msgid ""
 msgid ""

-"FUSE lets you mount filesystems as non-root.  The mountpoint must be owned "
-"by you, and the filesystem will not be visible to any other users unless you "
-"make certain global configuration changes to C</etc/fuse.conf>.  To unmount "
-"the filesystem, use the C<fusermount -u> command."
+"This command writes zeroes over the entire C<device>.  Compare with L</zero> "
+"which just zeroes the first few blocks of a device."

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../fuse/guestmount.pod:41
-msgid ""
-"For a typical Windows guest which has its main filesystem on the first "
-"partition:"
+# type: =head2
+#. type: =head2
+#: ../fish/guestfish-actions.pod:4954
+msgid "zerofree"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fuse/guestmount.pod:44
+#: ../fish/guestfish-actions.pod:4956

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" guestmount -a windows.img -m /dev/sda1 --ro /mnt\n"
+" zerofree device\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../fuse/guestmount.pod:46
-msgid ""
-"For a typical Linux guest which has a /boot filesystem on the first "
-"partition, and the root filesystem on a logical volume:"
+# type: =head2
+#. type: =head2
+#: ../fish/guestfish-actions.pod:4969
+msgid "zfgrep"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fuse/guestmount.pod:49
+#: ../fish/guestfish-actions.pod:4971

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" guestmount -a linux.img -m /dev/VG/LV -m /dev/sda1:/boot --ro /mnt\n"
+" zfgrep pattern path\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../fuse/guestmount.pod:51
-msgid "To get libguestfs to detect guest mountpoints for you:"
+# type: =head2
+#. type: =head2
+#: ../fish/guestfish-actions.pod:4979
+msgid "zfgrepi"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fuse/guestmount.pod:53
+#: ../fish/guestfish-actions.pod:4981

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" guestmount -a guest.img -i --ro /mnt\n"
+" zfgrepi pattern path\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../fuse/guestmount.pod:55
-msgid "For a libvirt guest called \"Guest\" you could do:"
+# type: =head2
+#. type: =head2
+#: ../fish/guestfish-actions.pod:4989
+msgid "zfile"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fuse/guestmount.pod:57
+#: ../fish/guestfish-actions.pod:4991

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" guestmount -d Guest -i --ro /mnt\n"
+" zfile meth path\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fuse/guestmount.pod:59
+#: ../fish/guestfish-actions.pod:4998

 msgid ""
 msgid ""

-"If you don't know what filesystems are contained in a guest or disk image, "
-"use L<virt-filesystems(1)> first:"
+"Since 1.0.63, use L</file> instead which can now process compressed files."
+msgstr ""
+
+#. type: textblock
+#: ../fish/guestfish-actions.pod:5001
+msgid ""
+"This function is deprecated.  In new code, use the L</file> call instead."
+msgstr ""
+
+# type: =head2
+#. type: =head2
+#: ../fish/guestfish-actions.pod:5008
+msgid "zgrep"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fuse/guestmount.pod:62
+#: ../fish/guestfish-actions.pod:5010

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" virt-filesystems MyGuest\n"
+" zgrep regex path\n"
+"\n"
+msgstr ""
+
+# type: =head2
+#. type: =head2
+#: ../fish/guestfish-actions.pod:5018
+msgid "zgrepi"
+msgstr ""
+
+# type: verbatim
+#. type: verbatim
+#: ../fish/guestfish-actions.pod:5020
+#, no-wrap
+msgid ""
+" zgrepi regex path\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../fuse/guestmount.pod:64
-msgid ""
-"If you want to trace the libguestfs calls but without excessive debugging "
-"information, we recommend:"
+# type: =head2
+#. type: =head2
+#: ../fish/guestfish-commands.pod:1
+msgid "alloc"
+msgstr ""
+
+# type: =head2
+#. type: =head2
+#: ../fish/guestfish-commands.pod:3
+msgid "allocate"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fuse/guestmount.pod:67
+#: ../fish/guestfish-commands.pod:5

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" guestmount [...] --trace /mnt\n"
+" alloc filename size\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fuse/guestmount.pod:69
-msgid "If you want to debug the program, we recommend:"
-msgstr ""
-
-# type: verbatim
-#. type: verbatim
-#: ../fuse/guestmount.pod:71
-#, no-wrap
+#: ../fish/guestfish-commands.pod:7

 msgid ""
 msgid ""

-" guestmount [...] --trace --verbose /mnt\n"
-"\n"
+"This creates an empty (zeroed) file of the given size, and then adds so it "
+"can be further examined."

 msgstr ""
 
 msgstr ""
 

-# type: =item
-#. type: =item
-#: ../fuse/guestmount.pod:77
-msgid "B<-a image> | B<--add image>"
+# type: textblock
+#. type: textblock
+#: ../fish/guestfish-commands.pod:10 ../fish/guestfish-commands.pod:168
+msgid "For more advanced image creation, see L<qemu-img(1)> utility."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fuse/guestmount.pod:79
-msgid "Add a block device or virtual machine image."
+#: ../fish/guestfish-commands.pod:12 ../fish/guestfish-commands.pod:170
+msgid "Size can be specified using standard suffixes, eg. C<1M>."

 msgstr ""
 
 msgstr ""
 

-# type: =item
-#. type: =item
-#: ../fuse/guestmount.pod:84
-msgid "B<-c URI> | B<--connect URI>"
+# type: textblock
+#. type: textblock
+#: ../fish/guestfish-commands.pod:14
+msgid ""
+"To create a sparse file, use L</sparse> instead.  To create a prepared disk "
+"image, see L</PREPARED DISK IMAGES>."

 msgstr ""
 
 msgstr ""
 

-# type: =item
-#. type: =item
-#: ../fuse/guestmount.pod:90
-msgid "B<-d libvirt-domain> | B<--domain libvirt-domain>"
+# type: =head2
+#. type: =head2
+#: ../fish/guestfish-commands.pod:17
+msgid "copy-in"

 msgstr ""
 
 msgstr ""
 

-# type: =item
-#. type: =item
-#: ../fuse/guestmount.pod:96
-msgid "B<--dir-cache-timeout N>"
+# type: verbatim
+#. type: verbatim
+#: ../fish/guestfish-commands.pod:19
+#, no-wrap
+msgid ""
+" copy-in local [local ...] /remotedir\n"
+"\n"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fuse/guestmount.pod:98
+#: ../fish/guestfish-commands.pod:21

 msgid ""
 msgid ""

-"Set the readdir cache timeout to I<N> seconds, the default being 60 "
-"seconds.  The readdir cache [actually, there are several semi-independent "
-"caches] is populated after a readdir(2) call with the stat and extended "
-"attributes of the files in the directory, in anticipation that they will be "
-"requested soon after."
+"C<copy-in> copies local files or directories recursively into the disk "
+"image, placing them in the directory called C</remotedir> (which must "
+"exist).  This guestfish meta-command turns into a sequence of L</tar-in> and "
+"other commands as necessary."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fuse/guestmount.pod:104
+#: ../fish/guestfish-commands.pod:26

 msgid ""
 msgid ""

-"There is also a different attribute cache implemented by FUSE (see the FUSE "
-"option I<-o attr_timeout>), but the FUSE cache does not anticipate future "
-"requests, only cache existing ones."
+"Multiple local files and directories can be specified, but the last "
+"parameter must always be a remote directory.  Wildcards cannot be used."

 msgstr ""
 
 msgstr ""
 

-# type: =item
-#. type: =item
-#: ../fuse/guestmount.pod:115
-msgid "B<--format=raw|qcow2|..> | B<--format>"
+# type: =head2
+#. type: =head2
+#: ../fish/guestfish-commands.pod:30
+msgid "copy-out"

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../fuse/guestmount.pod:122
+# type: verbatim
+#. type: verbatim
+#: ../fish/guestfish-commands.pod:32
+#, no-wrap

 msgid ""
 msgid ""

-"If you have untrusted raw-format guest disk images, you should use this "
-"option to specify the disk format.  This avoids a possible security problem "
-"with malicious guests (CVE-2010-3851).  See also L<guestfs(3)/"
-"guestfs_add_drive_opts>."
-msgstr ""
-
-# type: =item
-#. type: =item
-#: ../fuse/guestmount.pod:127
-msgid "B<--fuse-help>"
+" copy-out remote [remote ...] localdir\n"
+"\n"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fuse/guestmount.pod:129
-msgid "Display help on special FUSE options (see I<-o> below)."
+#: ../fish/guestfish-commands.pod:34
+msgid ""
+"C<copy-out> copies remote files or directories recursively out of the disk "
+"image, placing them on the host disk in a local directory called C<localdir> "
+"(which must exist).  This guestfish meta-command turns into a sequence of L</"
+"download>, L</tar-out> and other commands as necessary."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fuse/guestmount.pod:133
-msgid "Display brief help and exit."
-msgstr ""
-
-# type: =item
-#. type: =item
-#: ../fuse/guestmount.pod:135
-msgid "B<-i> | B<--inspector>"
+#: ../fish/guestfish-commands.pod:40
+msgid ""
+"Multiple remote files and directories can be specified, but the last "
+"parameter must always be a local directory.  To download to the current "
+"directory, use C<.> as in:"

 msgstr ""
 
 msgstr ""
 

-# type: =item
-#. type: =item
-#: ../fuse/guestmount.pod:151
-msgid "B<-m dev[:mnt]> | B<--mount dev[:mnt]>"
+# type: verbatim
+#. type: verbatim
+#: ../fish/guestfish-commands.pod:44
+#, no-wrap
+msgid ""
+" copy-out /home .\n"
+"\n"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fuse/guestmount.pod:153
+#: ../fish/guestfish-commands.pod:46

 msgid ""
 msgid ""

-"Mount the named partition or logical volume on the given mountpoint B<in the "
-"guest> (this has nothing to do with mountpoints in the host)."
+"Wildcards cannot be used in the ordinary command, but you can use them with "
+"the help of L</glob> like this:"

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../fuse/guestmount.pod:156
+# type: verbatim
+#. type: verbatim
+#: ../fish/guestfish-commands.pod:49
+#, no-wrap

 msgid ""
 msgid ""

-"If the mountpoint is omitted, it defaults to C</>.  You have to mount "
-"something on C</>."
+" glob copy-out /home/* .\n"
+"\n"

 msgstr ""
 
 msgstr ""
 

-# type: =item
-#. type: =item
-#: ../fuse/guestmount.pod:159
-msgid "B<-n> | B<--no-sync>"
+# type: =head2
+#. type: =head2
+#: ../fish/guestfish-commands.pod:51
+msgid "echo"
+msgstr ""
+
+# type: verbatim
+#. type: verbatim
+#: ../fish/guestfish-commands.pod:53
+#, no-wrap
+msgid ""
+" echo [params ...]\n"
+"\n"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fuse/guestmount.pod:161
-msgid ""
-"By default, we attempt to sync the guest disk when the FUSE mountpoint is "
-"unmounted.  If you specify this option, then we don't attempt to sync the "
-"disk.  See the discussion of autosync in the L<guestfs(3)> manpage."
+#: ../fish/guestfish-commands.pod:55
+msgid "This echos the parameters to the terminal."

 msgstr ""
 
 msgstr ""
 

-# type: =item
-#. type: =item
-#: ../fuse/guestmount.pod:166
-msgid "B<-o option> | B<--option option>"
+# type: =head2
+#. type: =head2
+#: ../fish/guestfish-commands.pod:57
+msgid "edit"

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../fuse/guestmount.pod:168
-msgid "Pass extra options to FUSE."
+# type: =head2
+#. type: =head2
+#: ../fish/guestfish-commands.pod:59
+msgid "vi"

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../fuse/guestmount.pod:170
-msgid ""
-"To get a list of all the extra options supported by FUSE, use the command "
-"below.  Note that only the FUSE I<-o> options can be passed, and only some "
-"of them are a good idea."
+# type: =head2
+#. type: =head2
+#: ../fish/guestfish-commands.pod:61
+msgid "emacs"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../fuse/guestmount.pod:174
+#: ../fish/guestfish-commands.pod:63

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" guestmount --fuse-help\n"
+" edit filename\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fuse/guestmount.pod:176
-msgid "Some potentially useful FUSE options:"
-msgstr ""
-
-# type: =item
-#. type: =item
-#: ../fuse/guestmount.pod:180
-msgid "B<-o allow_other>"
+#: ../fish/guestfish-commands.pod:65
+msgid ""
+"This is used to edit a file.  It downloads the file, edits it locally using "
+"your editor, then uploads the result."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fuse/guestmount.pod:182
-msgid "Allow other users to see the filesystem."
+#: ../fish/guestfish-commands.pod:68
+msgid ""
+"The editor is C<$EDITOR>.  However if you use the alternate commands C<vi> "
+"or C<emacs> you will get those corresponding editors."

 msgstr ""
 
 msgstr ""
 

-# type: =item
-#. type: =item
-#: ../fuse/guestmount.pod:184
-msgid "B<-o attr_timeout=N>"
+# type: =head2
+#. type: =head2
+#: ../fish/guestfish-commands.pod:72
+msgid "glob"

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../fuse/guestmount.pod:186
-msgid "Enable attribute caching by FUSE, and set the timeout to I<N> seconds."
+# type: verbatim
+#. type: verbatim
+#: ../fish/guestfish-commands.pod:74
+#, no-wrap
+msgid ""
+" glob command args...\n"
+"\n"

 msgstr ""
 
 msgstr ""
 

-# type: =item
-#. type: =item
-#: ../fuse/guestmount.pod:188
-msgid "B<-o kernel_cache>"
+# type: textblock
+#. type: textblock
+#: ../fish/guestfish-commands.pod:76
+msgid ""
+"Expand wildcards in any paths in the args list, and run C<command> "
+"repeatedly on each matching path."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fuse/guestmount.pod:190
-msgid ""
-"Allow the kernel to cache files (reduces the number of reads that have to go "
-"through the L<guestfs(3)> API).  This is generally a good idea if you can "
-"afford the extra memory usage."
+#: ../fish/guestfish-commands.pod:79
+msgid "See L</WILDCARDS AND GLOBBING>."

 msgstr ""
 
 msgstr ""
 

-# type: =item
-#. type: =item
-#: ../fuse/guestmount.pod:194
-msgid "B<-o uid=N> B<-o gid=N>"
+# type: =head2
+#. type: =head2
+#: ../fish/guestfish-commands.pod:81
+msgid "hexedit"
+msgstr ""
+
+# type: verbatim
+#. type: verbatim
+#: ../fish/guestfish-commands.pod:83
+#, no-wrap
+msgid ""
+" hexedit <filename|device>\n"
+" hexedit <filename|device> <max>\n"
+" hexedit <filename|device> <start> <max>\n"
+"\n"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fuse/guestmount.pod:196
+#: ../fish/guestfish-commands.pod:87

 msgid ""
 msgid ""

-"Use these options to map all UIDs and GIDs inside the guest filesystem to "
-"the chosen values."
-msgstr ""
-
-# type: =item
-#. type: =item
-#: ../fuse/guestmount.pod:201
-msgid "B<-r> | B<--ro>"
+"Use hexedit (a hex editor) to edit all or part of a binary file or block "
+"device."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fuse/guestmount.pod:203
+#: ../fish/guestfish-commands.pod:90

 msgid ""
 msgid ""

-"Add devices and mount everything read-only.  Also disallow writes and make "
-"the disk appear read-only to FUSE."
+"This command works by downloading potentially the whole file or device, "
+"editing it locally, then uploading it.  If the file or device is large, you "
+"have to specify which part you wish to edit by using C<max> and/or C<start> "
+"C<max> parameters.  C<start> and C<max> are specified in bytes, with the "
+"usual modifiers allowed such as C<1M> (1 megabyte)."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fuse/guestmount.pod:206
+#: ../fish/guestfish-commands.pod:97
+msgid "For example to edit the first few sectors of a disk you might do:"
+msgstr ""
+
+# type: verbatim
+#. type: verbatim
+#: ../fish/guestfish-commands.pod:100
+#, no-wrap

 msgid ""
 msgid ""

-"This is highly recommended if you are not going to edit the guest disk.  If "
-"the guest is running and this option is I<not> supplied, then there is a "
-"strong risk of disk corruption in the guest.  We try to prevent this from "
-"happening, but it is not always possible."
+" hexedit /dev/sda 1M\n"
+"\n"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fuse/guestmount.pod:211
-msgid "See also L<guestfish(1)/OPENING DISKS FOR READ AND WRITE>."
+#: ../fish/guestfish-commands.pod:102
+msgid ""
+"which would allow you to edit anywhere within the first megabyte of the disk."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fuse/guestmount.pod:215
-msgid "Enable SELinux support for the guest."
+#: ../fish/guestfish-commands.pod:105
+msgid "To edit the superblock of an ext2 filesystem on C</dev/sda1>, do:"

 msgstr ""
 
 msgstr ""
 

-# type: =item
-#. type: =item
-#: ../fuse/guestmount.pod:217
-msgid "B<-v> | B<--verbose>"
+# type: verbatim
+#. type: verbatim
+#: ../fish/guestfish-commands.pod:107
+#, no-wrap
+msgid ""
+" hexedit /dev/sda1 0x400 0x400\n"
+"\n"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fuse/guestmount.pod:219
-msgid "Enable verbose messages from underlying libguestfs."
+#: ../fish/guestfish-commands.pod:109
+msgid "(assuming the superblock is in the standard location)."

 msgstr ""
 
 msgstr ""
 

-# type: =item
-#. type: =item
-#: ../fuse/guestmount.pod:221
-msgid "B<-V> | B<--version>"
+# type: textblock
+#. type: textblock
+#: ../fish/guestfish-commands.pod:111
+msgid ""
+"This command requires the external L<hexedit(1)> program.  You can specify "
+"another program to use by setting the C<HEXEDITOR> environment variable."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fuse/guestmount.pod:223
-msgid "Display the program version and exit."
+#: ../fish/guestfish-commands.pod:115
+msgid "See also L</hexdump>."

 msgstr ""
 
 msgstr ""
 

-# type: =item
-#. type: =item
-#: ../fuse/guestmount.pod:225
-msgid "B<-w> | B<--rw>"
+# type: =head2
+#. type: =head2
+#: ../fish/guestfish-commands.pod:117
+msgid "lcd"

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../fuse/guestmount.pod:227
+# type: verbatim
+#. type: verbatim
+#: ../fish/guestfish-commands.pod:119
+#, no-wrap

 msgid ""
 msgid ""

-"This option does nothing at the moment.  See L<guestfish(1)/OPENING DISKS "
-"FOR READ AND WRITE>."
-msgstr ""
-
-# type: =item
-#. type: =item
-#: ../fuse/guestmount.pod:230
-msgid "B<-x> | B<--trace>"
+" lcd directory\n"
+"\n"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fuse/guestmount.pod:232
-msgid "Trace libguestfs calls and entry into each FUSE function."
+#: ../fish/guestfish-commands.pod:121
+msgid ""
+"Change the local directory, ie. the current directory of guestfish itself."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../fuse/guestmount.pod:234
-msgid "This also stops the daemon from forking into the background."
+#: ../fish/guestfish-commands.pod:124
+msgid "Note that C<!cd> won't do what you might expect."

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../fuse/guestmount.pod:240
-msgid ""
-"L<guestfish(1)>, L<virt-inspector(1)>, L<virt-cat(1)>, L<virt-edit(1)>, "
-"L<virt-tar(1)>, L<guestfs(3)>, L<http://libguestfs.org/>, L<http://fuse.sf."
-"net/>."
+# type: =head2
+#. type: =head2
+#: ../fish/guestfish-commands.pod:126
+msgid "man"

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../tools/virt-edit.pl:34
-msgid "virt-edit - Edit a file in a virtual machine"
+# type: =head2
+#. type: =head2
+#: ../fish/guestfish-commands.pod:128
+msgid "manual"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../tools/virt-edit.pl:38
+#: ../fish/guestfish-commands.pod:130

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" virt-edit [--options] domname file\n"
+"  man\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

+# type: textblock
+#. type: textblock
+#: ../fish/guestfish-commands.pod:132
+msgid "Opens the manual page for guestfish."
+msgstr ""
+
+# type: =head2
+#. type: =head2
+#: ../fish/guestfish-commands.pod:134
+msgid "more"
+msgstr ""
+
+# type: =head2
+#. type: =head2
+#: ../fish/guestfish-commands.pod:136
+msgid "less"
+msgstr ""
+

 # type: verbatim
 #. type: verbatim
 # type: verbatim
 #. type: verbatim

-#: ../tools/virt-edit.pl:40
+#: ../fish/guestfish-commands.pod:138

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" virt-edit [--options] disk.img [disk.img ...] file\n"
+" more filename\n"

 "\n"
 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 "\n"
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../tools/virt-edit.pl:42
+#: ../fish/guestfish-commands.pod:140

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" virt-edit [domname|disk.img] file -e 'expr'\n"
+" less filename\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../tools/virt-edit.pl:46
-msgid ""
-"You must I<not> use C<virt-edit> on live virtual machines.  If you do this, "
-"you risk disk corruption in the VM.  C<virt-edit> tries to stop you from "
-"doing this, but doesn't catch all cases."
+#: ../fish/guestfish-commands.pod:142
+msgid "This is used to view a file."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../tools/virt-edit.pl:52
+#: ../fish/guestfish-commands.pod:144

 msgid ""
 msgid ""

-"C<virt-edit> is a command line tool to edit C<file> where C<file> exists in "
-"the named virtual machine (or disk image)."
+"The default viewer is C<$PAGER>.  However if you use the alternate command "
+"C<less> you will get the C<less> command specifically."

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../tools/virt-edit.pl:55
+# type: =head2
+#. type: =head2
+#: ../fish/guestfish-commands.pod:147
+msgid "reopen"
+msgstr ""
+
+# type: verbatim
+#. type: verbatim
+#: ../fish/guestfish-commands.pod:149
+#, no-wrap

 msgid ""
 msgid ""

-"If you want to just view a file, use L<virt-cat(1)>.  For more complex cases "
-"you should look at the L<guestfish(1)> tool."
+"  reopen\n"
+"\n"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../tools/virt-edit.pl:60
-msgid "Edit the named files interactively:"
+#: ../fish/guestfish-commands.pod:151
+msgid ""
+"Close and reopen the libguestfs handle.  It is not necessary to use this "
+"normally, because the handle is closed properly when guestfish exits.  "
+"However this is occasionally useful for testing."
+msgstr ""
+
+# type: =head2
+#. type: =head2
+#: ../fish/guestfish-commands.pod:155
+msgid "sparse"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../tools/virt-edit.pl:62
+#: ../fish/guestfish-commands.pod:157

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" virt-edit mydomain /boot/grub/grub.conf\n"
+" sparse filename size\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

+# type: textblock
+#. type: textblock
+#: ../fish/guestfish-commands.pod:159
+msgid ""
+"This creates an empty sparse file of the given size, and then adds so it can "
+"be further examined."
+msgstr ""
+
+# type: textblock
+#. type: textblock
+#: ../fish/guestfish-commands.pod:162
+msgid ""
+"In all respects it works the same as the L</alloc> command, except that the "
+"image file is allocated sparsely, which means that disk blocks are not "
+"assigned to the file until they are needed.  Sparse disk files only use "
+"space when written to, but they are slower and there is a danger you could "
+"run out of real disk space during a write operation."
+msgstr ""
+
+# type: =head2
+#. type: =head2
+#: ../fish/guestfish-commands.pod:172
+msgid "supported"
+msgstr ""
+

 # type: verbatim
 #. type: verbatim
 # type: verbatim
 #. type: verbatim

-#: ../tools/virt-edit.pl:64
+#: ../fish/guestfish-commands.pod:174

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" virt-edit mydomain /etc/passwd\n"
+" supported\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../tools/virt-edit.pl:66
+#: ../fish/guestfish-commands.pod:176

 msgid ""
 msgid ""

-"You can also edit files non-interactively (see L</NON-INTERACTIVE EDITING> "
-"below).  To change the init default level to 5:"
+"This command returns a list of the optional groups known to the daemon, and "
+"indicates which ones are supported by this build of the libguestfs appliance."
+msgstr ""
+
+# type: textblock
+#. type: textblock
+#: ../fish/guestfish-commands.pod:180
+msgid "See also L<guestfs(3)/AVAILABILITY>."
+msgstr ""
+
+# type: =head2
+#. type: =head2
+#: ../fish/guestfish-commands.pod:182
+msgid "time"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../tools/virt-edit.pl:70
+#: ../fish/guestfish-commands.pod:184

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" virt-edit mydomain /etc/inittab -e 's/^id:.*/id:5:initdefault:/'\n"
+" time command args...\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../tools/virt-edit.pl:82 ../tools/virt-win-reg.pl:106
-#: ../tools/virt-list-filesystems.pl:63 ../tools/virt-tar.pl:113
-#: ../tools/virt-make-fs.pl:163 ../tools/virt-list-partitions.pl:64
-msgid "Display brief help."
+#: ../fish/guestfish-commands.pod:186
+msgid ""
+"Run the command as usual, but print the elapsed time afterwards.  This can "
+"be useful for benchmarking operations."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../tools/virt-edit.pl:90 ../tools/virt-win-reg.pl:114
-#: ../tools/virt-resize.pl:272 ../tools/virt-list-filesystems.pl:71
-#: ../tools/virt-tar.pl:121 ../tools/virt-make-fs.pl:171
-#: ../tools/virt-list-partitions.pl:72
-msgid "Display version number and exit."
+#: ../test-tool/libguestfs-test-tool.pod:5
+msgid "libguestfs-test-tool - End user tests for libguestfs"

 msgstr ""
 msgstr ""

-
-# type: =item
-#. type: =item
-#: ../tools/virt-edit.pl:96
-msgid "B<--backup extension> | B<-b extension>"
+
+# type: verbatim
+#. type: verbatim
+#: ../test-tool/libguestfs-test-tool.pod:9
+#, no-wrap
+msgid ""
+" libguestfs-test-tool [--options]\n"
+"\n"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../tools/virt-edit.pl:98
+#: ../test-tool/libguestfs-test-tool.pod:13

 msgid ""
 msgid ""

-"Create a backup of the original file I<in the guest disk image>.  The backup "
-"has the original filename with C<extension> added."
+"libguestfs-test-tool is a test program shipped with libguestfs to end users "
+"and developers, to allow them to check basic libguestfs functionality is "
+"working.  This is needed because libguestfs occasionally breaks for reasons "
+"beyond our control: usually because of changes in the underlying qemu or "
+"kernel packages, or the host environment."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../tools/virt-edit.pl:101
-msgid ""
-"Usually the first character of C<extension> would be a dot C<.> so you would "
-"write:"
+#: ../test-tool/libguestfs-test-tool.pod:20
+msgid "If you suspect a problem in libguestfs, then just run:"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../tools/virt-edit.pl:104
+#: ../test-tool/libguestfs-test-tool.pod:22

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" virt-edit -b .orig [etc]\n"
+" libguestfs-test-tool\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../tools/virt-edit.pl:106
-msgid "By default, no backup file is made."
+#: ../test-tool/libguestfs-test-tool.pod:24
+msgid "It will print lots of diagnostic messages."

 msgstr ""
 
 msgstr ""
 

-# type: =item
-#. type: =item
-#: ../tools/virt-edit.pl:112 ../tools/virt-win-reg.pl:128
-#: ../tools/virt-list-filesystems.pl:77 ../tools/virt-tar.pl:127
-#: ../tools/virt-list-partitions.pl:78
-msgid "B<--connect URI> | B<-c URI>"
+# type: textblock
+#. type: textblock
+#: ../test-tool/libguestfs-test-tool.pod:26
+msgid "If it runs to completion successfully, you will see this near the end:"
+msgstr ""
+
+# type: verbatim
+#. type: verbatim
+#: ../test-tool/libguestfs-test-tool.pod:28
+#, no-wrap
+msgid ""
+" ===== TEST FINISHED OK =====\n"
+"\n"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../tools/virt-edit.pl:114 ../tools/virt-win-reg.pl:130
-#: ../tools/virt-list-filesystems.pl:79 ../tools/virt-tar.pl:129
-#: ../tools/virt-list-partitions.pl:80
-msgid ""
-"If using libvirt, connect to the given I<URI>.  If omitted, then we connect "
-"to the default libvirt hypervisor."
+#: ../test-tool/libguestfs-test-tool.pod:30
+msgid "and the test tool will exit with code 0."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../tools/virt-edit.pl:117 ../tools/virt-win-reg.pl:133
-#: ../tools/virt-list-filesystems.pl:82 ../tools/virt-tar.pl:132
-#: ../tools/virt-list-partitions.pl:83
+#: ../test-tool/libguestfs-test-tool.pod:32

 msgid ""
 msgid ""

-"If you specify guest block devices directly, then libvirt is not used at all."
+"If it fails (and/or exits with non-zero error code), please paste the "
+"B<complete, unedited> output of the test tool into a bug report.  More "
+"information about reporting bugs can be found on the L<http://libguestfs.org/"
+"> website."

 msgstr ""
 
 # type: =item
 #. type: =item
 msgstr ""
 
 # type: =item
 #. type: =item

-#: ../tools/virt-edit.pl:124 ../tools/virt-win-reg.pl:140
-#: ../tools/virt-resize.pl:520 ../tools/virt-list-filesystems.pl:89
-#: ../tools/virt-tar.pl:139 ../tools/virt-list-partitions.pl:90
-msgid "B<--format> raw"
+#: ../test-tool/libguestfs-test-tool.pod:41
+msgid "I<--help>"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../tools/virt-edit.pl:126 ../tools/virt-win-reg.pl:142
-#: ../tools/virt-list-filesystems.pl:91 ../tools/virt-tar.pl:141
-#: ../tools/virt-list-partitions.pl:92
-msgid ""
-"Specify the format of disk images given on the command line.  If this is "
-"omitted then the format is autodetected from the content of the disk image."
+#: ../test-tool/libguestfs-test-tool.pod:43
+msgid "Display short usage information and exit."

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../tools/virt-edit.pl:130 ../tools/virt-win-reg.pl:146
-#: ../tools/virt-list-filesystems.pl:95 ../tools/virt-tar.pl:145
-#: ../tools/virt-list-partitions.pl:96
-msgid ""
-"If disk images are requested from libvirt, then this program asks libvirt "
-"for this information.  In this case, the value of the format parameter is "
-"ignored."
+# type: =item
+#. type: =item
+#: ../test-tool/libguestfs-test-tool.pod:45
+msgid "I<--qemu qemu_binary>"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../tools/virt-edit.pl:134 ../tools/virt-win-reg.pl:150
-#: ../tools/virt-resize.pl:525 ../tools/virt-resize.pl:540
-#: ../tools/virt-list-filesystems.pl:99 ../tools/virt-tar.pl:149
-#: ../tools/virt-list-partitions.pl:100
+#: ../test-tool/libguestfs-test-tool.pod:47

 msgid ""
 msgid ""

-"If working with untrusted raw-format guest disk images, you should ensure "
-"the format is always specified."
+"If you have downloaded another qemu binary, point this option at the full "
+"path of the binary to try it."

 msgstr ""
 
 # type: =item
 #. type: =item
 msgstr ""
 
 # type: =item
 #. type: =item

-#: ../tools/virt-edit.pl:141
-msgid "B<--expr EXPR> | B<-e EXPR>"
+#: ../test-tool/libguestfs-test-tool.pod:50
+msgid "I<--qemudir qemu_source_dir>"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../tools/virt-edit.pl:143
+#: ../test-tool/libguestfs-test-tool.pod:52

 msgid ""
 msgid ""

-"Instead of launching the external editor, non-interactively apply the Perl "
-"expression C<EXPR> to each line in the file.  See L</NON-INTERACTIVE "
-"EDITING> below."
+"If you have compiled qemu from source, point this option at the source "
+"directory to try it."
+msgstr ""
+
+# type: =item
+#. type: =item
+#: ../test-tool/libguestfs-test-tool.pod:55
+msgid "I<--timeout N>"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../tools/virt-edit.pl:147
+#: ../test-tool/libguestfs-test-tool.pod:57

 msgid ""
 msgid ""

-"Be careful to properly quote the expression to prevent it from being altered "
-"by the shell."
+"Set the launch timeout to C<N> seconds.  The default is 120 seconds which "
+"does not usually need to be adjusted unless your machine is very slow."

 msgstr ""
 
 # type: =head1
 #. type: =head1
 msgstr ""
 
 # type: =head1
 #. type: =head1

-#: ../tools/virt-edit.pl:268
-msgid "NON-INTERACTIVE EDITING"
+#: ../test-tool/libguestfs-test-tool.pod:63
+msgid "TRYING OUT A DIFFERENT VERSION OF QEMU"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../tools/virt-edit.pl:270
+#: ../test-tool/libguestfs-test-tool.pod:65

 msgid ""
 msgid ""

-"C<virt-edit> normally calls out to C<$EDITOR> (or vi) so the system "
-"administrator can interactively edit the file."
+"If you have compiled another version of qemu from source and would like to "
+"try that, then you can use the I<--qemudir> option to point to the qemu "
+"source directory."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../tools/virt-edit.pl:273
+#: ../test-tool/libguestfs-test-tool.pod:69

 msgid ""
 msgid ""

-"There are two ways also to use C<virt-edit> from scripts in order to make "
-"automated edits to files.  (Note that although you I<can> use C<virt-edit> "
-"like this, it's less error-prone to write scripts directly using the "
-"libguestfs API and Augeas for configuration file editing.)"
+"If you have downloaded a qemu binary from somewhere, use the I<--qemu> "
+"option to point to the binary."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../tools/virt-edit.pl:279
+#: ../test-tool/libguestfs-test-tool.pod:72

 msgid ""
 msgid ""

-"The first method is to temporarily set C<$EDITOR> to any script or program "
-"you want to run.  The script is invoked as C<$EDITOR tmpfile> and it should "
-"update C<tmpfile> in place however it likes."
+"When using an alternate qemu with libguestfs, usually you would need to "
+"write a qemu wrapper script (see section I<QEMU WRAPPERS> in L<guestfs(3)"
+">).  libguestfs-test-tool writes a temporary qemu wrapper script when you "
+"use either of the I<--qemudir> or I<--qemu> options."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../tools/virt-edit.pl:283
-msgid ""
-"The second method is to use the C<-e> parameter of C<virt-edit> to run a "
-"short Perl snippet in the style of L<sed(1)>.  For example to replace all "
-"instances of C<foo> with C<bar> in a file:"
-msgstr ""
-
-# type: verbatim
-#. type: verbatim
-#: ../tools/virt-edit.pl:287
-#, no-wrap
+#: ../test-tool/libguestfs-test-tool.pod:79

 msgid ""
 msgid ""

-" virt-edit domname filename -e 's/foo/bar/'\n"
-"\n"
+"libguestfs-test-tool returns I<0> if the tests completed without error, or "
+"I<1> if there was an error."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../tools/virt-edit.pl:289
-msgid ""
-"The full power of Perl regular expressions can be used (see L<perlre(1)>).  "
-"For example to delete root's password you could do:"
-msgstr ""
-
-# type: verbatim
-#. type: verbatim
-#: ../tools/virt-edit.pl:292
-#, no-wrap
+#: ../test-tool/libguestfs-test-tool.pod:84

 msgid ""
 msgid ""

-" virt-edit domname /etc/passwd -e 's/^root:.*?:/root::/'\n"
-"\n"
+"For the full list of environment variables which may affect libguestfs, "
+"please see the L<guestfs(3)> manual page."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../tools/virt-edit.pl:294
-msgid ""
-"What really happens is that the snippet is evaluated as a Perl expression "
-"for each line of the file.  The line, including the final C<\\n>, is passed "
-"in C<$_> and the expression should update C<$_> or leave it unchanged."
+#: ../test-tool/libguestfs-test-tool.pod:89
+msgid "L<guestfs(3)>, L<http://libguestfs.org/>, L<http://qemu.org/>."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../tools/virt-edit.pl:299
+#: ../fuse/guestmount.pod:5

 msgid ""
 msgid ""

-"To delete a line, set C<$_> to the empty string.  For example, to delete the "
-"C<apache> user account from the password file you can do:"
+"guestmount - Mount a guest filesystem on the host using FUSE and libguestfs"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../tools/virt-edit.pl:302
+#: ../fuse/guestmount.pod:9

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" virt-edit mydomain /etc/passwd -e '$_ = \"\" if /^apache:/'\n"
+" guestmount [--options] -a disk.img -m device [--ro] mountpoint\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../tools/virt-edit.pl:304
-msgid ""
-"To insert a line, prepend or append it to C<$_>.  However appending lines to "
-"the end of the file is rather difficult this way since there is no concept "
-"of \"last line of the file\" - your expression just doesn't get called "
-"again.  You might want to use the first method (setting C<$EDITOR>) if you "
-"want to do this."
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../tools/virt-edit.pl:310
-msgid ""
-"The variable C<$lineno> contains the current line number.  As is "
-"traditional, the first line in the file is number C<1>."
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../tools/virt-edit.pl:313
-msgid ""
-"The return value from the expression is ignored, but the expression may call "
-"C<die> in order to abort the whole program, leaving the original file "
-"untouched."
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../tools/virt-edit.pl:317
-msgid ""
-"Remember when matching the end of a line that C<$_> may contain the final C<"
-"\\n>, or (for DOS files) C<\\r\\n>, or if the file does not end with a "
-"newline then neither of these.  Thus to match or substitute some text at the "
-"end of a line, use this regular expression:"
-msgstr ""
-

 # type: verbatim
 #. type: verbatim
 # type: verbatim
 #. type: verbatim

-#: ../tools/virt-edit.pl:322
+#: ../fuse/guestmount.pod:11

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" /some text(\\r?\\n)?$/\n"
+" guestmount [--options] -a disk.img -i [--ro] mountpoint\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../tools/virt-edit.pl:324
-msgid ""
-"Alternately, use the perl C<chomp> function, being careful not to chomp C<"
-"$_> itself (since that would remove all newlines from the file):"
-msgstr ""
-

 # type: verbatim
 #. type: verbatim
 # type: verbatim
 #. type: verbatim

-#: ../tools/virt-edit.pl:328
+#: ../fuse/guestmount.pod:13

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" my $m = $_; chomp $m; $m =~ /some text$/\n"
+" guestmount [--options] -d Guest -i [--ro] mountpoint\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: =item
-#. type: =item
-#: ../tools/virt-edit.pl:334
-msgid "C<EDITOR>"
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../tools/virt-edit.pl:336
-msgid ""
-"If set, this string is used as the editor.  It may contain arguments, eg. C<"
-"\"emacs -nw\">"
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../tools/virt-edit.pl:339
-msgid "If not set, C<vi> is used."
-msgstr ""
-
-# type: =head2
-#. type: =head1
-#: ../tools/virt-edit.pl:343 ../tools/virt-win-reg.pl:559
-#: ../tools/virt-resize.pl:1476 ../tools/virt-list-filesystems.pl:182
-#: ../tools/virt-tar.pl:279 ../tools/virt-make-fs.pl:532
-#: ../tools/virt-list-partitions.pl:250
-msgid "SHELL QUOTING"
-msgstr ""
-

 # type: textblock
 #. type: textblock
 # type: textblock
 #. type: textblock

-#: ../tools/virt-edit.pl:345 ../tools/virt-win-reg.pl:567
-#: ../tools/virt-resize.pl:1478 ../tools/virt-list-filesystems.pl:184
-#: ../tools/virt-tar.pl:281 ../tools/virt-make-fs.pl:534
-#: ../tools/virt-list-partitions.pl:252
-msgid ""
-"Libvirt guest names can contain arbitrary characters, some of which have "
-"meaning to the shell such as C<#> and space.  You may need to quote or "
-"escape these characters on the command line.  See the shell manual page L<sh"
-"(1)> for details."
-msgstr ""
-
-#. type: textblock
-#: ../tools/virt-edit.pl:352
+#: ../fuse/guestmount.pod:17

 msgid ""
 msgid ""

-"L<guestfs(3)>, L<guestfish(1)>, L<virt-cat(1)>, L<virt-copy-in(1)>, L<virt-"
-"tar-in(1)>, L<Sys::Guestfs(3)>, L<Sys::Guestfs::Lib(3)>, L<Sys::Virt(3)>, "
-"L<http://libguestfs.org/>, L<perl(1)>, L<perlre(1)>."
-msgstr ""
-
-# type: =head1
-#. type: =head1
-#: ../tools/virt-edit.pl:364 ../tools/virt-win-reg.pl:598
-#: ../tools/virt-resize.pl:1504 ../tools/virt-list-filesystems.pl:202
-#: ../tools/virt-tar.pl:301 ../tools/virt-make-fs.pl:564
-#: ../tools/virt-list-partitions.pl:269
-msgid "AUTHOR"
+"You must I<not> use C<guestmount> in read-write mode on live virtual "
+"machines.  If you do this, you risk disk corruption in the VM."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../tools/virt-edit.pl:366 ../tools/virt-win-reg.pl:600
-#: ../tools/virt-resize.pl:1506 ../tools/virt-list-filesystems.pl:204
-#: ../tools/virt-tar.pl:303 ../tools/virt-make-fs.pl:566
-#: ../tools/virt-list-partitions.pl:271
-msgid "Richard W.M. Jones L<http://people.redhat.com/~rjones/>"
+#: ../fuse/guestmount.pod:22
+msgid ""
+"The guestmount program can be used to mount virtual machine filesystems and "
+"other disk images on the host.  It uses libguestfs for access to the guest "
+"filesystem, and FUSE (the \"filesystem in userspace\") to make it appear as "
+"a mountable device."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../tools/virt-edit.pl:370 ../tools/virt-list-partitions.pl:275
-msgid "Copyright (C) 2009-2010 Red Hat Inc."
+#: ../fuse/guestmount.pod:27
+msgid ""
+"Along with other options, you have to give at least one device (I<-a> "
+"option) or libvirt domain (I<-d> option), and at least one mountpoint (I<-m> "
+"option) or use the I<-i> inspection option.  How this works is better "
+"explained in the L<guestfish(1)> manual page, or by looking at the examples "
+"below."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../tools/virt-win-reg.pl:37
+#: ../fuse/guestmount.pod:33

 msgid ""
 msgid ""

-"virt-win-reg - Export and merge Windows Registry entries from a Windows guest"
+"FUSE lets you mount filesystems as non-root.  The mountpoint must be owned "
+"by you, and the filesystem will not be visible to any other users unless you "
+"make certain global configuration changes to C</etc/fuse.conf>.  To unmount "
+"the filesystem, use the C<fusermount -u> command."

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../tools/virt-win-reg.pl:41
-#, no-wrap
+# type: textblock
+#. type: textblock
+#: ../fuse/guestmount.pod:41

 msgid ""
 msgid ""

-" virt-win-reg domname 'HKLM\\Path\\To\\Subkey'\n"
-"\n"
+"For a typical Windows guest which has its main filesystem on the first "
+"partition:"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../tools/virt-win-reg.pl:43
+#: ../fuse/guestmount.pod:44

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" virt-win-reg domname 'HKLM\\Path\\To\\Subkey' name\n"
+" guestmount -a windows.img -m /dev/sda1 --ro /mnt\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../tools/virt-win-reg.pl:45
-#, no-wrap
+# type: textblock
+#. type: textblock
+#: ../fuse/guestmount.pod:46

 msgid ""
 msgid ""

-" virt-win-reg domname 'HKLM\\Path\\To\\Subkey' @\n"
-"\n"
+"For a typical Linux guest which has a /boot filesystem on the first "
+"partition, and the root filesystem on a logical volume:"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../tools/virt-win-reg.pl:47
+#: ../fuse/guestmount.pod:49

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" virt-win-reg --merge domname [input.reg ...]\n"
+" guestmount -a linux.img -m /dev/VG/LV -m /dev/sda1:/boot --ro /mnt\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

+# type: textblock
+#. type: textblock
+#: ../fuse/guestmount.pod:51
+msgid "To get libguestfs to detect guest mountpoints for you:"
+msgstr ""
+

 # type: verbatim
 #. type: verbatim
 # type: verbatim
 #. type: verbatim

-#: ../tools/virt-win-reg.pl:49
+#: ../fuse/guestmount.pod:53

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" virt-win-reg [--options] disk.img ... # instead of domname\n"
+" guestmount -a guest.img -i --ro /mnt\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../tools/virt-win-reg.pl:53
-msgid ""
-"You must I<not> use C<virt-win-reg> with the C<--merge> option on live "
-"virtual machines.  If you do this, you I<will> get irreversible disk "
-"corruption in the VM.  C<virt-win-reg> tries to stop you from doing this, "
-"but doesn't catch all cases."
+#: ../fuse/guestmount.pod:55
+msgid "For a libvirt guest called \"Guest\" you could do:"

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../tools/virt-win-reg.pl:58
+# type: verbatim
+#. type: verbatim
+#: ../fuse/guestmount.pod:57
+#, no-wrap

 msgid ""
 msgid ""

-"Modifying the Windows Registry is an inherently risky operation.  The format "
-"is deliberately obscure and undocumented, and Registry changes can leave the "
-"system unbootable.  Therefore when using the C<--merge> option, make sure "
-"you have a reliable backup first."
+" guestmount -d Guest -i --ro /mnt\n"
+"\n"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../tools/virt-win-reg.pl:65
+#: ../fuse/guestmount.pod:59

 msgid ""
 msgid ""

-"This program can export and merge Windows Registry entries from a Windows "
-"guest."
+"If you don't know what filesystems are contained in a guest or disk image, "
+"use L<virt-filesystems(1)> first:"

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../tools/virt-win-reg.pl:68
+# type: verbatim
+#. type: verbatim
+#: ../fuse/guestmount.pod:62
+#, no-wrap

 msgid ""
 msgid ""

-"The first parameter is the libvirt guest name or the raw disk image of a "
-"Windows guest."
+" virt-filesystems MyGuest\n"
+"\n"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../tools/virt-win-reg.pl:71
+#: ../fuse/guestmount.pod:64

 msgid ""
 msgid ""

-"If C<--merge> is I<not> specified, then the chosen registry key is displayed/"
-"exported (recursively).  For example:"
+"If you want to trace the libguestfs calls but without excessive debugging "
+"information, we recommend:"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../tools/virt-win-reg.pl:74
+#: ../fuse/guestmount.pod:67

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" $ virt-win-reg Windows7 'HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft'\n"
+" guestmount [...] --trace /mnt\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../tools/virt-win-reg.pl:76
-msgid ""
-"You can also display single values from within registry keys, for example:"
+#: ../fuse/guestmount.pod:69
+msgid "If you want to debug the program, we recommend:"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../tools/virt-win-reg.pl:79
+#: ../fuse/guestmount.pod:71

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" $ cvkey='HKLM\\SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion'\n"
-" $ virt-win-reg Windows7 $cvkey ProductName\n"
-" Windows 7 Enterprise\n"
+" guestmount [...] --trace --verbose /mnt\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: textblock
+#. type: =head1
+#: ../fuse/guestmount.pod:73
+msgid "NOTES"
+msgstr ""
+
+#. type: =head2
+#: ../fuse/guestmount.pod:75
+msgid "Other users cannot see the filesystem by default"
+msgstr ""
+

 #. type: textblock
 #. type: textblock

-#: ../tools/virt-win-reg.pl:83
+#: ../fuse/guestmount.pod:77

 msgid ""
 msgid ""

-"With C<--merge>, you can merge a textual regedit file into the Windows "
-"Registry:"
+"If you mount a filesystem as one user (eg. root), then other users will not "
+"be able to see it by default.  The fix is to add the FUSE C<allow_other> "
+"option when mounting:"

 msgstr ""
 
 msgstr ""
 

-# type: verbatim

 #. type: verbatim
 #. type: verbatim

-#: ../tools/virt-win-reg.pl:86
+#: ../fuse/guestmount.pod:81

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" $ virt-win-reg --merge Windows7 changes.reg\n"
+" sudo guestmount [...] -o allow_other /mnt\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: =head2
-#. type: =head1
-#: ../tools/virt-win-reg.pl:88 ../tools/virt-tar.pl:45
-msgid "NOTE"
+# type: =item
+#. type: =item
+#: ../fuse/guestmount.pod:87
+msgid "B<-a image> | B<--add image>"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../tools/virt-win-reg.pl:90
-msgid ""
-"This program is only meant for simple access to the registry.  If you want "
-"to do complicated things with the registry, we suggest you download the "
-"Registry hive files from the guest using L<libguestfs(3)> or L<guestfish(1)> "
-"and access them locally, eg. using L<hivex(3)>, L<hivexsh(1)> or "
-"L<hivexregedit(1)>."
+#: ../fuse/guestmount.pod:89
+msgid "Add a block device or virtual machine image."

 msgstr ""
 
 # type: =item
 #. type: =item
 msgstr ""
 
 # type: =item
 #. type: =item

-#: ../tools/virt-win-reg.pl:120 ../tools/virt-make-fs.pl:177
-msgid "B<--debug>"
+#: ../fuse/guestmount.pod:94
+msgid "B<-c URI> | B<--connect URI>"
+msgstr ""
+
+# type: =item
+#. type: =item
+#: ../fuse/guestmount.pod:100
+msgid "B<-d libvirt-domain> | B<--domain libvirt-domain>"
+msgstr ""
+
+# type: =item
+#. type: =item
+#: ../fuse/guestmount.pod:106
+msgid "B<--dir-cache-timeout N>"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../tools/virt-win-reg.pl:122 ../tools/virt-resize.pl:498
-msgid "Enable debugging messages."
+#: ../fuse/guestmount.pod:108
+msgid ""
+"Set the readdir cache timeout to I<N> seconds, the default being 60 "
+"seconds.  The readdir cache [actually, there are several semi-independent "
+"caches] is populated after a readdir(2) call with the stat and extended "
+"attributes of the files in the directory, in anticipation that they will be "
+"requested soon after."
+msgstr ""
+
+# type: textblock
+#. type: textblock
+#: ../fuse/guestmount.pod:114
+msgid ""
+"There is also a different attribute cache implemented by FUSE (see the FUSE "
+"option I<-o attr_timeout>), but the FUSE cache does not anticipate future "
+"requests, only cache existing ones."

 msgstr ""
 
 # type: =item
 #. type: =item
 msgstr ""
 
 # type: =item
 #. type: =item

-#: ../tools/virt-win-reg.pl:157
-msgid "B<--merge>"
+#: ../fuse/guestmount.pod:125
+msgid "B<--format=raw|qcow2|..> | B<--format>"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../tools/virt-win-reg.pl:159
+#: ../fuse/guestmount.pod:132

 msgid ""
 msgid ""

-"In merge mode, this merges a textual regedit file into the Windows Registry "
-"of the virtual machine.  If this flag is I<not> given then virt-win-reg "
-"displays or exports Registry entries instead."
+"If you have untrusted raw-format guest disk images, you should use this "
+"option to specify the disk format.  This avoids a possible security problem "
+"with malicious guests (CVE-2010-3851).  See also L<guestfs(3)/"
+"guestfs_add_drive_opts>."
+msgstr ""
+
+# type: =item
+#. type: =item
+#: ../fuse/guestmount.pod:137
+msgid "B<--fuse-help>"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../tools/virt-win-reg.pl:163
-msgid ""
-"Note that C<--merge> is I<unsafe> to use on live virtual machines, and will "
-"result in disk corruption.  However exporting (without this flag)  is always "
-"safe."
+#: ../fuse/guestmount.pod:139
+msgid "Display help on special FUSE options (see I<-o> below)."
+msgstr ""
+
+# type: textblock
+#. type: textblock
+#: ../fuse/guestmount.pod:143
+msgid "Display brief help and exit."

 msgstr ""
 
 # type: =item
 #. type: =item
 msgstr ""
 
 # type: =item
 #. type: =item

-#: ../tools/virt-win-reg.pl:171
-msgid "B<--encoding> UTF-16LE|ASCII"
+#: ../fuse/guestmount.pod:145
+msgid "B<-i> | B<--inspector>"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../tools/virt-win-reg.pl:173
+#: ../fuse/guestmount.pod:165

 msgid ""
 msgid ""

-"When merging (only), you may need to specify the encoding for strings to be "
-"used in the hive file.  This is explained in detail in L<Win::Hivex::Regedit"
-"(3)/ENCODING STRINGS>."
+"Mount the named partition or logical volume on the given mountpoint B<in the "
+"guest> (this has nothing to do with mountpoints in the host)."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../tools/virt-win-reg.pl:177
+#: ../fuse/guestmount.pod:168

 msgid ""
 msgid ""

-"The default is to use UTF-16LE, which should work with recent versions of "
-"Windows."
+"If the mountpoint is omitted, it defaults to C</>.  You have to mount "
+"something on C</>."

 msgstr ""
 
 msgstr ""
 

-# type: =head2
-#. type: =head1
-#: ../tools/virt-win-reg.pl:402
-msgid "SUPPORTED SYSTEMS"
+# type: =item
+#. type: =item
+#: ../fuse/guestmount.pod:181
+msgid "B<-n> | B<--no-sync>"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../tools/virt-win-reg.pl:404
+#: ../fuse/guestmount.pod:183

 msgid ""
 msgid ""

-"The program currently supports Windows NT-derived guests starting with "
-"Windows XP through to at least Windows 7."
+"By default, we attempt to sync the guest disk when the FUSE mountpoint is "
+"unmounted.  If you specify this option, then we don't attempt to sync the "
+"disk.  See the discussion of autosync in the L<guestfs(3)> manpage."
+msgstr ""
+
+# type: =item
+#. type: =item
+#: ../fuse/guestmount.pod:188
+msgid "B<-o option> | B<--option option>"
+msgstr ""
+
+# type: textblock
+#. type: textblock
+#: ../fuse/guestmount.pod:190
+msgid "Pass extra options to FUSE."
+msgstr ""
+
+# type: textblock
+#. type: textblock
+#: ../fuse/guestmount.pod:192
+msgid ""
+"To get a list of all the extra options supported by FUSE, use the command "
+"below.  Note that only the FUSE I<-o> options can be passed, and only some "
+"of them are a good idea."
+msgstr ""
+
+# type: verbatim
+#. type: verbatim
+#: ../fuse/guestmount.pod:196
+#, no-wrap
+msgid ""
+" guestmount --fuse-help\n"
+"\n"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../tools/virt-win-reg.pl:407
-msgid ""
-"Registry support is done for C<HKEY_LOCAL_MACHINE\\SAM>, C<HKEY_LOCAL_MACHINE"
-"\\SECURITY>, C<HKEY_LOCAL_MACHINE\\SOFTWARE>, C<HKEY_LOCAL_MACHINE\\SYSTEM> "
-"and C<HKEY_USERS\\.DEFAULT>."
+#: ../fuse/guestmount.pod:198
+msgid "Some potentially useful FUSE options:"
+msgstr ""
+
+# type: =item
+#. type: =item
+#: ../fuse/guestmount.pod:202
+msgid "B<-o allow_other>"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../tools/virt-win-reg.pl:411
-msgid ""
-"You can use C<HKLM> as a shorthand for C<HKEY_LOCAL_MACHINE>, and C<HKU> for "
-"C<HKEY_USERS>."
+#: ../fuse/guestmount.pod:204
+msgid "Allow other users to see the filesystem."
+msgstr ""
+
+# type: =item
+#. type: =item
+#: ../fuse/guestmount.pod:206
+msgid "B<-o attr_timeout=N>"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../tools/virt-win-reg.pl:414
-msgid ""
-"C<HKEY_USERS\\$SID> and C<HKEY_CURRENT_USER> are B<not> supported at this "
-"time."
+#: ../fuse/guestmount.pod:208
+msgid "Enable attribute caching by FUSE, and set the timeout to I<N> seconds."

 msgstr ""
 
 msgstr ""
 

-# type: =head2
-#. type: =head1
-#: ../tools/virt-win-reg.pl:417
-msgid "ENCODING"
+# type: =item
+#. type: =item
+#: ../fuse/guestmount.pod:210
+msgid "B<-o kernel_cache>"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../tools/virt-win-reg.pl:419
+#: ../fuse/guestmount.pod:212

 msgid ""
 msgid ""

-"C<virt-win-reg> expects that regedit files have already been reencoded in "
-"the local encoding.  Usually on Linux hosts, this means UTF-8 with Unix-"
-"style line endings.  Since Windows regedit files are often in UTF-16LE with "
-"Windows-style line endings, you may need to reencode the whole file before "
-"or after processing."
+"Allow the kernel to cache files (reduces the number of reads that have to go "
+"through the L<guestfs(3)> API).  This is generally a good idea if you can "
+"afford the extra memory usage."
+msgstr ""
+
+# type: =item
+#. type: =item
+#: ../fuse/guestmount.pod:216
+msgid "B<-o uid=N> B<-o gid=N>"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../tools/virt-win-reg.pl:425
+#: ../fuse/guestmount.pod:218

 msgid ""
 msgid ""

-"To reencode a file from Windows format to Linux (before processing it with "
-"the C<--merge> option), you would do something like this:"
+"Use these options to map all UIDs and GIDs inside the guest filesystem to "
+"the chosen values."

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../tools/virt-win-reg.pl:428
-#, no-wrap
-msgid ""
-" iconv -f utf-16le -t utf-8 < win.reg | dos2unix > linux.reg\n"
-"\n"
+# type: =item
+#. type: =item
+#: ../fuse/guestmount.pod:223
+msgid "B<-r> | B<--ro>"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../tools/virt-win-reg.pl:430
+#: ../fuse/guestmount.pod:225

 msgid ""
 msgid ""

-"To go in the opposite direction, after exporting and before sending the file "
-"to a Windows user, do something like this:"
+"Add devices and mount everything read-only.  Also disallow writes and make "
+"the disk appear read-only to FUSE."

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../tools/virt-win-reg.pl:433
-#, no-wrap
+# type: textblock
+#. type: textblock
+#: ../fuse/guestmount.pod:228

 msgid ""
 msgid ""

-" unix2dos linux.reg | iconv -f utf-8 -t utf-16le > win.reg\n"
-"\n"
+"This is highly recommended if you are not going to edit the guest disk.  If "
+"the guest is running and this option is I<not> supplied, then there is a "
+"strong risk of disk corruption in the guest.  We try to prevent this from "
+"happening, but it is not always possible."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../tools/virt-win-reg.pl:435
-msgid "For more information about encoding, see L<Win::Hivex::Regedit(3)>."
+#: ../fuse/guestmount.pod:233
+msgid "See also L<guestfish(1)/OPENING DISKS FOR READ AND WRITE>."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../tools/virt-win-reg.pl:437
-msgid ""
-"If you are unsure about the current encoding, use the L<file(1)> command.  "
-"Recent versions of Windows regedit.exe produce a UTF-16LE file with Windows-"
-"style (CRLF) line endings, like this:"
+#: ../fuse/guestmount.pod:237
+msgid "Enable SELinux support for the guest."

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../tools/virt-win-reg.pl:441
-#, no-wrap
-msgid ""
-" $ file software.reg\n"
-" software.reg: Little-endian UTF-16 Unicode text, with very long lines,\n"
-" with CRLF line terminators\n"
-"\n"
+# type: =item
+#. type: =item
+#: ../fuse/guestmount.pod:239
+msgid "B<-v> | B<--verbose>"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../tools/virt-win-reg.pl:445
-msgid "This file would need conversion before you could C<--merge> it."
+#: ../fuse/guestmount.pod:241
+msgid "Enable verbose messages from underlying libguestfs."

 msgstr ""
 
 msgstr ""
 

-# type: =head2
-#. type: =head1
-#: ../tools/virt-win-reg.pl:447
-msgid "CurrentControlSet etc."
+# type: =item
+#. type: =item
+#: ../fuse/guestmount.pod:243
+msgid "B<-V> | B<--version>"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../tools/virt-win-reg.pl:449
-msgid ""
-"Registry keys like C<CurrentControlSet> don't really exist in the Windows "
-"Registry at the level of the hive file, and therefore you cannot modify "
-"these."
+#: ../fuse/guestmount.pod:245
+msgid "Display the program version and exit."
+msgstr ""
+
+# type: =item
+#. type: =item
+#: ../fuse/guestmount.pod:247
+msgid "B<-w> | B<--rw>"

 msgstr ""
 
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../tools/virt-win-reg.pl:453
-msgid ""
-"C<CurrentControlSet> is usually an alias for C<ControlSet001>.  In some "
-"circumstances it might refer to another control set.  The way to find out is "
-"to look at the C<HKLM\\SYSTEM\\Select> key:"
+#: ../fuse/guestmount.pod:252 ../fuse/guestmount.pod:273
+msgid "See L<guestfish(1)/OPENING DISKS FOR READ AND WRITE>."

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../tools/virt-win-reg.pl:457
-#, no-wrap
-msgid ""
-" # virt-win-reg WindowsGuest 'HKLM\\SYSTEM\\Select'\n"
-" [HKEY_LOCAL_MACHINE\\SYSTEM\\Select]\n"
-" \"Current\"=dword:00000001\n"
-" \"Default\"=dword:00000001\n"
-" \"Failed\"=dword:00000000\n"
-" \"LastKnownGood\"=dword:00000002\n"
-"\n"
+# type: =item
+#. type: =item
+#: ../fuse/guestmount.pod:254
+msgid "B<-x> | B<--trace>"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../tools/virt-win-reg.pl:464
-msgid "\"Current\" is the one which Windows will choose when it boots."
+#: ../fuse/guestmount.pod:256
+msgid "Trace libguestfs calls and entry into each FUSE function."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../tools/virt-win-reg.pl:466
-msgid ""
-"Similarly, other C<Current...> keys in the path may need to be replaced."
-msgstr ""
-
-# type: =head1
-#. type: =head1
-#: ../tools/virt-win-reg.pl:469
-msgid "WINDOWS TIPS"
+#: ../fuse/guestmount.pod:258
+msgid "This also stops the daemon from forking into the background."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../tools/virt-win-reg.pl:471
+#: ../fuse/guestmount.pod:279

 msgid ""
 msgid ""

-"Note that some of these tips modify the guest disk image.  The guest I<must> "
-"be shut off, else you will get disk corruption."
+"L<guestfish(1)>, L<virt-inspector(1)>, L<virt-cat(1)>, L<virt-edit(1)>, "
+"L<virt-tar(1)>, L<guestfs(3)>, L<http://libguestfs.org/>, L<http://fuse.sf."
+"net/>."

 msgstr ""
 
 msgstr ""
 

-# type: =head2
-#. type: =head2
-#: ../tools/virt-win-reg.pl:474
-msgid "RUNNING A BATCH SCRIPT WHEN A USER LOGS IN"
+# type: textblock
+#. type: textblock
+#: ../fuse/guestmount.pod:294
+msgid "Copyright (C) 2009-2010 Red Hat Inc.  L<http://libguestfs.org/>"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../tools/virt-win-reg.pl:476
-msgid ""
-"Prepare a DOS batch script, VBScript or executable.  Upload this using "
-"L<guestfish(1)>.  For this example the script is called C<test.bat> and it "
-"is uploaded into C<C:\\>:"
+#: ../tools/virt-edit.pl:34
+msgid "virt-edit - Edit a file in a virtual machine"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../tools/virt-win-reg.pl:480
+#: ../tools/virt-edit.pl:38

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" guestfish -i -d WindowsGuest upload test.bat /test.bat\n"
+" virt-edit [--options] domname file\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../tools/virt-win-reg.pl:482
-msgid "Prepare a regedit file containing the registry change:"
+# type: verbatim
+#. type: verbatim
+#: ../tools/virt-edit.pl:40
+#, no-wrap
+msgid ""
+" virt-edit [--options] disk.img [disk.img ...] file\n"
+"\n"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../tools/virt-win-reg.pl:484
+#: ../tools/virt-edit.pl:42

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" cat > test.reg <<'EOF'\n"
-" [HKLM\\Software\\Microsoft\\Windows\\CurrentVersion\\RunOnce]\n"
-" \"Test\"=\"c:\\\\test.bat\"\n"
-" EOF\n"
+" virt-edit [domname|disk.img] file -e 'expr'\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../tools/virt-win-reg.pl:489
+#: ../tools/virt-edit.pl:46

 msgid ""
 msgid ""

-"In this example we use the key C<RunOnce> which means that the script will "
-"run precisely once when the first user logs in.  If you want it to run every "
-"time a user logs in, replace C<RunOnce> with C<Run>."
+"You must I<not> use C<virt-edit> on live virtual machines.  If you do this, "
+"you risk disk corruption in the VM.  C<virt-edit> tries to stop you from "
+"doing this, but doesn't catch all cases."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../tools/virt-win-reg.pl:493
-msgid "Now update the registry:"
-msgstr ""
-
-# type: verbatim
-#. type: verbatim
-#: ../tools/virt-win-reg.pl:495
-#, no-wrap
+#: ../tools/virt-edit.pl:52

 msgid ""
 msgid ""

-" virt-win-reg --merge WindowsGuest test.reg\n"
-"\n"
-msgstr ""
-
-# type: =head2
-#. type: =head2
-#: ../tools/virt-win-reg.pl:497
-msgid "INSTALLING A SERVICE"
+"C<virt-edit> is a command line tool to edit C<file> where C<file> exists in "
+"the named virtual machine (or disk image)."

 msgstr ""
 
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../tools/virt-win-reg.pl:499
-msgid ""
-"This section assumes you are familiar with Windows services, and you either "
-"have a program which handles the Windows Service Control Protocol directly "
-"or you want to run any program using a service wrapper like SrvAny or the "
-"free RHSrvAny."
+#: ../tools/virt-edit.pl:55
+msgid "If you want to just view a file, use L<virt-cat(1)>."

 msgstr ""
 
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../tools/virt-win-reg.pl:504
+#: ../tools/virt-edit.pl:57

 msgid ""
 msgid ""

-"First upload the program and optionally the service wrapper.  In this case "
-"the test program is called C<test.exe> and we are using the RHSrvAny wrapper:"
+"For more complex cases you should look at the L<guestfish(1)> tool (see L</"
+"USING GUESTFISH> below)."

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../tools/virt-win-reg.pl:508
-#, no-wrap
+#. type: textblock
+#: ../tools/virt-edit.pl:60

 msgid ""
 msgid ""

-" guestfish -i -d WindowsGuest <<EOF\n"
-"   upload rhsrvany.exe /rhsrvany.exe\n"
-"   upload test.exe /test.exe\n"
-" EOF\n"
-"\n"
+"C<virt-edit> cannot be used to create a new file, nor to edit multiple "
+"files.  L<guestfish(1)> can do that and much more."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../tools/virt-win-reg.pl:513
-msgid ""
-"Prepare a regedit file containing the registry changes.  In this example, "
-"the first registry change is needed for the service itself or the service "
-"wrapper (if used).  The second registry change is only needed because I am "
-"using the RHSrvAny service wrapper."
+#: ../tools/virt-edit.pl:65
+msgid "Edit the named files interactively:"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../tools/virt-win-reg.pl:518
+#: ../tools/virt-edit.pl:67

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" cat > service.reg <<'EOF'\n"
-" [HKLM\\SYSTEM\\ControlSet001\\services\\RHSrvAny]\n"
-" \"Type\"=dword:00000010\n"
-" \"Start\"=dword:00000002\n"
-" \"ErrorControl\"=dword:00000001\n"
-" \"ImagePath\"=\"c:\\\\rhsrvany.exe\"\n"
-" \"DisplayName\"=\"RHSrvAny\"\n"
-" \"ObjectName\"=\"NetworkService\"\n"
-" \n"
+" virt-edit mydomain /boot/grub/grub.conf\n"
+"\n"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../tools/virt-win-reg.pl:527
+#: ../tools/virt-edit.pl:69

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" [HKLM\\SYSTEM\\ControlSet001\\services\\RHSrvAny\\Parameters]\n"
-" \"CommandLine\"=\"c:\\\\test.exe\"\n"
-" \"PWD\"=\"c:\\\\Temp\"\n"
-" EOF\n"
+" virt-edit mydomain /etc/passwd\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../tools/virt-win-reg.pl:538
-msgid ""
-"For use of C<ControlSet001> see the section above in this manual page.  You "
-"may need to adjust this according to the control set that is in use by the "
-"guest."
+#: ../tools/virt-edit.pl:71
+msgid "For Windows guests, some Windows paths are understood:"

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../tools/virt-win-reg.pl:544
+#. type: verbatim
+#: ../tools/virt-edit.pl:73
+#, no-wrap

 msgid ""
 msgid ""

-"C<\"ObjectName\"> controls the privileges that the service will have.  An "
-"alternative is C<\"ObjectName\"=\"LocalSystem\"> which would be the most "
-"privileged account."
+" virt-edit mywindomain 'c:\\autoexec.bat'\n"
+"\n"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../tools/virt-win-reg.pl:550
+#: ../tools/virt-edit.pl:75

 msgid ""
 msgid ""

-"For the meaning of the magic numbers, see this Microsoft KB article: "
-"L<http://support.microsoft.com/kb/103000>."
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../tools/virt-win-reg.pl:555
-msgid "Update the registry:"
+"You can also edit files non-interactively (see L</NON-INTERACTIVE EDITING> "
+"below).  To change the init default level to 5:"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../tools/virt-win-reg.pl:557
+#: ../tools/virt-edit.pl:79

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" virt-win-reg --merge WindowsGuest service.reg\n"
+" virt-edit mydomain /etc/inittab -e 's/^id:.*/id:5:initdefault:/'\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../tools/virt-win-reg.pl:561
-msgid ""
-"Be careful when passing parameters containing C<\\> (backslash) in the "
-"shell.  Usually you will have to use 'single quotes' or double backslashes "
-"(but not both) to protect them from the shell."
+#: ../tools/virt-edit.pl:91 ../tools/virt-win-reg.pl:106
+#: ../tools/virt-list-filesystems.pl:63 ../tools/virt-tar.pl:113
+#: ../tools/virt-make-fs.pl:163 ../tools/virt-list-partitions.pl:64
+msgid "Display brief help."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../tools/virt-win-reg.pl:565
-msgid "Paths and value names are case-insensitive."
+#: ../tools/virt-edit.pl:99 ../tools/virt-win-reg.pl:114
+#: ../tools/virt-list-filesystems.pl:71 ../tools/virt-tar.pl:121
+#: ../tools/virt-make-fs.pl:171 ../tools/virt-list-partitions.pl:72
+msgid "Display version number and exit."
+msgstr ""
+
+# type: =item
+#. type: =item
+#: ../tools/virt-edit.pl:105
+msgid "B<--backup extension> | B<-b extension>"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../tools/virt-win-reg.pl:574
+#: ../tools/virt-edit.pl:107

 msgid ""
 msgid ""

-"L<hivex(3)>, L<hivexsh(1)>, L<hivexregedit(1)>, L<guestfs(3)>, L<guestfish(1)"
-">, L<virt-cat(1)>, L<Sys::Guestfs(3)>, L<Sys::Guestfs::Lib(3)>, L<Win::Hivex"
-"(3)>, L<Win::Hivex::Regedit(3)>, L<Sys::Virt(3)>, L<http://libguestfs.org/>."
+"Create a backup of the original file I<in the guest disk image>.  The backup "
+"has the original filename with C<extension> added."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../tools/virt-win-reg.pl:589 ../tools/virt-make-fs.pl:555
+#: ../tools/virt-edit.pl:110

 msgid ""
 msgid ""

-"When reporting bugs, please enable debugging and capture the I<complete> "
-"output:"
+"Usually the first character of C<extension> would be a dot C<.> so you would "
+"write:"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../tools/virt-win-reg.pl:592
+#: ../tools/virt-edit.pl:113

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" export LIBGUESTFS_DEBUG=1\n"
-" virt-win-reg --debug [... rest ...] > /tmp/virt-win-reg.log 2>&1\n"
+" virt-edit -b .orig [etc]\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../tools/virt-win-reg.pl:595
-msgid ""
-"Attach /tmp/virt-win-reg.log to a new bug report at L<https://bugzilla."
-"redhat.com/>"
+#: ../tools/virt-edit.pl:115
+msgid "By default, no backup file is made."
+msgstr ""
+
+# type: =item
+#. type: =item
+#: ../tools/virt-edit.pl:121 ../tools/virt-win-reg.pl:128
+#: ../tools/virt-list-filesystems.pl:77 ../tools/virt-tar.pl:127
+#: ../tools/virt-list-partitions.pl:78
+msgid "B<--connect URI> | B<-c URI>"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../tools/virt-win-reg.pl:604 ../tools/virt-resize.pl:1510
-#: ../tools/virt-make-fs.pl:570
-msgid "Copyright (C) 2010 Red Hat Inc."
+#: ../tools/virt-edit.pl:123 ../tools/virt-win-reg.pl:130
+#: ../tools/virt-list-filesystems.pl:79 ../tools/virt-tar.pl:129
+#: ../tools/virt-list-partitions.pl:80
+msgid ""
+"If using libvirt, connect to the given I<URI>.  If omitted, then we connect "
+"to the default libvirt hypervisor."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../tools/virt-resize.pl:42
-msgid "virt-resize - Resize a virtual machine disk"
+#: ../tools/virt-edit.pl:126 ../tools/virt-win-reg.pl:133
+#: ../tools/virt-list-filesystems.pl:82 ../tools/virt-tar.pl:132
+#: ../tools/virt-list-partitions.pl:83
+msgid ""
+"If you specify guest block devices directly, then libvirt is not used at all."

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../tools/virt-resize.pl:46
-#, no-wrap
-msgid ""
-" virt-resize [--resize /dev/sdaN=[+/-]<size>[%]]\n"
-"   [--expand /dev/sdaN] [--shrink /dev/sdaN]\n"
-"   [--ignore /dev/sdaN] [--delete /dev/sdaN] [...] indisk outdisk\n"
-"\n"
+# type: =item
+#. type: =item
+#: ../tools/virt-edit.pl:133 ../tools/virt-win-reg.pl:140
+#: ../tools/virt-list-filesystems.pl:89 ../tools/virt-tar.pl:139
+#: ../tools/virt-list-partitions.pl:90
+msgid "B<--format> raw"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../tools/virt-resize.pl:52
+#: ../tools/virt-edit.pl:135 ../tools/virt-win-reg.pl:142
+#: ../tools/virt-list-filesystems.pl:91 ../tools/virt-tar.pl:141
+#: ../tools/virt-list-partitions.pl:92

 msgid ""
 msgid ""

-"Virt-resize is a tool which can resize a virtual machine disk, making it "
-"larger or smaller overall, and resizing or deleting any partitions contained "
-"within."
+"Specify the format of disk images given on the command line.  If this is "
+"omitted then the format is autodetected from the content of the disk image."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../tools/virt-resize.pl:56
+#: ../tools/virt-edit.pl:139 ../tools/virt-win-reg.pl:146
+#: ../tools/virt-list-filesystems.pl:95 ../tools/virt-tar.pl:145
+#: ../tools/virt-list-partitions.pl:96

 msgid ""
 msgid ""

-"Virt-resize B<cannot> resize disk images in-place.  Virt-resize B<should "
-"not> be used on live virtual machines - for consistent results, shut the "
-"virtual machine down before resizing it."
+"If disk images are requested from libvirt, then this program asks libvirt "
+"for this information.  In this case, the value of the format parameter is "
+"ignored."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../tools/virt-resize.pl:60
+#: ../tools/virt-edit.pl:143 ../tools/virt-win-reg.pl:150
+#: ../tools/virt-list-filesystems.pl:99 ../tools/virt-tar.pl:149
+#: ../tools/virt-list-partitions.pl:100

 msgid ""
 msgid ""

-"If you are not familiar with the associated tools: L<virt-filesystems(1)> "
-"and L<virt-df(1)>, we recommend you go and read those manual pages first."
+"If working with untrusted raw-format guest disk images, you should ensure "
+"the format is always specified."
+msgstr ""
+
+# type: =item
+#. type: =item
+#: ../tools/virt-edit.pl:150
+msgid "B<--expr EXPR> | B<-e EXPR>"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../tools/virt-resize.pl:66
+#: ../tools/virt-edit.pl:152

 msgid ""
 msgid ""

-"Copy C<olddisk> to C<newdisk>, extending one of the guest's partitions to "
-"fill the extra 5GB of space."
+"Instead of launching the external editor, non-interactively apply the Perl "
+"expression C<EXPR> to each line in the file.  See L</NON-INTERACTIVE "
+"EDITING> below."

 msgstr ""
 
 msgstr ""
 

-#. type: verbatim
-#: ../tools/virt-resize.pl:69
-#, no-wrap
+# type: textblock
+#. type: textblock
+#: ../tools/virt-edit.pl:156

 msgid ""
 msgid ""

-" truncate -r olddisk newdisk; truncate -s +5G newdisk\n"
-" virt-filesystems --long -h --all -a olddisk\n"
-" # Note \"/dev/sda2\" is a partition inside the \"olddisk\" file.\n"
-" virt-resize --expand /dev/sda2 olddisk newdisk\n"
-"\n"
+"Be careful to properly quote the expression to prevent it from being altered "
+"by the shell."
+msgstr ""
+
+# type: =head1
+#. type: =head1
+#: ../tools/virt-edit.pl:280
+msgid "NON-INTERACTIVE EDITING"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../tools/virt-resize.pl:74
+#: ../tools/virt-edit.pl:282

 msgid ""
 msgid ""

-"As above, but make the /boot partition 200MB bigger, while giving the "
-"remaining space to /dev/sda2:"
+"C<virt-edit> normally calls out to C<$EDITOR> (or vi) so the system "
+"administrator can interactively edit the file."

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../tools/virt-resize.pl:77
-#, no-wrap
+# type: textblock
+#. type: textblock
+#: ../tools/virt-edit.pl:285

 msgid ""
 msgid ""

-" virt-resize --resize /dev/sda1=+200M --expand /dev/sda2 olddisk newdisk\n"
-"\n"
+"There are two ways also to use C<virt-edit> from scripts in order to make "
+"automated edits to files.  (Note that although you I<can> use C<virt-edit> "
+"like this, it's less error-prone to write scripts directly using the "
+"libguestfs API and Augeas for configuration file editing.)"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../tools/virt-resize.pl:79
-msgid "As above, but the output format will be uncompressed qcow2:"
+#: ../tools/virt-edit.pl:291
+msgid ""
+"The first method is to temporarily set C<$EDITOR> to any script or program "
+"you want to run.  The script is invoked as C<$EDITOR tmpfile> and it should "
+"update C<tmpfile> in place however it likes."
+msgstr ""
+
+#. type: textblock
+#: ../tools/virt-edit.pl:295
+msgid ""
+"The second method is to use the I<-e> parameter of C<virt-edit> to run a "
+"short Perl snippet in the style of L<sed(1)>.  For example to replace all "
+"instances of C<foo> with C<bar> in a file:"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../tools/virt-resize.pl:81
+#: ../tools/virt-edit.pl:299

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" qemu-img create -f qcow2 newdisk.qcow2 15G\n"
-" virt-resize --expand /dev/sda2 olddisk newdisk.qcow2\n"
+" virt-edit domname filename -e 's/foo/bar/'\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: =head1
-#. type: =head1
-#: ../tools/virt-resize.pl:84
-msgid "DETAILED USAGE"
-msgstr ""
-
-# type: =head2
-#. type: =head2
-#: ../tools/virt-resize.pl:86
-msgid "EXPANDING A VIRTUAL MACHINE DISK"
-msgstr ""
-
-# type: =item
-#. type: =item
-#: ../tools/virt-resize.pl:90
-msgid "1. Shut down the virtual machine"
-msgstr ""
-
-# type: =item
-#. type: =item
-#: ../tools/virt-resize.pl:92
-msgid "2. Locate input disk image"
-msgstr ""
-

 # type: textblock
 #. type: textblock
 # type: textblock
 #. type: textblock

-#: ../tools/virt-resize.pl:94
+#: ../tools/virt-edit.pl:301

 msgid ""
 msgid ""

-"Locate the input disk image (ie. the file or device on the host containing "
-"the guest's disk).  If the guest is managed by libvirt, you can use C<virsh "
-"dumpxml> like this to find the disk image name:"
+"The full power of Perl regular expressions can be used (see L<perlre(1)>).  "
+"For example to delete root's password you could do:"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../tools/virt-resize.pl:98
+#: ../tools/virt-edit.pl:304

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" # virsh dumpxml guestname | xpath /domain/devices/disk/source\n"
-" Found 1 nodes:\n"
-" -- NODE --\n"
-" <source dev=\"/dev/vg/lv_guest\" />\n"
+" virt-edit domname /etc/passwd -e 's/^root:.*?:/root::/'\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: =item
-#. type: =item
-#: ../tools/virt-resize.pl:103
-msgid "3. Look at current sizing"
+# type: textblock
+#. type: textblock
+#: ../tools/virt-edit.pl:306
+msgid ""
+"What really happens is that the snippet is evaluated as a Perl expression "
+"for each line of the file.  The line, including the final C<\\n>, is passed "
+"in C<$_> and the expression should update C<$_> or leave it unchanged."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../tools/virt-resize.pl:105
-msgid "Use L<virt-filesystems(1)> to display the current partitions and sizes:"
+#: ../tools/virt-edit.pl:311
+msgid ""
+"To delete a line, set C<$_> to the empty string.  For example, to delete the "
+"C<apache> user account from the password file you can do:"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../tools/virt-resize.pl:108
+#: ../tools/virt-edit.pl:314

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" # virt-filesystems --long --parts --blkdevs -h -a /dev/vg/lv_guest\n"
-" Name       Type       Size  Parent\n"
-" /dev/sda1  partition  101M  /dev/sda\n"
-" /dev/sda2  partition  7.9G  /dev/sda\n"
-" /dev/sda   device     8.0G  -\n"
+" virt-edit mydomain /etc/passwd -e '$_ = \"\" if /^apache:/'\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../tools/virt-resize.pl:114
+#: ../tools/virt-edit.pl:316

 msgid ""
 msgid ""

-"(This example is a virtual machine with an 8 GB disk which we would like to "
-"expand up to 10 GB)."
+"To insert a line, prepend or append it to C<$_>.  However appending lines to "
+"the end of the file is rather difficult this way since there is no concept "
+"of \"last line of the file\" - your expression just doesn't get called "
+"again.  You might want to use the first method (setting C<$EDITOR>) if you "
+"want to do this."

 msgstr ""
 
 msgstr ""
 

-# type: =item
-#. type: =item
-#: ../tools/virt-resize.pl:117
-msgid "4. Create output disk"
+# type: textblock
+#. type: textblock
+#: ../tools/virt-edit.pl:322
+msgid ""
+"The variable C<$lineno> contains the current line number.  As is "
+"traditional, the first line in the file is number C<1>."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../tools/virt-resize.pl:119
+#: ../tools/virt-edit.pl:325

 msgid ""
 msgid ""

-"Virt-resize cannot do in-place disk modifications.  You have to have space "
-"to store the resized output disk."
+"The return value from the expression is ignored, but the expression may call "
+"C<die> in order to abort the whole program, leaving the original file "
+"untouched."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../tools/virt-resize.pl:122
+#: ../tools/virt-edit.pl:329

 msgid ""
 msgid ""

-"To store the resized disk image in a file, create a file of a suitable size:"
+"Remember when matching the end of a line that C<$_> may contain the final C<"
+"\\n>, or (for DOS files) C<\\r\\n>, or if the file does not end with a "
+"newline then neither of these.  Thus to match or substitute some text at the "
+"end of a line, use this regular expression:"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../tools/virt-resize.pl:125
+#: ../tools/virt-edit.pl:334

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" # rm -f outdisk\n"
-" # truncate -s 10G outdisk\n"
+" /some text(\\r?\\n)?$/\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../tools/virt-resize.pl:128
-msgid "Or use L<lvcreate(1)> to create a logical volume:"
+#: ../tools/virt-edit.pl:336
+msgid ""
+"Alternately, use the perl C<chomp> function, being careful not to chomp C<"
+"$_> itself (since that would remove all newlines from the file):"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../tools/virt-resize.pl:130
+#: ../tools/virt-edit.pl:340

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" # lvcreate -L 10G -n lv_name vg_name\n"
+" my $m = $_; chomp $m; $m =~ /some text$/\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../tools/virt-resize.pl:132
-msgid "Or use L<virsh(1)> vol-create-as to create a libvirt storage volume:"
-msgstr ""
-
-# type: verbatim
-#. type: verbatim
-#: ../tools/virt-resize.pl:134
-#, no-wrap
+#: ../tools/virt-edit.pl:344

 msgid ""
 msgid ""

-" # virsh pool-list\n"
-" # virsh vol-create-as poolname newvol 10G\n"
-"\n"
+"C<virt-edit> has a limited ability to understand Windows drive letters and "
+"paths (eg. C<E:\\foo\\bar.txt>)."

 msgstr ""
 
 msgstr ""
 

-# type: =item
-#. type: =item
-#: ../tools/virt-resize.pl:137
-msgid "5. Resize"
+#. type: textblock
+#: ../tools/virt-edit.pl:347
+msgid "If and only if the guest is running Windows then:"

 msgstr ""
 
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../tools/virt-resize.pl:139
+#: ../tools/virt-edit.pl:353

 msgid ""
 msgid ""

-"virt-resize takes two mandatory parameters, the input disk (eg. device or "
-"file) and the output disk.  The output disk is the one created in the "
-"previous step."
+"Drive letter prefixes like C<C:> are resolved against the Windows Registry "
+"to the correct filesystem."

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../tools/virt-resize.pl:143
-#, no-wrap
+#. type: textblock
+#: ../tools/virt-edit.pl:358

 msgid ""
 msgid ""

-" # virt-resize indisk outdisk\n"
-"\n"
+"Any backslash (C<\\>) characters in the path are replaced with forward "
+"slashes so that libguestfs can process it."

 msgstr ""
 
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../tools/virt-resize.pl:145
+#: ../tools/virt-edit.pl:363

 msgid ""
 msgid ""

-"This command just copies disk image C<indisk> to disk image C<outdisk> "
-"I<without> resizing or changing any existing partitions.  If C<outdisk> is "
-"larger, then an extra, empty partition is created at the end of the disk "
-"covering the extra space.  If C<outdisk> is smaller, then it will give an "
-"error."
+"The path is resolved case insensitively to locate the file that should be "
+"edited."

 msgstr ""
 
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../tools/virt-resize.pl:151
-msgid ""
-"More realistically you'd want to expand existing partitions in the disk "
-"image by passing extra options (for the full list see the L</OPTIONS> "
-"section below)."
+#: ../tools/virt-edit.pl:368
+msgid "There are some known shortcomings:"

 msgstr ""
 
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../tools/virt-resize.pl:155
-msgid ""
-"L</--expand> is the most useful option.  It expands the named partition "
-"within the disk to fill any extra space:"
+#: ../tools/virt-edit.pl:374
+msgid "Some NTFS symbolic links may not be followed correctly."

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../tools/virt-resize.pl:158
-#, no-wrap
-msgid ""
-" # virt-resize --expand /dev/sda2 indisk outdisk\n"
-"\n"
+#. type: textblock
+#: ../tools/virt-edit.pl:378
+msgid "NTFS junction points that cross filesystems are not followed."
+msgstr ""
+
+#. type: =head1
+#: ../tools/virt-edit.pl:435
+msgid "USING GUESTFISH"

 msgstr ""
 
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../tools/virt-resize.pl:160
+#: ../tools/virt-edit.pl:437

 msgid ""
 msgid ""

-"(In this case, an extra partition is I<not> created at the end of the disk, "
-"because there will be no unused space)."
+"L<guestfish(1)> is a more powerful, lower level tool which you can use when "
+"C<virt-edit> doesn't work."

 msgstr ""
 
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../tools/virt-resize.pl:163
-msgid ""
-"L</--resize> is the other commonly used option.  The following would "
-"increase the size of /dev/sda1 by 200M, and expand /dev/sda2 to fill the "
-"rest of the available space:"
+#: ../tools/virt-edit.pl:440
+msgid "Using C<virt-edit> is approximately equivalent to doing:"

 msgstr ""
 
 msgstr ""
 

-# type: verbatim

 #. type: verbatim
 #. type: verbatim

-#: ../tools/virt-resize.pl:167
+#: ../tools/virt-edit.pl:442

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" # virt-resize --resize /dev/sda1=+200M --expand /dev/sda2 \\\n"
-"     indisk outdisk\n"
+" guestfish --rw -i -d domname edit /file\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../tools/virt-resize.pl:170
+#: ../tools/virt-edit.pl:444

 msgid ""
 msgid ""

-"If the expanded partition in the image contains a filesystem or LVM PV, then "
-"if virt-resize knows how, it will resize the contents, the equivalent of "
-"calling a command such as L<pvresize(8)>, L<resize2fs(8)> or L<ntfsresize(8)"
-">.  However virt-resize does not know how to resize some filesystems, so you "
-"would have to online resize them after booting the guest."
+"where C<domname> is the name of the libvirt guest, and C</file> is the full "
+"path to the file."

 msgstr ""
 
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../tools/virt-resize.pl:177
-msgid "Other options are covered below."
+#: ../tools/virt-edit.pl:447
+msgid ""
+"The command above uses libguestfs's guest inspection feature and so does not "
+"work on guests that libguestfs cannot inspect, or on things like arbitrary "
+"disk images that don't contain guests.  To edit a file on a disk image "
+"directly, use:"

 msgstr ""
 
 msgstr ""
 

-# type: =item
-#. type: =item
-#: ../tools/virt-resize.pl:179
-msgid "6. Test"
+#. type: verbatim
+#: ../tools/virt-edit.pl:452
+#, no-wrap
+msgid ""
+" guestfish --rw -a disk.img -m /dev/sda1 edit /file\n"
+"\n"

 msgstr ""
 
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../tools/virt-resize.pl:181
-msgid "Thoroughly test the new disk image I<before> discarding the old one."
+#: ../tools/virt-edit.pl:454
+msgid ""
+"where C<disk.img> is the disk image, C</dev/sda1> is the filesystem within "
+"the disk image to edit, and C</file> is the full path to the file."

 msgstr ""
 
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../tools/virt-resize.pl:183
-msgid "If you are using libvirt, edit the XML to point at the new disk:"
+#: ../tools/virt-edit.pl:458
+msgid ""
+"C<virt-edit> cannot create new files.  Use the guestfish commands C<touch>, "
+"C<write> or C<upload> instead:"

 msgstr ""
 
 msgstr ""
 

-# type: verbatim

 #. type: verbatim
 #. type: verbatim

-#: ../tools/virt-resize.pl:185
+#: ../tools/virt-edit.pl:461

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" # virsh edit guestname\n"
+" guestfish --rw -i -d domname touch /newfile\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../tools/virt-resize.pl:187
+#. type: verbatim
+#: ../tools/virt-edit.pl:463
+#, no-wrap

 msgid ""
 msgid ""

-"Change E<lt>source ...E<gt>, see L<http://libvirt.org/formatdomain."
-"html#elementsDisks>"
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../tools/virt-resize.pl:190
-msgid "Then start up the domain with the new, resized disk:"
+" guestfish --rw -i -d domname write /newfile \"new content\"\n"
+"\n"

 msgstr ""
 
 msgstr ""
 

-# type: verbatim

 #. type: verbatim
 #. type: verbatim

-#: ../tools/virt-resize.pl:192
+#: ../tools/virt-edit.pl:465

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" # virsh start guestname\n"
+" guestfish --rw -i -d domname upload localfile /newfile\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../tools/virt-resize.pl:194
+#: ../tools/virt-edit.pl:467
+msgid ""
+"C<virt-edit> cannot edit multiple files, but guestfish can do it like this:"
+msgstr ""
+
+#. type: verbatim
+#: ../tools/virt-edit.pl:470
+#, no-wrap

 msgid ""
 msgid ""

-"and check that it still works.  See also the L</NOTES> section below for "
-"additional information."
+" guestfish --rw -i -d domname edit /file1 : edit /file2\n"
+"\n"

 msgstr ""
 
 # type: =item
 #. type: =item
 msgstr ""
 
 # type: =item
 #. type: =item

-#: ../tools/virt-resize.pl:197
-msgid "7. Resize LVs etc inside the guest"
+#: ../tools/virt-edit.pl:480
+msgid "C<EDITOR>"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../tools/virt-resize.pl:199
-msgid "(This can also be done offline using L<guestfish(1)>)"
+#: ../tools/virt-edit.pl:482
+msgid ""
+"If set, this string is used as the editor.  It may contain arguments, eg. C<"
+"\"emacs -nw\">"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../tools/virt-resize.pl:201
-msgid ""
-"Once the guest has booted you should see the new space available, at least "
-"for filesystems that virt-resize knows how to resize, and for PVs.  The user "
-"may need to resize LVs inside PVs, and also resize filesystem types that "
-"virt-resize does not know how to expand."
+#: ../tools/virt-edit.pl:485
+msgid "If not set, C<vi> is used."

 msgstr ""
 
 # type: =head2
 msgstr ""
 
 # type: =head2

-#. type: =head2
-#: ../tools/virt-resize.pl:208
-msgid "SHRINKING A VIRTUAL MACHINE DISK"
+#. type: =head1
+#: ../tools/virt-edit.pl:489 ../tools/virt-win-reg.pl:559
+#: ../tools/virt-list-filesystems.pl:182 ../tools/virt-tar.pl:279
+#: ../tools/virt-make-fs.pl:532 ../tools/virt-list-partitions.pl:250
+msgid "SHELL QUOTING"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../tools/virt-resize.pl:210
+#: ../tools/virt-edit.pl:491 ../tools/virt-win-reg.pl:567
+#: ../tools/virt-list-filesystems.pl:184 ../tools/virt-tar.pl:281
+#: ../tools/virt-make-fs.pl:534 ../tools/virt-list-partitions.pl:252

 msgid ""
 msgid ""

-"Shrinking is somewhat more complex than expanding, and only an overview is "
-"given here."
+"Libvirt guest names can contain arbitrary characters, some of which have "
+"meaning to the shell such as C<#> and space.  You may need to quote or "
+"escape these characters on the command line.  See the shell manual page L<sh"
+"(1)> for details."

 msgstr ""
 
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../tools/virt-resize.pl:213
+#: ../tools/virt-edit.pl:498

 msgid ""
 msgid ""

-"Firstly virt-resize will not attempt to shrink any partition content (PVs, "
-"filesystems).  The user has to shrink content before passing the disk image "
-"to virt-resize, and virt-resize will check that the content has been shrunk "
-"properly."
+"L<guestfs(3)>, L<guestfish(1)>, L<virt-cat(1)>, L<virt-copy-in(1)>, L<virt-"
+"tar-in(1)>, L<Sys::Guestfs(3)>, L<Sys::Guestfs::Lib(3)>, L<Sys::Virt(3)>, "
+"L<http://libguestfs.org/>, L<perl(1)>, L<perlre(1)>."

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../tools/virt-resize.pl:218
-msgid "(Shrinking can also be done offline using L<guestfish(1)>)"
+# type: =head1
+#. type: =head1
+#: ../tools/virt-edit.pl:510 ../tools/virt-win-reg.pl:598
+#: ../tools/virt-list-filesystems.pl:202 ../tools/virt-tar.pl:301
+#: ../tools/virt-make-fs.pl:564 ../tools/virt-list-partitions.pl:269
+msgid "AUTHOR"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../tools/virt-resize.pl:220
-msgid ""
-"After shrinking PVs and filesystems, shut down the guest, and proceed with "
-"steps 3 and 4 above to allocate a new disk image."
+#: ../tools/virt-edit.pl:512 ../tools/virt-win-reg.pl:600
+#: ../tools/virt-list-filesystems.pl:204 ../tools/virt-tar.pl:303
+#: ../tools/virt-make-fs.pl:566 ../tools/virt-list-partitions.pl:271
+msgid "Richard W.M. Jones L<http://people.redhat.com/~rjones/>"

 msgstr ""
 
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../tools/virt-resize.pl:223
-msgid ""
-"Then run virt-resize with any of the C<--shrink> and/or C<--resize> options."
-msgstr ""
-
-# type: =head2
-#. type: =head2
-#: ../tools/virt-resize.pl:226
-msgid "IGNORING OR DELETING PARTITIONS"
+#: ../tools/virt-edit.pl:516
+msgid "Copyright (C) 2009-2011 Red Hat Inc."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../tools/virt-resize.pl:228
+#: ../tools/virt-win-reg.pl:37

 msgid ""
 msgid ""

-"virt-resize also gives a convenient way to ignore or delete partitions when "
-"copying from the input disk to the output disk.  Ignoring a partition speeds "
-"up the copy where you don't care about the existing contents of a "
-"partition.  Deleting a partition removes it completely, but note that it "
-"also renumbers any partitions after the one which is deleted, which can "
-"leave some guests unbootable."
-msgstr ""
-
-# type: =head2
-#. type: =head2
-#: ../tools/virt-resize.pl:235
-msgid "QCOW2 AND NON-SPARSE RAW FORMATS"
+"virt-win-reg - Export and merge Windows Registry entries from a Windows guest"

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../tools/virt-resize.pl:237
+# type: verbatim
+#. type: verbatim
+#: ../tools/virt-win-reg.pl:41
+#, no-wrap

 msgid ""
 msgid ""

-"If the input disk is in qcow2 format, then you may prefer that the output is "
-"in qcow2 format as well.  Alternately, virt-resize can convert the format on "
-"the fly.  The output format is simply determined by the format of the empty "
-"output container that you provide.  Thus to create qcow2 output, use:"
+" virt-win-reg domname 'HKLM\\Path\\To\\Subkey'\n"
+"\n"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../tools/virt-resize.pl:243
+#: ../tools/virt-win-reg.pl:43

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" qemu-img create [-c] -f qcow2 outdisk [size]\n"
+" virt-win-reg domname 'HKLM\\Path\\To\\Subkey' name\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../tools/virt-resize.pl:245
-msgid "instead of the truncate command (use C<-c> for a compressed disk)."
+# type: verbatim
+#. type: verbatim
+#: ../tools/virt-win-reg.pl:45
+#, no-wrap
+msgid ""
+" virt-win-reg domname 'HKLM\\Path\\To\\Subkey' @\n"
+"\n"

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../tools/virt-resize.pl:247
-msgid "Similarly, to get non-sparse raw output use:"
+# type: verbatim
+#. type: verbatim
+#: ../tools/virt-win-reg.pl:47
+#, no-wrap
+msgid ""
+" virt-win-reg --merge domname [input.reg ...]\n"
+"\n"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../tools/virt-resize.pl:249
+#: ../tools/virt-win-reg.pl:49

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" fallocate -l size outdisk\n"
+" virt-win-reg [--options] disk.img ... # instead of domname\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../tools/virt-resize.pl:251
+#: ../tools/virt-win-reg.pl:53

 msgid ""
 msgid ""

-"(on older systems that don't have the L<fallocate(1)> command use C<dd if=/"
-"dev/zero of=outdisk bs=1M count=..>)"
+"You must I<not> use C<virt-win-reg> with the I<--merge> option on live "
+"virtual machines.  If you do this, you I<will> get irreversible disk "
+"corruption in the VM.  C<virt-win-reg> tries to stop you from doing this, "
+"but doesn't catch all cases."

 msgstr ""
 
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../tools/virt-resize.pl:264
-msgid "Display help."
-msgstr ""
-
-# type: =item
-#. type: =item
-#: ../tools/virt-resize.pl:278
-msgid "B<--resize part=size>"
+#: ../tools/virt-win-reg.pl:58
+msgid ""
+"Modifying the Windows Registry is an inherently risky operation.  The format "
+"is deliberately obscure and undocumented, and Registry changes can leave the "
+"system unbootable.  Therefore when using the I<--merge> option, make sure "
+"you have a reliable backup first."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../tools/virt-resize.pl:280
+#: ../tools/virt-win-reg.pl:65

 msgid ""
 msgid ""

-"Resize the named partition (expanding or shrinking it) so that it has the "
-"given size."
+"This program can export and merge Windows Registry entries from a Windows "
+"guest."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../tools/virt-resize.pl:283
+#: ../tools/virt-win-reg.pl:68

 msgid ""
 msgid ""

-"C<size> can be expressed as an absolute number followed by b/K/M/G/T/P/E to "
-"mean bytes, Kilobytes, Megabytes, Gigabytes, Terabytes, Petabytes or "
-"Exabytes; or as a percentage of the current size; or as a relative number or "
-"percentage.  For example:"
+"The first parameter is the libvirt guest name or the raw disk image of a "
+"Windows guest."

 msgstr ""
 
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../tools/virt-resize.pl:288
-#, no-wrap
+#. type: textblock
+#: ../tools/virt-win-reg.pl:71

 msgid ""
 msgid ""

-" --resize /dev/sda2=10G\n"
-"\n"
+"If I<--merge> is I<not> specified, then the chosen registry key is displayed/"
+"exported (recursively).  For example:"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../tools/virt-resize.pl:290
+#: ../tools/virt-win-reg.pl:74

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" --resize /dev/sda4=90%\n"
+" $ virt-win-reg Windows7 'HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft'\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../tools/virt-resize.pl:292
-#, no-wrap
+# type: textblock
+#. type: textblock
+#: ../tools/virt-win-reg.pl:76

 msgid ""
 msgid ""

-" --resize /dev/sda2=+1G\n"
-"\n"
+"You can also display single values from within registry keys, for example:"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../tools/virt-resize.pl:294
+#: ../tools/virt-win-reg.pl:79

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" --resize /dev/sda2=-200M\n"
+" $ cvkey='HKLM\\SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion'\n"
+" $ virt-win-reg Windows7 $cvkey ProductName\n"
+" Windows 7 Enterprise\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../tools/virt-resize.pl:296
-#, no-wrap
+#. type: textblock
+#: ../tools/virt-win-reg.pl:83

 msgid ""
 msgid ""

-" --resize /dev/sda1=+128K\n"
-"\n"
+"With I<--merge>, you can merge a textual regedit file into the Windows "
+"Registry:"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../tools/virt-resize.pl:298
+#: ../tools/virt-win-reg.pl:86

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" --resize /dev/sda1=+10%\n"
+" $ virt-win-reg --merge Windows7 changes.reg\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: verbatim
-#. type: verbatim
-#: ../tools/virt-resize.pl:300
-#, no-wrap
-msgid ""
-" --resize /dev/sda1=-10%\n"
-"\n"
+# type: =head2
+#. type: =head1
+#: ../tools/virt-win-reg.pl:88 ../tools/virt-tar.pl:45
+msgid "NOTE"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../tools/virt-resize.pl:302
+#: ../tools/virt-win-reg.pl:90

 msgid ""
 msgid ""

-"You can increase the size of any partition.  Virt-resize will expand the "
-"direct content of the partition if it knows how (see C<--expand> below)."
+"This program is only meant for simple access to the registry.  If you want "
+"to do complicated things with the registry, we suggest you download the "
+"Registry hive files from the guest using L<libguestfs(3)> or L<guestfish(1)> "
+"and access them locally, eg. using L<hivex(3)>, L<hivexsh(1)> or "
+"L<hivexregedit(1)>."

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../tools/virt-resize.pl:306
-msgid ""
-"You can only I<decrease> the size of partitions that contain filesystems or "
-"PVs which have already been shrunk.  Virt-resize will check this has been "
-"done before proceeding, or else will print an error (see also C<--resize-"
-"force>)."
+# type: =item
+#. type: =item
+#: ../tools/virt-win-reg.pl:120 ../tools/virt-make-fs.pl:177
+msgid "B<--debug>"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../tools/virt-resize.pl:311 ../tools/virt-resize.pl:403
-#: ../tools/virt-resize.pl:420
-msgid "You can give this option multiple times."
+#: ../tools/virt-win-reg.pl:122
+msgid "Enable debugging messages."

 msgstr ""
 
 # type: =item
 #. type: =item
 msgstr ""
 
 # type: =item
 #. type: =item

-#: ../tools/virt-resize.pl:317
-msgid "B<--resize-force part=size>"
+#: ../tools/virt-win-reg.pl:157
+msgid "B<--merge>"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../tools/virt-resize.pl:319
+#: ../tools/virt-win-reg.pl:159

 msgid ""
 msgid ""

-"This is the same as C<--resize> except that it will let you decrease the "
-"size of any partition.  Generally this means you will lose any data which "
-"was at the end of the partition you shrink, but you may not care about that "
-"(eg. if shrinking an unused partition, or if you can easily recreate it such "
-"as a swap partition)."
+"In merge mode, this merges a textual regedit file into the Windows Registry "
+"of the virtual machine.  If this flag is I<not> given then virt-win-reg "
+"displays or exports Registry entries instead."

 msgstr ""
 
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../tools/virt-resize.pl:325
-msgid "See also the C<--ignore> option."
+#: ../tools/virt-win-reg.pl:163
+msgid ""
+"Note that I<--merge> is I<unsafe> to use on live virtual machines, and will "
+"result in disk corruption.  However exporting (without this flag)  is always "
+"safe."

 msgstr ""
 
 # type: =item
 #. type: =item
 msgstr ""
 
 # type: =item
 #. type: =item

-#: ../tools/virt-resize.pl:331
-msgid "B<--expand part>"
+#: ../tools/virt-win-reg.pl:171
+msgid "B<--encoding> UTF-16LE|ASCII"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../tools/virt-resize.pl:333
+#: ../tools/virt-win-reg.pl:173

 msgid ""
 msgid ""

-"Expand the named partition so it uses up all extra space (space left over "
-"after any other resize changes that you request have been done)."
+"When merging (only), you may need to specify the encoding for strings to be "
+"used in the hive file.  This is explained in detail in L<Win::Hivex::Regedit"
+"(3)/ENCODING STRINGS>."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../tools/virt-resize.pl:336
+#: ../tools/virt-win-reg.pl:177

 msgid ""
 msgid ""

-"If virt-resize knows how, it will expand the direct content of the "
-"partition.  For example, if the partition is an LVM PV, it will expand the "
-"PV to fit (like calling L<pvresize(8)>).  Virt-resize leaves any other "
-"content it doesn't know about alone."
+"The default is to use UTF-16LE, which should work with recent versions of "
+"Windows."

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../tools/virt-resize.pl:341
-msgid "Currently virt-resize can resize:"
+# type: =head2
+#. type: =head1
+#: ../tools/virt-win-reg.pl:402
+msgid "SUPPORTED SYSTEMS"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../tools/virt-resize.pl:347
+#: ../tools/virt-win-reg.pl:404

 msgid ""
 msgid ""

-"ext2, ext3 and ext4 filesystems when they are contained directly inside a "
-"partition."
+"The program currently supports Windows NT-derived guests starting with "
+"Windows XP through to at least Windows 7."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../tools/virt-resize.pl:352
+#: ../tools/virt-win-reg.pl:407

 msgid ""
 msgid ""

-"NTFS filesystems contained directly in a partition, if libguestfs was "
-"compiled with support for NTFS."
+"Registry support is done for C<HKEY_LOCAL_MACHINE\\SAM>, C<HKEY_LOCAL_MACHINE"
+"\\SECURITY>, C<HKEY_LOCAL_MACHINE\\SOFTWARE>, C<HKEY_LOCAL_MACHINE\\SYSTEM> "
+"and C<HKEY_USERS\\.DEFAULT>."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../tools/virt-resize.pl:355
+#: ../tools/virt-win-reg.pl:411

 msgid ""
 msgid ""

-"The filesystem must have been shut down consistently last time it was used.  "
-"Additionally, L<ntfsresize(8)> marks the resized filesystem as requiring a "
-"consistency check, so at the first boot after resizing Windows will check "
-"the disk."
+"You can use C<HKLM> as a shorthand for C<HKEY_LOCAL_MACHINE>, and C<HKU> for "
+"C<HKEY_USERS>."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../tools/virt-resize.pl:362
+#: ../tools/virt-win-reg.pl:414

 msgid ""
 msgid ""

-"LVM PVs (physical volumes).  virt-resize does not usually resize anything "
-"inside the PV, but see the C<--LV-expand> option.  The user could also "
-"resize LVs as desired after boot."
-msgstr ""
-
-# type: textblock
-#. type: textblock
-#: ../tools/virt-resize.pl:368 ../tools/virt-resize.pl:390
-msgid "Note that you cannot use C<--expand> and C<--shrink> together."
+"C<HKEY_USERS\\$SID> and C<HKEY_CURRENT_USER> are B<not> supported at this "
+"time."

 msgstr ""
 
 msgstr ""
 

-# type: =item
-#. type: =item
-#: ../tools/virt-resize.pl:374
-msgid "B<--shrink part>"
+# type: =head2
+#. type: =head1
+#: ../tools/virt-win-reg.pl:417
+msgid "ENCODING"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../tools/virt-resize.pl:376
+#: ../tools/virt-win-reg.pl:419

 msgid ""
 msgid ""

-"Shrink the named partition until the overall disk image fits in the "
-"destination.  The named partition B<must> contain a filesystem or PV which "
-"has already been shrunk using another tool (eg. L<guestfish(1)> or other "
-"online tools).  Virt-resize will check this and give an error if it has not "
-"been done."
+"C<virt-win-reg> expects that regedit files have already been reencoded in "
+"the local encoding.  Usually on Linux hosts, this means UTF-8 with Unix-"
+"style line endings.  Since Windows regedit files are often in UTF-16LE with "
+"Windows-style line endings, you may need to reencode the whole file before "
+"or after processing."

 msgstr ""
 
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../tools/virt-resize.pl:382
+#: ../tools/virt-win-reg.pl:425

 msgid ""
 msgid ""

-"The amount by which the overall disk must be shrunk (after carrying out all "
-"other operations requested by the user) is called the \"deficit\".  For "
-"example, a straight copy (assume no other operations)  from a 5GB disk image "
-"to a 4GB disk image results in a 1GB deficit.  In this case, virt-resize "
-"would give an error unless the user specified a partition to shrink and that "
-"partition had more than a gigabyte of free space."
+"To reencode a file from Windows format to Linux (before processing it with "
+"the I<--merge> option), you would do something like this:"

 msgstr ""
 
 msgstr ""
 

-# type: =item
-#. type: =item
-#: ../tools/virt-resize.pl:396
-msgid "B<--ignore part>"
+# type: verbatim
+#. type: verbatim
+#: ../tools/virt-win-reg.pl:428
+#, no-wrap
+msgid ""
+" iconv -f utf-16le -t utf-8 < win.reg | dos2unix > linux.reg\n"
+"\n"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../tools/virt-resize.pl:398
+#: ../tools/virt-win-reg.pl:430

 msgid ""
 msgid ""

-"Ignore the named partition.  Effectively this means the partition is "
-"allocated on the destination disk, but the content is not copied across from "
-"the source disk.  The content of the partition will be blank (all zero "
-"bytes)."
-msgstr ""
-
-# type: =item
-#. type: =item
-#: ../tools/virt-resize.pl:409
-msgid "B<--delete part>"
+"To go in the opposite direction, after exporting and before sending the file "
+"to a Windows user, do something like this:"

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../tools/virt-resize.pl:411
+# type: verbatim
+#. type: verbatim
+#: ../tools/virt-win-reg.pl:433
+#, no-wrap

 msgid ""
 msgid ""

-"Delete the named partition.  It would be more accurate to describe this as "
-"\"don't copy it over\", since virt-resize doesn't do in-place changes and "
-"the original disk image is left intact."
+" unix2dos linux.reg | iconv -f utf-8 -t utf-16le > win.reg\n"
+"\n"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../tools/virt-resize.pl:415
-msgid ""
-"Note that when you delete a partition, then anything contained in the "
-"partition is also deleted.  Furthermore, this causes any partitions that "
-"come after to be I<renumbered>, which can easily make your guest unbootable."
-msgstr ""
-
-# type: =item
-#. type: =item
-#: ../tools/virt-resize.pl:426
-msgid "B<--LV-expand logvol>"
+#: ../tools/virt-win-reg.pl:435
+msgid "For more information about encoding, see L<Win::Hivex::Regedit(3)>."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../tools/virt-resize.pl:428
+#: ../tools/virt-win-reg.pl:437

 msgid ""
 msgid ""

-"This takes the logical volume and, as a final step, expands it to fill all "
-"the space available in its volume group.  A typical usage, assuming a Linux "
-"guest with a single PV C</dev/sda2> and a root device called C</dev/vg_guest/"
-"lv_root> would be:"
+"If you are unsure about the current encoding, use the L<file(1)> command.  "
+"Recent versions of Windows regedit.exe produce a UTF-16LE file with Windows-"
+"style (CRLF) line endings, like this:"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../tools/virt-resize.pl:433
+#: ../tools/virt-win-reg.pl:441

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" virt-resize indisk outdisk \\\n"
-"   --expand /dev/sda2 --LV-expand /dev/vg_guest/lv_root\n"
+" $ file software.reg\n"
+" software.reg: Little-endian UTF-16 Unicode text, with very long lines,\n"
+" with CRLF line terminators\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #. type: textblock

-#: ../tools/virt-resize.pl:436
-msgid ""
-"This would first expand the partition (and PV), and then expand the root "
-"device to fill the extra space in the PV."
+#: ../tools/virt-win-reg.pl:445
+msgid "This file would need conversion before you could I<--merge> it."

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../tools/virt-resize.pl:439
-msgid ""
-"The contents of the LV are also resized if virt-resize knows how to do "
-"that.  You can stop virt-resize from trying to expand the content by using "
-"the option C<--no-expand-content>."
+# type: =head2
+#. type: =head1
+#: ../tools/virt-win-reg.pl:447
+msgid "CurrentControlSet etc."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../tools/virt-resize.pl:443
-msgid "Use L<virt-filesystems(1)> to list the filesystems in the guest."
+#: ../tools/virt-win-reg.pl:449
+msgid ""
+"Registry keys like C<CurrentControlSet> don't really exist in the Windows "
+"Registry at the level of the hive file, and therefore you cannot modify "
+"these."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../tools/virt-resize.pl:446
+#: ../tools/virt-win-reg.pl:453

 msgid ""
 msgid ""

-"You can give this option multiple times, I<but> it doesn't make sense to do "
-"this unless the logical volumes you specify are all in different volume "
-"groups."
+"C<CurrentControlSet> is usually an alias for C<ControlSet001>.  In some "
+"circumstances it might refer to another control set.  The way to find out is "
+"to look at the C<HKLM\\SYSTEM\\Select> key:"

 msgstr ""
 
 msgstr ""
 

-# type: =item
-#. type: =item
-#: ../tools/virt-resize.pl:454
-msgid "B<--no-copy-boot-loader>"
+# type: verbatim
+#. type: verbatim
+#: ../tools/virt-win-reg.pl:457
+#, no-wrap
+msgid ""
+" # virt-win-reg WindowsGuest 'HKLM\\SYSTEM\\Select'\n"
+" [HKEY_LOCAL_MACHINE\\SYSTEM\\Select]\n"
+" \"Current\"=dword:00000001\n"
+" \"Default\"=dword:00000001\n"
+" \"Failed\"=dword:00000000\n"
+" \"LastKnownGood\"=dword:00000002\n"
+"\n"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../tools/virt-resize.pl:456
-msgid ""
-"By default, virt-resize copies over some sectors at the start of the disk "
-"(up to the beginning of the first partition).  Commonly these sectors "
-"contain the Master Boot Record (MBR) and the boot loader, and are required "
-"in order for the guest to boot correctly."
+#: ../tools/virt-win-reg.pl:464
+msgid "\"Current\" is the one which Windows will choose when it boots."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../tools/virt-resize.pl:461
+#: ../tools/virt-win-reg.pl:466

 msgid ""
 msgid ""

-"If you specify this flag, then this initial copy is not done.  You may need "
-"to reinstall the boot loader in this case."
+"Similarly, other C<Current...> keys in the path may need to be replaced."

 msgstr ""
 
 msgstr ""
 

-# type: =item
-#. type: =item
-#: ../tools/virt-resize.pl:469
-msgid "B<--no-extra-partition>"
+# type: =head1
+#. type: =head1
+#: ../tools/virt-win-reg.pl:469
+msgid "WINDOWS TIPS"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../tools/virt-resize.pl:471
+#: ../tools/virt-win-reg.pl:471

 msgid ""
 msgid ""

-"By default, virt-resize creates an extra partition if there is any extra, "
-"unused space after all resizing has happened.  Use this option to prevent "
-"the extra partition from being created.  If you do this then the extra space "
-"will be inaccessible until you run fdisk, parted, or some other partitioning "
-"tool in the guest."
+"Note that some of these tips modify the guest disk image.  The guest I<must> "
+"be shut off, else you will get disk corruption."
+msgstr ""
+
+# type: =head2
+#. type: =head2
+#: ../tools/virt-win-reg.pl:474
+msgid "RUNNING A BATCH SCRIPT WHEN A USER LOGS IN"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../tools/virt-resize.pl:477
+#: ../tools/virt-win-reg.pl:476

 msgid ""
 msgid ""

-"Note that if the surplus space is smaller than 10 MB, no extra partition "
-"will be created."
+"Prepare a DOS batch script, VBScript or executable.  Upload this using "
+"L<guestfish(1)>.  For this example the script is called C<test.bat> and it "
+"is uploaded into C<C:\\>:"

 msgstr ""
 
 msgstr ""
 

-# type: =item
-#. type: =item
-#: ../tools/virt-resize.pl:484
-msgid "B<--no-expand-content>"
+# type: verbatim
+#. type: verbatim
+#: ../tools/virt-win-reg.pl:480
+#, no-wrap
+msgid ""
+" guestfish -i -d WindowsGuest upload test.bat /test.bat\n"
+"\n"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../tools/virt-resize.pl:486
+#: ../tools/virt-win-reg.pl:482
+msgid "Prepare a regedit file containing the registry change:"
+msgstr ""
+
+# type: verbatim
+#. type: verbatim
+#: ../tools/virt-win-reg.pl:484
+#, no-wrap

 msgid ""
 msgid ""

-"By default, virt-resize will try to expand the direct contents of "
-"partitions, if it knows how (see C<--expand> option above)."
+" cat > test.reg <<'EOF'\n"
+" [HKLM\\Software\\Microsoft\\Windows\\CurrentVersion\\RunOnce]\n"
+" \"Test\"=\"c:\\\\test.bat\"\n"
+" EOF\n"
+"\n"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../tools/virt-resize.pl:489
+#: ../tools/virt-win-reg.pl:489

 msgid ""
 msgid ""

-"If you give the C<--no-expand-content> option then virt-resize will not "
-"attempt this."
-msgstr ""
-
-# type: =item
-#. type: =item
-#: ../tools/virt-resize.pl:496
-msgid "B<-d> | B<--debug>"
-msgstr ""
-
-# type: =item
-#. type: =item
-#: ../tools/virt-resize.pl:504
-msgid "B<-n> | B<--dryrun>"
+"In this example we use the key C<RunOnce> which means that the script will "
+"run precisely once when the first user logs in.  If you want it to run every "
+"time a user logs in, replace C<RunOnce> with C<Run>."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../tools/virt-resize.pl:506
-msgid "Print a summary of what would be done, but don't do anything."
+#: ../tools/virt-win-reg.pl:493
+msgid "Now update the registry:"

 msgstr ""
 
 msgstr ""
 

-# type: =item
-#. type: =item
-#: ../tools/virt-resize.pl:512
-msgid "B<-q> | B<--quiet>"
+# type: verbatim
+#. type: verbatim
+#: ../tools/virt-win-reg.pl:495
+#, no-wrap
+msgid ""
+" virt-win-reg --merge WindowsGuest test.reg\n"
+"\n"

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../tools/virt-resize.pl:514
-msgid "Don't print the summary."
+# type: =head2
+#. type: =head2
+#: ../tools/virt-win-reg.pl:497
+msgid "INSTALLING A SERVICE"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../tools/virt-resize.pl:522
+#: ../tools/virt-win-reg.pl:499

 msgid ""
 msgid ""

-"Specify the format of the input disk image.  If this flag is not given then "
-"it is auto-detected from the image itself."
+"This section assumes you are familiar with Windows services, and you either "
+"have a program which handles the Windows Service Control Protocol directly "
+"or you want to run any program using a service wrapper like SrvAny or the "
+"free RHSrvAny."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../tools/virt-resize.pl:528
+#: ../tools/virt-win-reg.pl:504

 msgid ""
 msgid ""

-"Note that this option I<does not> affect the output format.  See L</QCOW2 "
-"AND NON-SPARSE RAW FORMATS>."
-msgstr ""
-
-# type: =item
-#. type: =item
-#: ../tools/virt-resize.pl:535
-msgid "B<--output-format> raw"
+"First upload the program and optionally the service wrapper.  In this case "
+"the test program is called C<test.exe> and we are using the RHSrvAny wrapper:"

 msgstr ""
 
 msgstr ""
 

-# type: textblock
-#. type: textblock
-#: ../tools/virt-resize.pl:537
+# type: verbatim
+#. type: verbatim
+#: ../tools/virt-win-reg.pl:508
+#, no-wrap

 msgid ""
 msgid ""

-"Specify the format of the output disk image.  If this flag is not given then "
-"it is auto-detected from the image itself."
+" guestfish -i -d WindowsGuest <<EOF\n"
+"   upload rhsrvany.exe /rhsrvany.exe\n"
+"   upload test.exe /test.exe\n"
+" EOF\n"
+"\n"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../tools/virt-resize.pl:543
+#: ../tools/virt-win-reg.pl:513

 msgid ""
 msgid ""

-"Note that you still need to create the output disk with the right format.  "
-"See L</QCOW2 AND NON-SPARSE RAW FORMATS>."
+"Prepare a regedit file containing the registry changes.  In this example, "
+"the first registry change is needed for the service itself or the service "
+"wrapper (if used).  The second registry change is only needed because I am "
+"using the RHSrvAny service wrapper."

 msgstr ""
 
 msgstr ""
 

-# type: =head1
-#. type: =head1
-#: ../tools/virt-resize.pl:1419
-msgid "NOTES"
+# type: verbatim
+#. type: verbatim
+#: ../tools/virt-win-reg.pl:518
+#, no-wrap
+msgid ""
+" cat > service.reg <<'EOF'\n"
+" [HKLM\\SYSTEM\\ControlSet001\\services\\RHSrvAny]\n"
+" \"Type\"=dword:00000010\n"
+" \"Start\"=dword:00000002\n"
+" \"ErrorControl\"=dword:00000001\n"
+" \"ImagePath\"=\"c:\\\\rhsrvany.exe\"\n"
+" \"DisplayName\"=\"RHSrvAny\"\n"
+" \"ObjectName\"=\"NetworkService\"\n"
+" \n"

 msgstr ""
 
 msgstr ""
 

-# type: =head2
-#. type: =head2
-#: ../tools/virt-resize.pl:1421
-msgid "\"Partition 1 does not end on cylinder boundary.\""
+# type: verbatim
+#. type: verbatim
+#: ../tools/virt-win-reg.pl:527
+#, no-wrap
+msgid ""
+" [HKLM\\SYSTEM\\ControlSet001\\services\\RHSrvAny\\Parameters]\n"
+" \"CommandLine\"=\"c:\\\\test.exe\"\n"
+" \"PWD\"=\"c:\\\\Temp\"\n"
+" EOF\n"
+"\n"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../tools/virt-resize.pl:1423
+#: ../tools/virt-win-reg.pl:538

 msgid ""
 msgid ""

-"Virt-resize aligns partitions to multiples of 64 sectors.  Usually this "
-"means the partitions will not be aligned to the ancient CHS geometry.  "
-"However CHS geometry is meaningless for disks manufactured since the early "
-"1990s, and doubly so for virtual hard drives.  Alignment of partitions to "
-"cylinders is not required by any modern operating system."
-msgstr ""
-
-# type: =head2
-#. type: =head2
-#: ../tools/virt-resize.pl:1430
-msgid "RESIZING WINDOWS VIRTUAL MACHINES"
+"For use of C<ControlSet001> see the section above in this manual page.  You "
+"may need to adjust this according to the control set that is in use by the "
+"guest."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../tools/virt-resize.pl:1432
+#: ../tools/virt-win-reg.pl:544

 msgid ""
 msgid ""

-"In Windows Vista and later versions, Microsoft switched to using a separate "
-"boot partition.  In these VMs, typically C</dev/sda1> is the boot partition "
-"and C</dev/sda2> is the main (C:) drive.  We have not had any luck resizing "
-"the boot partition.  Doing so seems to break the guest completely.  However "
-"expanding the second partition (ie. C: drive) should work."
+"C<\"ObjectName\"> controls the privileges that the service will have.  An "
+"alternative is C<\"ObjectName\"=\"LocalSystem\"> which would be the most "
+"privileged account."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../tools/virt-resize.pl:1439
+#: ../tools/virt-win-reg.pl:550

 msgid ""
 msgid ""

-"Windows may initiate a lengthy \"chkdsk\" on first boot after a resize, if "
-"NTFS partitions have been expanded.  This is just a safety check and (unless "
-"it find errors) is nothing to worry about."
-msgstr ""
-
-# type: =head2
-#. type: =head2
-#: ../tools/virt-resize.pl:1443
-msgid "GUEST BOOT STUCK AT \"GRUB\""
+"For the meaning of the magic numbers, see this Microsoft KB article: "
+"L<http://support.microsoft.com/kb/103000>."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../tools/virt-resize.pl:1445
-msgid ""
-"If a Linux guest does not boot after resizing, and the boot is stuck after "
-"printing C<GRUB> on the console, try reinstalling grub.  This sometimes "
-"happens on older (RHEL 5-era) guests, for reasons we don't fully understand, "
-"although we think is to do with partition alignment."
+#: ../tools/virt-win-reg.pl:555
+msgid "Update the registry:"

 msgstr ""
 
 # type: verbatim
 #. type: verbatim
 msgstr ""
 
 # type: verbatim
 #. type: verbatim

-#: ../tools/virt-resize.pl:1450
+#: ../tools/virt-win-reg.pl:557

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" guestfish -i -a newdisk\n"
-" ><fs> cat /boot/grub/device.map\n"
-" # check the contents of this file are sensible or\n"
-" # edit the file if necessary\n"
-" ><fs> grub-install / /dev/vda\n"
-" ><fs> exit\n"
+" virt-win-reg --merge WindowsGuest service.reg\n"

 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock
 "\n"
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../tools/virt-resize.pl:1457
+#: ../tools/virt-win-reg.pl:561

 msgid ""
 msgid ""

-"For more flexible guest reconfiguration, including if you need to specify "
-"other parameters to grub-install, use L<virt-rescue(1)>."
+"Be careful when passing parameters containing C<\\> (backslash) in the "
+"shell.  Usually you will have to use 'single quotes' or double backslashes "
+"(but not both) to protect them from the shell."

 msgstr ""
 
 msgstr ""
 

-# type: =head1
-#. type: =head1
-#: ../tools/virt-resize.pl:1460
-msgid "ALTERNATIVE TOOLS"
+# type: textblock
+#. type: textblock
+#: ../tools/virt-win-reg.pl:565
+msgid "Paths and value names are case-insensitive."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../tools/virt-resize.pl:1462
+#: ../tools/virt-win-reg.pl:574

 msgid ""
 msgid ""

-"There are several proprietary tools for resizing partitions.  We won't "
-"mention any here."
+"L<hivex(3)>, L<hivexsh(1)>, L<hivexregedit(1)>, L<guestfs(3)>, L<guestfish(1)"
+">, L<virt-cat(1)>, L<Sys::Guestfs(3)>, L<Sys::Guestfs::Lib(3)>, L<Win::Hivex"
+"(3)>, L<Win::Hivex::Regedit(3)>, L<Sys::Virt(3)>, L<http://libguestfs.org/>."

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../tools/virt-resize.pl:1465
+#: ../tools/virt-win-reg.pl:589 ../tools/virt-make-fs.pl:555
+msgid ""
+"When reporting bugs, please enable debugging and capture the I<complete> "
+"output:"
+msgstr ""
+
+# type: verbatim
+#. type: verbatim
+#: ../tools/virt-win-reg.pl:592
+#, no-wrap

 msgid ""
 msgid ""

-"L<parted(8)> and its graphical shell gparted can do some types of resizing "
-"operations on disk images.  They can resize and move partitions, but I don't "
-"think they can do anything with the contents, and they certainly don't "
-"understand LVM."
+" export LIBGUESTFS_DEBUG=1\n"
+" virt-win-reg --debug [... rest ...] > /tmp/virt-win-reg.log 2>&1\n"
+"\n"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../tools/virt-resize.pl:1470
+#: ../tools/virt-win-reg.pl:595

 msgid ""
 msgid ""

-"L<guestfish(1)> can do everything that virt-resize can do and a lot more, "
-"but at a much lower level.  You will probably end up hand-calculating sector "
-"offsets, which is something that virt-resize was designed to avoid.  If you "
-"want to see the guestfish-equivalent commands that virt-resize runs, use the "
-"C<--debug> flag."
+"Attach /tmp/virt-win-reg.log to a new bug report at L<https://bugzilla."
+"redhat.com/>"

 msgstr ""
 
 # type: textblock
 #. type: textblock
 msgstr ""
 
 # type: textblock
 #. type: textblock

-#: ../tools/virt-resize.pl:1485
-msgid ""
-"L<virt-filesystems(1)>, L<virt-df(1)>, L<guestfs(3)>, L<guestfish(1)>, L<lvm"
-"(8)>, L<pvresize(8)>, L<lvresize(8)>, L<resize2fs(8)>, L<ntfsresize(8)>, "
-"L<virsh(1)>, L<parted(8)>, L<truncate(1)>, L<fallocate(1)>, L<grub(8)>, "
-"L<grub-install(8)>, L<virt-rescue(1)>, L<Sys::Guestfs(3)>, L<http://"
-"libguestfs.org/>."
+#: ../tools/virt-win-reg.pl:604 ../tools/virt-make-fs.pl:570
+msgid "Copyright (C) 2010 Red Hat Inc."

 msgstr ""
 
 # type: textblock
 msgstr ""
 
 # type: textblock


@@ -34159,20 +34146,18 @@ msgid ""
 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #: ../tools/virt-tar.pl:66
 msgid ""
 #. type: textblock
 #: ../tools/virt-tar.pl:66
 msgid ""

-"You must I<not> use C<virt-tar> with the C<-u> option (upload) on live "
+"You must I<not> use C<virt-tar> with the I<-u> option (upload) on live "

 "virtual machines.  If you do this, you risk disk corruption in the VM.  "
 "C<virt-tar> tries to stop you from doing this, but doesn't catch all cases."
 msgstr ""
 
 "virtual machines.  If you do this, you risk disk corruption in the VM.  "
 "C<virt-tar> tries to stop you from doing this, but doesn't catch all cases."
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #: ../tools/virt-tar.pl:71
 msgid ""
 #. type: textblock
 #: ../tools/virt-tar.pl:71
 msgid ""

-"You can use C<-x> (extract) on live virtual machines, but you might get "
+"You can use I<-x> (extract) on live virtual machines, but you might get "

 "inconsistent results or errors if there is filesystem activity inside the "
 "VM.  If the live VM is synched and quiescent, then C<virt-tar> will usually "
 "work, but the only way to guarantee consistent results is if the virtual "
 "inconsistent results or errors if there is filesystem activity inside the "
 "VM.  If the live VM is synched and quiescent, then C<virt-tar> will usually "
 "work, but the only way to guarantee consistent results is if the virtual "


@@ -34198,22 +34183,20 @@ msgid ""
 "should look at the L<guestfish(1)> tool."
 msgstr ""
 
 "should look at the L<guestfish(1)> tool."
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #: ../tools/virt-tar.pl:88
 msgid ""
 #. type: textblock
 #: ../tools/virt-tar.pl:88
 msgid ""

-"There are two modes of operation: C<-x> (eXtract) downloads a directory and "
+"There are two modes of operation: I<-x> (eXtract) downloads a directory and "

 "its contents (recursively) from the virtual machine into a local tarball.  "
 "its contents (recursively) from the virtual machine into a local tarball.  "

-"C<-u> uploads from a local tarball, unpacking it into a directory inside the "
+"I<-u> uploads from a local tarball, unpacking it into a directory inside the "

 "virtual machine.  You cannot use these two options together."
 msgstr ""
 
 "virtual machine.  You cannot use these two options together."
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #: ../tools/virt-tar.pl:94
 msgid ""
 #. type: textblock
 #: ../tools/virt-tar.pl:94
 msgid ""

-"In addition, you may need to use the C<-z> (gZip) option to enable "
-"compression.  When uploading, you have to specify C<-z> if the upload file "
+"In addition, you may need to use the I<-z> (gZip) option to enable "
+"compression.  When uploading, you have to specify I<-z> if the upload file "

 "is compressed because virt-tar won't detect this on its own."
 msgstr ""
 
 "is compressed because virt-tar won't detect this on its own."
 msgstr ""
 


@@ -34239,19 +34222,17 @@ msgstr ""
 msgid "B<-u> | B<--upload>"
 msgstr ""
 
 msgid "B<-u> | B<--upload>"
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #: ../tools/virt-tar.pl:160
 msgid ""
 #. type: textblock
 #: ../tools/virt-tar.pl:160
 msgid ""

-"Use C<-x> to extract (download) a directory from a virtual machine to a "
+"Use I<-x> to extract (download) a directory from a virtual machine to a "

 "local tarball."
 msgstr ""
 
 "local tarball."
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #: ../tools/virt-tar.pl:163
 msgid ""
 #. type: textblock
 #: ../tools/virt-tar.pl:163
 msgid ""

-"Use C<-u> to upload and unpack from a local tarball into a virtual machine.  "
+"Use I<-u> to upload and unpack from a local tarball into a virtual machine.  "

 "Please read the L</WARNING> section above before using this option."
 msgstr ""
 
 "Please read the L</WARNING> section above before using this option."
 msgstr ""
 


@@ -34359,7 +34340,6 @@ msgstr ""
 msgid "EXTRA SPACE"
 msgstr ""
 
 msgid "EXTRA SPACE"
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #: ../tools/virt-make-fs.pl:69
 msgid ""
 #. type: textblock
 #: ../tools/virt-make-fs.pl:69
 msgid ""


@@ -34368,19 +34348,18 @@ msgid ""
 "you are going to use the output, you might think this extra space is wasted "
 "and want to minimize it, or you might want to leave space so that more files "
 "can be added later.  Virt-make-fs defaults to minimizing the extra space, "
 "you are going to use the output, you might think this extra space is wasted "
 "and want to minimize it, or you might want to leave space so that more files "
 "can be added later.  Virt-make-fs defaults to minimizing the extra space, "

-"but you can use the C<--size> flag to leave space in the filesystem if you "
+"but you can use the I<--size> flag to leave space in the filesystem if you "

 "want it."
 msgstr ""
 
 "want it."
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #: ../tools/virt-make-fs.pl:77
 msgid ""
 "An alternative way to leave extra space but not make the output image any "
 "bigger is to use an alternative disk image format (instead of the default "
 #. type: textblock
 #: ../tools/virt-make-fs.pl:77
 msgid ""
 "An alternative way to leave extra space but not make the output image any "
 "bigger is to use an alternative disk image format (instead of the default "

-"\"raw\" format).  Using C<--format=qcow2> will use the native QEmu/KVM qcow2 "
+"\"raw\" format).  Using I<--format=qcow2> will use the native QEmu/KVM qcow2 "

 "image format (check your hypervisor supports this before using it).  This "
 "image format (check your hypervisor supports this before using it).  This "

-"allows you to choose a large C<--size> but the extra space won't actually be "
+"allows you to choose a large I<--size> but the extra space won't actually be "

 "allocated in the image until you try to store something in it."
 msgstr ""
 
 "allocated in the image until you try to store something in it."
 msgstr ""
 


@@ -34577,11 +34556,10 @@ msgstr ""
 msgid "B<-s +E<lt>NE<gt>>"
 msgstr ""
 
 msgid "B<-s +E<lt>NE<gt>>"
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #: ../tools/virt-make-fs.pl:193
 msgid ""
 #. type: textblock
 #: ../tools/virt-make-fs.pl:193
 msgid ""

-"Use the C<--size> (or C<-s>) option to choose the size of the output image."
+"Use the I<--size> (or I<-s>) option to choose the size of the output image."

 msgstr ""
 
 # type: textblock
 msgstr ""
 
 # type: textblock


@@ -34602,13 +34580,12 @@ msgid ""
 "files, else you will get an error."
 msgstr ""
 
 "files, else you will get an error."
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #: ../tools/virt-make-fs.pl:204
 msgid ""
 "To leave extra space, specify C<+> (plus sign) and a number followed by b/K/"
 "M/G/T/P/E to mean bytes, Kilobytes, Megabytes, Gigabytes, Terabytes, "
 #. type: textblock
 #: ../tools/virt-make-fs.pl:204
 msgid ""
 "To leave extra space, specify C<+> (plus sign) and a number followed by b/K/"
 "M/G/T/P/E to mean bytes, Kilobytes, Megabytes, Gigabytes, Terabytes, "

-"Petabytes or Exabytes.  For example: C<--size=+200M> means enough space for "
+"Petabytes or Exabytes.  For example: I<--size=+200M> means enough space for "

 "the input files, and (approximately) an extra 200 MB free space."
 msgstr ""
 
 "the input files, and (approximately) an extra 200 MB free space."
 msgstr ""
 


@@ -34704,19 +34681,17 @@ msgid ""
 "If specified, this flag adds an MBR partition table to the output disk image."
 msgstr ""
 
 "If specified, this flag adds an MBR partition table to the output disk image."
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #: ../tools/virt-make-fs.pl:256
 msgid ""
 #. type: textblock
 #: ../tools/virt-make-fs.pl:256
 msgid ""

-"You can change the partition table type, eg. C<--partition=gpt> for large "
+"You can change the partition table type, eg. I<--partition=gpt> for large "

 "disks."
 msgstr ""
 
 "disks."
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #: ../tools/virt-make-fs.pl:259
 msgid ""
 #. type: textblock
 #: ../tools/virt-make-fs.pl:259
 msgid ""

-"Note that if you just use a lonesome C<--partition>, the Perl option parser "
+"Note that if you just use a lonesome I<--partition>, the Perl option parser "

 "might consider the next parameter to be the partition type.  For example:"
 msgstr ""
 
 "might consider the next parameter to be the partition type.  For example:"
 msgstr ""
 


@@ -34729,12 +34704,11 @@ msgid ""
 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-# type: textblock

 #. type: textblock
 #: ../tools/virt-make-fs.pl:265
 msgid ""
 "would cause virt-make-fs to think you wanted to use a partition type of "
 #. type: textblock
 #: ../tools/virt-make-fs.pl:265
 msgid ""
 "would cause virt-make-fs to think you wanted to use a partition type of "

-"C<input.tar> which is completely wrong.  To avoid this, use C<--> (a double "
+"C<input.tar> which is completely wrong.  To avoid this, use I<--> (a double "

 "dash) between options and the input file argument:"
 msgstr ""
 
 "dash) between options and the input file argument:"
 msgstr ""
 


@@ -34857,3 +34831,9 @@ msgid ""
 "filesystems(1)>, L<virt-resize(1)>, L<Sys::Guestfs(3)>, L<Sys::Guestfs::Lib"
 "(3)>, L<Sys::Virt(3)>, L<http://libguestfs.org/>."
 msgstr ""
 "filesystems(1)>, L<virt-resize(1)>, L<Sys::Guestfs(3)>, L<Sys::Guestfs::Lib"
 "(3)>, L<Sys::Virt(3)>, L<http://libguestfs.org/>."
 msgstr ""

+
+# type: textblock
+#. type: textblock
+#: ../tools/virt-list-partitions.pl:275
+msgid "Copyright (C) 2009-2010 Red Hat Inc."
+msgstr ""