diff options
Diffstat (limited to 'po-docs/ja.po')
| -rw-r--r-- | po-docs/ja.po | 265 |
1 files changed, 173 insertions, 92 deletions
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." |