summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--BUGS21
-rw-r--r--configure.ac2
-rw-r--r--po-docs/ja.po265
-rw-r--r--po-docs/libguestfs-docs.pot267
-rw-r--r--po-docs/uk.po267
-rw-r--r--po/en_GB.po28
-rw-r--r--po/es.po28
-rw-r--r--po/gu.po28
-rw-r--r--po/hi.po28
-rw-r--r--po/kn.po28
-rw-r--r--po/libguestfs.pot30
-rw-r--r--po/ml.po28
-rw-r--r--po/mr.po28
-rw-r--r--po/nl.po28
-rw-r--r--po/or.po28
-rw-r--r--po/pa.po28
-rw-r--r--po/pl.po28
-rw-r--r--po/ta.po28
-rw-r--r--po/te.po28
-rw-r--r--po/uk.po28
20 files changed, 786 insertions, 458 deletions
diff --git a/BUGS b/BUGS
index 7ed72d45..0f1788e9 100644
--- a/BUGS
+++ b/BUGS
@@ -1,5 +1,5 @@
NOTE: This file is automatically generated from "update-bugs.sh".
-Last updated: 2012-07-07
+Last updated: 2012-07-10
This contains a local list of the bugs that are open against
libguestfs. Bugs are tracked in the Red Hat Bugzilla database
@@ -185,9 +185,6 @@ Bugs in NEW or ASSIGNED state are open and waiting for someone to fix.
824782 NEW https://bugzilla.redhat.com/show_bug.cgi?id=824782
virt-resize cannot resize PowerPC guests
-825034 NEW https://bugzilla.redhat.com/show_bug.cgi?id=825034
- libguestfs has bad depndency on /lib/libusb-1.0.so.0
-
830135 NEW https://bugzilla.redhat.com/show_bug.cgi?id=830135
libguestfs should support mount-local APIs in RHEL 6 (for OpenStack)
@@ -209,9 +206,6 @@ Bugs in NEW or ASSIGNED state are open and waiting for someone to fix.
836501 NEW https://bugzilla.redhat.com/show_bug.cgi?id=836501
dependency on fuse suggested
-836710 NEW https://bugzilla.redhat.com/show_bug.cgi?id=836710
- Data loss when writing to qcow2-format disk files
-
837691 NEW https://bugzilla.redhat.com/show_bug.cgi?id=837691
Data loss when writing to qcow2-format disk files
@@ -221,6 +215,12 @@ Bugs in NEW or ASSIGNED state are open and waiting for someone to fix.
838081 NEW https://bugzilla.redhat.com/show_bug.cgi?id=838081
ocaml/t/guestfs_500_parallel_mount_local crashes in caml_thread_reinitialize
+838609 NEW https://bugzilla.redhat.com/show_bug.cgi?id=838609
+ guestmount + fusermount allows a race condition when unmounting and immediately using the disk image
+
+838904 NEW https://bugzilla.redhat.com/show_bug.cgi?id=838904
+ make-debian-img.sh failed: /dev/debian/root: not found: device not cleared. Aborting. Failed to wipe start of new LV.
+
503134 ASSIGNED https://bugzilla.redhat.com/show_bug.cgi?id=503134
guestfish's list splitting does not recognize internal quoting
@@ -239,11 +239,4 @@ Bugs in NEW or ASSIGNED state are open and waiting for someone to fix.
713678 ASSIGNED https://bugzilla.redhat.com/show_bug.cgi?id=713678
Not all febootstrap messages are redirected to log callbacks
---------------------------------------------------
-Bugs in MODIFIED, POST or ON_QA state are fixed.
-You can help by testing the fixes.
-
-749828 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=749828
- p2v does not support raid devices
-
End of BUGS file.
diff --git a/configure.ac b/configure.ac
index ef51a860..07b718ca 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,7 +20,7 @@
# freeform string.
m4_define([libguestfs_major], [1])
m4_define([libguestfs_minor], [16])
-m4_define([libguestfs_release], [27])
+m4_define([libguestfs_release], [28])
AC_INIT([libguestfs],libguestfs_major.libguestfs_minor.libguestfs_release)
AC_CONFIG_AUX_DIR([build-aux])
diff --git a/po-docs/ja.po b/po-docs/ja.po
index 7a9c5a32..693ef5f3 100644
--- a/po-docs/ja.po
+++ b/po-docs/ja.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: libguestfs@redhat.com\n"
-"POT-Creation-Date: 2012-07-07 13:58+0200\n"
+"POT-Creation-Date: 2012-07-10 13:19+0200\n"
"PO-Revision-Date: 2012-01-23 13:10+0000\n"
"Last-Translator: rjones <rjones@redhat.com>\n"
"Language-Team: Japanese <trans-ja@lists.fedoraproject.org>\n"
@@ -268,7 +268,7 @@ msgstr ""
#: ../fish/guestfish.pod:148 ../fish/virt-copy-in.pod:45
#: ../fish/virt-copy-out.pod:34 ../fish/virt-tar-in.pod:42
#: ../fish/virt-tar-out.pod:36 ../format/virt-format.pod:59
-#: ../fuse/guestmount.pod:92 ../inspector/virt-inspector.pod:54
+#: ../fuse/guestmount.pod:127 ../inspector/virt-inspector.pod:54
#: ../rescue/virt-rescue.pod:112 ../resize/virt-resize.pod:262
#: ../sparsify/virt-sparsify.pod:100 ../test-tool/libguestfs-test-tool.pod:36
#: ../tools/virt-list-filesystems.pl:55 ../tools/virt-list-partitions.pl:56
@@ -282,7 +282,7 @@ msgstr ""
#: ../cat/virt-filesystems.pod:95 ../cat/virt-ls.pod:265
#: ../clone/virt-sysprep.pod:46 ../df/virt-df.pod:63 ../edit/virt-edit.pod:66
#: ../fish/guestfish.pod:152 ../format/virt-format.pod:63
-#: ../fuse/guestmount.pod:160 ../inspector/virt-inspector.pod:58
+#: ../fuse/guestmount.pod:195 ../inspector/virt-inspector.pod:58
#: ../rescue/virt-rescue.pod:116 ../resize/virt-resize.pod:266
#: ../sparsify/virt-sparsify.pod:104 ../test-tool/libguestfs-test-tool.pod:40
#: ../tools/virt-list-filesystems.pl:63 ../tools/virt-list-partitions.pl:64
@@ -330,7 +330,7 @@ msgstr ""
#: ../cat/virt-filesystems.pod:107 ../cat/virt-ls.pod:277
#: ../clone/virt-sysprep.pod:56 ../df/virt-df.pod:75 ../edit/virt-edit.pod:78
#: ../fish/guestfish.pod:174 ../format/virt-format.pod:73
-#: ../fuse/guestmount.pod:102 ../inspector/virt-inspector.pod:70
+#: ../fuse/guestmount.pod:137 ../inspector/virt-inspector.pod:70
#: ../rescue/virt-rescue.pod:128
msgid ""
"The format of the disk image is auto-detected. To override this and force a "
@@ -406,7 +406,7 @@ msgstr ""
#: ../cat/virt-filesystems.pod:170 ../cat/virt-ls.pod:328
#: ../clone/virt-sysprep.pod:95 ../df/virt-df.pod:101
#: ../fish/guestfish.pod:233 ../format/virt-format.pod:87
-#: ../fuse/guestmount.pod:142 ../inspector/virt-inspector.pod:98
+#: ../fuse/guestmount.pod:177 ../inspector/virt-inspector.pod:98
#: ../rescue/virt-rescue.pod:152
msgid "B<--format=raw|qcow2|..>"
msgstr ""
@@ -416,7 +416,7 @@ msgstr ""
#: ../cat/virt-filesystems.pod:172 ../cat/virt-ls.pod:330
#: ../clone/virt-sysprep.pod:97 ../df/virt-df.pod:103
#: ../edit/virt-edit.pod:134 ../fish/guestfish.pod:235
-#: ../format/virt-format.pod:89 ../fuse/guestmount.pod:144
+#: ../format/virt-format.pod:89 ../fuse/guestmount.pod:179
#: ../inspector/virt-inspector.pod:100 ../rescue/virt-rescue.pod:154
msgid "B<--format>"
msgstr ""
@@ -426,7 +426,7 @@ msgstr ""
#: ../cat/virt-filesystems.pod:174 ../cat/virt-ls.pod:332
#: ../clone/virt-sysprep.pod:99 ../df/virt-df.pod:105
#: ../edit/virt-edit.pod:136 ../fish/guestfish.pod:237
-#: ../format/virt-format.pod:91 ../fuse/guestmount.pod:146
+#: ../format/virt-format.pod:91 ../fuse/guestmount.pod:181
#: ../rescue/virt-rescue.pod:156
msgid ""
"The default for the I<-a> option is to auto-detect the format of the disk "
@@ -518,7 +518,7 @@ msgstr ""
#: ../cat/virt-filesystems.pod:261 ../cat/virt-ls.pod:425
#: ../clone/virt-sysprep.pod:138 ../df/virt-df.pod:173
#: ../edit/virt-edit.pod:161 ../fish/guestfish.pod:390
-#: ../format/virt-format.pod:145 ../fuse/guestmount.pod:266
+#: ../format/virt-format.pod:145 ../fuse/guestmount.pod:307
#: ../inspector/virt-inspector.pod:118 ../rescue/virt-rescue.pod:219
#: ../sparsify/virt-sparsify.pod:184
msgid "B<-v>"
@@ -529,7 +529,7 @@ msgstr ""
#: ../cat/virt-filesystems.pod:263 ../cat/virt-ls.pod:427
#: ../clone/virt-sysprep.pod:140 ../df/virt-df.pod:175
#: ../edit/virt-edit.pod:163 ../fish/guestfish.pod:392
-#: ../format/virt-format.pod:147 ../fuse/guestmount.pod:268
+#: ../format/virt-format.pod:147 ../fuse/guestmount.pod:309
#: ../inspector/virt-inspector.pod:120 ../rescue/virt-rescue.pod:221
#: ../sparsify/virt-sparsify.pod:186
msgid "B<--verbose>"
@@ -550,7 +550,7 @@ msgstr ""
#: ../cat/virt-filesystems.pod:267 ../cat/virt-ls.pod:431
#: ../clone/virt-sysprep.pod:144 ../df/virt-df.pod:179
#: ../edit/virt-edit.pod:167 ../fish/guestfish.pod:397
-#: ../format/virt-format.pod:151 ../fuse/guestmount.pod:272
+#: ../format/virt-format.pod:151 ../fuse/guestmount.pod:313
#: ../inspector/virt-inspector.pod:124 ../rescue/virt-rescue.pod:225
#: ../resize/virt-resize.pod:567 ../sparsify/virt-sparsify.pod:190
#: ../test-tool/libguestfs-test-tool.pod:61
@@ -562,7 +562,7 @@ msgstr ""
#: ../cat/virt-filesystems.pod:269 ../cat/virt-ls.pod:433
#: ../clone/virt-sysprep.pod:146 ../df/virt-df.pod:181
#: ../edit/virt-edit.pod:169 ../fish/guestfish.pod:399
-#: ../format/virt-format.pod:153 ../fuse/guestmount.pod:274
+#: ../format/virt-format.pod:153 ../fuse/guestmount.pod:315
#: ../inspector/virt-inspector.pod:126 ../rescue/virt-rescue.pod:227
#: ../resize/virt-resize.pod:569 ../sparsify/virt-sparsify.pod:192
#: ../test-tool/libguestfs-test-tool.pod:63
@@ -590,7 +590,7 @@ msgstr ""
#: ../cat/virt-filesystems.pod:281 ../cat/virt-ls.pod:437
#: ../clone/virt-sysprep.pod:150 ../df/virt-df.pod:185
#: ../edit/virt-edit.pod:173 ../fish/guestfish.pod:412
-#: ../format/virt-format.pod:167 ../fuse/guestmount.pod:287
+#: ../format/virt-format.pod:167 ../fuse/guestmount.pod:328
#: ../inspector/virt-inspector.pod:130 ../rescue/virt-rescue.pod:240
#: ../sparsify/virt-sparsify.pod:196 ../tools/virt-tar.pl:158
msgid "B<-x>"
@@ -906,7 +906,7 @@ msgstr ""
#: ../cat/virt-filesystems.pod:380 ../cat/virt-ls.pod:490
#: ../clone/virt-sysprep.pod:482 ../df/virt-df.pod:248
#: ../edit/virt-edit.pod:363 ../fish/guestfish.pod:1114
-#: ../format/virt-format.pod:173 ../fuse/guestmount.pod:312
+#: ../format/virt-format.pod:173 ../fuse/guestmount.pod:353
#: ../inspector/virt-inspector.pod:496 ../resize/virt-resize.pod:697
#: ../sparsify/virt-sparsify.pod:252 ../test-tool/libguestfs-test-tool.pod:96
msgid "EXIT STATUS"
@@ -1053,7 +1053,7 @@ msgstr ""
#: ../examples/guestfs-testing.pod:291 ../fish/guestfish.pod:1268
#: ../fish/virt-copy-in.pod:50 ../fish/virt-copy-out.pod:39
#: ../fish/virt-tar-in.pod:47 ../fish/virt-tar-out.pod:41
-#: ../format/virt-format.pod:177 ../fuse/guestmount.pod:317
+#: ../format/virt-format.pod:177 ../fuse/guestmount.pod:358
#: ../inspector/virt-inspector.pod:501 ../java/examples/guestfs-java.pod:45
#: ../ocaml/examples/guestfs-ocaml.pod:78 ../perl/examples/guestfs-perl.pod:39
#: ../python/examples/guestfs-python.pod:42 ../rescue/virt-rescue.pod:325
@@ -1107,7 +1107,7 @@ msgstr ""
#: ../examples/guestfs-testing.pod:302 ../fish/guestfish.pod:1300
#: ../fish/virt-copy-in.pod:64 ../fish/virt-copy-out.pod:53
#: ../fish/virt-tar-in.pod:62 ../fish/virt-tar-out.pod:55
-#: ../format/virt-format.pod:191 ../fuse/guestmount.pod:332
+#: ../format/virt-format.pod:191 ../fuse/guestmount.pod:373
#: ../inspector/virt-inspector.pod:524 ../java/examples/guestfs-java.pod:62
#: ../ocaml/examples/guestfs-ocaml.pod:95 ../perl/examples/guestfs-perl.pod:56
#: ../python/examples/guestfs-python.pod:58 ../rescue/virt-rescue.pod:338
@@ -1133,7 +1133,7 @@ msgstr ""
#: ../edit/virt-edit.pod:390 ../fish/guestfish.pod:1305
#: ../fish/virt-copy-in.pod:69 ../fish/virt-copy-out.pod:58
#: ../fish/virt-tar-in.pod:67 ../fish/virt-tar-out.pod:60
-#: ../format/virt-format.pod:195 ../fuse/guestmount.pod:337
+#: ../format/virt-format.pod:195 ../fuse/guestmount.pod:378
#: ../inspector/virt-inspector.pod:528 ../rescue/virt-rescue.pod:342
#: ../resize/virt-resize.pod:733 ../sparsify/virt-sparsify.pod:305
#: ../test-tool/libguestfs-test-tool.pod:121
@@ -1154,7 +1154,7 @@ msgstr ""
#: ../edit/virt-edit.pod:395 ../fish/guestfish.pod:1310
#: ../fish/virt-copy-in.pod:74 ../fish/virt-copy-out.pod:63
#: ../fish/virt-tar-in.pod:72 ../fish/virt-tar-out.pod:65
-#: ../format/virt-format.pod:200 ../fuse/guestmount.pod:342
+#: ../format/virt-format.pod:200 ../fuse/guestmount.pod:383
#: ../inspector/virt-inspector.pod:533 ../rescue/virt-rescue.pod:347
#: ../resize/virt-resize.pod:738 ../sparsify/virt-sparsify.pod:310
#: ../test-tool/libguestfs-test-tool.pod:126
@@ -1175,7 +1175,7 @@ msgstr ""
#: ../edit/virt-edit.pod:400 ../fish/guestfish.pod:1315
#: ../fish/virt-copy-in.pod:79 ../fish/virt-copy-out.pod:68
#: ../fish/virt-tar-in.pod:77 ../fish/virt-tar-out.pod:70
-#: ../format/virt-format.pod:205 ../fuse/guestmount.pod:347
+#: ../format/virt-format.pod:205 ../fuse/guestmount.pod:388
#: ../inspector/virt-inspector.pod:538 ../rescue/virt-rescue.pod:352
#: ../resize/virt-resize.pod:743 ../sparsify/virt-sparsify.pod:315
#: ../test-tool/libguestfs-test-tool.pod:131
@@ -1360,7 +1360,7 @@ msgstr ""
#. type: =item
#: ../cat/virt-cat.pod:98 ../cat/virt-filesystems.pod:148
#: ../cat/virt-ls.pod:314 ../edit/virt-edit.pod:112 ../fish/guestfish.pod:217
-#: ../fuse/guestmount.pod:135 ../inspector/virt-inspector.pod:91
+#: ../fuse/guestmount.pod:170 ../inspector/virt-inspector.pod:91
msgid "B<--echo-keys>"
msgstr ""
@@ -1392,14 +1392,14 @@ msgstr ""
#. type: =item
#: ../cat/virt-cat.pod:129 ../cat/virt-filesystems.pod:200
#: ../cat/virt-ls.pod:361 ../edit/virt-edit.pod:156 ../fish/guestfish.pod:289
-#: ../fuse/guestmount.pod:172 ../inspector/virt-inspector.pod:113
+#: ../fuse/guestmount.pod:207 ../inspector/virt-inspector.pod:113
msgid "B<--keys-from-stdin>"
msgstr ""
#. type: textblock
#: ../cat/virt-cat.pod:131 ../cat/virt-filesystems.pod:202
#: ../cat/virt-ls.pod:363 ../edit/virt-edit.pod:158 ../fish/guestfish.pod:291
-#: ../fuse/guestmount.pod:174 ../inspector/virt-inspector.pod:115
+#: ../fuse/guestmount.pod:209 ../inspector/virt-inspector.pod:115
msgid ""
"Read key or passphrase parameters from stdin. The default is to try to read "
"passphrases from the user by opening C</dev/tty>."
@@ -1564,7 +1564,7 @@ msgstr ""
#. type: textblock
#: ../cat/virt-cat.pod:240 ../cat/virt-filesystems.pod:382
#: ../cat/virt-ls.pod:492 ../df/virt-df.pod:250 ../edit/virt-edit.pod:365
-#: ../fuse/guestmount.pod:314 ../inspector/virt-inspector.pod:498
+#: ../fuse/guestmount.pod:355 ../inspector/virt-inspector.pod:498
#: ../resize/virt-resize.pod:699 ../sparsify/virt-sparsify.pod:254
msgid ""
"This program returns 0 if successful, or non-zero if there was an error."
@@ -3954,7 +3954,7 @@ msgid "You are not allowed to use I<-h> and I<--csv> at the same time."
msgstr ""
#. type: =item
-#: ../df/virt-df.pod:133 ../fish/guestfish.pod:258 ../fuse/guestmount.pod:164
+#: ../df/virt-df.pod:133 ../fish/guestfish.pod:258 ../fuse/guestmount.pod:199
msgid "B<-i>"
msgstr ""
@@ -4256,7 +4256,7 @@ msgstr ""
#. type: =item
#: ../edit/virt-edit.pod:95 ../fish/guestfish.pod:181
-#: ../fuse/guestmount.pod:105 ../inspector/virt-inspector.pod:73
+#: ../fuse/guestmount.pod:140 ../inspector/virt-inspector.pod:73
#: ../tools/virt-list-filesystems.pl:79 ../tools/virt-list-partitions.pl:80
#: ../tools/virt-tar.pl:127 ../tools/virt-win-reg.pl:128
msgid "B<-c URI>"
@@ -4264,7 +4264,7 @@ msgstr ""
#. type: =item
#: ../edit/virt-edit.pod:97 ../fish/guestfish.pod:183
-#: ../fuse/guestmount.pod:107 ../inspector/virt-inspector.pod:75
+#: ../fuse/guestmount.pod:142 ../inspector/virt-inspector.pod:75
#: ../tools/virt-list-filesystems.pl:81 ../tools/virt-list-partitions.pl:82
#: ../tools/virt-tar.pl:129 ../tools/virt-win-reg.pl:130
msgid "B<--connect URI>"
@@ -4881,7 +4881,7 @@ msgstr ""
#: ../examples/guestfs-testing.pod:298 ../fish/guestfish.pod:1296
#: ../fish/virt-copy-in.pod:60 ../fish/virt-copy-out.pod:49
#: ../fish/virt-tar-in.pod:58 ../fish/virt-tar-out.pod:51
-#: ../fuse/guestmount.pod:328 ../inspector/virt-inspector.pod:510
+#: ../fuse/guestmount.pod:369 ../inspector/virt-inspector.pod:510
#: ../java/examples/guestfs-java.pod:58 ../ocaml/examples/guestfs-ocaml.pod:91
#: ../perl/examples/guestfs-perl.pod:52
#: ../python/examples/guestfs-python.pod:54
@@ -4896,7 +4896,7 @@ msgstr ""
#: ../examples/guestfs-testing.pod:300 ../fish/guestfish.pod:1298
#: ../fish/virt-copy-in.pod:62 ../fish/virt-copy-out.pod:51
#: ../fish/virt-tar-in.pod:60 ../fish/virt-tar-out.pod:53
-#: ../fuse/guestmount.pod:330 ../java/examples/guestfs-java.pod:60
+#: ../fuse/guestmount.pod:371 ../java/examples/guestfs-java.pod:60
#: ../ocaml/examples/guestfs-ocaml.pod:93 ../perl/examples/guestfs-perl.pod:54
#: ../python/examples/guestfs-python.pod:56
#: ../ruby/examples/guestfs-ruby.pod:50 ../src/guestfs.pod:3356
@@ -20008,12 +20008,12 @@ msgid "Displays detailed help on a single command C<cmd>."
msgstr ""
#. type: =item
-#: ../fish/guestfish.pod:168 ../fuse/guestmount.pod:96
+#: ../fish/guestfish.pod:168 ../fuse/guestmount.pod:131
msgid "B<-a image>"
msgstr ""
#. type: =item
-#: ../fish/guestfish.pod:170 ../fuse/guestmount.pod:98
+#: ../fish/guestfish.pod:170 ../fuse/guestmount.pod:133
msgid "B<--add image>"
msgstr ""
@@ -20031,7 +20031,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../fish/guestfish.pod:185 ../fuse/guestmount.pod:109
+#: ../fish/guestfish.pod:185 ../fuse/guestmount.pod:144
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."
@@ -20050,17 +20050,17 @@ msgid ""
msgstr ""
#. type: =item
-#: ../fish/guestfish.pod:194 ../fuse/guestmount.pod:113
+#: ../fish/guestfish.pod:194 ../fuse/guestmount.pod:148
msgid "B<-d libvirt-domain>"
msgstr ""
#. type: =item
-#: ../fish/guestfish.pod:196 ../fuse/guestmount.pod:115
+#: ../fish/guestfish.pod:196 ../fuse/guestmount.pod:150
msgid "B<--domain libvirt-domain>"
msgstr ""
#. type: textblock
-#: ../fish/guestfish.pod:198 ../fuse/guestmount.pod:117
+#: ../fish/guestfish.pod:198 ../fuse/guestmount.pod:152
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 "
@@ -20068,7 +20068,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../fish/guestfish.pod:202 ../fuse/guestmount.pod:121
+#: ../fish/guestfish.pod:202 ../fuse/guestmount.pod:156
msgid "Domain UUIDs can be used instead of names."
msgstr ""
@@ -20100,7 +20100,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../fish/guestfish.pod:219 ../fuse/guestmount.pod:137
+#: ../fish/guestfish.pod:219 ../fuse/guestmount.pod:172
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 "
@@ -20156,12 +20156,12 @@ msgid ""
msgstr ""
#. type: =item
-#: ../fish/guestfish.pod:260 ../fuse/guestmount.pod:166
+#: ../fish/guestfish.pod:260 ../fuse/guestmount.pod:201
msgid "B<--inspector>"
msgstr ""
#. type: textblock
-#: ../fish/guestfish.pod:262 ../fuse/guestmount.pod:168
+#: ../fish/guestfish.pod:262 ../fuse/guestmount.pod:203
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 "
@@ -20250,24 +20250,24 @@ msgid ""
msgstr ""
#. type: =item
-#: ../fish/guestfish.pod:299 ../fuse/guestmount.pod:177
+#: ../fish/guestfish.pod:299 ../fuse/guestmount.pod:212
msgid "B<--live>"
msgstr ""
#. type: textblock
-#: ../fish/guestfish.pod:301 ../fuse/guestmount.pod:179
+#: ../fish/guestfish.pod:301 ../fuse/guestmount.pod:214
msgid ""
"Connect to a live virtual machine. (Experimental, see L<guestfs(3)/"
"ATTACHING TO RUNNING DAEMONS>)."
msgstr ""
#. type: =item
-#: ../fish/guestfish.pod:304 ../fuse/guestmount.pod:182
+#: ../fish/guestfish.pod:304 ../fuse/guestmount.pod:217
msgid "B<-m dev[:mountpoint[:options]]>"
msgstr ""
#. type: =item
-#: ../fish/guestfish.pod:306 ../fuse/guestmount.pod:184
+#: ../fish/guestfish.pod:306 ../fuse/guestmount.pod:219
msgid "B<--mount dev[:mountpoint[:options]]>"
msgstr ""
@@ -20303,7 +20303,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../fish/guestfish.pod:323 ../fuse/guestmount.pod:192
+#: ../fish/guestfish.pod:323 ../fuse/guestmount.pod:227
msgid ""
"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 "
@@ -20314,7 +20314,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../fish/guestfish.pod:331 ../fuse/guestmount.pod:200
+#: ../fish/guestfish.pod:331 ../fuse/guestmount.pod:235
#, no-wrap
msgid ""
" -m /dev/sda1:/:acl,user_xattr\n"
@@ -20327,13 +20327,13 @@ msgid "Using this flag is equivalent to using the C<mount-options> command."
msgstr ""
#. type: =item
-#: ../fish/guestfish.pod:335 ../fuse/guestmount.pod:202
+#: ../fish/guestfish.pod:335 ../fuse/guestmount.pod:237
#: ../resize/virt-resize.pod:441
msgid "B<-n>"
msgstr ""
#. type: =item
-#: ../fish/guestfish.pod:337 ../fuse/guestmount.pod:204
+#: ../fish/guestfish.pod:337 ../fuse/guestmount.pod:239
msgid "B<--no-sync>"
msgstr ""
@@ -20408,13 +20408,13 @@ msgid ""
msgstr ""
#. type: =item
-#: ../fish/guestfish.pod:369 ../fuse/guestmount.pod:248
+#: ../fish/guestfish.pod:369 ../fuse/guestmount.pod:289
#: ../rescue/virt-rescue.pod:189
msgid "B<-r>"
msgstr ""
#. type: =item
-#: ../fish/guestfish.pod:371 ../fuse/guestmount.pod:250
+#: ../fish/guestfish.pod:371 ../fuse/guestmount.pod:291
#: ../rescue/virt-rescue.pod:191
msgid "B<--ro>"
msgstr ""
@@ -20448,7 +20448,7 @@ msgid "See also L</OPENING DISKS FOR READ AND WRITE> below."
msgstr ""
#. type: =item
-#: ../fish/guestfish.pod:386 ../fuse/guestmount.pod:262
+#: ../fish/guestfish.pod:386 ../fuse/guestmount.pod:303
#: ../rescue/virt-rescue.pod:201
msgid "B<--selinux>"
msgstr ""
@@ -20470,19 +20470,19 @@ msgid "Display the guestfish / libguestfs version number and exit."
msgstr ""
#. type: =item
-#: ../fish/guestfish.pod:403 ../fuse/guestmount.pod:278
+#: ../fish/guestfish.pod:403 ../fuse/guestmount.pod:319
#: ../rescue/virt-rescue.pod:231
msgid "B<-w>"
msgstr ""
#. type: =item
-#: ../fish/guestfish.pod:405 ../fuse/guestmount.pod:280
+#: ../fish/guestfish.pod:405 ../fuse/guestmount.pod:321
#: ../rescue/virt-rescue.pod:233
msgid "B<--rw>"
msgstr ""
#. type: textblock
-#: ../fish/guestfish.pod:407 ../fuse/guestmount.pod:282
+#: ../fish/guestfish.pod:407 ../fuse/guestmount.pod:323
msgid ""
"This changes the I<-a>, I<-d> and I<-m> options so that disks are added and "
"mounts are done read-write."
@@ -22267,25 +22267,25 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../fish/guestfish.pod:1209 ../fuse/guestmount.pod:297
+#: ../fish/guestfish.pod:1209 ../fuse/guestmount.pod:338
#: ../rescue/virt-rescue.pod:310
msgid "FILES"
msgstr ""
#. type: =item
-#: ../fish/guestfish.pod:1213 ../fuse/guestmount.pod:301
+#: ../fish/guestfish.pod:1213 ../fuse/guestmount.pod:342
#: ../rescue/virt-rescue.pod:314
msgid "$HOME/.libguestfs-tools.rc"
msgstr ""
#. type: =item
-#: ../fish/guestfish.pod:1215 ../fuse/guestmount.pod:303
+#: ../fish/guestfish.pod:1215 ../fuse/guestmount.pod:344
#: ../rescue/virt-rescue.pod:316
msgid "/etc/libguestfs-tools.conf"
msgstr ""
#. type: textblock
-#: ../fish/guestfish.pod:1217 ../fuse/guestmount.pod:305
+#: ../fish/guestfish.pod:1217 ../fuse/guestmount.pod:346
#: ../rescue/virt-rescue.pod:318
msgid ""
"This configuration file controls the default read-only or read-write mode "
@@ -22406,7 +22406,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../fish/guestfish.pod:1302 ../fuse/guestmount.pod:334
+#: ../fish/guestfish.pod:1302 ../fuse/guestmount.pod:375
#: ../src/guestfs.pod:3360 ../test-tool/libguestfs-test-tool.pod:118
msgid "Copyright (C) 2009-2012 Red Hat Inc. L<http://libguestfs.org/>"
msgstr ""
@@ -23214,18 +23214,84 @@ msgid ""
"Fedora or Red Hat Enterprise Linux."
msgstr ""
+#. type: =head2
+#: ../fuse/guestmount.pod:92
+msgid "fusermount error: \"Device or resource busy\""
+msgstr ""
+
+#. type: textblock
+#: ../fuse/guestmount.pod:94
+msgid ""
+"You can see this error when another process on the system jumps into the "
+"mountpoint you have just created, holding it open and preventing you from "
+"unmounting it. The usual culprits are various GUI \"indexing\" programs."
+msgstr ""
+
+#. type: textblock
+#: ../fuse/guestmount.pod:99
+msgid ""
+"The popular workaround for this problem is to retry the C<fusermount -u> "
+"command a few times until it works. Unfortunately this isn't a reliable fix "
+"if (for example) the mounted filesystem is particularly large and the "
+"intruding program is persistent."
+msgstr ""
+
+#. type: textblock
+#: ../fuse/guestmount.pod:104
+msgid ""
+"A proper fix is to use a private mountpoint by creating a new mount "
+"namespace using the Linux-specific L<clone(2)>/L<unshare(2)> flag "
+"C<CLONE_NEWNS>. Unfortunately at the moment this requires root and we would "
+"also probably need to add it as a feature to guestmount."
+msgstr ""
+
+#. type: =head2
+#: ../fuse/guestmount.pod:109
+msgid "Race conditions possible when shutting down the connection"
+msgstr ""
+
+#. type: textblock
+#: ../fuse/guestmount.pod:111
+msgid ""
+"When C<fusermount -u> exits, guestmount may still be running and cleaning up "
+"the mountpoint. The disk image will not be fully finalized."
+msgstr ""
+
+#. type: textblock
+#: ../fuse/guestmount.pod:115
+msgid "This means that scripts like the following have a nasty race condition:"
+msgstr ""
+
+#. type: verbatim
+#: ../fuse/guestmount.pod:118
+#, no-wrap
+msgid ""
+" guestmount -a disk.img -i /mnt\n"
+" # copy things into /mnt\n"
+" fusermount -u /mnt\n"
+" # immediately try to use 'disk.img' <-- UNSAFE\n"
+"\n"
+msgstr ""
+
+#. type: textblock
+#: ../fuse/guestmount.pod:123
+msgid ""
+"The solution is to use the I<--pid-file> option to write the guestmount PID "
+"to a file, then after fusermount spin waiting for this PID to exit."
+msgstr ""
+
#. type: textblock
-#: ../fuse/guestmount.pod:100
+#: ../fuse/guestmount.pod:135
msgid "Add a block device or virtual machine image."
msgstr ""
#. type: =item
-#: ../fuse/guestmount.pod:123
+#: ../fuse/guestmount.pod:158
msgid "B<--dir-cache-timeout N>"
msgstr ""
#. type: textblock
-#: ../fuse/guestmount.pod:125
+#: ../fuse/guestmount.pod:160
msgid ""
"Set the readdir cache timeout to I<N> seconds, the default being 60 "
"seconds. The readdir cache [actually, there are several semi-independent "
@@ -23235,7 +23301,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../fuse/guestmount.pod:131
+#: ../fuse/guestmount.pod:166
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 "
@@ -23243,7 +23309,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../fuse/guestmount.pod:151
+#: ../fuse/guestmount.pod:186
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 "
@@ -23252,36 +23318,36 @@ msgid ""
msgstr ""
#. type: =item
-#: ../fuse/guestmount.pod:156
+#: ../fuse/guestmount.pod:191
msgid "B<--fuse-help>"
msgstr ""
#. type: textblock
-#: ../fuse/guestmount.pod:158
+#: ../fuse/guestmount.pod:193
msgid "Display help on special FUSE options (see I<-o> below)."
msgstr ""
#. type: textblock
-#: ../fuse/guestmount.pod:162
+#: ../fuse/guestmount.pod:197
msgid "Display brief help and exit."
msgstr ""
#. type: textblock
-#: ../fuse/guestmount.pod:186
+#: ../fuse/guestmount.pod:221
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)."
msgstr ""
#. type: textblock
-#: ../fuse/guestmount.pod:189
+#: ../fuse/guestmount.pod:224
msgid ""
"If the mountpoint is omitted, it defaults to C</>. You have to mount "
"something on C</>."
msgstr ""
#. type: textblock
-#: ../fuse/guestmount.pod:206
+#: ../fuse/guestmount.pod:241
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 "
@@ -23289,22 +23355,22 @@ msgid ""
msgstr ""
#. type: =item
-#: ../fuse/guestmount.pod:211
+#: ../fuse/guestmount.pod:246
msgid "B<-o option>"
msgstr ""
#. type: =item
-#: ../fuse/guestmount.pod:213
+#: ../fuse/guestmount.pod:248
msgid "B<--option option>"
msgstr ""
#. type: textblock
-#: ../fuse/guestmount.pod:215
+#: ../fuse/guestmount.pod:250
msgid "Pass extra options to FUSE."
msgstr ""
#. type: textblock
-#: ../fuse/guestmount.pod:217
+#: ../fuse/guestmount.pod:252
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 "
@@ -23312,7 +23378,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../fuse/guestmount.pod:221
+#: ../fuse/guestmount.pod:256
#, no-wrap
msgid ""
" guestmount --fuse-help\n"
@@ -23320,37 +23386,37 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../fuse/guestmount.pod:223
+#: ../fuse/guestmount.pod:258
msgid "Some potentially useful FUSE options:"
msgstr ""
#. type: =item
-#: ../fuse/guestmount.pod:227
+#: ../fuse/guestmount.pod:262
msgid "B<-o allow_other>"
msgstr ""
#. type: textblock
-#: ../fuse/guestmount.pod:229
+#: ../fuse/guestmount.pod:264
msgid "Allow other users to see the filesystem."
msgstr ""
#. type: =item
-#: ../fuse/guestmount.pod:231
+#: ../fuse/guestmount.pod:266
msgid "B<-o attr_timeout=N>"
msgstr ""
#. type: textblock
-#: ../fuse/guestmount.pod:233
+#: ../fuse/guestmount.pod:268
msgid "Enable attribute caching by FUSE, and set the timeout to I<N> seconds."
msgstr ""
#. type: =item
-#: ../fuse/guestmount.pod:235
+#: ../fuse/guestmount.pod:270
msgid "B<-o kernel_cache>"
msgstr ""
#. type: textblock
-#: ../fuse/guestmount.pod:237
+#: ../fuse/guestmount.pod:272
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 "
@@ -23358,26 +23424,41 @@ msgid ""
msgstr ""
#. type: =item
-#: ../fuse/guestmount.pod:241
+#: ../fuse/guestmount.pod:276
msgid "B<-o uid=N> B<-o gid=N>"
msgstr ""
#. type: textblock
-#: ../fuse/guestmount.pod:243
+#: ../fuse/guestmount.pod:278
msgid ""
"Use these options to map all UIDs and GIDs inside the guest filesystem to "
"the chosen values."
msgstr ""
+#. type: =item
+#: ../fuse/guestmount.pod:283
+msgid "B<--pid-file filename>"
+msgstr ""
+
#. type: textblock
-#: ../fuse/guestmount.pod:252
+#: ../fuse/guestmount.pod:285
+msgid "Write the PID of the guestmount worker process to C<filename>."
+msgstr ""
+
+#. type: textblock
+#: ../fuse/guestmount.pod:287
+msgid "In libguestfs 1.16 (only), C<filename> must be an absolute path."
+msgstr ""
+
+#. type: textblock
+#: ../fuse/guestmount.pod:293
msgid ""
"Add devices and mount everything read-only. Also disallow writes and make "
"the disk appear read-only to FUSE."
msgstr ""
#. type: textblock
-#: ../fuse/guestmount.pod:255
+#: ../fuse/guestmount.pod:296
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 "
@@ -23386,48 +23467,48 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../fuse/guestmount.pod:260 ../rescue/virt-rescue.pod:199
+#: ../fuse/guestmount.pod:301 ../rescue/virt-rescue.pod:199
msgid "See also L<guestfish(1)/OPENING DISKS FOR READ AND WRITE>."
msgstr ""
#. type: textblock
-#: ../fuse/guestmount.pod:264
+#: ../fuse/guestmount.pod:305
msgid "Enable SELinux support for the guest."
msgstr ""
#. type: textblock
-#: ../fuse/guestmount.pod:270
+#: ../fuse/guestmount.pod:311
msgid "Enable verbose messages from underlying libguestfs."
msgstr ""
#. type: textblock
-#: ../fuse/guestmount.pod:276
+#: ../fuse/guestmount.pod:317
msgid "Display the program version and exit."
msgstr ""
#. type: textblock
-#: ../fuse/guestmount.pod:285 ../fuse/guestmount.pod:308
+#: ../fuse/guestmount.pod:326 ../fuse/guestmount.pod:349
#: ../rescue/virt-rescue.pod:238 ../rescue/virt-rescue.pod:321
msgid "See L<guestfish(1)/OPENING DISKS FOR READ AND WRITE>."
msgstr ""
#. type: =item
-#: ../fuse/guestmount.pod:289
+#: ../fuse/guestmount.pod:330
msgid "B<--trace>"
msgstr ""
#. type: textblock
-#: ../fuse/guestmount.pod:291
+#: ../fuse/guestmount.pod:332
msgid "Trace libguestfs calls and entry into each FUSE function."
msgstr ""
#. type: textblock
-#: ../fuse/guestmount.pod:293
+#: ../fuse/guestmount.pod:334
msgid "This also stops the daemon from forking into the background."
msgstr ""
#. type: textblock
-#: ../fuse/guestmount.pod:319
+#: ../fuse/guestmount.pod:360
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."
diff --git a/po-docs/libguestfs-docs.pot b/po-docs/libguestfs-docs.pot
index 294296bb..1f3cef20 100644
--- a/po-docs/libguestfs-docs.pot
+++ b/po-docs/libguestfs-docs.pot
@@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: libguestfs 1.16.27\n"
+"Project-Id-Version: libguestfs 1.16.28\n"
"Report-Msgid-Bugs-To: libguestfs@redhat.com\n"
-"POT-Creation-Date: 2012-07-07 13:58+0200\n"
+"POT-Creation-Date: 2012-07-10 13:19+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -212,12 +212,12 @@ msgid "If you just want the exit code with no output, use the I<-q> option."
msgstr ""
#. type: =head1
-#: ../align/virt-alignment-scan.pod:89 ../cat/virt-cat.pod:62 ../cat/virt-filesystems.pod:91 ../cat/virt-ls.pod:261 ../clone/virt-sysprep.pod:42 ../df/virt-df.pod:59 ../edit/virt-edit.pod:62 ../fish/guestfish.pod:148 ../fish/virt-copy-in.pod:45 ../fish/virt-copy-out.pod:34 ../fish/virt-tar-in.pod:42 ../fish/virt-tar-out.pod:36 ../format/virt-format.pod:59 ../fuse/guestmount.pod:92 ../inspector/virt-inspector.pod:54 ../rescue/virt-rescue.pod:112 ../resize/virt-resize.pod:262 ../sparsify/virt-sparsify.pod:100 ../test-tool/libguestfs-test-tool.pod:36 ../tools/virt-list-filesystems.pl:55 ../tools/virt-list-partitions.pl:56 ../tools/virt-make-fs.pl:155 ../tools/virt-tar.pl:103 ../tools/virt-win-reg.pl:96
+#: ../align/virt-alignment-scan.pod:89 ../cat/virt-cat.pod:62 ../cat/virt-filesystems.pod:91 ../cat/virt-ls.pod:261 ../clone/virt-sysprep.pod:42 ../df/virt-df.pod:59 ../edit/virt-edit.pod:62 ../fish/guestfish.pod:148 ../fish/virt-copy-in.pod:45 ../fish/virt-copy-out.pod:34 ../fish/virt-tar-in.pod:42 ../fish/virt-tar-out.pod:36 ../format/virt-format.pod:59 ../fuse/guestmount.pod:127 ../inspector/virt-inspector.pod:54 ../rescue/virt-rescue.pod:112 ../resize/virt-resize.pod:262 ../sparsify/virt-sparsify.pod:100 ../test-tool/libguestfs-test-tool.pod:36 ../tools/virt-list-filesystems.pl:55 ../tools/virt-list-partitions.pl:56 ../tools/virt-make-fs.pl:155 ../tools/virt-tar.pl:103 ../tools/virt-win-reg.pl:96
msgid "OPTIONS"
msgstr ""
#. type: =item
-#: ../align/virt-alignment-scan.pod:93 ../cat/virt-cat.pod:66 ../cat/virt-filesystems.pod:95 ../cat/virt-ls.pod:265 ../clone/virt-sysprep.pod:46 ../df/virt-df.pod:63 ../edit/virt-edit.pod:66 ../fish/guestfish.pod:152 ../format/virt-format.pod:63 ../fuse/guestmount.pod:160 ../inspector/virt-inspector.pod:58 ../rescue/virt-rescue.pod:116 ../resize/virt-resize.pod:266 ../sparsify/virt-sparsify.pod:104 ../test-tool/libguestfs-test-tool.pod:40 ../tools/virt-list-filesystems.pl:63 ../tools/virt-list-partitions.pl:64 ../tools/virt-make-fs.pl:163 ../tools/virt-tar.pl:111 ../tools/virt-win-reg.pl:104
+#: ../align/virt-alignment-scan.pod:93 ../cat/virt-cat.pod:66 ../cat/virt-filesystems.pod:95 ../cat/virt-ls.pod:265 ../clone/virt-sysprep.pod:46 ../df/virt-df.pod:63 ../edit/virt-edit.pod:66 ../fish/guestfish.pod:152 ../format/virt-format.pod:63 ../fuse/guestmount.pod:195 ../inspector/virt-inspector.pod:58 ../rescue/virt-rescue.pod:116 ../resize/virt-resize.pod:266 ../sparsify/virt-sparsify.pod:104 ../test-tool/libguestfs-test-tool.pod:40 ../tools/virt-list-filesystems.pl:63 ../tools/virt-list-partitions.pl:64 ../tools/virt-make-fs.pl:163 ../tools/virt-tar.pl:111 ../tools/virt-win-reg.pl:104
msgid "B<--help>"
msgstr ""
@@ -242,7 +242,7 @@ msgid "Add I<file> which should be a disk image from a virtual machine."
msgstr ""
#. type: textblock
-#: ../align/virt-alignment-scan.pod:103 ../cat/virt-cat.pod:78 ../cat/virt-filesystems.pod:107 ../cat/virt-ls.pod:277 ../clone/virt-sysprep.pod:56 ../df/virt-df.pod:75 ../edit/virt-edit.pod:78 ../fish/guestfish.pod:174 ../format/virt-format.pod:73 ../fuse/guestmount.pod:102 ../inspector/virt-inspector.pod:70 ../rescue/virt-rescue.pod:128
+#: ../align/virt-alignment-scan.pod:103 ../cat/virt-cat.pod:78 ../cat/virt-filesystems.pod:107 ../cat/virt-ls.pod:277 ../clone/virt-sysprep.pod:56 ../df/virt-df.pod:75 ../edit/virt-edit.pod:78 ../fish/guestfish.pod:174 ../format/virt-format.pod:73 ../fuse/guestmount.pod:137 ../inspector/virt-inspector.pod:70 ../rescue/virt-rescue.pod:128
msgid ""
"The format of the disk image is auto-detected. To override this and force a "
"particular format use the I<--format=..> option."
@@ -290,17 +290,17 @@ msgid ""
msgstr ""
#. type: =item
-#: ../align/virt-alignment-scan.pod:123 ../cat/virt-cat.pod:105 ../cat/virt-filesystems.pod:170 ../cat/virt-ls.pod:328 ../clone/virt-sysprep.pod:95 ../df/virt-df.pod:101 ../fish/guestfish.pod:233 ../format/virt-format.pod:87 ../fuse/guestmount.pod:142 ../inspector/virt-inspector.pod:98 ../rescue/virt-rescue.pod:152
+#: ../align/virt-alignment-scan.pod:123 ../cat/virt-cat.pod:105 ../cat/virt-filesystems.pod:170 ../cat/virt-ls.pod:328 ../clone/virt-sysprep.pod:95 ../df/virt-df.pod:101 ../fish/guestfish.pod:233 ../format/virt-format.pod:87 ../fuse/guestmount.pod:177 ../inspector/virt-inspector.pod:98 ../rescue/virt-rescue.pod:152
msgid "B<--format=raw|qcow2|..>"
msgstr ""
#. type: =item
-#: ../align/virt-alignment-scan.pod:125 ../cat/virt-cat.pod:107 ../cat/virt-filesystems.pod:172 ../cat/virt-ls.pod:330 ../clone/virt-sysprep.pod:97 ../df/virt-df.pod:103 ../edit/virt-edit.pod:134 ../fish/guestfish.pod:235 ../format/virt-format.pod:89 ../fuse/guestmount.pod:144 ../inspector/virt-inspector.pod:100 ../rescue/virt-rescue.pod:154
+#: ../align/virt-alignment-scan.pod:125 ../cat/virt-cat.pod:107 ../cat/virt-filesystems.pod:172 ../cat/virt-ls.pod:330 ../clone/virt-sysprep.pod:97 ../df/virt-df.pod:103 ../edit/virt-edit.pod:134 ../fish/guestfish.pod:235 ../format/virt-format.pod:89 ../fuse/guestmount.pod:179 ../inspector/virt-inspector.pod:100 ../rescue/virt-rescue.pod:154
msgid "B<--format>"
msgstr ""
#. type: textblock
-#: ../align/virt-alignment-scan.pod:127 ../cat/virt-cat.pod:109 ../cat/virt-filesystems.pod:174 ../cat/virt-ls.pod:332 ../clone/virt-sysprep.pod:99 ../df/virt-df.pod:105 ../edit/virt-edit.pod:136 ../fish/guestfish.pod:237 ../format/virt-format.pod:91 ../fuse/guestmount.pod:146 ../rescue/virt-rescue.pod:156
+#: ../align/virt-alignment-scan.pod:127 ../cat/virt-cat.pod:109 ../cat/virt-filesystems.pod:174 ../cat/virt-ls.pod:332 ../clone/virt-sysprep.pod:99 ../df/virt-df.pod:105 ../edit/virt-edit.pod:136 ../fish/guestfish.pod:237 ../format/virt-format.pod:91 ../fuse/guestmount.pod:181 ../rescue/virt-rescue.pod:156
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 "
@@ -367,12 +367,12 @@ msgid ""
msgstr ""
#. type: =item
-#: ../align/virt-alignment-scan.pod:154 ../cat/virt-cat.pod:134 ../cat/virt-filesystems.pod:261 ../cat/virt-ls.pod:425 ../clone/virt-sysprep.pod:138 ../df/virt-df.pod:173 ../edit/virt-edit.pod:161 ../fish/guestfish.pod:390 ../format/virt-format.pod:145 ../fuse/guestmount.pod:266 ../inspector/virt-inspector.pod:118 ../rescue/virt-rescue.pod:219 ../sparsify/virt-sparsify.pod:184
+#: ../align/virt-alignment-scan.pod:154 ../cat/virt-cat.pod:134 ../cat/virt-filesystems.pod:261 ../cat/virt-ls.pod:425 ../clone/virt-sysprep.pod:138 ../df/virt-df.pod:173 ../edit/virt-edit.pod:161 ../fish/guestfish.pod:390 ../format/virt-format.pod:145 ../fuse/guestmount.pod:307 ../inspector/virt-inspector.pod:118 ../rescue/virt-rescue.pod:219 ../sparsify/virt-sparsify.pod:184
msgid "B<-v>"
msgstr ""
#. type: =item
-#: ../align/virt-alignment-scan.pod:156 ../cat/virt-cat.pod:136 ../cat/virt-filesystems.pod:263 ../cat/virt-ls.pod:427 ../clone/virt-sysprep.pod:140 ../df/virt-df.pod:175 ../edit/virt-edit.pod:163 ../fish/guestfish.pod:392 ../format/virt-format.pod:147 ../fuse/guestmount.pod:268 ../inspector/virt-inspector.pod:120 ../rescue/virt-rescue.pod:221 ../sparsify/virt-sparsify.pod:186
+#: ../align/virt-alignment-scan.pod:156 ../cat/virt-cat.pod:136 ../cat/virt-filesystems.pod:263 ../cat/virt-ls.pod:427 ../clone/virt-sysprep.pod:140 ../df/virt-df.pod:175 ../edit/virt-edit.pod:163 ../fish/guestfish.pod:392 ../format/virt-format.pod:147 ../fuse/guestmount.pod:309 ../inspector/virt-inspector.pod:120 ../rescue/virt-rescue.pod:221 ../sparsify/virt-sparsify.pod:186
msgid "B<--verbose>"
msgstr ""
@@ -382,12 +382,12 @@ msgid "Enable verbose messages for debugging."
msgstr ""
#. type: =item
-#: ../align/virt-alignment-scan.pod:160 ../cat/virt-cat.pod:140 ../cat/virt-filesystems.pod:267 ../cat/virt-ls.pod:431 ../clone/virt-sysprep.pod:144 ../df/virt-df.pod:179 ../edit/virt-edit.pod:167 ../fish/guestfish.pod:397 ../format/virt-format.pod:151 ../fuse/guestmount.pod:272 ../inspector/virt-inspector.pod:124 ../rescue/virt-rescue.pod:225 ../resize/virt-resize.pod:567 ../sparsify/virt-sparsify.pod:190 ../test-tool/libguestfs-test-tool.pod:61
+#: ../align/virt-alignment-scan.pod:160 ../cat/virt-cat.pod:140 ../cat/virt-filesystems.pod:267 ../cat/virt-ls.pod:431 ../clone/virt-sysprep.pod:144 ../df/virt-df.pod:179 ../edit/virt-edit.pod:167 ../fish/guestfish.pod:397 ../format/virt-format.pod:151 ../fuse/guestmount.pod:313 ../inspector/virt-inspector.pod:124 ../rescue/virt-rescue.pod:225 ../resize/virt-resize.pod:567 ../sparsify/virt-sparsify.pod:190 ../test-tool/libguestfs-test-tool.pod:61
msgid "B<-V>"
msgstr ""
#. type: =item
-#: ../align/virt-alignment-scan.pod:162 ../cat/virt-cat.pod:142 ../cat/virt-filesystems.pod:269 ../cat/virt-ls.pod:433 ../clone/virt-sysprep.pod:146 ../df/virt-df.pod:181 ../edit/virt-edit.pod:169 ../fish/guestfish.pod:399 ../format/virt-format.pod:153 ../fuse/guestmount.pod:274 ../inspector/virt-inspector.pod:126 ../rescue/virt-rescue.pod:227 ../resize/virt-resize.pod:569 ../sparsify/virt-sparsify.pod:192 ../test-tool/libguestfs-test-tool.pod:63 ../tools/virt-list-filesystems.pl:71 ../tools/virt-list-partitions.pl:72 ../tools/virt-make-fs.pl:171 ../tools/virt-tar.pl:119 ../tools/virt-win-reg.pl:112
+#: ../align/virt-alignment-scan.pod:162 ../cat/virt-cat.pod:142 ../cat/virt-filesystems.pod:269 ../cat/virt-ls.pod:433 ../clone/virt-sysprep.pod:146 ../df/virt-df.pod:181 ../edit/virt-edit.pod:169 ../fish/guestfish.pod:399 ../format/virt-format.pod:153 ../fuse/guestmount.pod:315 ../inspector/virt-inspector.pod:126 ../rescue/virt-rescue.pod:227 ../resize/virt-resize.pod:569 ../sparsify/virt-sparsify.pod:192 ../test-tool/libguestfs-test-tool.pod:63 ../tools/virt-list-filesystems.pl:71 ../tools/virt-list-partitions.pl:72 ../tools/virt-make-fs.pl:171 ../tools/virt-tar.pl:119 ../tools/virt-win-reg.pl:112
msgid "B<--version>"
msgstr ""
@@ -397,7 +397,7 @@ msgid "Display version number and exit."
msgstr ""
#. type: =item
-#: ../align/virt-alignment-scan.pod:166 ../cat/virt-cat.pod:146 ../cat/virt-filesystems.pod:281 ../cat/virt-ls.pod:437 ../clone/virt-sysprep.pod:150 ../df/virt-df.pod:185 ../edit/virt-edit.pod:173 ../fish/guestfish.pod:412 ../format/virt-format.pod:167 ../fuse/guestmount.pod:287 ../inspector/virt-inspector.pod:130 ../rescue/virt-rescue.pod:240 ../sparsify/virt-sparsify.pod:196 ../tools/virt-tar.pl:158
+#: ../align/virt-alignment-scan.pod:166 ../cat/virt-cat.pod:146 ../cat/virt-filesystems.pod:281 ../cat/virt-ls.pod:437 ../clone/virt-sysprep.pod:150 ../df/virt-df.pod:185 ../edit/virt-edit.pod:173 ../fish/guestfish.pod:412 ../format/virt-format.pod:167 ../fuse/guestmount.pod:328 ../inspector/virt-inspector.pod:130 ../rescue/virt-rescue.pod:240 ../sparsify/virt-sparsify.pod:196 ../tools/virt-tar.pl:158
msgid "B<-x>"
msgstr ""
@@ -687,7 +687,7 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../align/virt-alignment-scan.pod:318 ../cat/virt-cat.pod:238 ../cat/virt-filesystems.pod:380 ../cat/virt-ls.pod:490 ../clone/virt-sysprep.pod:482 ../df/virt-df.pod:248 ../edit/virt-edit.pod:363 ../fish/guestfish.pod:1114 ../format/virt-format.pod:173 ../fuse/guestmount.pod:312 ../inspector/virt-inspector.pod:496 ../resize/virt-resize.pod:697 ../sparsify/virt-sparsify.pod:252 ../test-tool/libguestfs-test-tool.pod:96
+#: ../align/virt-alignment-scan.pod:318 ../cat/virt-cat.pod:238 ../cat/virt-filesystems.pod:380 ../cat/virt-ls.pod:490 ../clone/virt-sysprep.pod:482 ../df/virt-df.pod:248 ../edit/virt-edit.pod:363 ../fish/guestfish.pod:1114 ../format/virt-format.pod:173 ../fuse/guestmount.pod:353 ../inspector/virt-inspector.pod:496 ../resize/virt-resize.pod:697 ../sparsify/virt-sparsify.pod:252 ../test-tool/libguestfs-test-tool.pod:96
msgid "EXIT STATUS"
msgstr ""
@@ -746,7 +746,7 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../align/virt-alignment-scan.pod:352 ../cat/virt-cat.pod:243 ../cat/virt-filesystems.pod:385 ../cat/virt-ls.pod:495 ../clone/virt-sysprep.pod:486 ../df/virt-df.pod:253 ../edit/virt-edit.pod:368 ../erlang/examples/guestfs-erlang.pod:97 ../examples/guestfs-examples.pod:33 ../examples/guestfs-recipes.pod:384 ../examples/guestfs-testing.pod:291 ../fish/guestfish.pod:1268 ../fish/virt-copy-in.pod:50 ../fish/virt-copy-out.pod:39 ../fish/virt-tar-in.pod:47 ../fish/virt-tar-out.pod:41 ../format/virt-format.pod:177 ../fuse/guestmount.pod:317 ../inspector/virt-inspector.pod:501 ../java/examples/guestfs-java.pod:45 ../ocaml/examples/guestfs-ocaml.pod:78 ../perl/examples/guestfs-perl.pod:39 ../python/examples/guestfs-python.pod:42 ../rescue/virt-rescue.pod:325 ../resize/virt-resize.pod:702 ../ruby/examples/guestfs-ruby.pod:36 ../sparsify/virt-sparsify.pod:284 ../src/guestfs.pod:3273 ../test-tool/libguestfs-test-tool.pod:106 ../tools/virt-list-filesystems.pl:197 ../tools/virt-list-partitions.pl:267 ../tools/virt-make-fs.pl:579 ../tools/virt-tar.pl:294 ../tools/virt-win-reg.pl:757
+#: ../align/virt-alignment-scan.pod:352 ../cat/virt-cat.pod:243 ../cat/virt-filesystems.pod:385 ../cat/virt-ls.pod:495 ../clone/virt-sysprep.pod:486 ../df/virt-df.pod:253 ../edit/virt-edit.pod:368 ../erlang/examples/guestfs-erlang.pod:97 ../examples/guestfs-examples.pod:33 ../examples/guestfs-recipes.pod:384 ../examples/guestfs-testing.pod:291 ../fish/guestfish.pod:1268 ../fish/virt-copy-in.pod:50 ../fish/virt-copy-out.pod:39 ../fish/virt-tar-in.pod:47 ../fish/virt-tar-out.pod:41 ../format/virt-format.pod:177 ../fuse/guestmount.pod:358 ../inspector/virt-inspector.pod:501 ../java/examples/guestfs-java.pod:45 ../ocaml/examples/guestfs-ocaml.pod:78 ../perl/examples/guestfs-perl.pod:39 ../python/examples/guestfs-python.pod:42 ../rescue/virt-rescue.pod:325 ../resize/virt-resize.pod:702 ../ruby/examples/guestfs-ruby.pod:36 ../sparsify/virt-sparsify.pod:284 ../src/guestfs.pod:3273 ../test-tool/libguestfs-test-tool.pod:106 ../tools/virt-list-filesystems.pl:197 ../tools/virt-list-partitions.pl:267 ../tools/virt-make-fs.pl:579 ../tools/virt-tar.pl:294 ../tools/virt-win-reg.pl:757
msgid "SEE ALSO"
msgstr ""
@@ -768,7 +768,7 @@ msgid "Richard W.M. Jones L<http://people.redhat.com/~rjones/>"
msgstr ""
#. type: =head1
-#: ../align/virt-alignment-scan.pod:365 ../cat/virt-cat.pod:256 ../cat/virt-filesystems.pod:400 ../cat/virt-ls.pod:511 ../clone/virt-sysprep.pod:505 ../df/virt-df.pod:265 ../edit/virt-edit.pod:386 ../erlang/examples/guestfs-erlang.pod:114 ../examples/guestfs-examples.pod:49 ../examples/guestfs-recipes.pod:401 ../examples/guestfs-testing.pod:302 ../fish/guestfish.pod:1300 ../fish/virt-copy-in.pod:64 ../fish/virt-copy-out.pod:53 ../fish/virt-tar-in.pod:62 ../fish/virt-tar-out.pod:55 ../format/virt-format.pod:191 ../fuse/guestmount.pod:332 ../inspector/virt-inspector.pod:524 ../java/examples/guestfs-java.pod:62 ../ocaml/examples/guestfs-ocaml.pod:95 ../perl/examples/guestfs-perl.pod:56 ../python/examples/guestfs-python.pod:58 ../rescue/virt-rescue.pod:338 ../resize/virt-resize.pod:729 ../ruby/examples/guestfs-ruby.pod:52 ../sparsify/virt-sparsify.pod:301 ../src/guestfs.pod:3358 ../test-tool/libguestfs-test-tool.pod:116 ../tools/virt-list-filesystems.pl:214 ../tools/virt-list-partitions.pl:283 ../tools/virt-make-fs.pl:609 ../tools/virt-tar.pl:313 ../tools/virt-win-reg.pl:787
+#: ../align/virt-alignment-scan.pod:365 ../cat/virt-cat.pod:256 ../cat/virt-filesystems.pod:400 ../cat/virt-ls.pod:511 ../clone/virt-sysprep.pod:505 ../df/virt-df.pod:265 ../edit/virt-edit.pod:386 ../erlang/examples/guestfs-erlang.pod:114 ../examples/guestfs-examples.pod:49 ../examples/guestfs-recipes.pod:401 ../examples/guestfs-testing.pod:302 ../fish/guestfish.pod:1300 ../fish/virt-copy-in.pod:64 ../fish/virt-copy-out.pod:53 ../fish/virt-tar-in.pod:62 ../fish/virt-tar-out.pod:55 ../format/virt-format.pod:191 ../fuse/guestmount.pod:373 ../inspector/virt-inspector.pod:524 ../java/examples/guestfs-java.pod:62 ../ocaml/examples/guestfs-ocaml.pod:95 ../perl/examples/guestfs-perl.pod:56 ../python/examples/guestfs-python.pod:58 ../rescue/virt-rescue.pod:338 ../resize/virt-resize.pod:729 ../ruby/examples/guestfs-ruby.pod:52 ../sparsify/virt-sparsify.pod:301 ../src/guestfs.pod:3358 ../test-tool/libguestfs-test-tool.pod:116 ../tools/virt-list-filesystems.pl:214 ../tools/virt-list-partitions.pl:283 ../tools/virt-make-fs.pl:609 ../tools/virt-tar.pl:313 ../tools/virt-win-reg.pl:787
msgid "COPYRIGHT"
msgstr ""
@@ -778,7 +778,7 @@ msgid "Copyright (C) 2011 Red Hat Inc."
msgstr ""
#. type: textblock
-#: ../align/virt-alignment-scan.pod:369 ../cat/virt-cat.pod:260 ../cat/virt-filesystems.pod:404 ../cat/virt-ls.pod:515 ../clone/virt-sysprep.pod:509 ../df/virt-df.pod:269 ../edit/virt-edit.pod:390 ../fish/guestfish.pod:1305 ../fish/virt-copy-in.pod:69 ../fish/virt-copy-out.pod:58 ../fish/virt-tar-in.pod:67 ../fish/virt-tar-out.pod:60 ../format/virt-format.pod:195 ../fuse/guestmount.pod:337 ../inspector/virt-inspector.pod:528 ../rescue/virt-rescue.pod:342 ../resize/virt-resize.pod:733 ../sparsify/virt-sparsify.pod:305 ../test-tool/libguestfs-test-tool.pod:121 ../tools/virt-list-filesystems.pl:218 ../tools/virt-list-partitions.pl:287 ../tools/virt-make-fs.pl:613 ../tools/virt-tar.pl:317 ../tools/virt-win-reg.pl:791
+#: ../align/virt-alignment-scan.pod:369 ../cat/virt-cat.pod:260 ../cat/virt-filesystems.pod:404 ../cat/virt-ls.pod:515 ../clone/virt-sysprep.pod:509 ../df/virt-df.pod:269 ../edit/virt-edit.pod:390 ../fish/guestfish.pod:1305 ../fish/virt-copy-in.pod:69 ../fish/virt-copy-out.pod:58 ../fish/virt-tar-in.pod:67 ../fish/virt-tar-out.pod:60 ../format/virt-format.pod:195 ../fuse/guestmount.pod:378 ../inspector/virt-inspector.pod:528 ../rescue/virt-rescue.pod:342 ../resize/virt-resize.pod:733 ../sparsify/virt-sparsify.pod:305 ../test-tool/libguestfs-test-tool.pod:121 ../tools/virt-list-filesystems.pl:218 ../tools/virt-list-partitions.pl:287 ../tools/virt-make-fs.pl:613 ../tools/virt-tar.pl:317 ../tools/virt-win-reg.pl:791
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 "
@@ -787,7 +787,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../align/virt-alignment-scan.pod:374 ../cat/virt-cat.pod:265 ../cat/virt-filesystems.pod:409 ../cat/virt-ls.pod:520 ../clone/virt-sysprep.pod:514 ../df/virt-df.pod:274 ../edit/virt-edit.pod:395 ../fish/guestfish.pod:1310 ../fish/virt-copy-in.pod:74 ../fish/virt-copy-out.pod:63 ../fish/virt-tar-in.pod:72 ../fish/virt-tar-out.pod:65 ../format/virt-format.pod:200 ../fuse/guestmount.pod:342 ../inspector/virt-inspector.pod:533 ../rescue/virt-rescue.pod:347 ../resize/virt-resize.pod:738 ../sparsify/virt-sparsify.pod:310 ../test-tool/libguestfs-test-tool.pod:126 ../tools/virt-list-filesystems.pl:223 ../tools/virt-list-partitions.pl:292 ../tools/virt-make-fs.pl:618 ../tools/virt-tar.pl:322 ../tools/virt-win-reg.pl:796
+#: ../align/virt-alignment-scan.pod:374 ../cat/virt-cat.pod:265 ../cat/virt-filesystems.pod:409 ../cat/virt-ls.pod:520 ../clone/virt-sysprep.pod:514 ../df/virt-df.pod:274 ../edit/virt-edit.pod:395 ../fish/guestfish.pod:1310 ../fish/virt-copy-in.pod:74 ../fish/virt-copy-out.pod:63 ../fish/virt-tar-in.pod:72 ../fish/virt-tar-out.pod:65 ../format/virt-format.pod:200 ../fuse/guestmount.pod:383 ../inspector/virt-inspector.pod:533 ../rescue/virt-rescue.pod:347 ../resize/virt-resize.pod:738 ../sparsify/virt-sparsify.pod:310 ../test-tool/libguestfs-test-tool.pod:126 ../tools/virt-list-filesystems.pl:223 ../tools/virt-list-partitions.pl:292 ../tools/virt-make-fs.pl:618 ../tools/virt-tar.pl:322 ../tools/virt-win-reg.pl:796
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 "
@@ -796,7 +796,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../align/virt-alignment-scan.pod:379 ../cat/virt-cat.pod:270 ../cat/virt-filesystems.pod:414 ../cat/virt-ls.pod:525 ../clone/virt-sysprep.pod:519 ../df/virt-df.pod:279 ../edit/virt-edit.pod:400 ../fish/guestfish.pod:1315 ../fish/virt-copy-in.pod:79 ../fish/virt-copy-out.pod:68 ../fish/virt-tar-in.pod:77 ../fish/virt-tar-out.pod:70 ../format/virt-format.pod:205 ../fuse/guestmount.pod:347 ../inspector/virt-inspector.pod:538 ../rescue/virt-rescue.pod:352 ../resize/virt-resize.pod:743 ../sparsify/virt-sparsify.pod:315 ../test-tool/libguestfs-test-tool.pod:131 ../tools/virt-list-filesystems.pl:228 ../tools/virt-list-partitions.pl:297 ../tools/virt-make-fs.pl:623 ../tools/virt-tar.pl:327 ../tools/virt-win-reg.pl:801
+#: ../align/virt-alignment-scan.pod:379 ../cat/virt-cat.pod:270 ../cat/virt-filesystems.pod:414 ../cat/virt-ls.pod:525 ../clone/virt-sysprep.pod:519 ../df/virt-df.pod:279 ../edit/virt-edit.pod:400 ../fish/guestfish.pod:1315 ../fish/virt-copy-in.pod:79 ../fish/virt-copy-out.pod:68 ../fish/virt-tar-in.pod:77 ../fish/virt-tar-out.pod:70 ../format/virt-format.pod:205 ../fuse/guestmount.pod:388 ../inspector/virt-inspector.pod:538 ../rescue/virt-rescue.pod:352 ../resize/virt-resize.pod:743 ../sparsify/virt-sparsify.pod:315 ../test-tool/libguestfs-test-tool.pod:131 ../tools/virt-list-filesystems.pl:228 ../tools/virt-list-partitions.pl:297 ../tools/virt-make-fs.pl:623 ../tools/virt-tar.pl:327 ../tools/virt-win-reg.pl:801
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., 51 "
@@ -963,7 +963,7 @@ msgid ""
msgstr ""
#. type: =item
-#: ../cat/virt-cat.pod:98 ../cat/virt-filesystems.pod:148 ../cat/virt-ls.pod:314 ../edit/virt-edit.pod:112 ../fish/guestfish.pod:217 ../fuse/guestmount.pod:135 ../inspector/virt-inspector.pod:91
+#: ../cat/virt-cat.pod:98 ../cat/virt-filesystems.pod:148 ../cat/virt-ls.pod:314 ../edit/virt-edit.pod:112 ../fish/guestfish.pod:217 ../fuse/guestmount.pod:170 ../inspector/virt-inspector.pod:91
msgid "B<--echo-keys>"
msgstr ""
@@ -993,12 +993,12 @@ msgid ""
msgstr ""
#. type: =item
-#: ../cat/virt-cat.pod:129 ../cat/virt-filesystems.pod:200 ../cat/virt-ls.pod:361 ../edit/virt-edit.pod:156 ../fish/guestfish.pod:289 ../fuse/guestmount.pod:172 ../inspector/virt-inspector.pod:113
+#: ../cat/virt-cat.pod:129 ../cat/virt-filesystems.pod:200 ../cat/virt-ls.pod:361 ../edit/virt-edit.pod:156 ../fish/guestfish.pod:289 ../fuse/guestmount.pod:207 ../inspector/virt-inspector.pod:113
msgid "B<--keys-from-stdin>"
msgstr ""
#. type: textblock
-#: ../cat/virt-cat.pod:131 ../cat/virt-filesystems.pod:202 ../cat/virt-ls.pod:363 ../edit/virt-edit.pod:158 ../fish/guestfish.pod:291 ../fuse/guestmount.pod:174 ../inspector/virt-inspector.pod:115
+#: ../cat/virt-cat.pod:131 ../cat/virt-filesystems.pod:202 ../cat/virt-ls.pod:363 ../edit/virt-edit.pod:158 ../fish/guestfish.pod:291 ../fuse/guestmount.pod:209 ../inspector/virt-inspector.pod:115
msgid ""
"Read key or passphrase parameters from stdin. The default is to try to read "
"passphrases from the user by opening C</dev/tty>."
@@ -1157,7 +1157,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../cat/virt-cat.pod:240 ../cat/virt-filesystems.pod:382 ../cat/virt-ls.pod:492 ../df/virt-df.pod:250 ../edit/virt-edit.pod:365 ../fuse/guestmount.pod:314 ../inspector/virt-inspector.pod:498 ../resize/virt-resize.pod:699 ../sparsify/virt-sparsify.pod:254
+#: ../cat/virt-cat.pod:240 ../cat/virt-filesystems.pod:382 ../cat/virt-ls.pod:492 ../df/virt-df.pod:250 ../edit/virt-edit.pod:365 ../fuse/guestmount.pod:355 ../inspector/virt-inspector.pod:498 ../resize/virt-resize.pod:699 ../sparsify/virt-sparsify.pod:254
msgid "This program returns 0 if successful, or non-zero if there was an error."
msgstr ""
@@ -3525,7 +3525,7 @@ msgid "You are not allowed to use I<-h> and I<--csv> at the same time."
msgstr ""
#. type: =item
-#: ../df/virt-df.pod:133 ../fish/guestfish.pod:258 ../fuse/guestmount.pod:164
+#: ../df/virt-df.pod:133 ../fish/guestfish.pod:258 ../fuse/guestmount.pod:199
msgid "B<-i>"
msgstr ""
@@ -3823,12 +3823,12 @@ msgid "By default, no backup file is made."
msgstr ""
#. type: =item
-#: ../edit/virt-edit.pod:95 ../fish/guestfish.pod:181 ../fuse/guestmount.pod:105 ../inspector/virt-inspector.pod:73 ../tools/virt-list-filesystems.pl:79 ../tools/virt-list-partitions.pl:80 ../tools/virt-tar.pl:127 ../tools/virt-win-reg.pl:128
+#: ../edit/virt-edit.pod:95 ../fish/guestfish.pod:181 ../fuse/guestmount.pod:140 ../inspector/virt-inspector.pod:73 ../tools/virt-list-filesystems.pl:79 ../tools/virt-list-partitions.pl:80 ../tools/virt-tar.pl:127 ../tools/virt-win-reg.pl:128
msgid "B<-c URI>"
msgstr ""
#. type: =item
-#: ../edit/virt-edit.pod:97 ../fish/guestfish.pod:183 ../fuse/guestmount.pod:107 ../inspector/virt-inspector.pod:75 ../tools/virt-list-filesystems.pl:81 ../tools/virt-list-partitions.pl:82 ../tools/virt-tar.pl:129 ../tools/virt-win-reg.pl:130
+#: ../edit/virt-edit.pod:97 ../fish/guestfish.pod:183 ../fuse/guestmount.pod:142 ../inspector/virt-inspector.pod:75 ../tools/virt-list-filesystems.pl:81 ../tools/virt-list-partitions.pl:82 ../tools/virt-tar.pl:129 ../tools/virt-win-reg.pl:130
msgid "B<--connect URI>"
msgstr ""
@@ -4421,12 +4421,12 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../erlang/examples/guestfs-erlang.pod:110 ../examples/guestfs-examples.pod:45 ../examples/guestfs-recipes.pod:397 ../examples/guestfs-testing.pod:298 ../fish/guestfish.pod:1296 ../fish/virt-copy-in.pod:60 ../fish/virt-copy-out.pod:49 ../fish/virt-tar-in.pod:58 ../fish/virt-tar-out.pod:51 ../fuse/guestmount.pod:328 ../inspector/virt-inspector.pod:510 ../java/examples/guestfs-java.pod:58 ../ocaml/examples/guestfs-ocaml.pod:91 ../perl/examples/guestfs-perl.pod:52 ../python/examples/guestfs-python.pod:54 ../ruby/examples/guestfs-ruby.pod:48 ../src/guestfs.pod:3354 ../test-tool/libguestfs-test-tool.pod:112
+#: ../erlang/examples/guestfs-erlang.pod:110 ../examples/guestfs-examples.pod:45 ../examples/guestfs-recipes.pod:397 ../examples/guestfs-testing.pod:298 ../fish/guestfish.pod:1296 ../fish/virt-copy-in.pod:60 ../fish/virt-copy-out.pod:49 ../fish/virt-tar-in.pod:58 ../fish/virt-tar-out.pod:51 ../fuse/guestmount.pod:369 ../inspector/virt-inspector.pod:510 ../java/examples/guestfs-java.pod:58 ../ocaml/examples/guestfs-ocaml.pod:91 ../perl/examples/guestfs-perl.pod:52 ../python/examples/guestfs-python.pod:54 ../ruby/examples/guestfs-ruby.pod:48 ../src/guestfs.pod:3354 ../test-tool/libguestfs-test-tool.pod:112
msgid "AUTHORS"
msgstr ""
#. type: textblock
-#: ../erlang/examples/guestfs-erlang.pod:112 ../examples/guestfs-examples.pod:47 ../examples/guestfs-recipes.pod:399 ../examples/guestfs-testing.pod:300 ../fish/guestfish.pod:1298 ../fish/virt-copy-in.pod:62 ../fish/virt-copy-out.pod:51 ../fish/virt-tar-in.pod:60 ../fish/virt-tar-out.pod:53 ../fuse/guestmount.pod:330 ../java/examples/guestfs-java.pod:60 ../ocaml/examples/guestfs-ocaml.pod:93 ../perl/examples/guestfs-perl.pod:54 ../python/examples/guestfs-python.pod:56 ../ruby/examples/guestfs-ruby.pod:50 ../src/guestfs.pod:3356 ../test-tool/libguestfs-test-tool.pod:114
+#: ../erlang/examples/guestfs-erlang.pod:112 ../examples/guestfs-examples.pod:47 ../examples/guestfs-recipes.pod:399 ../examples/guestfs-testing.pod:300 ../fish/guestfish.pod:1298 ../fish/virt-copy-in.pod:62 ../fish/virt-copy-out.pod:51 ../fish/virt-tar-in.pod:60 ../fish/virt-tar-out.pod:53 ../fuse/guestmount.pod:371 ../java/examples/guestfs-java.pod:60 ../ocaml/examples/guestfs-ocaml.pod:93 ../perl/examples/guestfs-perl.pod:54 ../python/examples/guestfs-python.pod:56 ../ruby/examples/guestfs-ruby.pod:50 ../src/guestfs.pod:3356 ../test-tool/libguestfs-test-tool.pod:114
msgid "Richard W.M. Jones (C<rjones at redhat dot com>)"
msgstr ""
@@ -19294,12 +19294,12 @@ msgid "Displays detailed help on a single command C<cmd>."
msgstr ""
#. type: =item
-#: ../fish/guestfish.pod:168 ../fuse/guestmount.pod:96
+#: ../fish/guestfish.pod:168 ../fuse/guestmount.pod:131
msgid "B<-a image>"
msgstr ""
#. type: =item
-#: ../fish/guestfish.pod:170 ../fuse/guestmount.pod:98
+#: ../fish/guestfish.pod:170 ../fuse/guestmount.pod:133
msgid "B<--add image>"
msgstr ""
@@ -19317,7 +19317,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../fish/guestfish.pod:185 ../fuse/guestmount.pod:109
+#: ../fish/guestfish.pod:185 ../fuse/guestmount.pod:144
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."
@@ -19336,17 +19336,17 @@ msgid ""
msgstr ""
#. type: =item
-#: ../fish/guestfish.pod:194 ../fuse/guestmount.pod:113
+#: ../fish/guestfish.pod:194 ../fuse/guestmount.pod:148
msgid "B<-d libvirt-domain>"
msgstr ""
#. type: =item
-#: ../fish/guestfish.pod:196 ../fuse/guestmount.pod:115
+#: ../fish/guestfish.pod:196 ../fuse/guestmount.pod:150
msgid "B<--domain libvirt-domain>"
msgstr ""
#. type: textblock
-#: ../fish/guestfish.pod:198 ../fuse/guestmount.pod:117
+#: ../fish/guestfish.pod:198 ../fuse/guestmount.pod:152
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 "
@@ -19354,7 +19354,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../fish/guestfish.pod:202 ../fuse/guestmount.pod:121
+#: ../fish/guestfish.pod:202 ../fuse/guestmount.pod:156
msgid "Domain UUIDs can be used instead of names."
msgstr ""
@@ -19386,7 +19386,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../fish/guestfish.pod:219 ../fuse/guestmount.pod:137
+#: ../fish/guestfish.pod:219 ../fuse/guestmount.pod:172
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 "
@@ -19442,12 +19442,12 @@ msgid ""
msgstr ""
#. type: =item
-#: ../fish/guestfish.pod:260 ../fuse/guestmount.pod:166
+#: ../fish/guestfish.pod:260 ../fuse/guestmount.pod:201
msgid "B<--inspector>"
msgstr ""
#. type: textblock
-#: ../fish/guestfish.pod:262 ../fuse/guestmount.pod:168
+#: ../fish/guestfish.pod:262 ../fuse/guestmount.pod:203
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 "
@@ -19536,24 +19536,24 @@ msgid ""
msgstr ""
#. type: =item
-#: ../fish/guestfish.pod:299 ../fuse/guestmount.pod:177
+#: ../fish/guestfish.pod:299 ../fuse/guestmount.pod:212
msgid "B<--live>"
msgstr ""
#. type: textblock
-#: ../fish/guestfish.pod:301 ../fuse/guestmount.pod:179
+#: ../fish/guestfish.pod:301 ../fuse/guestmount.pod:214
msgid ""
"Connect to a live virtual machine. (Experimental, see "
"L<guestfs(3)/ATTACHING TO RUNNING DAEMONS>)."
msgstr ""
#. type: =item
-#: ../fish/guestfish.pod:304 ../fuse/guestmount.pod:182
+#: ../fish/guestfish.pod:304 ../fuse/guestmount.pod:217
msgid "B<-m dev[:mountpoint[:options]]>"
msgstr ""
#. type: =item
-#: ../fish/guestfish.pod:306 ../fuse/guestmount.pod:184
+#: ../fish/guestfish.pod:306 ../fuse/guestmount.pod:219
msgid "B<--mount dev[:mountpoint[:options]]>"
msgstr ""
@@ -19589,7 +19589,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../fish/guestfish.pod:323 ../fuse/guestmount.pod:192
+#: ../fish/guestfish.pod:323 ../fuse/guestmount.pod:227
msgid ""
"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 "
@@ -19600,7 +19600,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../fish/guestfish.pod:331 ../fuse/guestmount.pod:200
+#: ../fish/guestfish.pod:331 ../fuse/guestmount.pod:235
#, no-wrap
msgid ""
" -m /dev/sda1:/:acl,user_xattr\n"
@@ -19613,12 +19613,12 @@ msgid "Using this flag is equivalent to using the C<mount-options> command."
msgstr ""
#. type: =item
-#: ../fish/guestfish.pod:335 ../fuse/guestmount.pod:202 ../resize/virt-resize.pod:441
+#: ../fish/guestfish.pod:335 ../fuse/guestmount.pod:237 ../resize/virt-resize.pod:441
msgid "B<-n>"
msgstr ""
#. type: =item
-#: ../fish/guestfish.pod:337 ../fuse/guestmount.pod:204
+#: ../fish/guestfish.pod:337 ../fuse/guestmount.pod:239
msgid "B<--no-sync>"
msgstr ""
@@ -19693,12 +19693,12 @@ msgid ""
msgstr ""
#. type: =item
-#: ../fish/guestfish.pod:369 ../fuse/guestmount.pod:248 ../rescue/virt-rescue.pod:189
+#: ../fish/guestfish.pod:369 ../fuse/guestmount.pod:289 ../rescue/virt-rescue.pod:189
msgid "B<-r>"
msgstr ""
#. type: =item
-#: ../fish/guestfish.pod:371 ../fuse/guestmount.pod:250 ../rescue/virt-rescue.pod:191
+#: ../fish/guestfish.pod:371 ../fuse/guestmount.pod:291 ../rescue/virt-rescue.pod:191
msgid "B<--ro>"
msgstr ""
@@ -19731,7 +19731,7 @@ msgid "See also L</OPENING DISKS FOR READ AND WRITE> below."
msgstr ""
#. type: =item
-#: ../fish/guestfish.pod:386 ../fuse/guestmount.pod:262 ../rescue/virt-rescue.pod:201
+#: ../fish/guestfish.pod:386 ../fuse/guestmount.pod:303 ../rescue/virt-rescue.pod:201
msgid "B<--selinux>"
msgstr ""
@@ -19753,17 +19753,17 @@ msgid "Display the guestfish / libguestfs version number and exit."
msgstr ""
#. type: =item
-#: ../fish/guestfish.pod:403 ../fuse/guestmount.pod:278 ../rescue/virt-rescue.pod:231
+#: ../fish/guestfish.pod:403 ../fuse/guestmount.pod:319 ../rescue/virt-rescue.pod:231
msgid "B<-w>"
msgstr ""
#. type: =item
-#: ../fish/guestfish.pod:405 ../fuse/guestmount.pod:280 ../rescue/virt-rescue.pod:233
+#: ../fish/guestfish.pod:405 ../fuse/guestmount.pod:321 ../rescue/virt-rescue.pod:233
msgid "B<--rw>"
msgstr ""
#. type: textblock
-#: ../fish/guestfish.pod:407 ../fuse/guestmount.pod:282
+#: ../fish/guestfish.pod:407 ../fuse/guestmount.pod:323
msgid ""
"This changes the I<-a>, I<-d> and I<-m> options so that disks are added and "
"mounts are done read-write."
@@ -21543,22 +21543,22 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../fish/guestfish.pod:1209 ../fuse/guestmount.pod:297 ../rescue/virt-rescue.pod:310
+#: ../fish/guestfish.pod:1209 ../fuse/guestmount.pod:338 ../rescue/virt-rescue.pod:310
msgid "FILES"
msgstr ""
#. type: =item
-#: ../fish/guestfish.pod:1213 ../fuse/guestmount.pod:301 ../rescue/virt-rescue.pod:314
+#: ../fish/guestfish.pod:1213 ../fuse/guestmount.pod:342 ../rescue/virt-rescue.pod:314
msgid "$HOME/.libguestfs-tools.rc"
msgstr ""
#. type: =item
-#: ../fish/guestfish.pod:1215 ../fuse/guestmount.pod:303 ../rescue/virt-rescue.pod:316
+#: ../fish/guestfish.pod:1215 ../fuse/guestmount.pod:344 ../rescue/virt-rescue.pod:316
msgid "/etc/libguestfs-tools.conf"
msgstr ""
#. type: textblock
-#: ../fish/guestfish.pod:1217 ../fuse/guestmount.pod:305 ../rescue/virt-rescue.pod:318
+#: ../fish/guestfish.pod:1217 ../fuse/guestmount.pod:346 ../rescue/virt-rescue.pod:318
msgid ""
"This configuration file controls the default read-only or read-write mode "
"(I<--ro> or I<--rw>)."
@@ -21679,7 +21679,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../fish/guestfish.pod:1302 ../fuse/guestmount.pod:334 ../src/guestfs.pod:3360 ../test-tool/libguestfs-test-tool.pod:118
+#: ../fish/guestfish.pod:1302 ../fuse/guestmount.pod:375 ../src/guestfs.pod:3360 ../test-tool/libguestfs-test-tool.pod:118
msgid "Copyright (C) 2009-2012 Red Hat Inc. L<http://libguestfs.org/>"
msgstr ""
@@ -22476,18 +22476,84 @@ msgid ""
"Fedora or Red Hat Enterprise Linux."
msgstr ""
+#. type: =head2
+#: ../fuse/guestmount.pod:92
+msgid "fusermount error: \"Device or resource busy\""
+msgstr ""
+
+#. type: textblock
+#: ../fuse/guestmount.pod:94
+msgid ""
+"You can see this error when another process on the system jumps into the "
+"mountpoint you have just created, holding it open and preventing you from "
+"unmounting it. The usual culprits are various GUI \"indexing\" programs."
+msgstr ""
+
+#. type: textblock
+#: ../fuse/guestmount.pod:99
+msgid ""
+"The popular workaround for this problem is to retry the C<fusermount -u> "
+"command a few times until it works. Unfortunately this isn't a reliable fix "
+"if (for example) the mounted filesystem is particularly large and the "
+"intruding program is persistent."
+msgstr ""
+
+#. type: textblock
+#: ../fuse/guestmount.pod:104
+msgid ""
+"A proper fix is to use a private mountpoint by creating a new mount "
+"namespace using the Linux-specific L<clone(2)>/L<unshare(2)> flag "
+"C<CLONE_NEWNS>. Unfortunately at the moment this requires root and we would "
+"also probably need to add it as a feature to guestmount."
+msgstr ""
+
+#. type: =head2
+#: ../fuse/guestmount.pod:109
+msgid "Race conditions possible when shutting down the connection"
+msgstr ""
+
+#. type: textblock
+#: ../fuse/guestmount.pod:111
+msgid ""
+"When C<fusermount -u> exits, guestmount may still be running and cleaning up "
+"the mountpoint. The disk image will not be fully finalized."
+msgstr ""
+
+#. type: textblock
+#: ../fuse/guestmount.pod:115
+msgid "This means that scripts like the following have a nasty race condition:"
+msgstr ""
+
+#. type: verbatim
+#: ../fuse/guestmount.pod:118
+#, no-wrap
+msgid ""
+" guestmount -a disk.img -i /mnt\n"
+" # copy things into /mnt\n"
+" fusermount -u /mnt\n"
+" # immediately try to use 'disk.img' <-- UNSAFE\n"
+"\n"
+msgstr ""
+
+#. type: textblock
+#: ../fuse/guestmount.pod:123
+msgid ""
+"The solution is to use the I<--pid-file> option to write the guestmount PID "
+"to a file, then after fusermount spin waiting for this PID to exit."
+msgstr ""
+
#. type: textblock
-#: ../fuse/guestmount.pod:100
+#: ../fuse/guestmount.pod:135
msgid "Add a block device or virtual machine image."
msgstr ""
#. type: =item
-#: ../fuse/guestmount.pod:123
+#: ../fuse/guestmount.pod:158
msgid "B<--dir-cache-timeout N>"
msgstr ""
#. type: textblock
-#: ../fuse/guestmount.pod:125
+#: ../fuse/guestmount.pod:160
msgid ""
"Set the readdir cache timeout to I<N> seconds, the default being 60 "
"seconds. The readdir cache [actually, there are several semi-independent "
@@ -22497,7 +22563,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../fuse/guestmount.pod:131
+#: ../fuse/guestmount.pod:166
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 "
@@ -22505,7 +22571,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../fuse/guestmount.pod:151
+#: ../fuse/guestmount.pod:186
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 "
@@ -22514,36 +22580,36 @@ msgid ""
msgstr ""
#. type: =item
-#: ../fuse/guestmount.pod:156
+#: ../fuse/guestmount.pod:191
msgid "B<--fuse-help>"
msgstr ""
#. type: textblock
-#: ../fuse/guestmount.pod:158
+#: ../fuse/guestmount.pod:193
msgid "Display help on special FUSE options (see I<-o> below)."
msgstr ""
#. type: textblock
-#: ../fuse/guestmount.pod:162
+#: ../fuse/guestmount.pod:197
msgid "Display brief help and exit."
msgstr ""
#. type: textblock
-#: ../fuse/guestmount.pod:186
+#: ../fuse/guestmount.pod:221
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)."
msgstr ""
#. type: textblock
-#: ../fuse/guestmount.pod:189
+#: ../fuse/guestmount.pod:224
msgid ""
"If the mountpoint is omitted, it defaults to C</>. You have to mount "
"something on C</>."
msgstr ""
#. type: textblock
-#: ../fuse/guestmount.pod:206
+#: ../fuse/guestmount.pod:241
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 "
@@ -22551,22 +22617,22 @@ msgid ""
msgstr ""
#. type: =item
-#: ../fuse/guestmount.pod:211
+#: ../fuse/guestmount.pod:246
msgid "B<-o option>"
msgstr ""
#. type: =item
-#: ../fuse/guestmount.pod:213
+#: ../fuse/guestmount.pod:248
msgid "B<--option option>"
msgstr ""
#. type: textblock
-#: ../fuse/guestmount.pod:215
+#: ../fuse/guestmount.pod:250
msgid "Pass extra options to FUSE."
msgstr ""
#. type: textblock
-#: ../fuse/guestmount.pod:217
+#: ../fuse/guestmount.pod:252
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 "
@@ -22574,7 +22640,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../fuse/guestmount.pod:221
+#: ../fuse/guestmount.pod:256
#, no-wrap
msgid ""
" guestmount --fuse-help\n"
@@ -22582,37 +22648,37 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../fuse/guestmount.pod:223
+#: ../fuse/guestmount.pod:258
msgid "Some potentially useful FUSE options:"
msgstr ""
#. type: =item
-#: ../fuse/guestmount.pod:227
+#: ../fuse/guestmount.pod:262
msgid "B<-o allow_other>"
msgstr ""
#. type: textblock
-#: ../fuse/guestmount.pod:229
+#: ../fuse/guestmount.pod:264
msgid "Allow other users to see the filesystem."
msgstr ""
#. type: =item
-#: ../fuse/guestmount.pod:231
+#: ../fuse/guestmount.pod:266
msgid "B<-o attr_timeout=N>"
msgstr ""
#. type: textblock
-#: ../fuse/guestmount.pod:233
+#: ../fuse/guestmount.pod:268
msgid "Enable attribute caching by FUSE, and set the timeout to I<N> seconds."
msgstr ""
#. type: =item
-#: ../fuse/guestmount.pod:235
+#: ../fuse/guestmount.pod:270
msgid "B<-o kernel_cache>"
msgstr ""
#. type: textblock
-#: ../fuse/guestmount.pod:237
+#: ../fuse/guestmount.pod:272
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 "
@@ -22620,26 +22686,41 @@ msgid ""
msgstr ""
#. type: =item
-#: ../fuse/guestmount.pod:241
+#: ../fuse/guestmount.pod:276
msgid "B<-o uid=N> B<-o gid=N>"
msgstr ""
#. type: textblock
-#: ../fuse/guestmount.pod:243
+#: ../fuse/guestmount.pod:278
msgid ""
"Use these options to map all UIDs and GIDs inside the guest filesystem to "
"the chosen values."
msgstr ""
+#. type: =item
+#: ../fuse/guestmount.pod:283
+msgid "B<--pid-file filename>"
+msgstr ""
+
#. type: textblock
-#: ../fuse/guestmount.pod:252
+#: ../fuse/guestmount.pod:285
+msgid "Write the PID of the guestmount worker process to C<filename>."
+msgstr ""
+
+#. type: textblock
+#: ../fuse/guestmount.pod:287
+msgid "In libguestfs 1.16 (only), C<filename> must be an absolute path."
+msgstr ""
+
+#. type: textblock
+#: ../fuse/guestmount.pod:293
msgid ""
"Add devices and mount everything read-only. Also disallow writes and make "
"the disk appear read-only to FUSE."
msgstr ""
#. type: textblock
-#: ../fuse/guestmount.pod:255
+#: ../fuse/guestmount.pod:296
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 "
@@ -22648,47 +22729,47 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../fuse/guestmount.pod:260 ../rescue/virt-rescue.pod:199
+#: ../fuse/guestmount.pod:301 ../rescue/virt-rescue.pod:199
msgid "See also L<guestfish(1)/OPENING DISKS FOR READ AND WRITE>."
msgstr ""
#. type: textblock
-#: ../fuse/guestmount.pod:264
+#: ../fuse/guestmount.pod:305
msgid "Enable SELinux support for the guest."
msgstr ""
#. type: textblock
-#: ../fuse/guestmount.pod:270
+#: ../fuse/guestmount.pod:311
msgid "Enable verbose messages from underlying libguestfs."
msgstr ""
#. type: textblock
-#: ../fuse/guestmount.pod:276
+#: ../fuse/guestmount.pod:317
msgid "Display the program version and exit."
msgstr ""
#. type: textblock
-#: ../fuse/guestmount.pod:285 ../fuse/guestmount.pod:308 ../rescue/virt-rescue.pod:238 ../rescue/virt-rescue.pod:321
+#: ../fuse/guestmount.pod:326 ../fuse/guestmount.pod:349 ../rescue/virt-rescue.pod:238 ../rescue/virt-rescue.pod:321
msgid "See L<guestfish(1)/OPENING DISKS FOR READ AND WRITE>."
msgstr ""
#. type: =item
-#: ../fuse/guestmount.pod:289
+#: ../fuse/guestmount.pod:330
msgid "B<--trace>"
msgstr ""
#. type: textblock
-#: ../fuse/guestmount.pod:291
+#: ../fuse/guestmount.pod:332
msgid "Trace libguestfs calls and entry into each FUSE function."
msgstr ""
#. type: textblock
-#: ../fuse/guestmount.pod:293
+#: ../fuse/guestmount.pod:334
msgid "This also stops the daemon from forking into the background."
msgstr ""
#. type: textblock
-#: ../fuse/guestmount.pod:319
+#: ../fuse/guestmount.pod:360
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/>, "
diff --git a/po-docs/uk.po b/po-docs/uk.po
index aaa36e5c..827fa106 100644
--- a/po-docs/uk.po
+++ b/po-docs/uk.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: libguestfs@redhat.com\n"
-"POT-Creation-Date: 2012-07-07 13:58+0200\n"
+"POT-Creation-Date: 2012-07-10 13:19+0200\n"
"PO-Revision-Date: 2012-01-23 13:10+0000\n"
"Last-Translator: rjones <rjones@redhat.com>\n"
"Language-Team: Ukrainian <trans-uk@lists.fedoraproject.org>\n"
@@ -290,7 +290,7 @@ msgstr ""
#: ../fish/guestfish.pod:148 ../fish/virt-copy-in.pod:45
#: ../fish/virt-copy-out.pod:34 ../fish/virt-tar-in.pod:42
#: ../fish/virt-tar-out.pod:36 ../format/virt-format.pod:59
-#: ../fuse/guestmount.pod:92 ../inspector/virt-inspector.pod:54
+#: ../fuse/guestmount.pod:127 ../inspector/virt-inspector.pod:54
#: ../rescue/virt-rescue.pod:112 ../resize/virt-resize.pod:262
#: ../sparsify/virt-sparsify.pod:100 ../test-tool/libguestfs-test-tool.pod:36
#: ../tools/virt-list-filesystems.pl:55 ../tools/virt-list-partitions.pl:56
@@ -304,7 +304,7 @@ msgstr "ПАРАМЕТРИ"
#: ../cat/virt-filesystems.pod:95 ../cat/virt-ls.pod:265
#: ../clone/virt-sysprep.pod:46 ../df/virt-df.pod:63 ../edit/virt-edit.pod:66
#: ../fish/guestfish.pod:152 ../format/virt-format.pod:63
-#: ../fuse/guestmount.pod:160 ../inspector/virt-inspector.pod:58
+#: ../fuse/guestmount.pod:195 ../inspector/virt-inspector.pod:58
#: ../rescue/virt-rescue.pod:116 ../resize/virt-resize.pod:266
#: ../sparsify/virt-sparsify.pod:104 ../test-tool/libguestfs-test-tool.pod:40
#: ../tools/virt-list-filesystems.pl:63 ../tools/virt-list-partitions.pl:64
@@ -352,7 +352,7 @@ msgstr ""
#: ../cat/virt-filesystems.pod:107 ../cat/virt-ls.pod:277
#: ../clone/virt-sysprep.pod:56 ../df/virt-df.pod:75 ../edit/virt-edit.pod:78
#: ../fish/guestfish.pod:174 ../format/virt-format.pod:73
-#: ../fuse/guestmount.pod:102 ../inspector/virt-inspector.pod:70
+#: ../fuse/guestmount.pod:137 ../inspector/virt-inspector.pod:70
#: ../rescue/virt-rescue.pod:128
msgid ""
"The format of the disk image is auto-detected. To override this and force a "
@@ -428,7 +428,7 @@ msgstr ""
#: ../cat/virt-filesystems.pod:170 ../cat/virt-ls.pod:328
#: ../clone/virt-sysprep.pod:95 ../df/virt-df.pod:101
#: ../fish/guestfish.pod:233 ../format/virt-format.pod:87
-#: ../fuse/guestmount.pod:142 ../inspector/virt-inspector.pod:98
+#: ../fuse/guestmount.pod:177 ../inspector/virt-inspector.pod:98
#: ../rescue/virt-rescue.pod:152
msgid "B<--format=raw|qcow2|..>"
msgstr "B<--format=raw|qcow2|..>"
@@ -438,7 +438,7 @@ msgstr "B<--format=raw|qcow2|..>"
#: ../cat/virt-filesystems.pod:172 ../cat/virt-ls.pod:330
#: ../clone/virt-sysprep.pod:97 ../df/virt-df.pod:103
#: ../edit/virt-edit.pod:134 ../fish/guestfish.pod:235
-#: ../format/virt-format.pod:89 ../fuse/guestmount.pod:144
+#: ../format/virt-format.pod:89 ../fuse/guestmount.pod:179
#: ../inspector/virt-inspector.pod:100 ../rescue/virt-rescue.pod:154
msgid "B<--format>"
msgstr "B<--format>"
@@ -448,7 +448,7 @@ msgstr "B<--format>"
#: ../cat/virt-filesystems.pod:174 ../cat/virt-ls.pod:332
#: ../clone/virt-sysprep.pod:99 ../df/virt-df.pod:105
#: ../edit/virt-edit.pod:136 ../fish/guestfish.pod:237
-#: ../format/virt-format.pod:91 ../fuse/guestmount.pod:146
+#: ../format/virt-format.pod:91 ../fuse/guestmount.pod:181
#: ../rescue/virt-rescue.pod:156
msgid ""
"The default for the I<-a> option is to auto-detect the format of the disk "
@@ -544,7 +544,7 @@ msgstr ""
#: ../cat/virt-filesystems.pod:261 ../cat/virt-ls.pod:425
#: ../clone/virt-sysprep.pod:138 ../df/virt-df.pod:173
#: ../edit/virt-edit.pod:161 ../fish/guestfish.pod:390
-#: ../format/virt-format.pod:145 ../fuse/guestmount.pod:266
+#: ../format/virt-format.pod:145 ../fuse/guestmount.pod:307
#: ../inspector/virt-inspector.pod:118 ../rescue/virt-rescue.pod:219
#: ../sparsify/virt-sparsify.pod:184
msgid "B<-v>"
@@ -555,7 +555,7 @@ msgstr "B<-v>"
#: ../cat/virt-filesystems.pod:263 ../cat/virt-ls.pod:427
#: ../clone/virt-sysprep.pod:140 ../df/virt-df.pod:175
#: ../edit/virt-edit.pod:163 ../fish/guestfish.pod:392
-#: ../format/virt-format.pod:147 ../fuse/guestmount.pod:268
+#: ../format/virt-format.pod:147 ../fuse/guestmount.pod:309
#: ../inspector/virt-inspector.pod:120 ../rescue/virt-rescue.pod:221
#: ../sparsify/virt-sparsify.pod:186
msgid "B<--verbose>"
@@ -576,7 +576,7 @@ msgstr "Увімкнути докладний показ повідомлень
#: ../cat/virt-filesystems.pod:267 ../cat/virt-ls.pod:431
#: ../clone/virt-sysprep.pod:144 ../df/virt-df.pod:179
#: ../edit/virt-edit.pod:167 ../fish/guestfish.pod:397
-#: ../format/virt-format.pod:151 ../fuse/guestmount.pod:272
+#: ../format/virt-format.pod:151 ../fuse/guestmount.pod:313
#: ../inspector/virt-inspector.pod:124 ../rescue/virt-rescue.pod:225
#: ../resize/virt-resize.pod:567 ../sparsify/virt-sparsify.pod:190
#: ../test-tool/libguestfs-test-tool.pod:61
@@ -588,7 +588,7 @@ msgstr "B<-V>"
#: ../cat/virt-filesystems.pod:269 ../cat/virt-ls.pod:433
#: ../clone/virt-sysprep.pod:146 ../df/virt-df.pod:181
#: ../edit/virt-edit.pod:169 ../fish/guestfish.pod:399
-#: ../format/virt-format.pod:153 ../fuse/guestmount.pod:274
+#: ../format/virt-format.pod:153 ../fuse/guestmount.pod:315
#: ../inspector/virt-inspector.pod:126 ../rescue/virt-rescue.pod:227
#: ../resize/virt-resize.pod:569 ../sparsify/virt-sparsify.pod:192
#: ../test-tool/libguestfs-test-tool.pod:63
@@ -616,7 +616,7 @@ msgstr "Показати дані щодо версії і завершити р
#: ../cat/virt-filesystems.pod:281 ../cat/virt-ls.pod:437
#: ../clone/virt-sysprep.pod:150 ../df/virt-df.pod:185
#: ../edit/virt-edit.pod:173 ../fish/guestfish.pod:412
-#: ../format/virt-format.pod:167 ../fuse/guestmount.pod:287
+#: ../format/virt-format.pod:167 ../fuse/guestmount.pod:328
#: ../inspector/virt-inspector.pod:130 ../rescue/virt-rescue.pod:240
#: ../sparsify/virt-sparsify.pod:196 ../tools/virt-tar.pl:158
msgid "B<-x>"
@@ -941,7 +941,7 @@ msgstr ""
#: ../cat/virt-filesystems.pod:380 ../cat/virt-ls.pod:490
#: ../clone/virt-sysprep.pod:482 ../df/virt-df.pod:248
#: ../edit/virt-edit.pod:363 ../fish/guestfish.pod:1114
-#: ../format/virt-format.pod:173 ../fuse/guestmount.pod:312
+#: ../format/virt-format.pod:173 ../fuse/guestmount.pod:353
#: ../inspector/virt-inspector.pod:496 ../resize/virt-resize.pod:697
#: ../sparsify/virt-sparsify.pod:252 ../test-tool/libguestfs-test-tool.pod:96
msgid "EXIT STATUS"
@@ -1088,7 +1088,7 @@ msgstr ""
#: ../examples/guestfs-testing.pod:291 ../fish/guestfish.pod:1268
#: ../fish/virt-copy-in.pod:50 ../fish/virt-copy-out.pod:39
#: ../fish/virt-tar-in.pod:47 ../fish/virt-tar-out.pod:41
-#: ../format/virt-format.pod:177 ../fuse/guestmount.pod:317
+#: ../format/virt-format.pod:177 ../fuse/guestmount.pod:358
#: ../inspector/virt-inspector.pod:501 ../java/examples/guestfs-java.pod:45
#: ../ocaml/examples/guestfs-ocaml.pod:78 ../perl/examples/guestfs-perl.pod:39
#: ../python/examples/guestfs-python.pod:42 ../rescue/virt-rescue.pod:325
@@ -1144,7 +1144,7 @@ msgstr "Richard W.M. Jones L<http://people.redhat.com/~rjones/>"
#: ../examples/guestfs-testing.pod:302 ../fish/guestfish.pod:1300
#: ../fish/virt-copy-in.pod:64 ../fish/virt-copy-out.pod:53
#: ../fish/virt-tar-in.pod:62 ../fish/virt-tar-out.pod:55
-#: ../format/virt-format.pod:191 ../fuse/guestmount.pod:332
+#: ../format/virt-format.pod:191 ../fuse/guestmount.pod:373
#: ../inspector/virt-inspector.pod:524 ../java/examples/guestfs-java.pod:62
#: ../ocaml/examples/guestfs-ocaml.pod:95 ../perl/examples/guestfs-perl.pod:56
#: ../python/examples/guestfs-python.pod:58 ../rescue/virt-rescue.pod:338
@@ -1170,7 +1170,7 @@ msgstr "© Red Hat Inc., 2011"
#: ../edit/virt-edit.pod:390 ../fish/guestfish.pod:1305
#: ../fish/virt-copy-in.pod:69 ../fish/virt-copy-out.pod:58
#: ../fish/virt-tar-in.pod:67 ../fish/virt-tar-out.pod:60
-#: ../format/virt-format.pod:195 ../fuse/guestmount.pod:337
+#: ../format/virt-format.pod:195 ../fuse/guestmount.pod:378
#: ../inspector/virt-inspector.pod:528 ../rescue/virt-rescue.pod:342
#: ../resize/virt-resize.pod:733 ../sparsify/virt-sparsify.pod:305
#: ../test-tool/libguestfs-test-tool.pod:121
@@ -1191,7 +1191,7 @@ msgstr ""
#: ../edit/virt-edit.pod:395 ../fish/guestfish.pod:1310
#: ../fish/virt-copy-in.pod:74 ../fish/virt-copy-out.pod:63
#: ../fish/virt-tar-in.pod:72 ../fish/virt-tar-out.pod:65
-#: ../format/virt-format.pod:200 ../fuse/guestmount.pod:342
+#: ../format/virt-format.pod:200 ../fuse/guestmount.pod:383
#: ../inspector/virt-inspector.pod:533 ../rescue/virt-rescue.pod:347
#: ../resize/virt-resize.pod:738 ../sparsify/virt-sparsify.pod:310
#: ../test-tool/libguestfs-test-tool.pod:126
@@ -1216,7 +1216,7 @@ msgstr ""
#: ../edit/virt-edit.pod:400 ../fish/guestfish.pod:1315
#: ../fish/virt-copy-in.pod:79 ../fish/virt-copy-out.pod:68
#: ../fish/virt-tar-in.pod:77 ../fish/virt-tar-out.pod:70
-#: ../format/virt-format.pod:205 ../fuse/guestmount.pod:347
+#: ../format/virt-format.pod:205 ../fuse/guestmount.pod:388
#: ../inspector/virt-inspector.pod:538 ../rescue/virt-rescue.pod:352
#: ../resize/virt-resize.pod:743 ../sparsify/virt-sparsify.pod:315
#: ../test-tool/libguestfs-test-tool.pod:131
@@ -1435,7 +1435,7 @@ msgstr ""
#. type: =item
#: ../cat/virt-cat.pod:98 ../cat/virt-filesystems.pod:148
#: ../cat/virt-ls.pod:314 ../edit/virt-edit.pod:112 ../fish/guestfish.pod:217
-#: ../fuse/guestmount.pod:135 ../inspector/virt-inspector.pod:91
+#: ../fuse/guestmount.pod:170 ../inspector/virt-inspector.pod:91
msgid "B<--echo-keys>"
msgstr "B<--echo-keys>"
@@ -1471,14 +1471,14 @@ msgstr ""
#. type: =item
#: ../cat/virt-cat.pod:129 ../cat/virt-filesystems.pod:200
#: ../cat/virt-ls.pod:361 ../edit/virt-edit.pod:156 ../fish/guestfish.pod:289
-#: ../fuse/guestmount.pod:172 ../inspector/virt-inspector.pod:113
+#: ../fuse/guestmount.pod:207 ../inspector/virt-inspector.pod:113
msgid "B<--keys-from-stdin>"
msgstr "B<--keys-from-stdin>"
#. type: textblock
#: ../cat/virt-cat.pod:131 ../cat/virt-filesystems.pod:202
#: ../cat/virt-ls.pod:363 ../edit/virt-edit.pod:158 ../fish/guestfish.pod:291
-#: ../fuse/guestmount.pod:174 ../inspector/virt-inspector.pod:115
+#: ../fuse/guestmount.pod:209 ../inspector/virt-inspector.pod:115
msgid ""
"Read key or passphrase parameters from stdin. The default is to try to read "
"passphrases from the user by opening C</dev/tty>."
@@ -1647,7 +1647,7 @@ msgstr ""
#. type: textblock
#: ../cat/virt-cat.pod:240 ../cat/virt-filesystems.pod:382
#: ../cat/virt-ls.pod:492 ../df/virt-df.pod:250 ../edit/virt-edit.pod:365
-#: ../fuse/guestmount.pod:314 ../inspector/virt-inspector.pod:498
+#: ../fuse/guestmount.pod:355 ../inspector/virt-inspector.pod:498
#: ../resize/virt-resize.pod:699 ../sparsify/virt-sparsify.pod:254
msgid ""
"This program returns 0 if successful, or non-zero if there was an error."
@@ -4115,7 +4115,7 @@ msgid "You are not allowed to use I<-h> and I<--csv> at the same time."
msgstr ""
#. type: =item
-#: ../df/virt-df.pod:133 ../fish/guestfish.pod:258 ../fuse/guestmount.pod:164
+#: ../df/virt-df.pod:133 ../fish/guestfish.pod:258 ../fuse/guestmount.pod:199
msgid "B<-i>"
msgstr "B<-i>"
@@ -4417,7 +4417,7 @@ msgstr ""
#. type: =item
#: ../edit/virt-edit.pod:95 ../fish/guestfish.pod:181
-#: ../fuse/guestmount.pod:105 ../inspector/virt-inspector.pod:73
+#: ../fuse/guestmount.pod:140 ../inspector/virt-inspector.pod:73
#: ../tools/virt-list-filesystems.pl:79 ../tools/virt-list-partitions.pl:80
#: ../tools/virt-tar.pl:127 ../tools/virt-win-reg.pl:128
msgid "B<-c URI>"
@@ -4425,7 +4425,7 @@ msgstr "B<-c адреса>"
#. type: =item
#: ../edit/virt-edit.pod:97 ../fish/guestfish.pod:183
-#: ../fuse/guestmount.pod:107 ../inspector/virt-inspector.pod:75
+#: ../fuse/guestmount.pod:142 ../inspector/virt-inspector.pod:75
#: ../tools/virt-list-filesystems.pl:81 ../tools/virt-list-partitions.pl:82
#: ../tools/virt-tar.pl:129 ../tools/virt-win-reg.pl:130
msgid "B<--connect URI>"
@@ -5055,7 +5055,7 @@ msgstr ""
#: ../examples/guestfs-testing.pod:298 ../fish/guestfish.pod:1296
#: ../fish/virt-copy-in.pod:60 ../fish/virt-copy-out.pod:49
#: ../fish/virt-tar-in.pod:58 ../fish/virt-tar-out.pod:51
-#: ../fuse/guestmount.pod:328 ../inspector/virt-inspector.pod:510
+#: ../fuse/guestmount.pod:369 ../inspector/virt-inspector.pod:510
#: ../java/examples/guestfs-java.pod:58 ../ocaml/examples/guestfs-ocaml.pod:91
#: ../perl/examples/guestfs-perl.pod:52
#: ../python/examples/guestfs-python.pod:54
@@ -5070,7 +5070,7 @@ msgstr "АВТОРИ"
#: ../examples/guestfs-testing.pod:300 ../fish/guestfish.pod:1298
#: ../fish/virt-copy-in.pod:62 ../fish/virt-copy-out.pod:51
#: ../fish/virt-tar-in.pod:60 ../fish/virt-tar-out.pod:53
-#: ../fuse/guestmount.pod:330 ../java/examples/guestfs-java.pod:60
+#: ../fuse/guestmount.pod:371 ../java/examples/guestfs-java.pod:60
#: ../ocaml/examples/guestfs-ocaml.pod:93 ../perl/examples/guestfs-perl.pod:54
#: ../python/examples/guestfs-python.pod:56
#: ../ruby/examples/guestfs-ruby.pod:50 ../src/guestfs.pod:3356
@@ -20686,12 +20686,12 @@ msgid "Displays detailed help on a single command C<cmd>."
msgstr ""
#. type: =item
-#: ../fish/guestfish.pod:168 ../fuse/guestmount.pod:96
+#: ../fish/guestfish.pod:168 ../fuse/guestmount.pod:131
msgid "B<-a image>"
msgstr "B<-a образ>"
#. type: =item
-#: ../fish/guestfish.pod:170 ../fuse/guestmount.pod:98
+#: ../fish/guestfish.pod:170 ../fuse/guestmount.pod:133
msgid "B<--add image>"
msgstr "B<--add образ>"
@@ -20709,7 +20709,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../fish/guestfish.pod:185 ../fuse/guestmount.pod:109
+#: ../fish/guestfish.pod:185 ../fuse/guestmount.pod:144
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."
@@ -20728,17 +20728,17 @@ msgid ""
msgstr ""
#. type: =item
-#: ../fish/guestfish.pod:194 ../fuse/guestmount.pod:113
+#: ../fish/guestfish.pod:194 ../fuse/guestmount.pod:148
msgid "B<-d libvirt-domain>"
msgstr "B<-d домен-libvirt>"
#. type: =item
-#: ../fish/guestfish.pod:196 ../fuse/guestmount.pod:115
+#: ../fish/guestfish.pod:196 ../fuse/guestmount.pod:150
msgid "B<--domain libvirt-domain>"
msgstr "B<--domain домен-libvirt>"
#. type: textblock
-#: ../fish/guestfish.pod:198 ../fuse/guestmount.pod:117
+#: ../fish/guestfish.pod:198 ../fuse/guestmount.pod:152
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 "
@@ -20746,7 +20746,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../fish/guestfish.pod:202 ../fuse/guestmount.pod:121
+#: ../fish/guestfish.pod:202 ../fuse/guestmount.pod:156
msgid "Domain UUIDs can be used instead of names."
msgstr ""
@@ -20778,7 +20778,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../fish/guestfish.pod:219 ../fuse/guestmount.pod:137
+#: ../fish/guestfish.pod:219 ../fuse/guestmount.pod:172
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 "
@@ -20840,12 +20840,12 @@ msgid ""
msgstr ""
#. type: =item
-#: ../fish/guestfish.pod:260 ../fuse/guestmount.pod:166
+#: ../fish/guestfish.pod:260 ../fuse/guestmount.pod:201
msgid "B<--inspector>"
msgstr "B<--inspector>"
#. type: textblock
-#: ../fish/guestfish.pod:262 ../fuse/guestmount.pod:168
+#: ../fish/guestfish.pod:262 ../fuse/guestmount.pod:203
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 "
@@ -20942,24 +20942,24 @@ msgid ""
msgstr ""
#. type: =item
-#: ../fish/guestfish.pod:299 ../fuse/guestmount.pod:177
+#: ../fish/guestfish.pod:299 ../fuse/guestmount.pod:212
msgid "B<--live>"
msgstr "B<--live>"
#. type: textblock
-#: ../fish/guestfish.pod:301 ../fuse/guestmount.pod:179
+#: ../fish/guestfish.pod:301 ../fuse/guestmount.pod:214
msgid ""
"Connect to a live virtual machine. (Experimental, see L<guestfs(3)/"
"ATTACHING TO RUNNING DAEMONS>)."
msgstr ""
#. type: =item
-#: ../fish/guestfish.pod:304 ../fuse/guestmount.pod:182
+#: ../fish/guestfish.pod:304 ../fuse/guestmount.pod:217
msgid "B<-m dev[:mountpoint[:options]]>"
msgstr "B<-m пристрій[:точка_монтування[:параметри]]>"
#. type: =item
-#: ../fish/guestfish.pod:306 ../fuse/guestmount.pod:184
+#: ../fish/guestfish.pod:306 ../fuse/guestmount.pod:219
msgid "B<--mount dev[:mountpoint[:options]]>"
msgstr "B<--mount пристрій[:точка_монтування[:параметри]]>"
@@ -20995,7 +20995,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../fish/guestfish.pod:323 ../fuse/guestmount.pod:192
+#: ../fish/guestfish.pod:323 ../fuse/guestmount.pod:227
msgid ""
"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 "
@@ -21006,7 +21006,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../fish/guestfish.pod:331 ../fuse/guestmount.pod:200
+#: ../fish/guestfish.pod:331 ../fuse/guestmount.pod:235
#, no-wrap
msgid ""
" -m /dev/sda1:/:acl,user_xattr\n"
@@ -21019,13 +21019,13 @@ msgid "Using this flag is equivalent to using the C<mount-options> command."
msgstr ""
#. type: =item
-#: ../fish/guestfish.pod:335 ../fuse/guestmount.pod:202
+#: ../fish/guestfish.pod:335 ../fuse/guestmount.pod:237
#: ../resize/virt-resize.pod:441
msgid "B<-n>"
msgstr "B<-n>"
#. type: =item
-#: ../fish/guestfish.pod:337 ../fuse/guestmount.pod:204
+#: ../fish/guestfish.pod:337 ../fuse/guestmount.pod:239
msgid "B<--no-sync>"
msgstr "B<--no-sync>"
@@ -21100,13 +21100,13 @@ msgid ""
msgstr ""
#. type: =item
-#: ../fish/guestfish.pod:369 ../fuse/guestmount.pod:248
+#: ../fish/guestfish.pod:369 ../fuse/guestmount.pod:289
#: ../rescue/virt-rescue.pod:189
msgid "B<-r>"
msgstr "B<-r>"
#. type: =item
-#: ../fish/guestfish.pod:371 ../fuse/guestmount.pod:250
+#: ../fish/guestfish.pod:371 ../fuse/guestmount.pod:291
#: ../rescue/virt-rescue.pod:191
msgid "B<--ro>"
msgstr "B<--ro>"
@@ -21140,7 +21140,7 @@ msgid "See also L</OPENING DISKS FOR READ AND WRITE> below."
msgstr ""
#. type: =item
-#: ../fish/guestfish.pod:386 ../fuse/guestmount.pod:262
+#: ../fish/guestfish.pod:386 ../fuse/guestmount.pod:303
#: ../rescue/virt-rescue.pod:201
msgid "B<--selinux>"
msgstr "B<--selinux>"
@@ -21162,19 +21162,19 @@ msgid "Display the guestfish / libguestfs version number and exit."
msgstr ""
#. type: =item
-#: ../fish/guestfish.pod:403 ../fuse/guestmount.pod:278
+#: ../fish/guestfish.pod:403 ../fuse/guestmount.pod:319
#: ../rescue/virt-rescue.pod:231
msgid "B<-w>"
msgstr "B<-w>"
#. type: =item
-#: ../fish/guestfish.pod:405 ../fuse/guestmount.pod:280
+#: ../fish/guestfish.pod:405 ../fuse/guestmount.pod:321
#: ../rescue/virt-rescue.pod:233
msgid "B<--rw>"
msgstr "B<--rw>"
#. type: textblock
-#: ../fish/guestfish.pod:407 ../fuse/guestmount.pod:282
+#: ../fish/guestfish.pod:407 ../fuse/guestmount.pod:323
msgid ""
"This changes the I<-a>, I<-d> and I<-m> options so that disks are added and "
"mounts are done read-write."
@@ -22966,25 +22966,25 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../fish/guestfish.pod:1209 ../fuse/guestmount.pod:297
+#: ../fish/guestfish.pod:1209 ../fuse/guestmount.pod:338
#: ../rescue/virt-rescue.pod:310
msgid "FILES"
msgstr "ФАЙЛИ"
#. type: =item
-#: ../fish/guestfish.pod:1213 ../fuse/guestmount.pod:301
+#: ../fish/guestfish.pod:1213 ../fuse/guestmount.pod:342
#: ../rescue/virt-rescue.pod:314
msgid "$HOME/.libguestfs-tools.rc"
msgstr ""
#. type: =item
-#: ../fish/guestfish.pod:1215 ../fuse/guestmount.pod:303
+#: ../fish/guestfish.pod:1215 ../fuse/guestmount.pod:344
#: ../rescue/virt-rescue.pod:316
msgid "/etc/libguestfs-tools.conf"
msgstr ""
#. type: textblock
-#: ../fish/guestfish.pod:1217 ../fuse/guestmount.pod:305
+#: ../fish/guestfish.pod:1217 ../fuse/guestmount.pod:346
#: ../rescue/virt-rescue.pod:318
msgid ""
"This configuration file controls the default read-only or read-write mode "
@@ -23105,7 +23105,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../fish/guestfish.pod:1302 ../fuse/guestmount.pod:334
+#: ../fish/guestfish.pod:1302 ../fuse/guestmount.pod:375
#: ../src/guestfs.pod:3360 ../test-tool/libguestfs-test-tool.pod:118
msgid "Copyright (C) 2009-2012 Red Hat Inc. L<http://libguestfs.org/>"
msgstr ""
@@ -23918,18 +23918,84 @@ msgid ""
"Fedora or Red Hat Enterprise Linux."
msgstr ""
+#. type: =head2
+#: ../fuse/guestmount.pod:92
+msgid "fusermount error: \"Device or resource busy\""
+msgstr ""
+
#. type: textblock
-#: ../fuse/guestmount.pod:100
+#: ../fuse/guestmount.pod:94
+msgid ""
+"You can see this error when another process on the system jumps into the "
+"mountpoint you have just created, holding it open and preventing you from "
+"unmounting it. The usual culprits are various GUI \"indexing\" programs."
+msgstr ""
+
+#. type: textblock
+#: ../fuse/guestmount.pod:99
+msgid ""
+"The popular workaround for this problem is to retry the C<fusermount -u> "
+"command a few times until it works. Unfortunately this isn't a reliable fix "
+"if (for example) the mounted filesystem is particularly large and the "
+"intruding program is persistent."
+msgstr ""
+
+#. type: textblock
+#: ../fuse/guestmount.pod:104
+msgid ""
+"A proper fix is to use a private mountpoint by creating a new mount "
+"namespace using the Linux-specific L<clone(2)>/L<unshare(2)> flag "
+"C<CLONE_NEWNS>. Unfortunately at the moment this requires root and we would "
+"also probably need to add it as a feature to guestmount."
+msgstr ""
+
+#. type: =head2
+#: ../fuse/guestmount.pod:109
+msgid "Race conditions possible when shutting down the connection"
+msgstr ""
+
+#. type: textblock
+#: ../fuse/guestmount.pod:111
+msgid ""
+"When C<fusermount -u> exits, guestmount may still be running and cleaning up "
+"the mountpoint. The disk image will not be fully finalized."
+msgstr ""
+
+#. type: textblock
+#: ../fuse/guestmount.pod:115
+msgid "This means that scripts like the following have a nasty race condition:"
+msgstr ""
+
+#. type: verbatim
+#: ../fuse/guestmount.pod:118
+#, no-wrap
+msgid ""
+" guestmount -a disk.img -i /mnt\n"
+" # copy things into /mnt\n"
+" fusermount -u /mnt\n"
+" # immediately try to use 'disk.img' <-- UNSAFE\n"
+"\n"
+msgstr ""
+
+#. type: textblock
+#: ../fuse/guestmount.pod:123
+msgid ""
+"The solution is to use the I<--pid-file> option to write the guestmount PID "
+"to a file, then after fusermount spin waiting for this PID to exit."
+msgstr ""
+
+#. type: textblock
+#: ../fuse/guestmount.pod:135
msgid "Add a block device or virtual machine image."
msgstr ""
#. type: =item
-#: ../fuse/guestmount.pod:123
+#: ../fuse/guestmount.pod:158
msgid "B<--dir-cache-timeout N>"
msgstr "B<--dir-cache-timeout N>"
#. type: textblock
-#: ../fuse/guestmount.pod:125
+#: ../fuse/guestmount.pod:160
msgid ""
"Set the readdir cache timeout to I<N> seconds, the default being 60 "
"seconds. The readdir cache [actually, there are several semi-independent "
@@ -23939,7 +24005,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../fuse/guestmount.pod:131
+#: ../fuse/guestmount.pod:166
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 "
@@ -23947,7 +24013,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../fuse/guestmount.pod:151
+#: ../fuse/guestmount.pod:186
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 "
@@ -23956,36 +24022,36 @@ msgid ""
msgstr ""
#. type: =item
-#: ../fuse/guestmount.pod:156
+#: ../fuse/guestmount.pod:191
msgid "B<--fuse-help>"
msgstr "B<--fuse-help>"
#. type: textblock
-#: ../fuse/guestmount.pod:158
+#: ../fuse/guestmount.pod:193
msgid "Display help on special FUSE options (see I<-o> below)."
msgstr ""
#. type: textblock
-#: ../fuse/guestmount.pod:162
+#: ../fuse/guestmount.pod:197
msgid "Display brief help and exit."
msgstr ""
#. type: textblock
-#: ../fuse/guestmount.pod:186
+#: ../fuse/guestmount.pod:221
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)."
msgstr ""
#. type: textblock
-#: ../fuse/guestmount.pod:189
+#: ../fuse/guestmount.pod:224
msgid ""
"If the mountpoint is omitted, it defaults to C</>. You have to mount "
"something on C</>."
msgstr ""
#. type: textblock
-#: ../fuse/guestmount.pod:206
+#: ../fuse/guestmount.pod:241
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 "
@@ -23993,22 +24059,22 @@ msgid ""
msgstr ""
#. type: =item
-#: ../fuse/guestmount.pod:211
+#: ../fuse/guestmount.pod:246
msgid "B<-o option>"
msgstr "B<-o параметр>"
#. type: =item
-#: ../fuse/guestmount.pod:213
+#: ../fuse/guestmount.pod:248
msgid "B<--option option>"
msgstr "B<--option параметр>"
#. type: textblock
-#: ../fuse/guestmount.pod:215
+#: ../fuse/guestmount.pod:250
msgid "Pass extra options to FUSE."
msgstr ""
#. type: textblock
-#: ../fuse/guestmount.pod:217
+#: ../fuse/guestmount.pod:252
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 "
@@ -24016,7 +24082,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../fuse/guestmount.pod:221
+#: ../fuse/guestmount.pod:256
#, no-wrap
msgid ""
" guestmount --fuse-help\n"
@@ -24024,37 +24090,37 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../fuse/guestmount.pod:223
+#: ../fuse/guestmount.pod:258
msgid "Some potentially useful FUSE options:"
msgstr ""
#. type: =item
-#: ../fuse/guestmount.pod:227
+#: ../fuse/guestmount.pod:262
msgid "B<-o allow_other>"
msgstr ""
#. type: textblock
-#: ../fuse/guestmount.pod:229
+#: ../fuse/guestmount.pod:264
msgid "Allow other users to see the filesystem."
msgstr ""
#. type: =item
-#: ../fuse/guestmount.pod:231
+#: ../fuse/guestmount.pod:266
msgid "B<-o attr_timeout=N>"
msgstr "B<-o attr_timeout=N>"
#. type: textblock
-#: ../fuse/guestmount.pod:233
+#: ../fuse/guestmount.pod:268
msgid "Enable attribute caching by FUSE, and set the timeout to I<N> seconds."
msgstr ""
#. type: =item
-#: ../fuse/guestmount.pod:235
+#: ../fuse/guestmount.pod:270
msgid "B<-o kernel_cache>"
msgstr ""
#. type: textblock
-#: ../fuse/guestmount.pod:237
+#: ../fuse/guestmount.pod:272
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 "
@@ -24062,26 +24128,43 @@ msgid ""
msgstr ""
#. type: =item
-#: ../fuse/guestmount.pod:241
+#: ../fuse/guestmount.pod:276
msgid "B<-o uid=N> B<-o gid=N>"
msgstr "B<-o uid=N> B<-o gid=N>"
#. type: textblock
-#: ../fuse/guestmount.pod:243
+#: ../fuse/guestmount.pod:278
msgid ""
"Use these options to map all UIDs and GIDs inside the guest filesystem to "
"the chosen values."
msgstr ""
+#. type: =item
+#: ../fuse/guestmount.pod:283
+#, fuzzy
+#| msgid "B<--file file>"
+msgid "B<--pid-file filename>"
+msgstr "B<--file файл>"
+
#. type: textblock
-#: ../fuse/guestmount.pod:252
+#: ../fuse/guestmount.pod:285
+msgid "Write the PID of the guestmount worker process to C<filename>."
+msgstr ""
+
+#. type: textblock
+#: ../fuse/guestmount.pod:287
+msgid "In libguestfs 1.16 (only), C<filename> must be an absolute path."
+msgstr ""
+
+#. type: textblock
+#: ../fuse/guestmount.pod:293
msgid ""
"Add devices and mount everything read-only. Also disallow writes and make "
"the disk appear read-only to FUSE."
msgstr ""
#. type: textblock
-#: ../fuse/guestmount.pod:255
+#: ../fuse/guestmount.pod:296
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 "
@@ -24090,48 +24173,48 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../fuse/guestmount.pod:260 ../rescue/virt-rescue.pod:199
+#: ../fuse/guestmount.pod:301 ../rescue/virt-rescue.pod:199
msgid "See also L<guestfish(1)/OPENING DISKS FOR READ AND WRITE>."
msgstr "Див. також L<guestfish(1)/OPENING DISKS FOR READ AND WRITE>."
#. type: textblock
-#: ../fuse/guestmount.pod:264
+#: ../fuse/guestmount.pod:305
msgid "Enable SELinux support for the guest."
msgstr ""
#. type: textblock
-#: ../fuse/guestmount.pod:270
+#: ../fuse/guestmount.pod:311
msgid "Enable verbose messages from underlying libguestfs."
msgstr ""
#. type: textblock
-#: ../fuse/guestmount.pod:276
+#: ../fuse/guestmount.pod:317
msgid "Display the program version and exit."
msgstr ""
#. type: textblock
-#: ../fuse/guestmount.pod:285 ../fuse/guestmount.pod:308
+#: ../fuse/guestmount.pod:326 ../fuse/guestmount.pod:349
#: ../rescue/virt-rescue.pod:238 ../rescue/virt-rescue.pod:321
msgid "See L<guestfish(1)/OPENING DISKS FOR READ AND WRITE>."
msgstr "Див. L<guestfish(1)/OPENING DISKS FOR READ AND WRITE>."
#. type: =item
-#: ../fuse/guestmount.pod:289
+#: ../fuse/guestmount.pod:330
msgid "B<--trace>"
msgstr "B<--trace>"
#. type: textblock
-#: ../fuse/guestmount.pod:291
+#: ../fuse/guestmount.pod:332
msgid "Trace libguestfs calls and entry into each FUSE function."
msgstr ""
#. type: textblock
-#: ../fuse/guestmount.pod:293
+#: ../fuse/guestmount.pod:334
msgid "This also stops the daemon from forking into the background."
msgstr ""
#. type: textblock
-#: ../fuse/guestmount.pod:319
+#: ../fuse/guestmount.pod:360
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."
diff --git a/po/en_GB.po b/po/en_GB.po
index f7c8998e..dc73b6c0 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2012-07-07 13:58+0100\n"
+"POT-Creation-Date: 2012-07-10 13:19+0100\n"
"PO-Revision-Date: 2012-01-23 13:09+0000\n"
"Last-Translator: rjones <rjones@redhat.com>\n"
"Language-Team: English (United Kingdom) (http://www.transifex.net/projects/p/"
@@ -22,7 +22,7 @@ msgstr ""
#: align/scan.c:68 cat/virt-cat.c:61 cat/virt-filesystems.c:100
#: cat/virt-ls.c:99 df/main.c:70 edit/virt-edit.c:75 fish/fish.c:101
-#: fuse/guestmount.c:939 inspector/virt-inspector.c:78 rescue/virt-rescue.c:62
+#: fuse/guestmount.c:954 inspector/virt-inspector.c:78 rescue/virt-rescue.c:62
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "Try `%s --help' for more information.\n"
@@ -50,7 +50,7 @@ msgstr ""
#: align/scan.c:127 cat/virt-cat.c:121 cat/virt-filesystems.c:203
#: cat/virt-ls.c:192 df/domains.c:431 df/main.c:136 edit/virt-edit.c:143
-#: fish/fish.c:226 format/format.c:136 fuse/guestmount.c:1055
+#: fish/fish.c:226 format/format.c:136 fuse/guestmount.c:1072
#: inspector/virt-inspector.c:140 rescue/virt-rescue.c:142
#, c-format
msgid "guestfs_create: failed to create handle\n"
@@ -58,7 +58,7 @@ msgstr "guestfs_create: failed to create handle\n"
#: align/scan.c:145 cat/virt-cat.c:143 cat/virt-filesystems.c:257
#: cat/virt-ls.c:242 df/main.c:160 edit/virt-edit.c:165 fish/fish.c:283
-#: format/format.c:188 fuse/guestmount.c:1092 inspector/virt-inspector.c:164
+#: format/format.c:188 fuse/guestmount.c:1116 inspector/virt-inspector.c:164
#: rescue/virt-rescue.c:179
#, c-format
msgid "%s: unknown long option: %s (%d)\n"
@@ -2848,7 +2848,7 @@ msgstr ""
msgid "%s: cannot parse --lvm option (%s)\n"
msgstr ""
-#: fuse/guestmount.c:943
+#: fuse/guestmount.c:958
#, c-format
msgid ""
"%s: FUSE module for libguestfs\n"
@@ -2871,6 +2871,7 @@ msgid ""
" -m|--mount dev[:mnt[:opts]] Mount dev on mnt (if omitted, /)\n"
" -n|--no-sync Don't autosync\n"
" -o|--option opt Pass extra option to FUSE\n"
+" --pid-file filename Write PID to filename\n"
" -r|--ro Mount read-only\n"
" --selinux Enable SELinux support\n"
" -v|--verbose Verbose messages\n"
@@ -2879,32 +2880,37 @@ msgid ""
" -x|--trace Trace guestfs API calls\n"
msgstr ""
-#: fuse/guestmount.c:1162
+#: fuse/guestmount.c:1111
+#, c-format
+msgid "%s: --pid-file must be an absolute path (in 1.16.x only)\n"
+msgstr ""
+
+#: fuse/guestmount.c:1186
#, c-format
msgid "%s: must have at least one -a/-d and at least one -m/-i option\n"
msgstr ""
-#: fuse/guestmount.c:1172
+#: fuse/guestmount.c:1196
#, c-format
msgid "%s: --live is not compatible with --ro option\n"
msgstr ""
-#: fuse/guestmount.c:1179
+#: fuse/guestmount.c:1203
#, c-format
msgid "%s: --live is not compatible with -i option\n"
msgstr ""
-#: fuse/guestmount.c:1194
+#: fuse/guestmount.c:1218
#, c-format
msgid "%s: with --live, you must use exactly one -d option\n"
msgstr ""
-#: fuse/guestmount.c:1201
+#: fuse/guestmount.c:1225
#, c-format
msgid "%s: --live is not compatible with -a option\n"
msgstr ""
-#: fuse/guestmount.c:1210
+#: fuse/guestmount.c:1234
#, c-format
msgid "%s: you must specify a mountpoint in the host filesystem\n"
msgstr ""
diff --git a/po/es.po b/po/es.po
index fc1c87e2..a05066af 100644
--- a/po/es.po
+++ b/po/es.po
@@ -11,7 +11,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2012-07-07 13:58+0100\n"
+"POT-Creation-Date: 2012-07-10 13:19+0100\n"
"PO-Revision-Date: 2012-01-23 13:09+0000\n"
"Last-Translator: rjones <rjones@redhat.com>\n"
"Language-Team: Spanish (Castilian) <trans-es@lists.fedoraproject.org>\n"
@@ -23,7 +23,7 @@ msgstr ""
#: align/scan.c:68 cat/virt-cat.c:61 cat/virt-filesystems.c:100
#: cat/virt-ls.c:99 df/main.c:70 edit/virt-edit.c:75 fish/fish.c:101
-#: fuse/guestmount.c:939 inspector/virt-inspector.c:78 rescue/virt-rescue.c:62
+#: fuse/guestmount.c:954 inspector/virt-inspector.c:78 rescue/virt-rescue.c:62
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "Intente con `%s --help' para más información.\n"
@@ -67,7 +67,7 @@ msgstr ""
#: align/scan.c:127 cat/virt-cat.c:121 cat/virt-filesystems.c:203
#: cat/virt-ls.c:192 df/domains.c:431 df/main.c:136 edit/virt-edit.c:143
-#: fish/fish.c:226 format/format.c:136 fuse/guestmount.c:1055
+#: fish/fish.c:226 format/format.c:136 fuse/guestmount.c:1072
#: inspector/virt-inspector.c:140 rescue/virt-rescue.c:142
#, c-format
msgid "guestfs_create: failed to create handle\n"
@@ -75,7 +75,7 @@ msgstr "guestfs_create: falló al crear manipulador\n"
#: align/scan.c:145 cat/virt-cat.c:143 cat/virt-filesystems.c:257
#: cat/virt-ls.c:242 df/main.c:160 edit/virt-edit.c:165 fish/fish.c:283
-#: format/format.c:188 fuse/guestmount.c:1092 inspector/virt-inspector.c:164
+#: format/format.c:188 fuse/guestmount.c:1116 inspector/virt-inspector.c:164
#: rescue/virt-rescue.c:179
#, c-format
msgid "%s: unknown long option: %s (%d)\n"
@@ -2990,7 +2990,7 @@ msgstr ""
msgid "%s: cannot parse --lvm option (%s)\n"
msgstr ""
-#: fuse/guestmount.c:943
+#: fuse/guestmount.c:958
#, c-format
msgid ""
"%s: FUSE module for libguestfs\n"
@@ -3013,6 +3013,7 @@ msgid ""
" -m|--mount dev[:mnt[:opts]] Mount dev on mnt (if omitted, /)\n"
" -n|--no-sync Don't autosync\n"
" -o|--option opt Pass extra option to FUSE\n"
+" --pid-file filename Write PID to filename\n"
" -r|--ro Mount read-only\n"
" --selinux Enable SELinux support\n"
" -v|--verbose Verbose messages\n"
@@ -3021,32 +3022,37 @@ msgid ""
" -x|--trace Trace guestfs API calls\n"
msgstr ""
-#: fuse/guestmount.c:1162
+#: fuse/guestmount.c:1111
+#, c-format
+msgid "%s: --pid-file must be an absolute path (in 1.16.x only)\n"
+msgstr ""
+
+#: fuse/guestmount.c:1186
#, c-format
msgid "%s: must have at least one -a/-d and at least one -m/-i option\n"
msgstr "%s: debe tener por lo menos -a/-d, y como mínimo una opción -m/-i\n"
-#: fuse/guestmount.c:1172
+#: fuse/guestmount.c:1196
#, c-format
msgid "%s: --live is not compatible with --ro option\n"
msgstr "%s: --live no es compatible con la opcion --ro\n"
-#: fuse/guestmount.c:1179
+#: fuse/guestmount.c:1203
#, c-format
msgid "%s: --live is not compatible with -i option\n"
msgstr "%s: --live no es compatible con la opcion -i\n"
-#: fuse/guestmount.c:1194
+#: fuse/guestmount.c:1218
#, c-format
msgid "%s: with --live, you must use exactly one -d option\n"
msgstr "%s: con --live,debe usar exactamente una opción -d\n"
-#: fuse/guestmount.c:1201
+#: fuse/guestmount.c:1225
#, c-format
msgid "%s: --live is not compatible with -a option\n"
msgstr "%s: --live no es compatible con la opción -a\n"
-#: fuse/guestmount.c:1210
+#: fuse/guestmount.c:1234
#, c-format
msgid "%s: you must specify a mountpoint in the host filesystem\n"
msgstr ""
diff --git a/po/gu.po b/po/gu.po
index 13320192..a7f9e578 100644
--- a/po/gu.po
+++ b/po/gu.po
@@ -10,7 +10,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2012-07-07 13:58+0100\n"
+"POT-Creation-Date: 2012-07-10 13:19+0100\n"
"PO-Revision-Date: 2012-01-23 13:09+0000\n"
"Last-Translator: rjones <rjones@redhat.com>\n"
"Language-Team: Gujarati <trans-gu@lists.fedoraproject.org>\n"
@@ -22,7 +22,7 @@ msgstr ""
#: align/scan.c:68 cat/virt-cat.c:61 cat/virt-filesystems.c:100
#: cat/virt-ls.c:99 df/main.c:70 edit/virt-edit.c:75 fish/fish.c:101
-#: fuse/guestmount.c:939 inspector/virt-inspector.c:78 rescue/virt-rescue.c:62
+#: fuse/guestmount.c:954 inspector/virt-inspector.c:78 rescue/virt-rescue.c:62
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "વધારે જાણકારી માટે `%s --help' નો પ્રયત્ન કરો.\n"
@@ -50,7 +50,7 @@ msgstr ""
#: align/scan.c:127 cat/virt-cat.c:121 cat/virt-filesystems.c:203
#: cat/virt-ls.c:192 df/domains.c:431 df/main.c:136 edit/virt-edit.c:143
-#: fish/fish.c:226 format/format.c:136 fuse/guestmount.c:1055
+#: fish/fish.c:226 format/format.c:136 fuse/guestmount.c:1072
#: inspector/virt-inspector.c:140 rescue/virt-rescue.c:142
#, c-format
msgid "guestfs_create: failed to create handle\n"
@@ -58,7 +58,7 @@ msgstr "guestfs_create: હેન્ડલ ને બનાવવાનું
#: align/scan.c:145 cat/virt-cat.c:143 cat/virt-filesystems.c:257
#: cat/virt-ls.c:242 df/main.c:160 edit/virt-edit.c:165 fish/fish.c:283
-#: format/format.c:188 fuse/guestmount.c:1092 inspector/virt-inspector.c:164
+#: format/format.c:188 fuse/guestmount.c:1116 inspector/virt-inspector.c:164
#: rescue/virt-rescue.c:179
#, c-format
msgid "%s: unknown long option: %s (%d)\n"
@@ -2788,7 +2788,7 @@ msgstr ""
msgid "%s: cannot parse --lvm option (%s)\n"
msgstr ""
-#: fuse/guestmount.c:943
+#: fuse/guestmount.c:958
#, c-format
msgid ""
"%s: FUSE module for libguestfs\n"
@@ -2811,6 +2811,7 @@ msgid ""
" -m|--mount dev[:mnt[:opts]] Mount dev on mnt (if omitted, /)\n"
" -n|--no-sync Don't autosync\n"
" -o|--option opt Pass extra option to FUSE\n"
+" --pid-file filename Write PID to filename\n"
" -r|--ro Mount read-only\n"
" --selinux Enable SELinux support\n"
" -v|--verbose Verbose messages\n"
@@ -2819,32 +2820,37 @@ msgid ""
" -x|--trace Trace guestfs API calls\n"
msgstr ""
-#: fuse/guestmount.c:1162
+#: fuse/guestmount.c:1111
+#, c-format
+msgid "%s: --pid-file must be an absolute path (in 1.16.x only)\n"
+msgstr ""
+
+#: fuse/guestmount.c:1186
#, c-format
msgid "%s: must have at least one -a/-d and at least one -m/-i option\n"
msgstr ""
-#: fuse/guestmount.c:1172
+#: fuse/guestmount.c:1196
#, c-format
msgid "%s: --live is not compatible with --ro option\n"
msgstr ""
-#: fuse/guestmount.c:1179
+#: fuse/guestmount.c:1203
#, c-format
msgid "%s: --live is not compatible with -i option\n"
msgstr ""
-#: fuse/guestmount.c:1194
+#: fuse/guestmount.c:1218
#, c-format
msgid "%s: with --live, you must use exactly one -d option\n"
msgstr ""
-#: fuse/guestmount.c:1201
+#: fuse/guestmount.c:1225
#, c-format
msgid "%s: --live is not compatible with -a option\n"
msgstr ""
-#: fuse/guestmount.c:1210
+#: fuse/guestmount.c:1234
#, c-format
msgid "%s: you must specify a mountpoint in the host filesystem\n"
msgstr "%s: યજમાન ફાઇલસિસ્ટમમાં માઉન્ટબિંદુને સ્પષ્ટ કરવુ જ પડશે\n"
diff --git a/po/hi.po b/po/hi.po
index 058df43b..058f7167 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -10,7 +10,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2012-07-07 13:58+0100\n"
+"POT-Creation-Date: 2012-07-10 13:19+0100\n"
"PO-Revision-Date: 2012-01-23 13:09+0000\n"
"Last-Translator: rjones <rjones@redhat.com>\n"
"Language-Team: Hindi <indlinux-hindi@lists.sourceforge.net>\n"
@@ -22,7 +22,7 @@ msgstr ""
#: align/scan.c:68 cat/virt-cat.c:61 cat/virt-filesystems.c:100
#: cat/virt-ls.c:99 df/main.c:70 edit/virt-edit.c:75 fish/fish.c:101
-#: fuse/guestmount.c:939 inspector/virt-inspector.c:78 rescue/virt-rescue.c:62
+#: fuse/guestmount.c:954 inspector/virt-inspector.c:78 rescue/virt-rescue.c:62
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "अधिक सूचना के लिए `%s --help' आजमाएँ.\n"
@@ -50,7 +50,7 @@ msgstr ""
#: align/scan.c:127 cat/virt-cat.c:121 cat/virt-filesystems.c:203
#: cat/virt-ls.c:192 df/domains.c:431 df/main.c:136 edit/virt-edit.c:143
-#: fish/fish.c:226 format/format.c:136 fuse/guestmount.c:1055
+#: fish/fish.c:226 format/format.c:136 fuse/guestmount.c:1072
#: inspector/virt-inspector.c:140 rescue/virt-rescue.c:142
#, c-format
msgid "guestfs_create: failed to create handle\n"
@@ -58,7 +58,7 @@ msgstr "guestfs_create: नियंत्रण बनाने में व
#: align/scan.c:145 cat/virt-cat.c:143 cat/virt-filesystems.c:257
#: cat/virt-ls.c:242 df/main.c:160 edit/virt-edit.c:165 fish/fish.c:283
-#: format/format.c:188 fuse/guestmount.c:1092 inspector/virt-inspector.c:164
+#: format/format.c:188 fuse/guestmount.c:1116 inspector/virt-inspector.c:164
#: rescue/virt-rescue.c:179
#, c-format
msgid "%s: unknown long option: %s (%d)\n"
@@ -2786,7 +2786,7 @@ msgstr ""
msgid "%s: cannot parse --lvm option (%s)\n"
msgstr ""
-#: fuse/guestmount.c:943
+#: fuse/guestmount.c:958
#, c-format
msgid ""
"%s: FUSE module for libguestfs\n"
@@ -2809,6 +2809,7 @@ msgid ""
" -m|--mount dev[:mnt[:opts]] Mount dev on mnt (if omitted, /)\n"
" -n|--no-sync Don't autosync\n"
" -o|--option opt Pass extra option to FUSE\n"
+" --pid-file filename Write PID to filename\n"
" -r|--ro Mount read-only\n"
" --selinux Enable SELinux support\n"
" -v|--verbose Verbose messages\n"
@@ -2817,32 +2818,37 @@ msgid ""
" -x|--trace Trace guestfs API calls\n"
msgstr ""
-#: fuse/guestmount.c:1162
+#: fuse/guestmount.c:1111
+#, c-format
+msgid "%s: --pid-file must be an absolute path (in 1.16.x only)\n"
+msgstr ""
+
+#: fuse/guestmount.c:1186
#, c-format
msgid "%s: must have at least one -a/-d and at least one -m/-i option\n"
msgstr ""
-#: fuse/guestmount.c:1172
+#: fuse/guestmount.c:1196
#, c-format
msgid "%s: --live is not compatible with --ro option\n"
msgstr ""
-#: fuse/guestmount.c:1179
+#: fuse/guestmount.c:1203
#, c-format
msgid "%s: --live is not compatible with -i option\n"
msgstr ""
-#: fuse/guestmount.c:1194
+#: fuse/guestmount.c:1218
#, c-format
msgid "%s: with --live, you must use exactly one -d option\n"
msgstr ""
-#: fuse/guestmount.c:1201
+#: fuse/guestmount.c:1225
#, c-format
msgid "%s: --live is not compatible with -a option\n"
msgstr ""
-#: fuse/guestmount.c:1210
+#: fuse/guestmount.c:1234
#, c-format
msgid "%s: you must specify a mountpoint in the host filesystem\n"
msgstr "%s: तुम्हें मेजबान फाइल सिस्टम में कोई माउंटप्वाइंट को जरूर निर्दिष्ट करना चाहिए\n"
diff --git a/po/kn.po b/po/kn.po
index 61d9b271..f83244e7 100644
--- a/po/kn.po
+++ b/po/kn.po
@@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2012-07-07 13:58+0100\n"
+"POT-Creation-Date: 2012-07-10 13:19+0100\n"
"PO-Revision-Date: 2012-01-23 13:09+0000\n"
"Last-Translator: rjones <rjones@redhat.com>\n"
"Language-Team: Kannada (http://www.transifex.net/projects/p/fedora/team/"
@@ -22,7 +22,7 @@ msgstr ""
#: align/scan.c:68 cat/virt-cat.c:61 cat/virt-filesystems.c:100
#: cat/virt-ls.c:99 df/main.c:70 edit/virt-edit.c:75 fish/fish.c:101
-#: fuse/guestmount.c:939 inspector/virt-inspector.c:78 rescue/virt-rescue.c:62
+#: fuse/guestmount.c:954 inspector/virt-inspector.c:78 rescue/virt-rescue.c:62
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "ಹೆಚ್ಚಿನ ಮಾಹಿತಿಗಾಗಿ `%s -help' ಅನ್ನು ಪ್ರಯತ್ನಿಸಿ .\n"
@@ -50,7 +50,7 @@ msgstr ""
#: align/scan.c:127 cat/virt-cat.c:121 cat/virt-filesystems.c:203
#: cat/virt-ls.c:192 df/domains.c:431 df/main.c:136 edit/virt-edit.c:143
-#: fish/fish.c:226 format/format.c:136 fuse/guestmount.c:1055
+#: fish/fish.c:226 format/format.c:136 fuse/guestmount.c:1072
#: inspector/virt-inspector.c:140 rescue/virt-rescue.c:142
#, c-format
msgid "guestfs_create: failed to create handle\n"
@@ -58,7 +58,7 @@ msgstr "guestfs_create: ಹ್ಯಾಂಡಲ್ ಅನ್ನು ನಿರ್ಮ
#: align/scan.c:145 cat/virt-cat.c:143 cat/virt-filesystems.c:257
#: cat/virt-ls.c:242 df/main.c:160 edit/virt-edit.c:165 fish/fish.c:283
-#: format/format.c:188 fuse/guestmount.c:1092 inspector/virt-inspector.c:164
+#: format/format.c:188 fuse/guestmount.c:1116 inspector/virt-inspector.c:164
#: rescue/virt-rescue.c:179
#, c-format
msgid "%s: unknown long option: %s (%d)\n"
@@ -2793,7 +2793,7 @@ msgstr ""
msgid "%s: cannot parse --lvm option (%s)\n"
msgstr ""
-#: fuse/guestmount.c:943
+#: fuse/guestmount.c:958
#, c-format
msgid ""
"%s: FUSE module for libguestfs\n"
@@ -2816,6 +2816,7 @@ msgid ""
" -m|--mount dev[:mnt[:opts]] Mount dev on mnt (if omitted, /)\n"
" -n|--no-sync Don't autosync\n"
" -o|--option opt Pass extra option to FUSE\n"
+" --pid-file filename Write PID to filename\n"
" -r|--ro Mount read-only\n"
" --selinux Enable SELinux support\n"
" -v|--verbose Verbose messages\n"
@@ -2824,32 +2825,37 @@ msgid ""
" -x|--trace Trace guestfs API calls\n"
msgstr ""
-#: fuse/guestmount.c:1162
+#: fuse/guestmount.c:1111
+#, c-format
+msgid "%s: --pid-file must be an absolute path (in 1.16.x only)\n"
+msgstr ""
+
+#: fuse/guestmount.c:1186
#, c-format
msgid "%s: must have at least one -a/-d and at least one -m/-i option\n"
msgstr ""
-#: fuse/guestmount.c:1172
+#: fuse/guestmount.c:1196
#, c-format
msgid "%s: --live is not compatible with --ro option\n"
msgstr ""
-#: fuse/guestmount.c:1179
+#: fuse/guestmount.c:1203
#, c-format
msgid "%s: --live is not compatible with -i option\n"
msgstr ""
-#: fuse/guestmount.c:1194
+#: fuse/guestmount.c:1218
#, c-format
msgid "%s: with --live, you must use exactly one -d option\n"
msgstr ""
-#: fuse/guestmount.c:1201
+#: fuse/guestmount.c:1225
#, c-format
msgid "%s: --live is not compatible with -a option\n"
msgstr ""
-#: fuse/guestmount.c:1210
+#: fuse/guestmount.c:1234
#, c-format
msgid "%s: you must specify a mountpoint in the host filesystem\n"
msgstr "%s: ಆತಿಥೇಯ ಕಡತವ್ಯವಸ್ಥೆಯಲ್ಲಿ ಒಂದು ಆರೋಹಣಾ ತಾಣವನ್ನು ನೀವು ಸೂಚಿಸಬೇಕು\n"
diff --git a/po/libguestfs.pot b/po/libguestfs.pot
index d5f03116..420f61f5 100644
--- a/po/libguestfs.pot
+++ b/po/libguestfs.pot
@@ -6,10 +6,10 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: libguestfs 1.16.27\n"
+"Project-Id-Version: libguestfs 1.16.28\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2012-07-07 13:58+0100\n"
+"POT-Creation-Date: 2012-07-10 13:19+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -20,7 +20,7 @@ msgstr ""
#: align/scan.c:68 cat/virt-cat.c:61 cat/virt-filesystems.c:100
#: cat/virt-ls.c:99 df/main.c:70 edit/virt-edit.c:75 fish/fish.c:101
-#: fuse/guestmount.c:939 inspector/virt-inspector.c:78 rescue/virt-rescue.c:62
+#: fuse/guestmount.c:954 inspector/virt-inspector.c:78 rescue/virt-rescue.c:62
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr ""
@@ -48,7 +48,7 @@ msgstr ""
#: align/scan.c:127 cat/virt-cat.c:121 cat/virt-filesystems.c:203
#: cat/virt-ls.c:192 df/domains.c:431 df/main.c:136 edit/virt-edit.c:143
-#: fish/fish.c:226 format/format.c:136 fuse/guestmount.c:1055
+#: fish/fish.c:226 format/format.c:136 fuse/guestmount.c:1072
#: inspector/virt-inspector.c:140 rescue/virt-rescue.c:142
#, c-format
msgid "guestfs_create: failed to create handle\n"
@@ -56,7 +56,7 @@ msgstr ""
#: align/scan.c:145 cat/virt-cat.c:143 cat/virt-filesystems.c:257
#: cat/virt-ls.c:242 df/main.c:160 edit/virt-edit.c:165 fish/fish.c:283
-#: format/format.c:188 fuse/guestmount.c:1092 inspector/virt-inspector.c:164
+#: format/format.c:188 fuse/guestmount.c:1116 inspector/virt-inspector.c:164
#: rescue/virt-rescue.c:179
#, c-format
msgid "%s: unknown long option: %s (%d)\n"
@@ -2775,7 +2775,7 @@ msgstr ""
msgid "%s: cannot parse --lvm option (%s)\n"
msgstr ""
-#: fuse/guestmount.c:943
+#: fuse/guestmount.c:958
#, c-format
msgid ""
"%s: FUSE module for libguestfs\n"
@@ -2798,6 +2798,7 @@ msgid ""
" -m|--mount dev[:mnt[:opts]] Mount dev on mnt (if omitted, /)\n"
" -n|--no-sync Don't autosync\n"
" -o|--option opt Pass extra option to FUSE\n"
+" --pid-file filename Write PID to filename\n"
" -r|--ro Mount read-only\n"
" --selinux Enable SELinux support\n"
" -v|--verbose Verbose messages\n"
@@ -2806,32 +2807,37 @@ msgid ""
" -x|--trace Trace guestfs API calls\n"
msgstr ""
-#: fuse/guestmount.c:1162
+#: fuse/guestmount.c:1111
+#, c-format
+msgid "%s: --pid-file must be an absolute path (in 1.16.x only)\n"
+msgstr ""
+
+#: fuse/guestmount.c:1186
#, c-format
msgid "%s: must have at least one -a/-d and at least one -m/-i option\n"
msgstr ""
-#: fuse/guestmount.c:1172
+#: fuse/guestmount.c:1196
#, c-format
msgid "%s: --live is not compatible with --ro option\n"
msgstr ""
-#: fuse/guestmount.c:1179
+#: fuse/guestmount.c:1203
#, c-format
msgid "%s: --live is not compatible with -i option\n"
msgstr ""
-#: fuse/guestmount.c:1194
+#: fuse/guestmount.c:1218
#, c-format
msgid "%s: with --live, you must use exactly one -d option\n"
msgstr ""
-#: fuse/guestmount.c:1201
+#: fuse/guestmount.c:1225
#, c-format
msgid "%s: --live is not compatible with -a option\n"
msgstr ""
-#: fuse/guestmount.c:1210
+#: fuse/guestmount.c:1234
#, c-format
msgid "%s: you must specify a mountpoint in the host filesystem\n"
msgstr ""
diff --git a/po/ml.po b/po/ml.po
index 41d807cf..2b7ff083 100644
--- a/po/ml.po
+++ b/po/ml.po
@@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2012-07-07 13:58+0100\n"
+"POT-Creation-Date: 2012-07-10 13:19+0100\n"
"PO-Revision-Date: 2012-01-23 13:09+0000\n"
"Last-Translator: rjones <rjones@redhat.com>\n"
"Language-Team: Malayalam <discuss@lists.smc.org.in>\n"
@@ -21,7 +21,7 @@ msgstr ""
#: align/scan.c:68 cat/virt-cat.c:61 cat/virt-filesystems.c:100
#: cat/virt-ls.c:99 df/main.c:70 edit/virt-edit.c:75 fish/fish.c:101
-#: fuse/guestmount.c:939 inspector/virt-inspector.c:78 rescue/virt-rescue.c:62
+#: fuse/guestmount.c:954 inspector/virt-inspector.c:78 rescue/virt-rescue.c:62
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "കൂടുതല്‍ വിവരങ്ങള്‍ക്കായി `%s --help' ശ്രമിക്കുക.\n"
@@ -49,7 +49,7 @@ msgstr ""
#: align/scan.c:127 cat/virt-cat.c:121 cat/virt-filesystems.c:203
#: cat/virt-ls.c:192 df/domains.c:431 df/main.c:136 edit/virt-edit.c:143
-#: fish/fish.c:226 format/format.c:136 fuse/guestmount.c:1055
+#: fish/fish.c:226 format/format.c:136 fuse/guestmount.c:1072
#: inspector/virt-inspector.c:140 rescue/virt-rescue.c:142
#, c-format
msgid "guestfs_create: failed to create handle\n"
@@ -57,7 +57,7 @@ msgstr "guestfs_create: ഹാന്‍ഡില്‍ ഉണ്ടാക്ക
#: align/scan.c:145 cat/virt-cat.c:143 cat/virt-filesystems.c:257
#: cat/virt-ls.c:242 df/main.c:160 edit/virt-edit.c:165 fish/fish.c:283
-#: format/format.c:188 fuse/guestmount.c:1092 inspector/virt-inspector.c:164
+#: format/format.c:188 fuse/guestmount.c:1116 inspector/virt-inspector.c:164
#: rescue/virt-rescue.c:179
#, c-format
msgid "%s: unknown long option: %s (%d)\n"
@@ -2788,7 +2788,7 @@ msgstr ""
msgid "%s: cannot parse --lvm option (%s)\n"
msgstr ""
-#: fuse/guestmount.c:943
+#: fuse/guestmount.c:958
#, c-format
msgid ""
"%s: FUSE module for libguestfs\n"
@@ -2811,6 +2811,7 @@ msgid ""
" -m|--mount dev[:mnt[:opts]] Mount dev on mnt (if omitted, /)\n"
" -n|--no-sync Don't autosync\n"
" -o|--option opt Pass extra option to FUSE\n"
+" --pid-file filename Write PID to filename\n"
" -r|--ro Mount read-only\n"
" --selinux Enable SELinux support\n"
" -v|--verbose Verbose messages\n"
@@ -2819,32 +2820,37 @@ msgid ""
" -x|--trace Trace guestfs API calls\n"
msgstr ""
-#: fuse/guestmount.c:1162
+#: fuse/guestmount.c:1111
+#, c-format
+msgid "%s: --pid-file must be an absolute path (in 1.16.x only)\n"
+msgstr ""
+
+#: fuse/guestmount.c:1186
#, c-format
msgid "%s: must have at least one -a/-d and at least one -m/-i option\n"
msgstr ""
-#: fuse/guestmount.c:1172
+#: fuse/guestmount.c:1196
#, c-format
msgid "%s: --live is not compatible with --ro option\n"
msgstr ""
-#: fuse/guestmount.c:1179
+#: fuse/guestmount.c:1203
#, c-format
msgid "%s: --live is not compatible with -i option\n"
msgstr ""
-#: fuse/guestmount.c:1194
+#: fuse/guestmount.c:1218
#, c-format
msgid "%s: with --live, you must use exactly one -d option\n"
msgstr ""
-#: fuse/guestmount.c:1201
+#: fuse/guestmount.c:1225
#, c-format
msgid "%s: --live is not compatible with -a option\n"
msgstr ""
-#: fuse/guestmount.c:1210
+#: fuse/guestmount.c:1234
#, c-format
msgid "%s: you must specify a mountpoint in the host filesystem\n"
msgstr "%s: ഹോസ്റ്റ് ഫയല്‍സിസ്റ്റത്തില്‍ ഒരു മൌണ്ട് പോയിന്റ് നല്‍കണം\n"
diff --git a/po/mr.po b/po/mr.po
index f360d77c..b55b9b3b 100644
--- a/po/mr.po
+++ b/po/mr.po
@@ -10,7 +10,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2012-07-07 13:58+0100\n"
+"POT-Creation-Date: 2012-07-10 13:19+0100\n"
"PO-Revision-Date: 2012-01-23 13:09+0000\n"
"Last-Translator: rjones <rjones@redhat.com>\n"
"Language-Team: Marathi (http://www.transifex.net/projects/p/fedora/team/"
@@ -23,7 +23,7 @@ msgstr ""
#: align/scan.c:68 cat/virt-cat.c:61 cat/virt-filesystems.c:100
#: cat/virt-ls.c:99 df/main.c:70 edit/virt-edit.c:75 fish/fish.c:101
-#: fuse/guestmount.c:939 inspector/virt-inspector.c:78 rescue/virt-rescue.c:62
+#: fuse/guestmount.c:954 inspector/virt-inspector.c:78 rescue/virt-rescue.c:62
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "अधिक माहितीसाठी `%s --help' वापरून पहा.\n"
@@ -51,7 +51,7 @@ msgstr ""
#: align/scan.c:127 cat/virt-cat.c:121 cat/virt-filesystems.c:203
#: cat/virt-ls.c:192 df/domains.c:431 df/main.c:136 edit/virt-edit.c:143
-#: fish/fish.c:226 format/format.c:136 fuse/guestmount.c:1055
+#: fish/fish.c:226 format/format.c:136 fuse/guestmount.c:1072
#: inspector/virt-inspector.c:140 rescue/virt-rescue.c:142
#, c-format
msgid "guestfs_create: failed to create handle\n"
@@ -59,7 +59,7 @@ msgstr "guestfs_create: हँडल निर्माण करण्यास
#: align/scan.c:145 cat/virt-cat.c:143 cat/virt-filesystems.c:257
#: cat/virt-ls.c:242 df/main.c:160 edit/virt-edit.c:165 fish/fish.c:283
-#: format/format.c:188 fuse/guestmount.c:1092 inspector/virt-inspector.c:164
+#: format/format.c:188 fuse/guestmount.c:1116 inspector/virt-inspector.c:164
#: rescue/virt-rescue.c:179
#, c-format
msgid "%s: unknown long option: %s (%d)\n"
@@ -2894,7 +2894,7 @@ msgstr ""
msgid "%s: cannot parse --lvm option (%s)\n"
msgstr ""
-#: fuse/guestmount.c:943
+#: fuse/guestmount.c:958
#, c-format
msgid ""
"%s: FUSE module for libguestfs\n"
@@ -2917,6 +2917,7 @@ msgid ""
" -m|--mount dev[:mnt[:opts]] Mount dev on mnt (if omitted, /)\n"
" -n|--no-sync Don't autosync\n"
" -o|--option opt Pass extra option to FUSE\n"
+" --pid-file filename Write PID to filename\n"
" -r|--ro Mount read-only\n"
" --selinux Enable SELinux support\n"
" -v|--verbose Verbose messages\n"
@@ -2925,32 +2926,37 @@ msgid ""
" -x|--trace Trace guestfs API calls\n"
msgstr ""
-#: fuse/guestmount.c:1162
+#: fuse/guestmount.c:1111
+#, c-format
+msgid "%s: --pid-file must be an absolute path (in 1.16.x only)\n"
+msgstr ""
+
+#: fuse/guestmount.c:1186
#, c-format
msgid "%s: must have at least one -a/-d and at least one -m/-i option\n"
msgstr "%s: किमान एक -a/-d व किमान एक -m/-i पर्याय असायला हवे\n"
-#: fuse/guestmount.c:1172
+#: fuse/guestmount.c:1196
#, c-format
msgid "%s: --live is not compatible with --ro option\n"
msgstr ""
-#: fuse/guestmount.c:1179
+#: fuse/guestmount.c:1203
#, c-format
msgid "%s: --live is not compatible with -i option\n"
msgstr ""
-#: fuse/guestmount.c:1194
+#: fuse/guestmount.c:1218
#, c-format
msgid "%s: with --live, you must use exactly one -d option\n"
msgstr ""
-#: fuse/guestmount.c:1201
+#: fuse/guestmount.c:1225
#, c-format
msgid "%s: --live is not compatible with -a option\n"
msgstr ""
-#: fuse/guestmount.c:1210
+#: fuse/guestmount.c:1234
#, c-format
msgid "%s: you must specify a mountpoint in the host filesystem\n"
msgstr "%s: यजमान फाइलप्रणालीत तुम्ही माऊंटपॉईंट निर्देशीत करायला हवे\n"
diff --git a/po/nl.po b/po/nl.po
index 5f644282..d29af462 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -11,7 +11,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2012-07-07 13:58+0100\n"
+"POT-Creation-Date: 2012-07-10 13:19+0100\n"
"PO-Revision-Date: 2012-01-23 13:09+0000\n"
"Last-Translator: rjones <rjones@redhat.com>\n"
"Language-Team: Dutch (http://www.transifex.net/projects/p/fedora/team/nl/)\n"
@@ -23,7 +23,7 @@ msgstr ""
#: align/scan.c:68 cat/virt-cat.c:61 cat/virt-filesystems.c:100
#: cat/virt-ls.c:99 df/main.c:70 edit/virt-edit.c:75 fish/fish.c:101
-#: fuse/guestmount.c:939 inspector/virt-inspector.c:78 rescue/virt-rescue.c:62
+#: fuse/guestmount.c:954 inspector/virt-inspector.c:78 rescue/virt-rescue.c:62
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "Probeer `%s --help' voor meer informatie\n"
@@ -67,7 +67,7 @@ msgstr ""
#: align/scan.c:127 cat/virt-cat.c:121 cat/virt-filesystems.c:203
#: cat/virt-ls.c:192 df/domains.c:431 df/main.c:136 edit/virt-edit.c:143
-#: fish/fish.c:226 format/format.c:136 fuse/guestmount.c:1055
+#: fish/fish.c:226 format/format.c:136 fuse/guestmount.c:1072
#: inspector/virt-inspector.c:140 rescue/virt-rescue.c:142
#, c-format
msgid "guestfs_create: failed to create handle\n"
@@ -75,7 +75,7 @@ msgstr "guestfs_create: hendel aanmaken mislukte\n"
#: align/scan.c:145 cat/virt-cat.c:143 cat/virt-filesystems.c:257
#: cat/virt-ls.c:242 df/main.c:160 edit/virt-edit.c:165 fish/fish.c:283
-#: format/format.c:188 fuse/guestmount.c:1092 inspector/virt-inspector.c:164
+#: format/format.c:188 fuse/guestmount.c:1116 inspector/virt-inspector.c:164
#: rescue/virt-rescue.c:179
#, c-format
msgid "%s: unknown long option: %s (%d)\n"
@@ -2951,7 +2951,7 @@ msgstr ""
msgid "%s: cannot parse --lvm option (%s)\n"
msgstr ""
-#: fuse/guestmount.c:943
+#: fuse/guestmount.c:958
#, c-format
msgid ""
"%s: FUSE module for libguestfs\n"
@@ -2974,6 +2974,7 @@ msgid ""
" -m|--mount dev[:mnt[:opts]] Mount dev on mnt (if omitted, /)\n"
" -n|--no-sync Don't autosync\n"
" -o|--option opt Pass extra option to FUSE\n"
+" --pid-file filename Write PID to filename\n"
" -r|--ro Mount read-only\n"
" --selinux Enable SELinux support\n"
" -v|--verbose Verbose messages\n"
@@ -2982,32 +2983,37 @@ msgid ""
" -x|--trace Trace guestfs API calls\n"
msgstr ""
-#: fuse/guestmount.c:1162
+#: fuse/guestmount.c:1111
+#, c-format
+msgid "%s: --pid-file must be an absolute path (in 1.16.x only)\n"
+msgstr ""
+
+#: fuse/guestmount.c:1186
#, c-format
msgid "%s: must have at least one -a/-d and at least one -m/-i option\n"
msgstr "%s: moet tenminste een -a/-d en tenminste een -m/-i optie hebben\n"
-#: fuse/guestmount.c:1172
+#: fuse/guestmount.c:1196
#, c-format
msgid "%s: --live is not compatible with --ro option\n"
msgstr "%s: --live is niet compatibel met --ro optie\n"
-#: fuse/guestmount.c:1179
+#: fuse/guestmount.c:1203
#, c-format
msgid "%s: --live is not compatible with -i option\n"
msgstr "%s: --live is niet compatibel met -i optie\n"
-#: fuse/guestmount.c:1194
+#: fuse/guestmount.c:1218
#, c-format
msgid "%s: with --live, you must use exactly one -d option\n"
msgstr "%s: met --live moet je exact een -d optie gebruiken\n"
-#: fuse/guestmount.c:1201
+#: fuse/guestmount.c:1225
#, c-format
msgid "%s: --live is not compatible with -a option\n"
msgstr "%s: --live is niet compatibel met -a optie\n"
-#: fuse/guestmount.c:1210
+#: fuse/guestmount.c:1234
#, c-format
msgid "%s: you must specify a mountpoint in the host filesystem\n"
msgstr ""
diff --git a/po/or.po b/po/or.po
index d9f8fbe2..dbd324ab 100644
--- a/po/or.po
+++ b/po/or.po
@@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2012-07-07 13:58+0100\n"
+"POT-Creation-Date: 2012-07-10 13:19+0100\n"
"PO-Revision-Date: 2012-01-23 13:09+0000\n"
"Last-Translator: rjones <rjones@redhat.com>\n"
"Language-Team: Oriya (http://www.transifex.net/projects/p/fedora/team/or/)\n"
@@ -21,7 +21,7 @@ msgstr ""
#: align/scan.c:68 cat/virt-cat.c:61 cat/virt-filesystems.c:100
#: cat/virt-ls.c:99 df/main.c:70 edit/virt-edit.c:75 fish/fish.c:101
-#: fuse/guestmount.c:939 inspector/virt-inspector.c:78 rescue/virt-rescue.c:62
+#: fuse/guestmount.c:954 inspector/virt-inspector.c:78 rescue/virt-rescue.c:62
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "ଅଧିକ ସୂଚନା ପାଇଁ `%s --help' କୁ ଚେଷ୍ଟା କରନ୍ତୁ।\n"
@@ -49,7 +49,7 @@ msgstr ""
#: align/scan.c:127 cat/virt-cat.c:121 cat/virt-filesystems.c:203
#: cat/virt-ls.c:192 df/domains.c:431 df/main.c:136 edit/virt-edit.c:143
-#: fish/fish.c:226 format/format.c:136 fuse/guestmount.c:1055
+#: fish/fish.c:226 format/format.c:136 fuse/guestmount.c:1072
#: inspector/virt-inspector.c:140 rescue/virt-rescue.c:142
#, c-format
msgid "guestfs_create: failed to create handle\n"
@@ -57,7 +57,7 @@ msgstr "guestfs_create: ନିୟନ୍ତ୍ରଣ ପ୍ରସ୍ତୁତ କ
#: align/scan.c:145 cat/virt-cat.c:143 cat/virt-filesystems.c:257
#: cat/virt-ls.c:242 df/main.c:160 edit/virt-edit.c:165 fish/fish.c:283
-#: format/format.c:188 fuse/guestmount.c:1092 inspector/virt-inspector.c:164
+#: format/format.c:188 fuse/guestmount.c:1116 inspector/virt-inspector.c:164
#: rescue/virt-rescue.c:179
#, c-format
msgid "%s: unknown long option: %s (%d)\n"
@@ -2786,7 +2786,7 @@ msgstr ""
msgid "%s: cannot parse --lvm option (%s)\n"
msgstr ""
-#: fuse/guestmount.c:943
+#: fuse/guestmount.c:958
#, c-format
msgid ""
"%s: FUSE module for libguestfs\n"
@@ -2809,6 +2809,7 @@ msgid ""
" -m|--mount dev[:mnt[:opts]] Mount dev on mnt (if omitted, /)\n"
" -n|--no-sync Don't autosync\n"
" -o|--option opt Pass extra option to FUSE\n"
+" --pid-file filename Write PID to filename\n"
" -r|--ro Mount read-only\n"
" --selinux Enable SELinux support\n"
" -v|--verbose Verbose messages\n"
@@ -2817,32 +2818,37 @@ msgid ""
" -x|--trace Trace guestfs API calls\n"
msgstr ""
-#: fuse/guestmount.c:1162
+#: fuse/guestmount.c:1111
+#, c-format
+msgid "%s: --pid-file must be an absolute path (in 1.16.x only)\n"
+msgstr ""
+
+#: fuse/guestmount.c:1186
#, c-format
msgid "%s: must have at least one -a/-d and at least one -m/-i option\n"
msgstr ""
-#: fuse/guestmount.c:1172
+#: fuse/guestmount.c:1196
#, c-format
msgid "%s: --live is not compatible with --ro option\n"
msgstr ""
-#: fuse/guestmount.c:1179
+#: fuse/guestmount.c:1203
#, c-format
msgid "%s: --live is not compatible with -i option\n"
msgstr ""
-#: fuse/guestmount.c:1194
+#: fuse/guestmount.c:1218
#, c-format
msgid "%s: with --live, you must use exactly one -d option\n"
msgstr ""
-#: fuse/guestmount.c:1201
+#: fuse/guestmount.c:1225
#, c-format
msgid "%s: --live is not compatible with -a option\n"
msgstr ""
-#: fuse/guestmount.c:1210
+#: fuse/guestmount.c:1234
#, c-format
msgid "%s: you must specify a mountpoint in the host filesystem\n"
msgstr "%s: ଆପଣଙ୍କୁ ହୋଷ୍ଟ ଫାଇଲତନ୍ତ୍ରରେ ଗୋଟିଏ ସ୍ଥାପନ ବିନ୍ଦୁ ଉଲ୍ଲେଖ କରିବାକୁ ହେବ\n"
diff --git a/po/pa.po b/po/pa.po
index 97c51b69..0a6a992e 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -10,7 +10,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2012-07-07 13:58+0100\n"
+"POT-Creation-Date: 2012-07-10 13:19+0100\n"
"PO-Revision-Date: 2012-01-23 13:09+0000\n"
"Last-Translator: rjones <rjones@redhat.com>\n"
"Language-Team: Panjabi (Punjabi) <punjabi-users@lists.sf.net>\n"
@@ -22,7 +22,7 @@ msgstr ""
#: align/scan.c:68 cat/virt-cat.c:61 cat/virt-filesystems.c:100
#: cat/virt-ls.c:99 df/main.c:70 edit/virt-edit.c:75 fish/fish.c:101
-#: fuse/guestmount.c:939 inspector/virt-inspector.c:78 rescue/virt-rescue.c:62
+#: fuse/guestmount.c:954 inspector/virt-inspector.c:78 rescue/virt-rescue.c:62
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "ਵਧੇਰੇ ਜਾਣਕਾਰੀ ਲਈ `%s --help' ਵਰਤੋ।\n"
@@ -66,7 +66,7 @@ msgstr ""
#: align/scan.c:127 cat/virt-cat.c:121 cat/virt-filesystems.c:203
#: cat/virt-ls.c:192 df/domains.c:431 df/main.c:136 edit/virt-edit.c:143
-#: fish/fish.c:226 format/format.c:136 fuse/guestmount.c:1055
+#: fish/fish.c:226 format/format.c:136 fuse/guestmount.c:1072
#: inspector/virt-inspector.c:140 rescue/virt-rescue.c:142
#, c-format
msgid "guestfs_create: failed to create handle\n"
@@ -74,7 +74,7 @@ msgstr "guestfs_create: ਹੈਂਡਲ ਬਣਾਉਣ ਵਿੱਚ ਫੇਲ\n
#: align/scan.c:145 cat/virt-cat.c:143 cat/virt-filesystems.c:257
#: cat/virt-ls.c:242 df/main.c:160 edit/virt-edit.c:165 fish/fish.c:283
-#: format/format.c:188 fuse/guestmount.c:1092 inspector/virt-inspector.c:164
+#: format/format.c:188 fuse/guestmount.c:1116 inspector/virt-inspector.c:164
#: rescue/virt-rescue.c:179
#, c-format
msgid "%s: unknown long option: %s (%d)\n"
@@ -2904,7 +2904,7 @@ msgstr ""
msgid "%s: cannot parse --lvm option (%s)\n"
msgstr ""
-#: fuse/guestmount.c:943
+#: fuse/guestmount.c:958
#, c-format
msgid ""
"%s: FUSE module for libguestfs\n"
@@ -2927,6 +2927,7 @@ msgid ""
" -m|--mount dev[:mnt[:opts]] Mount dev on mnt (if omitted, /)\n"
" -n|--no-sync Don't autosync\n"
" -o|--option opt Pass extra option to FUSE\n"
+" --pid-file filename Write PID to filename\n"
" -r|--ro Mount read-only\n"
" --selinux Enable SELinux support\n"
" -v|--verbose Verbose messages\n"
@@ -2935,32 +2936,37 @@ msgid ""
" -x|--trace Trace guestfs API calls\n"
msgstr ""
-#: fuse/guestmount.c:1162
+#: fuse/guestmount.c:1111
+#, c-format
+msgid "%s: --pid-file must be an absolute path (in 1.16.x only)\n"
+msgstr ""
+
+#: fuse/guestmount.c:1186
#, c-format
msgid "%s: must have at least one -a/-d and at least one -m/-i option\n"
msgstr "%s: ਸਾਡੇ ਕੋਲ ਘੱਟੋ-ਘੱਟ ਇੱਕ -a/-d ਅਤੇ ਘੱਟੋ-ਘੱਟ ਇੱਕ -m/-i ਚੋਣ ਹੋਣੀ ਜਰੂਰੀ ਹੈ\n"
-#: fuse/guestmount.c:1172
+#: fuse/guestmount.c:1196
#, c-format
msgid "%s: --live is not compatible with --ro option\n"
msgstr ""
-#: fuse/guestmount.c:1179
+#: fuse/guestmount.c:1203
#, c-format
msgid "%s: --live is not compatible with -i option\n"
msgstr ""
-#: fuse/guestmount.c:1194
+#: fuse/guestmount.c:1218
#, c-format
msgid "%s: with --live, you must use exactly one -d option\n"
msgstr ""
-#: fuse/guestmount.c:1201
+#: fuse/guestmount.c:1225
#, c-format
msgid "%s: --live is not compatible with -a option\n"
msgstr ""
-#: fuse/guestmount.c:1210
+#: fuse/guestmount.c:1234
#, c-format
msgid "%s: you must specify a mountpoint in the host filesystem\n"
msgstr "%s: ਤੁਹਾਨੂੰ ਹੋਸਟ ਫਾਇਲ-ਸਿਸਟਮ ਵਿੱਚ ਮਾਊਂਟ-ਪੁਆਂਇਟ ਦੇਣਾ ਚਾਹੀਦਾ ਹੈ\n"
diff --git a/po/pl.po b/po/pl.po
index 6bbf93be..112d63e6 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -10,7 +10,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2012-07-07 13:58+0100\n"
+"POT-Creation-Date: 2012-07-10 13:19+0100\n"
"PO-Revision-Date: 2012-01-23 13:09+0000\n"
"Last-Translator: rjones <rjones@redhat.com>\n"
"Language-Team: Polish (http://www.transifex.net/projects/p/fedora/team/pl/)\n"
@@ -23,7 +23,7 @@ msgstr ""
#: align/scan.c:68 cat/virt-cat.c:61 cat/virt-filesystems.c:100
#: cat/virt-ls.c:99 df/main.c:70 edit/virt-edit.c:75 fish/fish.c:101
-#: fuse/guestmount.c:939 inspector/virt-inspector.c:78 rescue/virt-rescue.c:62
+#: fuse/guestmount.c:954 inspector/virt-inspector.c:78 rescue/virt-rescue.c:62
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "Należy spróbować \"%s --help\", aby uzyskać więcej informacji.\n"
@@ -67,7 +67,7 @@ msgstr ""
#: align/scan.c:127 cat/virt-cat.c:121 cat/virt-filesystems.c:203
#: cat/virt-ls.c:192 df/domains.c:431 df/main.c:136 edit/virt-edit.c:143
-#: fish/fish.c:226 format/format.c:136 fuse/guestmount.c:1055
+#: fish/fish.c:226 format/format.c:136 fuse/guestmount.c:1072
#: inspector/virt-inspector.c:140 rescue/virt-rescue.c:142
#, c-format
msgid "guestfs_create: failed to create handle\n"
@@ -75,7 +75,7 @@ msgstr "guestfs_create: utworzenie programu obsługi nie powiodło się\n"
#: align/scan.c:145 cat/virt-cat.c:143 cat/virt-filesystems.c:257
#: cat/virt-ls.c:242 df/main.c:160 edit/virt-edit.c:165 fish/fish.c:283
-#: format/format.c:188 fuse/guestmount.c:1092 inspector/virt-inspector.c:164
+#: format/format.c:188 fuse/guestmount.c:1116 inspector/virt-inspector.c:164
#: rescue/virt-rescue.c:179
#, c-format
msgid "%s: unknown long option: %s (%d)\n"
@@ -2966,7 +2966,7 @@ msgstr ""
msgid "%s: cannot parse --lvm option (%s)\n"
msgstr ""
-#: fuse/guestmount.c:943
+#: fuse/guestmount.c:958
#, c-format
msgid ""
"%s: FUSE module for libguestfs\n"
@@ -2989,6 +2989,7 @@ msgid ""
" -m|--mount dev[:mnt[:opts]] Mount dev on mnt (if omitted, /)\n"
" -n|--no-sync Don't autosync\n"
" -o|--option opt Pass extra option to FUSE\n"
+" --pid-file filename Write PID to filename\n"
" -r|--ro Mount read-only\n"
" --selinux Enable SELinux support\n"
" -v|--verbose Verbose messages\n"
@@ -2997,33 +2998,38 @@ msgid ""
" -x|--trace Trace guestfs API calls\n"
msgstr ""
-#: fuse/guestmount.c:1162
+#: fuse/guestmount.c:1111
+#, c-format
+msgid "%s: --pid-file must be an absolute path (in 1.16.x only)\n"
+msgstr ""
+
+#: fuse/guestmount.c:1186
#, c-format
msgid "%s: must have at least one -a/-d and at least one -m/-i option\n"
msgstr ""
"%s: musi posiadać co najmniej jedną opcję -a/-d i co najmniej jedną -m/-i\n"
-#: fuse/guestmount.c:1172
+#: fuse/guestmount.c:1196
#, c-format
msgid "%s: --live is not compatible with --ro option\n"
msgstr "%s: --live nie jest zgodne z opcją --ro\n"
-#: fuse/guestmount.c:1179
+#: fuse/guestmount.c:1203
#, c-format
msgid "%s: --live is not compatible with -i option\n"
msgstr "%s: --live nie jest zgodne z opcją -i\n"
-#: fuse/guestmount.c:1194
+#: fuse/guestmount.c:1218
#, c-format
msgid "%s: with --live, you must use exactly one -d option\n"
msgstr "%s: dla --live należy użyć dokładnie jednej opcji -d\n"
-#: fuse/guestmount.c:1201
+#: fuse/guestmount.c:1225
#, c-format
msgid "%s: --live is not compatible with -a option\n"
msgstr "%s: --live nie jest zgodne z opcją -a\n"
-#: fuse/guestmount.c:1210
+#: fuse/guestmount.c:1234
#, c-format
msgid "%s: you must specify a mountpoint in the host filesystem\n"
msgstr "%s: należy podać punkt montowania w systemie plików gospodarza\n"
diff --git a/po/ta.po b/po/ta.po
index f9d95f6d..7a1eae14 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2012-07-07 13:58+0100\n"
+"POT-Creation-Date: 2012-07-10 13:19+0100\n"
"PO-Revision-Date: 2012-01-23 13:09+0000\n"
"Last-Translator: rjones <rjones@redhat.com>\n"
"Language-Team: Tamil <tamil-users@lists.fedoraproject.org>\n"
@@ -21,7 +21,7 @@ msgstr ""
#: align/scan.c:68 cat/virt-cat.c:61 cat/virt-filesystems.c:100
#: cat/virt-ls.c:99 df/main.c:70 edit/virt-edit.c:75 fish/fish.c:101
-#: fuse/guestmount.c:939 inspector/virt-inspector.c:78 rescue/virt-rescue.c:62
+#: fuse/guestmount.c:954 inspector/virt-inspector.c:78 rescue/virt-rescue.c:62
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "`%s --help' க்கான கூடுதல் தகவலுக்கு முயற்சிக்கவும்.\n"
@@ -49,7 +49,7 @@ msgstr ""
#: align/scan.c:127 cat/virt-cat.c:121 cat/virt-filesystems.c:203
#: cat/virt-ls.c:192 df/domains.c:431 df/main.c:136 edit/virt-edit.c:143
-#: fish/fish.c:226 format/format.c:136 fuse/guestmount.c:1055
+#: fish/fish.c:226 format/format.c:136 fuse/guestmount.c:1072
#: inspector/virt-inspector.c:140 rescue/virt-rescue.c:142
#, c-format
msgid "guestfs_create: failed to create handle\n"
@@ -57,7 +57,7 @@ msgstr "guestfs_create: ஹாண்டிலை உருவாக்க மு
#: align/scan.c:145 cat/virt-cat.c:143 cat/virt-filesystems.c:257
#: cat/virt-ls.c:242 df/main.c:160 edit/virt-edit.c:165 fish/fish.c:283
-#: format/format.c:188 fuse/guestmount.c:1092 inspector/virt-inspector.c:164
+#: format/format.c:188 fuse/guestmount.c:1116 inspector/virt-inspector.c:164
#: rescue/virt-rescue.c:179
#, c-format
msgid "%s: unknown long option: %s (%d)\n"
@@ -2787,7 +2787,7 @@ msgstr ""
msgid "%s: cannot parse --lvm option (%s)\n"
msgstr ""
-#: fuse/guestmount.c:943
+#: fuse/guestmount.c:958
#, c-format
msgid ""
"%s: FUSE module for libguestfs\n"
@@ -2810,6 +2810,7 @@ msgid ""
" -m|--mount dev[:mnt[:opts]] Mount dev on mnt (if omitted, /)\n"
" -n|--no-sync Don't autosync\n"
" -o|--option opt Pass extra option to FUSE\n"
+" --pid-file filename Write PID to filename\n"
" -r|--ro Mount read-only\n"
" --selinux Enable SELinux support\n"
" -v|--verbose Verbose messages\n"
@@ -2818,32 +2819,37 @@ msgid ""
" -x|--trace Trace guestfs API calls\n"
msgstr ""
-#: fuse/guestmount.c:1162
+#: fuse/guestmount.c:1111
+#, c-format
+msgid "%s: --pid-file must be an absolute path (in 1.16.x only)\n"
+msgstr ""
+
+#: fuse/guestmount.c:1186
#, c-format
msgid "%s: must have at least one -a/-d and at least one -m/-i option\n"
msgstr ""
-#: fuse/guestmount.c:1172
+#: fuse/guestmount.c:1196
#, c-format
msgid "%s: --live is not compatible with --ro option\n"
msgstr ""
-#: fuse/guestmount.c:1179
+#: fuse/guestmount.c:1203
#, c-format
msgid "%s: --live is not compatible with -i option\n"
msgstr ""
-#: fuse/guestmount.c:1194
+#: fuse/guestmount.c:1218
#, c-format
msgid "%s: with --live, you must use exactly one -d option\n"
msgstr ""
-#: fuse/guestmount.c:1201
+#: fuse/guestmount.c:1225
#, c-format
msgid "%s: --live is not compatible with -a option\n"
msgstr ""
-#: fuse/guestmount.c:1210
+#: fuse/guestmount.c:1234
#, c-format
msgid "%s: you must specify a mountpoint in the host filesystem\n"
msgstr "%s: புரவல கோப்புமுறைமையில் ஒரு ஏறும்புள்ளியை நீங்கள் குறிப்பிட வேண்டும்\n"
diff --git a/po/te.po b/po/te.po
index 5c20e6ea..f2503631 100644
--- a/po/te.po
+++ b/po/te.po
@@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2012-07-07 13:58+0100\n"
+"POT-Creation-Date: 2012-07-10 13:19+0100\n"
"PO-Revision-Date: 2012-01-23 13:09+0000\n"
"Last-Translator: rjones <rjones@redhat.com>\n"
"Language-Team: Telugu (http://www.transifex.net/projects/p/fedora/team/te/)\n"
@@ -21,7 +21,7 @@ msgstr ""
#: align/scan.c:68 cat/virt-cat.c:61 cat/virt-filesystems.c:100
#: cat/virt-ls.c:99 df/main.c:70 edit/virt-edit.c:75 fish/fish.c:101
-#: fuse/guestmount.c:939 inspector/virt-inspector.c:78 rescue/virt-rescue.c:62
+#: fuse/guestmount.c:954 inspector/virt-inspector.c:78 rescue/virt-rescue.c:62
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "అధిక సమాచారము కొరకు `%s --help' ప్రయత్నించండి\n"
@@ -49,7 +49,7 @@ msgstr ""
#: align/scan.c:127 cat/virt-cat.c:121 cat/virt-filesystems.c:203
#: cat/virt-ls.c:192 df/domains.c:431 df/main.c:136 edit/virt-edit.c:143
-#: fish/fish.c:226 format/format.c:136 fuse/guestmount.c:1055
+#: fish/fish.c:226 format/format.c:136 fuse/guestmount.c:1072
#: inspector/virt-inspector.c:140 rescue/virt-rescue.c:142
#, c-format
msgid "guestfs_create: failed to create handle\n"
@@ -57,7 +57,7 @@ msgstr "guestfs_create: సంభాలికను సృష్టించు
#: align/scan.c:145 cat/virt-cat.c:143 cat/virt-filesystems.c:257
#: cat/virt-ls.c:242 df/main.c:160 edit/virt-edit.c:165 fish/fish.c:283
-#: format/format.c:188 fuse/guestmount.c:1092 inspector/virt-inspector.c:164
+#: format/format.c:188 fuse/guestmount.c:1116 inspector/virt-inspector.c:164
#: rescue/virt-rescue.c:179
#, c-format
msgid "%s: unknown long option: %s (%d)\n"
@@ -2784,7 +2784,7 @@ msgstr ""
msgid "%s: cannot parse --lvm option (%s)\n"
msgstr ""
-#: fuse/guestmount.c:943
+#: fuse/guestmount.c:958
#, c-format
msgid ""
"%s: FUSE module for libguestfs\n"
@@ -2807,6 +2807,7 @@ msgid ""
" -m|--mount dev[:mnt[:opts]] Mount dev on mnt (if omitted, /)\n"
" -n|--no-sync Don't autosync\n"
" -o|--option opt Pass extra option to FUSE\n"
+" --pid-file filename Write PID to filename\n"
" -r|--ro Mount read-only\n"
" --selinux Enable SELinux support\n"
" -v|--verbose Verbose messages\n"
@@ -2815,32 +2816,37 @@ msgid ""
" -x|--trace Trace guestfs API calls\n"
msgstr ""
-#: fuse/guestmount.c:1162
+#: fuse/guestmount.c:1111
+#, c-format
+msgid "%s: --pid-file must be an absolute path (in 1.16.x only)\n"
+msgstr ""
+
+#: fuse/guestmount.c:1186
#, c-format
msgid "%s: must have at least one -a/-d and at least one -m/-i option\n"
msgstr ""
-#: fuse/guestmount.c:1172
+#: fuse/guestmount.c:1196
#, c-format
msgid "%s: --live is not compatible with --ro option\n"
msgstr ""
-#: fuse/guestmount.c:1179
+#: fuse/guestmount.c:1203
#, c-format
msgid "%s: --live is not compatible with -i option\n"
msgstr ""
-#: fuse/guestmount.c:1194
+#: fuse/guestmount.c:1218
#, c-format
msgid "%s: with --live, you must use exactly one -d option\n"
msgstr ""
-#: fuse/guestmount.c:1201
+#: fuse/guestmount.c:1225
#, c-format
msgid "%s: --live is not compatible with -a option\n"
msgstr ""
-#: fuse/guestmount.c:1210
+#: fuse/guestmount.c:1234
#, c-format
msgid "%s: you must specify a mountpoint in the host filesystem\n"
msgstr "%s:హోస్టు ఫైల్‌సిస్టమ్ నందు మీరు తప్పక వొక మౌంట్‌పాయింట్‌ను తెలుపవలెను\n"
diff --git a/po/uk.po b/po/uk.po
index f9a2046a..0de7fa88 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2012-07-07 13:58+0100\n"
+"POT-Creation-Date: 2012-07-10 13:19+0100\n"
"PO-Revision-Date: 2012-01-23 13:09+0000\n"
"Last-Translator: rjones <rjones@redhat.com>\n"
"Language-Team: Ukrainian <trans-uk@lists.fedoraproject.org>\n"
@@ -22,7 +22,7 @@ msgstr ""
#: align/scan.c:68 cat/virt-cat.c:61 cat/virt-filesystems.c:100
#: cat/virt-ls.c:99 df/main.c:70 edit/virt-edit.c:75 fish/fish.c:101
-#: fuse/guestmount.c:939 inspector/virt-inspector.c:78 rescue/virt-rescue.c:62
+#: fuse/guestmount.c:954 inspector/virt-inspector.c:78 rescue/virt-rescue.c:62
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "Щоб дізнатися більше, віддайте команду «%s --help».\n"
@@ -66,7 +66,7 @@ msgstr ""
#: align/scan.c:127 cat/virt-cat.c:121 cat/virt-filesystems.c:203
#: cat/virt-ls.c:192 df/domains.c:431 df/main.c:136 edit/virt-edit.c:143
-#: fish/fish.c:226 format/format.c:136 fuse/guestmount.c:1055
+#: fish/fish.c:226 format/format.c:136 fuse/guestmount.c:1072
#: inspector/virt-inspector.c:140 rescue/virt-rescue.c:142
#, c-format
msgid "guestfs_create: failed to create handle\n"
@@ -74,7 +74,7 @@ msgstr "guestfs_create: не вдалося створити елемент ке
#: align/scan.c:145 cat/virt-cat.c:143 cat/virt-filesystems.c:257
#: cat/virt-ls.c:242 df/main.c:160 edit/virt-edit.c:165 fish/fish.c:283
-#: format/format.c:188 fuse/guestmount.c:1092 inspector/virt-inspector.c:164
+#: format/format.c:188 fuse/guestmount.c:1116 inspector/virt-inspector.c:164
#: rescue/virt-rescue.c:179
#, c-format
msgid "%s: unknown long option: %s (%d)\n"
@@ -3001,7 +3001,7 @@ msgstr ""
msgid "%s: cannot parse --lvm option (%s)\n"
msgstr ""
-#: fuse/guestmount.c:943
+#: fuse/guestmount.c:958
#, c-format
msgid ""
"%s: FUSE module for libguestfs\n"
@@ -3024,6 +3024,7 @@ msgid ""
" -m|--mount dev[:mnt[:opts]] Mount dev on mnt (if omitted, /)\n"
" -n|--no-sync Don't autosync\n"
" -o|--option opt Pass extra option to FUSE\n"
+" --pid-file filename Write PID to filename\n"
" -r|--ro Mount read-only\n"
" --selinux Enable SELinux support\n"
" -v|--verbose Verbose messages\n"
@@ -3032,34 +3033,39 @@ msgid ""
" -x|--trace Trace guestfs API calls\n"
msgstr ""
-#: fuse/guestmount.c:1162
+#: fuse/guestmount.c:1111
+#, c-format
+msgid "%s: --pid-file must be an absolute path (in 1.16.x only)\n"
+msgstr ""
+
+#: fuse/guestmount.c:1186
#, c-format
msgid "%s: must have at least one -a/-d and at least one -m/-i option\n"
msgstr ""
"%s: слід вказати принаймні один параметр -a/-d і принаймні один параметр -m/-"
"i\n"
-#: fuse/guestmount.c:1172
+#: fuse/guestmount.c:1196
#, c-format
msgid "%s: --live is not compatible with --ro option\n"
msgstr "%s: параметр --live несумісний з параметром --ro\n"
-#: fuse/guestmount.c:1179
+#: fuse/guestmount.c:1203
#, c-format
msgid "%s: --live is not compatible with -i option\n"
msgstr "%s: параметр --live несумісний з параметром -i\n"
-#: fuse/guestmount.c:1194
+#: fuse/guestmount.c:1218
#, c-format
msgid "%s: with --live, you must use exactly one -d option\n"
msgstr "%s: з параметром --live можна вказувати лише один параметр -d\n"
-#: fuse/guestmount.c:1201
+#: fuse/guestmount.c:1225
#, c-format
msgid "%s: --live is not compatible with -a option\n"
msgstr "%s: параметр --live несумісний з параметром -a\n"
-#: fuse/guestmount.c:1210
+#: fuse/guestmount.c:1234
#, c-format
msgid "%s: you must specify a mountpoint in the host filesystem\n"
msgstr "%s: вам слід вказати точку монтування у основній файловій системі\n"