X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=po-docs%2Fja.po;h=744b65246598ad6ac0995eeb8c876e2888002d18;hp=47872fc5ff9b91103a703612eb77981b717e8e5a;hb=477c437ba0e2108413fe2b54a830b36c251242f3;hpb=c49819f9b3a29329da87e2001d8025b3842bb0db diff --git a/po-docs/ja.po b/po-docs/ja.po index 47872fc..744b652 100644 --- a/po-docs/ja.po +++ b/po-docs/ja.po @@ -2,16 +2,17 @@ # Copyright (C) YEAR Red Hat Inc. # This file is distributed under the same license as the libguestfs package. # +# Translators: # rjones , 2011. +# , 2011. msgid "" msgstr "" "Project-Id-Version: libguestfs\n" "Report-Msgid-Bugs-To: libguestfs@redhat.com\n" -"POT-Creation-Date: 2011-10-08 13:55+0200\n" -"PO-Revision-Date: 2011-07-17 20:50+0000\n" +"POT-Creation-Date: 2011-10-27 16:05+0200\n" +"PO-Revision-Date: 2011-10-27 09:15+0000\n" "Last-Translator: rjones \n" -"Language-Team: Japanese (http://www.transifex.net/projects/p/fedora/team/" -"ja/)\n" +"Language-Team: Japanese \n" "Language: ja\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -261,12 +262,12 @@ 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:36 ../df/virt-df.pod:59 ../edit/virt-edit.pod:62 +#: ../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 ../fuse/guestmount.pod:83 +#: ../fish/virt-tar-out.pod:36 ../fuse/guestmount.pod:92 #: ../inspector/virt-inspector.pod:55 ../rescue/virt-rescue.pod:84 -#: ../resize/virt-resize.pod:241 ../sparsify/virt-sparsify.pod:99 +#: ../resize/virt-resize.pod:262 ../sparsify/virt-sparsify.pod:99 #: ../test-tool/libguestfs-test-tool.pod:36 #: ../tools/virt-list-filesystems.pl:53 ../tools/virt-list-partitions.pl:54 #: ../tools/virt-make-fs.pl:153 ../tools/virt-tar.pl:103 @@ -277,10 +278,10 @@ 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:40 ../df/virt-df.pod:63 ../edit/virt-edit.pod:66 -#: ../fish/guestfish.pod:152 ../fuse/guestmount.pod:151 +#: ../clone/virt-sysprep.pod:46 ../df/virt-df.pod:63 ../edit/virt-edit.pod:66 +#: ../fish/guestfish.pod:152 ../fuse/guestmount.pod:160 #: ../inspector/virt-inspector.pod:59 ../rescue/virt-rescue.pod:88 -#: ../resize/virt-resize.pod:245 ../sparsify/virt-sparsify.pod:103 +#: ../resize/virt-resize.pod:266 ../sparsify/virt-sparsify.pod:103 #: ../test-tool/libguestfs-test-tool.pod:40 #: ../tools/virt-list-filesystems.pl:61 ../tools/virt-list-partitions.pl:62 #: ../tools/virt-make-fs.pl:161 ../tools/virt-tar.pl:111 @@ -291,7 +292,7 @@ msgstr "" #. type: textblock #: ../align/virt-alignment-scan.pod:95 ../cat/virt-cat.pod:68 #: ../cat/virt-filesystems.pod:97 ../cat/virt-ls.pod:267 -#: ../clone/virt-sysprep.pod:42 ../df/virt-df.pod:65 ../edit/virt-edit.pod:68 +#: ../clone/virt-sysprep.pod:48 ../df/virt-df.pod:65 ../edit/virt-edit.pod:68 #: ../inspector/virt-inspector.pod:61 ../rescue/virt-rescue.pod:90 #: ../tools/virt-list-filesystems.pl:63 ../tools/virt-list-partitions.pl:64 #: ../tools/virt-make-fs.pl:163 ../tools/virt-tar.pl:113 @@ -302,7 +303,7 @@ msgstr "" #. type: =item #: ../align/virt-alignment-scan.pod:97 ../cat/virt-cat.pod:70 #: ../cat/virt-filesystems.pod:99 ../cat/virt-ls.pod:269 -#: ../clone/virt-sysprep.pod:44 ../df/virt-df.pod:67 ../edit/virt-edit.pod:70 +#: ../clone/virt-sysprep.pod:50 ../df/virt-df.pod:67 ../edit/virt-edit.pod:70 #: ../inspector/virt-inspector.pod:63 ../rescue/virt-rescue.pod:92 msgid "B<-a> file" msgstr "" @@ -310,21 +311,21 @@ msgstr "" #. type: =item #: ../align/virt-alignment-scan.pod:99 ../cat/virt-cat.pod:72 #: ../cat/virt-filesystems.pod:101 ../cat/virt-ls.pod:271 -#: ../clone/virt-sysprep.pod:46 ../df/virt-df.pod:69 ../edit/virt-edit.pod:72 +#: ../clone/virt-sysprep.pod:52 ../df/virt-df.pod:69 ../edit/virt-edit.pod:72 #: ../inspector/virt-inspector.pod:65 ../rescue/virt-rescue.pod:94 msgid "B<--add> file" msgstr "" #. type: textblock -#: ../align/virt-alignment-scan.pod:101 ../clone/virt-sysprep.pod:48 +#: ../align/virt-alignment-scan.pod:101 ../clone/virt-sysprep.pod:54 msgid "Add I 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:50 ../df/virt-df.pod:75 ../edit/virt-edit.pod:78 -#: ../fish/guestfish.pod:174 ../fuse/guestmount.pod:93 +#: ../clone/virt-sysprep.pod:56 ../df/virt-df.pod:75 ../edit/virt-edit.pod:78 +#: ../fish/guestfish.pod:174 ../fuse/guestmount.pod:102 #: ../inspector/virt-inspector.pod:71 ../rescue/virt-rescue.pod:100 msgid "" "The format of the disk image is auto-detected. To override this and force a " @@ -334,7 +335,7 @@ msgstr "" #. type: =item #: ../align/virt-alignment-scan.pod:106 ../cat/virt-cat.pod:81 #: ../cat/virt-filesystems.pod:125 ../cat/virt-ls.pod:291 -#: ../clone/virt-sysprep.pod:53 ../df/virt-df.pod:78 +#: ../clone/virt-sysprep.pod:59 ../df/virt-df.pod:78 #: ../rescue/virt-rescue.pod:107 msgid "B<-c> URI" msgstr "" @@ -342,7 +343,7 @@ msgstr "" #. type: =item #: ../align/virt-alignment-scan.pod:108 ../cat/virt-cat.pod:83 #: ../cat/virt-filesystems.pod:127 ../cat/virt-ls.pod:293 -#: ../clone/virt-sysprep.pod:55 ../df/virt-df.pod:80 +#: ../clone/virt-sysprep.pod:61 ../df/virt-df.pod:80 #: ../rescue/virt-rescue.pod:109 msgid "B<--connect> URI" msgstr "" @@ -350,7 +351,7 @@ msgstr "" #. type: textblock #: ../align/virt-alignment-scan.pod:110 ../cat/virt-cat.pod:85 #: ../cat/virt-filesystems.pod:129 ../cat/virt-ls.pod:295 -#: ../clone/virt-sysprep.pod:57 ../df/virt-df.pod:82 ../edit/virt-edit.pod:99 +#: ../clone/virt-sysprep.pod:63 ../df/virt-df.pod:82 ../edit/virt-edit.pod:99 #: ../inspector/virt-inspector.pod:78 ../rescue/virt-rescue.pod:111 #: ../tools/virt-list-filesystems.pl:81 ../tools/virt-list-partitions.pl:82 #: ../tools/virt-tar.pl:131 ../tools/virt-win-reg.pl:132 @@ -362,7 +363,7 @@ msgstr "" #. type: textblock #: ../align/virt-alignment-scan.pod:113 ../cat/virt-cat.pod:88 #: ../cat/virt-filesystems.pod:132 ../cat/virt-ls.pod:298 -#: ../clone/virt-sysprep.pod:60 ../df/virt-df.pod:85 +#: ../clone/virt-sysprep.pod:66 ../df/virt-df.pod:85 #: ../rescue/virt-rescue.pod:114 msgid "" "If you specify guest block devices directly (I<-a>), then libvirt is not " @@ -372,7 +373,7 @@ msgstr "" #. type: =item #: ../align/virt-alignment-scan.pod:116 ../cat/virt-cat.pod:91 #: ../cat/virt-filesystems.pod:141 ../cat/virt-ls.pod:307 -#: ../clone/virt-sysprep.pod:63 ../df/virt-df.pod:94 ../edit/virt-edit.pod:105 +#: ../clone/virt-sysprep.pod:69 ../df/virt-df.pod:94 ../edit/virt-edit.pod:105 #: ../inspector/virt-inspector.pod:85 ../rescue/virt-rescue.pod:117 msgid "B<-d> guest" msgstr "" @@ -380,7 +381,7 @@ msgstr "" #. type: =item #: ../align/virt-alignment-scan.pod:118 ../cat/virt-cat.pod:93 #: ../cat/virt-filesystems.pod:143 ../cat/virt-ls.pod:309 -#: ../clone/virt-sysprep.pod:65 ../df/virt-df.pod:96 ../edit/virt-edit.pod:107 +#: ../clone/virt-sysprep.pod:71 ../df/virt-df.pod:96 ../edit/virt-edit.pod:107 #: ../inspector/virt-inspector.pod:87 ../rescue/virt-rescue.pod:119 msgid "B<--domain> guest" msgstr "" @@ -388,7 +389,7 @@ msgstr "" #. type: textblock #: ../align/virt-alignment-scan.pod:120 ../cat/virt-cat.pod:95 #: ../cat/virt-filesystems.pod:145 ../cat/virt-ls.pod:311 -#: ../clone/virt-sysprep.pod:67 ../df/virt-df.pod:98 ../edit/virt-edit.pod:109 +#: ../clone/virt-sysprep.pod:73 ../df/virt-df.pod:98 ../edit/virt-edit.pod:109 #: ../inspector/virt-inspector.pod:89 ../rescue/virt-rescue.pod:121 msgid "" "Add all the disks from the named libvirt guest. Domain UUIDs can be used " @@ -398,8 +399,8 @@ 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:89 ../df/virt-df.pod:101 -#: ../fish/guestfish.pod:233 ../fuse/guestmount.pod:133 +#: ../clone/virt-sysprep.pod:95 ../df/virt-df.pod:101 +#: ../fish/guestfish.pod:233 ../fuse/guestmount.pod:142 #: ../inspector/virt-inspector.pod:99 ../rescue/virt-rescue.pod:124 msgid "B<--format=raw|qcow2|..>" msgstr "" @@ -407,9 +408,9 @@ 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:91 ../df/virt-df.pod:103 +#: ../clone/virt-sysprep.pod:97 ../df/virt-df.pod:103 #: ../edit/virt-edit.pod:134 ../fish/guestfish.pod:235 -#: ../fuse/guestmount.pod:135 ../inspector/virt-inspector.pod:101 +#: ../fuse/guestmount.pod:144 ../inspector/virt-inspector.pod:101 #: ../rescue/virt-rescue.pod:126 msgid "B<--format>" msgstr "" @@ -417,9 +418,9 @@ 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:93 ../df/virt-df.pod:105 +#: ../clone/virt-sysprep.pod:99 ../df/virt-df.pod:105 #: ../edit/virt-edit.pod:136 ../fish/guestfish.pod:237 -#: ../fuse/guestmount.pod:137 ../rescue/virt-rescue.pod:128 +#: ../fuse/guestmount.pod:146 ../rescue/virt-rescue.pod:128 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 " @@ -430,10 +431,10 @@ msgstr "" #. type: textblock #: ../align/virt-alignment-scan.pod:132 ../cat/virt-cat.pod:114 #: ../cat/virt-filesystems.pod:179 ../cat/virt-ls.pod:337 -#: ../clone/virt-sysprep.pod:98 ../df/virt-df.pod:110 +#: ../clone/virt-sysprep.pod:104 ../df/virt-df.pod:110 #: ../edit/virt-edit.pod:141 ../fish/guestfish.pod:242 #: ../fish/guestfish.pod:673 ../inspector/virt-inspector.pod:336 -#: ../rescue/virt-rescue.pod:133 ../src/guestfs.pod:2791 +#: ../rescue/virt-rescue.pod:133 ../src/guestfs.pod:2877 msgid "For example:" msgstr "" @@ -448,7 +449,7 @@ msgstr "" #. type: textblock #: ../align/virt-alignment-scan.pod:136 ../cat/virt-cat.pod:118 #: ../cat/virt-filesystems.pod:183 ../cat/virt-ls.pod:341 -#: ../clone/virt-sysprep.pod:102 ../df/virt-df.pod:114 +#: ../clone/virt-sysprep.pod:108 ../df/virt-df.pod:114 #: ../edit/virt-edit.pod:145 ../fish/guestfish.pod:246 #: ../rescue/virt-rescue.pod:137 msgid "forces raw format (no auto-detection) for C." @@ -465,7 +466,7 @@ msgstr "" #. type: textblock #: ../align/virt-alignment-scan.pod:140 ../cat/virt-cat.pod:122 #: ../cat/virt-filesystems.pod:187 ../cat/virt-ls.pod:345 -#: ../clone/virt-sysprep.pod:106 ../df/virt-df.pod:118 +#: ../clone/virt-sysprep.pod:112 ../df/virt-df.pod:118 #: ../edit/virt-edit.pod:149 ../fish/guestfish.pod:250 #: ../rescue/virt-rescue.pod:141 msgid "" @@ -476,7 +477,7 @@ msgstr "" #. type: textblock #: ../align/virt-alignment-scan.pod:143 ../cat/virt-cat.pod:125 #: ../cat/virt-filesystems.pod:190 ../cat/virt-ls.pod:348 -#: ../clone/virt-sysprep.pod:109 ../df/virt-df.pod:121 +#: ../clone/virt-sysprep.pod:115 ../df/virt-df.pod:121 #: ../edit/virt-edit.pod:152 ../rescue/virt-rescue.pod:144 msgid "" "If you have untrusted raw-format guest disk images, you should use this " @@ -485,13 +486,13 @@ msgid "" msgstr "" #. type: =item -#: ../align/virt-alignment-scan.pod:147 ../resize/virt-resize.pod:414 +#: ../align/virt-alignment-scan.pod:147 ../resize/virt-resize.pod:491 #: ../sparsify/virt-sparsify.pod:153 msgid "B<-q>" msgstr "" #. type: =item -#: ../align/virt-alignment-scan.pod:149 ../resize/virt-resize.pod:416 +#: ../align/virt-alignment-scan.pod:149 ../resize/virt-resize.pod:493 #: ../sparsify/virt-sparsify.pod:155 msgid "B<--quiet>" msgstr "" @@ -506,9 +507,9 @@ 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:122 ../df/virt-df.pod:173 +#: ../clone/virt-sysprep.pod:138 ../df/virt-df.pod:173 #: ../edit/virt-edit.pod:161 ../fish/guestfish.pod:390 -#: ../fuse/guestmount.pod:257 ../inspector/virt-inspector.pod:119 +#: ../fuse/guestmount.pod:266 ../inspector/virt-inspector.pod:119 #: ../rescue/virt-rescue.pod:182 ../sparsify/virt-sparsify.pod:159 msgid "B<-v>" msgstr "" @@ -516,9 +517,9 @@ 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:124 ../df/virt-df.pod:175 +#: ../clone/virt-sysprep.pod:140 ../df/virt-df.pod:175 #: ../edit/virt-edit.pod:163 ../fish/guestfish.pod:392 -#: ../fuse/guestmount.pod:259 ../inspector/virt-inspector.pod:121 +#: ../fuse/guestmount.pod:268 ../inspector/virt-inspector.pod:121 #: ../rescue/virt-rescue.pod:184 ../sparsify/virt-sparsify.pod:161 msgid "B<--verbose>" msgstr "" @@ -526,7 +527,7 @@ msgstr "" #. type: textblock #: ../align/virt-alignment-scan.pod:158 ../cat/virt-cat.pod:138 #: ../cat/virt-filesystems.pod:265 ../cat/virt-ls.pod:429 -#: ../clone/virt-sysprep.pod:126 ../df/virt-df.pod:177 +#: ../clone/virt-sysprep.pod:142 ../df/virt-df.pod:177 #: ../edit/virt-edit.pod:165 ../inspector/virt-inspector.pod:123 #: ../rescue/virt-rescue.pod:186 ../sparsify/virt-sparsify.pod:163 msgid "Enable verbose messages for debugging." @@ -535,10 +536,10 @@ 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:128 ../df/virt-df.pod:179 +#: ../clone/virt-sysprep.pod:144 ../df/virt-df.pod:179 #: ../edit/virt-edit.pod:167 ../fish/guestfish.pod:397 -#: ../fuse/guestmount.pod:263 ../inspector/virt-inspector.pod:125 -#: ../rescue/virt-rescue.pod:188 ../resize/virt-resize.pod:484 +#: ../fuse/guestmount.pod:272 ../inspector/virt-inspector.pod:125 +#: ../rescue/virt-rescue.pod:188 ../resize/virt-resize.pod:561 #: ../sparsify/virt-sparsify.pod:165 msgid "B<-V>" msgstr "" @@ -546,10 +547,10 @@ 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:130 ../df/virt-df.pod:181 +#: ../clone/virt-sysprep.pod:146 ../df/virt-df.pod:181 #: ../edit/virt-edit.pod:169 ../fish/guestfish.pod:399 -#: ../fuse/guestmount.pod:265 ../inspector/virt-inspector.pod:127 -#: ../rescue/virt-rescue.pod:190 ../resize/virt-resize.pod:486 +#: ../fuse/guestmount.pod:274 ../inspector/virt-inspector.pod:127 +#: ../rescue/virt-rescue.pod:190 ../resize/virt-resize.pod:563 #: ../sparsify/virt-sparsify.pod:167 ../tools/virt-list-filesystems.pl:69 #: ../tools/virt-list-partitions.pl:70 ../tools/virt-make-fs.pl:169 #: ../tools/virt-tar.pl:119 ../tools/virt-win-reg.pl:112 @@ -559,9 +560,9 @@ msgstr "" #. type: textblock #: ../align/virt-alignment-scan.pod:164 ../cat/virt-cat.pod:144 #: ../cat/virt-filesystems.pod:271 ../cat/virt-ls.pod:435 -#: ../clone/virt-sysprep.pod:132 ../df/virt-df.pod:183 +#: ../clone/virt-sysprep.pod:148 ../df/virt-df.pod:183 #: ../edit/virt-edit.pod:171 ../inspector/virt-inspector.pod:129 -#: ../rescue/virt-rescue.pod:192 ../resize/virt-resize.pod:488 +#: ../rescue/virt-rescue.pod:192 ../resize/virt-resize.pod:565 #: ../sparsify/virt-sparsify.pod:169 ../tools/virt-list-filesystems.pl:71 #: ../tools/virt-list-partitions.pl:72 ../tools/virt-make-fs.pl:171 #: ../tools/virt-tar.pl:121 ../tools/virt-win-reg.pl:114 @@ -571,9 +572,9 @@ 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:134 ../df/virt-df.pod:185 +#: ../clone/virt-sysprep.pod:150 ../df/virt-df.pod:185 #: ../edit/virt-edit.pod:173 ../fish/guestfish.pod:412 -#: ../fuse/guestmount.pod:278 ../inspector/virt-inspector.pod:131 +#: ../fuse/guestmount.pod:287 ../inspector/virt-inspector.pod:131 #: ../rescue/virt-rescue.pod:203 ../sparsify/virt-sparsify.pod:171 #: ../tools/virt-tar.pl:158 msgid "B<-x>" @@ -582,7 +583,7 @@ msgstr "" #. type: textblock #: ../align/virt-alignment-scan.pod:168 ../cat/virt-cat.pod:148 #: ../cat/virt-filesystems.pod:283 ../cat/virt-ls.pod:439 -#: ../clone/virt-sysprep.pod:136 ../df/virt-df.pod:187 +#: ../clone/virt-sysprep.pod:152 ../df/virt-df.pod:187 #: ../edit/virt-edit.pod:175 ../inspector/virt-inspector.pod:133 #: ../rescue/virt-rescue.pod:205 ../sparsify/virt-sparsify.pod:173 msgid "Enable tracing of libguestfs API calls." @@ -705,13 +706,15 @@ msgstr "" #. type: textblock #: ../align/virt-alignment-scan.pod:232 -msgid "For a typical hard drive with 512 byte sectors:" +msgid "For a typical consumer hard drive with 512 byte sectors:" msgstr "" #. type: verbatim #: ../align/virt-alignment-scan.pod:234 #, no-wrap msgid "" +" $ cat /sys/block/sda/queue/hw_sector_size\n" +" 512\n" " $ cat /sys/block/sda/queue/physical_block_size\n" " 512\n" " $ cat /sys/block/sda/queue/logical_block_size\n" @@ -724,12 +727,34 @@ msgid "" msgstr "" #. type: textblock -#: ../align/virt-alignment-scan.pod:243 +#: ../align/virt-alignment-scan.pod:245 +msgid "For a new consumer hard drive with 4Kbyte sectors:" +msgstr "" + +#. type: verbatim +#: ../align/virt-alignment-scan.pod:247 +#, no-wrap +msgid "" +" $ cat /sys/block/sda/queue/hw_sector_size\n" +" 4096\n" +" $ cat /sys/block/sda/queue/physical_block_size\n" +" 4096\n" +" $ cat /sys/block/sda/queue/logical_block_size\n" +" 4096\n" +" $ cat /sys/block/sda/queue/minimum_io_size\n" +" 4096\n" +" $ cat /sys/block/sda/queue/optimal_io_size\n" +" 0\n" +"\n" +msgstr "" + +#. type: textblock +#: ../align/virt-alignment-scan.pod:258 msgid "For a NetApp LUN:" msgstr "" #. type: verbatim -#: ../align/virt-alignment-scan.pod:245 +#: ../align/virt-alignment-scan.pod:260 #, no-wrap msgid "" " $ cat /sys/block/sdc/queue/logical_block_size\n" @@ -744,14 +769,14 @@ msgid "" msgstr "" #. type: textblock -#: ../align/virt-alignment-scan.pod:254 +#: ../align/virt-alignment-scan.pod:269 msgid "" "The NetApp allows 512 byte accesses (but they will be very inefficient), " "prefers a minimum 4K I/O size, but the optimal I/O size is 64K." msgstr "" #. type: textblock -#: ../align/virt-alignment-scan.pod:258 +#: ../align/virt-alignment-scan.pod:273 msgid "" "For detailed information about what these numbers mean, see L can change the alignment of the partitions of some " +"guests. Currently it can fully align all the partitions of all Windows " +"guests, and it will fix the bootloader where necessary. For Linux guests, " +"it can align the second and subsequent partitions, so the majority of OS " +"accesses except at boot will be aligned." msgstr "" #. type: textblock -#: ../align/virt-alignment-scan.pod:284 +#: ../align/virt-alignment-scan.pod:299 msgid "" -"L does not change the alignment of the first partition, but " -"it does align the second and subsequent partitions to a multiple of 64 or " -"128 sectors (depending on the version of virt-resize, 128 in virt-resize " -"E 1.13.19). For operating systems that have a separate boot partition, " -"virt-resize could be used to align the main OS partition, so that the " -"majority of OS accesses except at boot will be aligned." -msgstr "" - -#. type: textblock -#: ../align/virt-alignment-scan.pod:292 -msgid "" -"The easiest way to correct partition alignment problems is to reinstall your " +"Another way to correct partition alignment problems is to reinstall your " "guest operating systems. If you install operating systems from templates, " "ensure these have correct partition alignment too." msgstr "" #. type: textblock -#: ../align/virt-alignment-scan.pod:297 +#: ../align/virt-alignment-scan.pod:303 msgid "" "For older versions of Windows, the following NetApp document contains useful " "information: L" msgstr "" #. type: textblock -#: ../align/virt-alignment-scan.pod:300 +#: ../align/virt-alignment-scan.pod:306 msgid "" "For Red Hat Enterprise Linux E 5, use a Kickstart script that contains " "an explicit C<%pre> section that creates aligned partitions using L and space. You may need to quote or " @@ -870,30 +885,32 @@ msgid "" msgstr "" #. type: =head1 -#: ../align/virt-alignment-scan.pod:312 ../cat/virt-cat.pod:198 -#: ../cat/virt-filesystems.pod:372 ../cat/virt-ls.pod:490 -#: ../clone/virt-sysprep.pod:366 ../df/virt-df.pod:222 -#: ../edit/virt-edit.pod:349 ../fish/guestfish.pod:1113 -#: ../fuse/guestmount.pod:303 ../inspector/virt-inspector.pod:375 -#: ../resize/virt-resize.pod:608 ../sparsify/virt-sparsify.pod:227 +#: ../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:222 +#: ../edit/virt-edit.pod:349 ../fish/guestfish.pod:1114 +#: ../fuse/guestmount.pod:312 ../inspector/virt-inspector.pod:375 +#: ../resize/virt-resize.pod:683 ../sparsify/virt-sparsify.pod:227 #: ../test-tool/libguestfs-test-tool.pod:90 msgid "EXIT STATUS" msgstr "" #. type: textblock -#: ../align/virt-alignment-scan.pod:314 +#: ../align/virt-alignment-scan.pod:320 msgid "This program returns:" msgstr "" #. type: =item -#: ../align/virt-alignment-scan.pod:318 ../align/virt-alignment-scan.pod:324 -#: ../align/virt-alignment-scan.pod:330 ../align/virt-alignment-scan.pod:337 -#: ../clone/virt-sysprep.pod:213 ../clone/virt-sysprep.pod:217 -#: ../clone/virt-sysprep.pod:221 ../clone/virt-sysprep.pod:225 -#: ../clone/virt-sysprep.pod:240 ../clone/virt-sysprep.pod:244 -#: ../clone/virt-sysprep.pod:248 ../clone/virt-sysprep.pod:252 -#: ../clone/virt-sysprep.pod:256 ../clone/virt-sysprep.pod:292 -#: ../clone/virt-sysprep.pod:314 ../clone/virt-sysprep.pod:318 +#: ../align/virt-alignment-scan.pod:324 ../align/virt-alignment-scan.pod:330 +#: ../align/virt-alignment-scan.pod:336 ../align/virt-alignment-scan.pod:343 +#: ../cat/virt-cat.pod:177 ../cat/virt-cat.pod:182 ../cat/virt-cat.pod:187 +#: ../cat/virt-cat.pod:198 ../cat/virt-cat.pod:202 +#: ../clone/virt-sysprep.pod:283 ../clone/virt-sysprep.pod:287 +#: ../clone/virt-sysprep.pod:291 ../clone/virt-sysprep.pod:295 +#: ../clone/virt-sysprep.pod:310 ../clone/virt-sysprep.pod:314 +#: ../clone/virt-sysprep.pod:318 ../clone/virt-sysprep.pod:322 +#: ../clone/virt-sysprep.pod:326 ../clone/virt-sysprep.pod:362 +#: ../clone/virt-sysprep.pod:384 ../clone/virt-sysprep.pod:388 #: ../df/virt-df.pod:148 ../df/virt-df.pod:154 ../edit/virt-edit.pod:266 #: ../edit/virt-edit.pod:271 ../edit/virt-edit.pod:276 #: ../edit/virt-edit.pod:287 ../edit/virt-edit.pod:291 @@ -903,204 +920,204 @@ msgstr "" #: ../examples/guestfs-recipes.pod:231 ../examples/guestfs-recipes.pod:235 #: ../examples/guestfs-recipes.pod:239 ../examples/guestfs-recipes.pod:243 #: ../fish/guestfish-actions.pod:13 ../fish/guestfish-actions.pod:20 -#: ../fish/guestfish-actions.pod:390 ../fish/guestfish-actions.pod:398 -#: ../fish/guestfish-actions.pod:405 ../fish/guestfish-actions.pod:412 -#: ../fish/guestfish-actions.pod:1139 ../fish/guestfish-actions.pod:1143 -#: ../fish/guestfish-actions.pod:1147 ../fish/guestfish-actions.pod:1151 -#: ../fish/guestfish-actions.pod:1159 ../fish/guestfish-actions.pod:1163 -#: ../fish/guestfish-actions.pod:1167 ../fish/guestfish-actions.pod:1177 -#: ../fish/guestfish-actions.pod:1181 ../fish/guestfish-actions.pod:1185 -#: ../fish/guestfish-actions.pod:1275 ../fish/guestfish-actions.pod:1279 -#: ../fish/guestfish-actions.pod:1284 ../fish/guestfish-actions.pod:1289 -#: ../fish/guestfish-actions.pod:1331 ../fish/guestfish-actions.pod:1335 -#: ../fish/guestfish-actions.pod:1340 ../fish/guestfish-actions.pod:1596 -#: ../fish/guestfish-actions.pod:1603 ../fish/guestfish-actions.pod:1610 -#: ../fish/guestfish-actions.pod:2005 ../fish/guestfish-actions.pod:2011 -#: ../fish/guestfish-actions.pod:2019 ../fish/guestfish-actions.pod:2026 -#: ../fish/guestfish-actions.pod:2033 ../fish/guestfish.pod:445 +#: ../fish/guestfish-actions.pod:441 ../fish/guestfish-actions.pod:449 +#: ../fish/guestfish-actions.pod:456 ../fish/guestfish-actions.pod:463 +#: ../fish/guestfish-actions.pod:1262 ../fish/guestfish-actions.pod:1266 +#: ../fish/guestfish-actions.pod:1270 ../fish/guestfish-actions.pod:1274 +#: ../fish/guestfish-actions.pod:1282 ../fish/guestfish-actions.pod:1286 +#: ../fish/guestfish-actions.pod:1290 ../fish/guestfish-actions.pod:1300 +#: ../fish/guestfish-actions.pod:1304 ../fish/guestfish-actions.pod:1308 +#: ../fish/guestfish-actions.pod:1398 ../fish/guestfish-actions.pod:1402 +#: ../fish/guestfish-actions.pod:1407 ../fish/guestfish-actions.pod:1412 +#: ../fish/guestfish-actions.pod:1454 ../fish/guestfish-actions.pod:1458 +#: ../fish/guestfish-actions.pod:1463 ../fish/guestfish-actions.pod:1719 +#: ../fish/guestfish-actions.pod:1726 ../fish/guestfish-actions.pod:1733 +#: ../fish/guestfish-actions.pod:2136 ../fish/guestfish-actions.pod:2142 +#: ../fish/guestfish-actions.pod:2150 ../fish/guestfish-actions.pod:2157 +#: ../fish/guestfish-actions.pod:2164 ../fish/guestfish.pod:445 #: ../fish/guestfish.pod:449 ../fish/guestfish.pod:453 #: ../fish/guestfish.pod:457 ../inspector/virt-inspector.pod:393 -#: ../inspector/virt-inspector.pod:397 ../resize/virt-resize.pod:282 -#: ../resize/virt-resize.pod:286 ../resize/virt-resize.pod:295 -#: ../resize/virt-resize.pod:301 ../sparsify/virt-sparsify.pod:32 +#: ../inspector/virt-inspector.pod:397 ../resize/virt-resize.pod:359 +#: ../resize/virt-resize.pod:363 ../resize/virt-resize.pod:372 +#: ../resize/virt-resize.pod:378 ../sparsify/virt-sparsify.pod:32 #: ../sparsify/virt-sparsify.pod:39 ../sparsify/virt-sparsify.pod:43 #: ../sparsify/virt-sparsify.pod:49 ../sparsify/virt-sparsify.pod:54 #: ../sparsify/virt-sparsify.pod:58 ../sparsify/virt-sparsify.pod:64 #: ../src/guestfs-actions.pod:22 ../src/guestfs-actions.pod:29 -#: ../src/guestfs-actions.pod:588 ../src/guestfs-actions.pod:596 -#: ../src/guestfs-actions.pod:603 ../src/guestfs-actions.pod:610 -#: ../src/guestfs-actions.pod:1778 ../src/guestfs-actions.pod:1782 -#: ../src/guestfs-actions.pod:1786 ../src/guestfs-actions.pod:1790 -#: ../src/guestfs-actions.pod:1798 ../src/guestfs-actions.pod:1802 -#: ../src/guestfs-actions.pod:1806 ../src/guestfs-actions.pod:1816 -#: ../src/guestfs-actions.pod:1820 ../src/guestfs-actions.pod:1824 -#: ../src/guestfs-actions.pod:1962 ../src/guestfs-actions.pod:1966 -#: ../src/guestfs-actions.pod:1971 ../src/guestfs-actions.pod:1976 -#: ../src/guestfs-actions.pod:2037 ../src/guestfs-actions.pod:2041 -#: ../src/guestfs-actions.pod:2046 ../src/guestfs-actions.pod:2461 -#: ../src/guestfs-actions.pod:2468 ../src/guestfs-actions.pod:2475 -#: ../src/guestfs-actions.pod:3012 ../src/guestfs-actions.pod:3018 -#: ../src/guestfs-actions.pod:3026 ../src/guestfs-actions.pod:3033 -#: ../src/guestfs-actions.pod:3040 ../src/guestfs.pod:388 -#: ../src/guestfs.pod:393 ../src/guestfs.pod:398 ../src/guestfs.pod:402 -#: ../src/guestfs.pod:407 ../src/guestfs.pod:411 ../src/guestfs.pod:416 -#: ../src/guestfs.pod:421 ../src/guestfs.pod:1094 ../src/guestfs.pod:1098 -#: ../src/guestfs.pod:1102 ../src/guestfs.pod:1107 ../src/guestfs.pod:1115 -#: ../src/guestfs.pod:1134 ../src/guestfs.pod:1142 ../src/guestfs.pod:1164 -#: ../src/guestfs.pod:1168 ../src/guestfs.pod:1172 ../src/guestfs.pod:1176 -#: ../src/guestfs.pod:1180 ../src/guestfs.pod:1184 ../src/guestfs.pod:1674 -#: ../src/guestfs.pod:1679 ../src/guestfs.pod:1683 ../src/guestfs.pod:1785 -#: ../src/guestfs.pod:1790 ../src/guestfs.pod:1794 ../src/guestfs.pod:1804 -#: ../src/guestfs.pod:2093 ../src/guestfs.pod:2098 ../src/guestfs.pod:2104 -#: ../src/guestfs.pod:2112 ../src/guestfs.pod:2559 ../src/guestfs.pod:2565 -#: ../src/guestfs.pod:2570 ../src/guestfs.pod:2576 ../src/guestfs.pod:2976 -#: ../src/guestfs.pod:2981 ../src/guestfs.pod:2985 ../src/guestfs.pod:2989 -#: ../src/guestfs.pod:2993 ../src/guestfs.pod:3007 ../src/guestfs.pod:3012 -#: ../src/guestfs.pod:3242 ../src/guestfs.pod:3246 ../src/guestfs.pod:3250 -#: ../src/guestfs.pod:3254 ../tools/virt-win-reg.pl:197 +#: ../src/guestfs-actions.pod:641 ../src/guestfs-actions.pod:649 +#: ../src/guestfs-actions.pod:656 ../src/guestfs-actions.pod:663 +#: ../src/guestfs-actions.pod:2079 ../src/guestfs-actions.pod:2083 +#: ../src/guestfs-actions.pod:2087 ../src/guestfs-actions.pod:2091 +#: ../src/guestfs-actions.pod:2099 ../src/guestfs-actions.pod:2103 +#: ../src/guestfs-actions.pod:2107 ../src/guestfs-actions.pod:2117 +#: ../src/guestfs-actions.pod:2121 ../src/guestfs-actions.pod:2125 +#: ../src/guestfs-actions.pod:2263 ../src/guestfs-actions.pod:2267 +#: ../src/guestfs-actions.pod:2272 ../src/guestfs-actions.pod:2277 +#: ../src/guestfs-actions.pod:2338 ../src/guestfs-actions.pod:2342 +#: ../src/guestfs-actions.pod:2347 ../src/guestfs-actions.pod:2762 +#: ../src/guestfs-actions.pod:2769 ../src/guestfs-actions.pod:2776 +#: ../src/guestfs-actions.pod:3321 ../src/guestfs-actions.pod:3327 +#: ../src/guestfs-actions.pod:3335 ../src/guestfs-actions.pod:3342 +#: ../src/guestfs-actions.pod:3349 ../src/guestfs.pod:403 +#: ../src/guestfs.pod:408 ../src/guestfs.pod:413 ../src/guestfs.pod:417 +#: ../src/guestfs.pod:422 ../src/guestfs.pod:426 ../src/guestfs.pod:431 +#: ../src/guestfs.pod:436 ../src/guestfs.pod:1109 ../src/guestfs.pod:1113 +#: ../src/guestfs.pod:1117 ../src/guestfs.pod:1122 ../src/guestfs.pod:1130 +#: ../src/guestfs.pod:1149 ../src/guestfs.pod:1157 ../src/guestfs.pod:1179 +#: ../src/guestfs.pod:1183 ../src/guestfs.pod:1187 ../src/guestfs.pod:1191 +#: ../src/guestfs.pod:1195 ../src/guestfs.pod:1199 ../src/guestfs.pod:1689 +#: ../src/guestfs.pod:1694 ../src/guestfs.pod:1698 ../src/guestfs.pod:1800 +#: ../src/guestfs.pod:1805 ../src/guestfs.pod:1809 ../src/guestfs.pod:1819 +#: ../src/guestfs.pod:2108 ../src/guestfs.pod:2113 ../src/guestfs.pod:2119 +#: ../src/guestfs.pod:2127 ../src/guestfs.pod:2645 ../src/guestfs.pod:2651 +#: ../src/guestfs.pod:2656 ../src/guestfs.pod:2662 ../src/guestfs.pod:3062 +#: ../src/guestfs.pod:3067 ../src/guestfs.pod:3071 ../src/guestfs.pod:3075 +#: ../src/guestfs.pod:3079 ../src/guestfs.pod:3093 ../src/guestfs.pod:3098 +#: ../src/guestfs.pod:3329 ../src/guestfs.pod:3333 ../src/guestfs.pod:3337 +#: ../src/guestfs.pod:3341 ../tools/virt-win-reg.pl:197 #: ../tools/virt-win-reg.pl:202 ../tools/virt-win-reg.pl:208 -#: ../tools/virt-win-reg.pl:710 ../tools/virt-win-reg.pl:716 -#: ../tools/virt-win-reg.pl:722 +#: ../tools/virt-win-reg.pl:721 ../tools/virt-win-reg.pl:727 +#: ../tools/virt-win-reg.pl:733 msgid "*" msgstr "" #. type: textblock -#: ../align/virt-alignment-scan.pod:320 +#: ../align/virt-alignment-scan.pod:326 msgid "0" msgstr "" #. type: textblock -#: ../align/virt-alignment-scan.pod:322 +#: ../align/virt-alignment-scan.pod:328 msgid "" "successful exit, all partitions are aligned E 64K for best performance" msgstr "" #. type: textblock -#: ../align/virt-alignment-scan.pod:326 +#: ../align/virt-alignment-scan.pod:332 msgid "1" msgstr "" #. type: textblock -#: ../align/virt-alignment-scan.pod:328 +#: ../align/virt-alignment-scan.pod:334 msgid "an error scanning the disk image or guest" msgstr "" #. type: textblock -#: ../align/virt-alignment-scan.pod:332 +#: ../align/virt-alignment-scan.pod:338 msgid "2" msgstr "" #. type: textblock -#: ../align/virt-alignment-scan.pod:334 +#: ../align/virt-alignment-scan.pod:340 msgid "" "successful exit, some partitions have alignment E 64K which can result " "in poor performance on high end network storage" msgstr "" #. type: textblock -#: ../align/virt-alignment-scan.pod:339 +#: ../align/virt-alignment-scan.pod:345 msgid "3" msgstr "" #. type: textblock -#: ../align/virt-alignment-scan.pod:341 +#: ../align/virt-alignment-scan.pod:347 msgid "" "successful exit, some partitions have alignment E 4K which can result in " "poor performance on most hypervisors" msgstr "" #. type: =head1 -#: ../align/virt-alignment-scan.pod:346 ../cat/virt-cat.pod:203 -#: ../cat/virt-filesystems.pod:377 ../cat/virt-ls.pod:495 -#: ../clone/virt-sysprep.pod:370 ../df/virt-df.pod:227 +#: ../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:227 #: ../edit/virt-edit.pod:354 ../erlang/examples/guestfs-erlang.pod:97 #: ../examples/guestfs-examples.pod:33 ../examples/guestfs-recipes.pod:384 -#: ../fish/guestfish.pod:1267 ../fish/virt-copy-in.pod:50 +#: ../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 ../fuse/guestmount.pod:308 +#: ../fish/virt-tar-out.pod:41 ../fuse/guestmount.pod:317 #: ../inspector/virt-inspector.pod:380 ../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:288 -#: ../resize/virt-resize.pod:613 ../ruby/examples/guestfs-ruby.pod:36 -#: ../sparsify/virt-sparsify.pod:251 ../src/guestfs.pod:3184 +#: ../resize/virt-resize.pod:688 ../ruby/examples/guestfs-ruby.pod:36 +#: ../sparsify/virt-sparsify.pod:251 ../src/guestfs.pod:3270 #: ../test-tool/libguestfs-test-tool.pod:100 #: ../tools/virt-list-filesystems.pl:195 ../tools/virt-list-partitions.pl:265 -#: ../tools/virt-make-fs.pl:539 ../tools/virt-tar.pl:296 -#: ../tools/virt-win-reg.pl:746 +#: ../tools/virt-make-fs.pl:557 ../tools/virt-tar.pl:296 +#: ../tools/virt-win-reg.pl:757 msgid "SEE ALSO" msgstr "" #. type: textblock -#: ../align/virt-alignment-scan.pod:348 +#: ../align/virt-alignment-scan.pod:354 msgid "" "L, L, L, L, " "L, L." msgstr "" #. type: =head1 -#: ../align/virt-alignment-scan.pod:355 ../cat/virt-cat.pod:212 -#: ../cat/virt-filesystems.pod:388 ../cat/virt-ls.pod:507 -#: ../clone/virt-sysprep.pod:384 ../df/virt-df.pod:235 +#: ../align/virt-alignment-scan.pod:361 ../cat/virt-cat.pod:252 +#: ../cat/virt-filesystems.pod:396 ../cat/virt-ls.pod:507 +#: ../clone/virt-sysprep.pod:501 ../df/virt-df.pod:235 #: ../edit/virt-edit.pod:368 ../rescue/virt-rescue.pod:296 -#: ../resize/virt-resize.pod:635 ../sparsify/virt-sparsify.pod:264 +#: ../resize/virt-resize.pod:711 ../sparsify/virt-sparsify.pod:264 #: ../tools/virt-list-filesystems.pl:208 ../tools/virt-list-partitions.pl:277 -#: ../tools/virt-make-fs.pl:564 ../tools/virt-tar.pl:311 -#: ../tools/virt-win-reg.pl:772 +#: ../tools/virt-make-fs.pl:582 ../tools/virt-tar.pl:311 +#: ../tools/virt-win-reg.pl:783 msgid "AUTHOR" msgstr "" #. type: textblock -#: ../align/virt-alignment-scan.pod:357 ../cat/virt-cat.pod:214 -#: ../cat/virt-filesystems.pod:390 ../cat/virt-ls.pod:509 -#: ../clone/virt-sysprep.pod:386 ../df/virt-df.pod:237 +#: ../align/virt-alignment-scan.pod:363 ../cat/virt-cat.pod:254 +#: ../cat/virt-filesystems.pod:398 ../cat/virt-ls.pod:509 +#: ../clone/virt-sysprep.pod:503 ../df/virt-df.pod:237 #: ../edit/virt-edit.pod:370 ../inspector/virt-inspector.pod:395 -#: ../rescue/virt-rescue.pod:298 ../resize/virt-resize.pod:637 +#: ../rescue/virt-rescue.pod:298 ../resize/virt-resize.pod:713 #: ../sparsify/virt-sparsify.pod:266 ../tools/virt-list-filesystems.pl:210 -#: ../tools/virt-list-partitions.pl:279 ../tools/virt-make-fs.pl:566 -#: ../tools/virt-tar.pl:313 ../tools/virt-win-reg.pl:774 +#: ../tools/virt-list-partitions.pl:279 ../tools/virt-make-fs.pl:584 +#: ../tools/virt-tar.pl:313 ../tools/virt-win-reg.pl:785 msgid "Richard W.M. Jones L" msgstr "" #. type: =head1 -#: ../align/virt-alignment-scan.pod:359 ../cat/virt-cat.pod:216 -#: ../cat/virt-filesystems.pod:392 ../cat/virt-ls.pod:511 -#: ../clone/virt-sysprep.pod:388 ../df/virt-df.pod:239 +#: ../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:239 #: ../edit/virt-edit.pod:372 ../erlang/examples/guestfs-erlang.pod:114 #: ../examples/guestfs-examples.pod:49 ../examples/guestfs-recipes.pod:401 -#: ../fish/guestfish.pod:1299 ../fish/virt-copy-in.pod:64 +#: ../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 ../fuse/guestmount.pod:323 +#: ../fish/virt-tar-out.pod:55 ../fuse/guestmount.pod:332 #: ../inspector/virt-inspector.pod:403 ../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:300 -#: ../resize/virt-resize.pod:639 ../ruby/examples/guestfs-ruby.pod:52 -#: ../sparsify/virt-sparsify.pod:268 ../src/guestfs.pod:3265 +#: ../resize/virt-resize.pod:715 ../ruby/examples/guestfs-ruby.pod:52 +#: ../sparsify/virt-sparsify.pod:268 ../src/guestfs.pod:3352 #: ../test-tool/libguestfs-test-tool.pod:110 #: ../tools/virt-list-filesystems.pl:212 ../tools/virt-list-partitions.pl:281 -#: ../tools/virt-make-fs.pl:568 ../tools/virt-tar.pl:315 -#: ../tools/virt-win-reg.pl:776 +#: ../tools/virt-make-fs.pl:586 ../tools/virt-tar.pl:315 +#: ../tools/virt-win-reg.pl:787 msgid "COPYRIGHT" msgstr "" #. type: textblock -#: ../align/virt-alignment-scan.pod:361 ../clone/virt-sysprep.pod:390 +#: ../align/virt-alignment-scan.pod:367 ../clone/virt-sysprep.pod:507 #: ../sparsify/virt-sparsify.pod:270 msgid "Copyright (C) 2011 Red Hat Inc." msgstr "" #. type: textblock -#: ../align/virt-alignment-scan.pod:363 ../cat/virt-cat.pod:220 -#: ../cat/virt-filesystems.pod:396 ../cat/virt-ls.pod:515 -#: ../clone/virt-sysprep.pod:392 ../df/virt-df.pod:243 -#: ../edit/virt-edit.pod:376 ../fish/guestfish.pod:1304 +#: ../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:243 +#: ../edit/virt-edit.pod:376 ../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 -#: ../fuse/guestmount.pod:328 ../inspector/virt-inspector.pod:407 -#: ../rescue/virt-rescue.pod:304 ../resize/virt-resize.pod:643 +#: ../fuse/guestmount.pod:337 ../inspector/virt-inspector.pod:407 +#: ../rescue/virt-rescue.pod:304 ../resize/virt-resize.pod:719 #: ../sparsify/virt-sparsify.pod:272 ../test-tool/libguestfs-test-tool.pod:115 #: ../tools/virt-list-filesystems.pl:216 ../tools/virt-list-partitions.pl:285 -#: ../tools/virt-make-fs.pl:572 ../tools/virt-tar.pl:319 -#: ../tools/virt-win-reg.pl:780 +#: ../tools/virt-make-fs.pl:590 ../tools/virt-tar.pl:319 +#: ../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 " @@ -1109,18 +1126,18 @@ msgid "" msgstr "" #. type: textblock -#: ../align/virt-alignment-scan.pod:368 ../cat/virt-cat.pod:225 -#: ../cat/virt-filesystems.pod:401 ../cat/virt-ls.pod:520 -#: ../clone/virt-sysprep.pod:397 ../df/virt-df.pod:248 -#: ../edit/virt-edit.pod:381 ../fish/guestfish.pod:1309 +#: ../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:248 +#: ../edit/virt-edit.pod:381 ../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 -#: ../fuse/guestmount.pod:333 ../inspector/virt-inspector.pod:412 -#: ../rescue/virt-rescue.pod:309 ../resize/virt-resize.pod:648 +#: ../fuse/guestmount.pod:342 ../inspector/virt-inspector.pod:412 +#: ../rescue/virt-rescue.pod:309 ../resize/virt-resize.pod:724 #: ../sparsify/virt-sparsify.pod:277 ../test-tool/libguestfs-test-tool.pod:120 #: ../tools/virt-list-filesystems.pl:221 ../tools/virt-list-partitions.pl:290 -#: ../tools/virt-make-fs.pl:577 ../tools/virt-tar.pl:324 -#: ../tools/virt-win-reg.pl:785 +#: ../tools/virt-make-fs.pl:595 ../tools/virt-tar.pl:324 +#: ../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 " @@ -1129,18 +1146,18 @@ msgid "" msgstr "" #. type: textblock -#: ../align/virt-alignment-scan.pod:373 ../cat/virt-cat.pod:230 -#: ../cat/virt-filesystems.pod:406 ../cat/virt-ls.pod:525 -#: ../clone/virt-sysprep.pod:402 ../df/virt-df.pod:253 -#: ../edit/virt-edit.pod:386 ../fish/guestfish.pod:1314 +#: ../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:253 +#: ../edit/virt-edit.pod:386 ../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 -#: ../fuse/guestmount.pod:338 ../inspector/virt-inspector.pod:417 -#: ../rescue/virt-rescue.pod:314 ../resize/virt-resize.pod:653 +#: ../fuse/guestmount.pod:347 ../inspector/virt-inspector.pod:417 +#: ../rescue/virt-rescue.pod:314 ../resize/virt-resize.pod:729 #: ../sparsify/virt-sparsify.pod:282 ../test-tool/libguestfs-test-tool.pod:125 #: ../tools/virt-list-filesystems.pl:226 ../tools/virt-list-partitions.pl:295 -#: ../tools/virt-make-fs.pl:582 ../tools/virt-tar.pl:329 -#: ../tools/virt-win-reg.pl:790 +#: ../tools/virt-make-fs.pl:600 ../tools/virt-tar.pl:329 +#: ../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., 675 Mass " @@ -1216,7 +1233,7 @@ msgstr "" #. type: =head1 #: ../cat/virt-cat.pod:32 ../cat/virt-ls.pod:35 ../df/virt-df.pod:43 #: ../edit/virt-edit.pod:44 ../fish/guestfish.pod:41 -#: ../fish/guestfish.pod:1050 ../fish/virt-copy-in.pod:29 +#: ../fish/guestfish.pod:1051 ../fish/virt-copy-in.pod:29 #: ../fish/virt-copy-out.pod:21 ../fish/virt-tar-in.pod:30 #: ../fish/virt-tar-out.pod:24 ../fuse/guestmount.pod:39 #: ../resize/virt-resize.pod:27 ../sparsify/virt-sparsify.pod:75 @@ -1319,7 +1336,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:126 ../inspector/virt-inspector.pod:92 +#: ../fuse/guestmount.pod:135 ../inspector/virt-inspector.pod:92 msgid "B<--echo-keys>" msgstr "" @@ -1351,14 +1368,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:163 ../inspector/virt-inspector.pod:114 +#: ../fuse/guestmount.pod:172 ../inspector/virt-inspector.pod:114 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:165 ../inspector/virt-inspector.pod:116 +#: ../fuse/guestmount.pod:174 ../inspector/virt-inspector.pod:116 msgid "" "Read key or passphrase parameters from stdin. The default is to try to read " "passphrases from the user by opening C." @@ -1412,24 +1429,77 @@ msgid "For compatibility the old style is still supported." msgstr "" #. type: =head1 -#: ../cat/virt-cat.pod:168 ../edit/virt-edit.pod:297 -msgid "USING GUESTFISH" +#: ../cat/virt-cat.pod:168 ../edit/virt-edit.pod:257 ../fish/guestfish.pod:858 +msgid "WINDOWS PATHS" msgstr "" #. type: textblock #: ../cat/virt-cat.pod:170 msgid "" +"C has a limited ability to understand Windows drive letters and " +"paths (eg. C)." +msgstr "" + +#. type: textblock +#: ../cat/virt-cat.pod:173 ../edit/virt-edit.pod:262 +msgid "If and only if the guest is running Windows then:" +msgstr "" + +#. type: textblock +#: ../cat/virt-cat.pod:179 ../edit/virt-edit.pod:268 +msgid "" +"Drive letter prefixes like C are resolved against the Windows Registry " +"to the correct filesystem." +msgstr "" + +#. type: textblock +#: ../cat/virt-cat.pod:184 ../edit/virt-edit.pod:273 +msgid "" +"Any backslash (C<\\>) characters in the path are replaced with forward " +"slashes so that libguestfs can process it." +msgstr "" + +#. type: textblock +#: ../cat/virt-cat.pod:189 +msgid "" +"The path is resolved case insensitively to locate the file that should be " +"displayed." +msgstr "" + +#. type: textblock +#: ../cat/virt-cat.pod:194 ../edit/virt-edit.pod:283 +msgid "There are some known shortcomings:" +msgstr "" + +#. type: textblock +#: ../cat/virt-cat.pod:200 ../edit/virt-edit.pod:289 +msgid "Some NTFS symbolic links may not be followed correctly." +msgstr "" + +#. type: textblock +#: ../cat/virt-cat.pod:204 ../edit/virt-edit.pod:293 +msgid "NTFS junction points that cross filesystems are not followed." +msgstr "" + +#. type: =head1 +#: ../cat/virt-cat.pod:208 ../edit/virt-edit.pod:297 +msgid "USING GUESTFISH" +msgstr "" + +#. type: textblock +#: ../cat/virt-cat.pod:210 +msgid "" "L is a more powerful, lower level tool which you can use when " "C doesn't work." msgstr "" #. type: textblock -#: ../cat/virt-cat.pod:173 +#: ../cat/virt-cat.pod:213 msgid "Using C is approximately equivalent to doing:" msgstr "" #. type: verbatim -#: ../cat/virt-cat.pod:175 +#: ../cat/virt-cat.pod:215 #, no-wrap msgid "" " guestfish --ro -i -d domname download file -\n" @@ -1437,14 +1507,14 @@ msgid "" msgstr "" #. type: textblock -#: ../cat/virt-cat.pod:177 +#: ../cat/virt-cat.pod:217 msgid "" "where C is the name of the libvirt guest, and C is the full " "path to the file. Note the final C<-> (meaning \"output to stdout\")." msgstr "" #. type: textblock -#: ../cat/virt-cat.pod:181 +#: ../cat/virt-cat.pod:221 msgid "" "The command above uses libguestfs's guest inspection feature and so does not " "work on guests that libguestfs cannot inspect, or on things like arbitrary " @@ -1453,7 +1523,7 @@ msgid "" msgstr "" #. type: verbatim -#: ../cat/virt-cat.pod:186 +#: ../cat/virt-cat.pod:226 #, no-wrap msgid "" " guestfish --ro -a disk.img -m /dev/sda1 download file -\n" @@ -1461,31 +1531,31 @@ msgid "" msgstr "" #. type: textblock -#: ../cat/virt-cat.pod:188 +#: ../cat/virt-cat.pod:228 msgid "" "where C is the disk image, C is the filesystem within " "the disk image, and C is the full path to the file." msgstr "" #. type: textblock -#: ../cat/virt-cat.pod:200 ../cat/virt-filesystems.pod:374 +#: ../cat/virt-cat.pod:240 ../cat/virt-filesystems.pod:382 #: ../cat/virt-ls.pod:492 ../df/virt-df.pod:224 ../edit/virt-edit.pod:351 -#: ../fuse/guestmount.pod:305 ../inspector/virt-inspector.pod:377 -#: ../resize/virt-resize.pod:610 ../sparsify/virt-sparsify.pod:229 +#: ../fuse/guestmount.pod:314 ../inspector/virt-inspector.pod:377 +#: ../resize/virt-resize.pod:685 ../sparsify/virt-sparsify.pod:229 msgid "" "This program returns 0 if successful, or non-zero if there was an error." msgstr "" #. type: textblock -#: ../cat/virt-cat.pod:205 +#: ../cat/virt-cat.pod:245 msgid "" "L, L, L, L, L, L." msgstr "" #. type: textblock -#: ../cat/virt-cat.pod:218 ../inspector/virt-inspector.pod:405 -#: ../resize/virt-resize.pod:641 +#: ../cat/virt-cat.pod:258 ../inspector/virt-inspector.pod:405 +#: ../resize/virt-resize.pod:717 ../tools/virt-make-fs.pl:588 msgid "Copyright (C) 2010-2011 Red Hat Inc." msgstr "" @@ -2021,23 +2091,41 @@ msgstr "" #. type: =item #: ../cat/virt-filesystems.pod:319 -msgid "B" +msgid "B" msgstr "" #. type: textblock #: ../cat/virt-filesystems.pod:321 msgid "" +"The partition type byte, displayed as a two digit hexadecimal number. A " +"comprehensive list of partition types can be found here: L" +msgstr "" + +#. type: textblock +#: ../cat/virt-filesystems.pod:325 +msgid "This is only applicable for DOS (MBR) partitions." +msgstr "" + +#. type: =item +#: ../cat/virt-filesystems.pod:327 +msgid "B" +msgstr "" + +#. type: textblock +#: ../cat/virt-filesystems.pod:329 +msgid "" "The size of the object in bytes. If the I<--human> option is used then the " "size is displayed in a human-readable form." msgstr "" #. type: =item -#: ../cat/virt-filesystems.pod:324 +#: ../cat/virt-filesystems.pod:332 msgid "B" msgstr "" #. type: textblock -#: ../cat/virt-filesystems.pod:326 +#: ../cat/virt-filesystems.pod:334 msgid "" "The parent column records the parent relationship between objects. For " "example, if the object is a partition, then this column contains the name of " @@ -2046,30 +2134,30 @@ msgid "" msgstr "" #. type: =item -#: ../cat/virt-filesystems.pod:331 +#: ../cat/virt-filesystems.pod:339 msgid "B" msgstr "" #. type: textblock -#: ../cat/virt-filesystems.pod:333 +#: ../cat/virt-filesystems.pod:341 msgid "" "If the object has a UUID (used for identifying and mounting filesystems and " "block devices) then this column contains the UUID as a string." msgstr "" #. type: textblock -#: ../cat/virt-filesystems.pod:337 +#: ../cat/virt-filesystems.pod:345 msgid "The UUID is only displayed if the I<--uuid> option is given." msgstr "" #. type: =head1 -#: ../cat/virt-filesystems.pod:341 ../cat/virt-ls.pod:459 +#: ../cat/virt-filesystems.pod:349 ../cat/virt-ls.pod:459 #: ../df/virt-df.pod:191 msgid "NOTE ABOUT CSV FORMAT" msgstr "" #. type: textblock -#: ../cat/virt-filesystems.pod:343 ../cat/virt-ls.pod:461 +#: ../cat/virt-filesystems.pod:351 ../cat/virt-ls.pod:461 #: ../df/virt-df.pod:193 msgid "" "Comma-separated values (CSV) is a deceptive format. It I like it " @@ -2077,7 +2165,7 @@ msgid "" msgstr "" #. type: textblock -#: ../cat/virt-filesystems.pod:346 ../cat/virt-ls.pod:464 +#: ../cat/virt-filesystems.pod:354 ../cat/virt-ls.pod:464 #: ../df/virt-df.pod:196 msgid "" "Myth: Just split fields at commas. Reality: This does I work " @@ -2085,7 +2173,7 @@ msgid "" msgstr "" #. type: verbatim -#: ../cat/virt-filesystems.pod:349 ../cat/virt-ls.pod:467 +#: ../cat/virt-filesystems.pod:357 ../cat/virt-ls.pod:467 #: ../df/virt-df.pod:199 #, no-wrap msgid "" @@ -2094,7 +2182,7 @@ msgid "" msgstr "" #. type: textblock -#: ../cat/virt-filesystems.pod:351 ../cat/virt-ls.pod:469 +#: ../cat/virt-filesystems.pod:359 ../cat/virt-ls.pod:469 #: ../df/virt-df.pod:201 msgid "" "Myth: Read the file one line at a time. Reality: This does I work " @@ -2102,7 +2190,7 @@ msgid "" msgstr "" #. type: verbatim -#: ../cat/virt-filesystems.pod:354 ../cat/virt-ls.pod:472 +#: ../cat/virt-filesystems.pod:362 ../cat/virt-ls.pod:472 #: ../df/virt-df.pod:204 #, no-wrap msgid "" @@ -2112,7 +2200,7 @@ msgid "" msgstr "" #. type: textblock -#: ../cat/virt-filesystems.pod:357 ../cat/virt-ls.pod:475 +#: ../cat/virt-filesystems.pod:365 ../cat/virt-ls.pod:475 #: ../df/virt-df.pod:207 msgid "" "For shell scripts, use C (L also " @@ -2120,7 +2208,7 @@ msgid "" msgstr "" #. type: textblock -#: ../cat/virt-filesystems.pod:360 ../cat/virt-ls.pod:478 +#: ../cat/virt-filesystems.pod:368 ../cat/virt-ls.pod:478 #: ../df/virt-df.pod:210 msgid "" "For other languages, use a CSV processing library (eg. C for Perl " @@ -2128,13 +2216,13 @@ msgid "" msgstr "" #. type: textblock -#: ../cat/virt-filesystems.pod:363 ../cat/virt-ls.pod:481 +#: ../cat/virt-filesystems.pod:371 ../cat/virt-ls.pod:481 #: ../df/virt-df.pod:213 msgid "Most spreadsheets and databases can import CSV directly." msgstr "" #. type: textblock -#: ../cat/virt-filesystems.pod:379 +#: ../cat/virt-filesystems.pod:387 msgid "" "L, L, L, L, L, L, L, L need to run virt-sysprep as root. In fact we'd generally " +"recommend that you don't. The time you might want to run it as root is when " +"you need root in order to access the disk image, but even in this case it " +"would be better to change the permissions on the disk image to be writable " +"as the non-root user running virt-sysprep." +msgstr "" + +#. type: textblock +#: ../clone/virt-sysprep.pod:35 +msgid "" "\"Sysprep\" stands for \"system preparation\" tool. The name comes from the " "Microsoft program C which is used to unconfigure Windows " "machines in preparation for cloning them. Having said that, virt-sysprep " @@ -2958,19 +3055,19 @@ msgid "" msgstr "" #. type: =item -#: ../clone/virt-sysprep.pod:70 +#: ../clone/virt-sysprep.pod:76 msgid "B<--enable=...>" msgstr "" #. type: textblock -#: ../clone/virt-sysprep.pod:72 +#: ../clone/virt-sysprep.pod:78 msgid "" "Choose which sysprep operations to perform. Give a comma-separated list of " "operations, for example:" msgstr "" #. type: verbatim -#: ../clone/virt-sysprep.pod:75 +#: ../clone/virt-sysprep.pod:81 #, no-wrap msgid "" " --enable=ssh-hostkeys,udev-persistent-net\n" @@ -2978,13 +3075,13 @@ msgid "" msgstr "" #. type: textblock -#: ../clone/virt-sysprep.pod:77 +#: ../clone/virt-sysprep.pod:83 msgid "" "would enable ONLY C and C operations." msgstr "" #. type: textblock -#: ../clone/virt-sysprep.pod:79 +#: ../clone/virt-sysprep.pod:85 msgid "" "If the I<--enable> option is not given, then we default to trying all " "possible sysprep operations. But some sysprep operations are skipped for " @@ -2992,20 +3089,20 @@ msgid "" msgstr "" #. type: textblock -#: ../clone/virt-sysprep.pod:83 +#: ../clone/virt-sysprep.pod:89 msgid "" "Use I<--list-operations> to list operations supported by a particular " "version of virt-sysprep." msgstr "" #. type: textblock -#: ../clone/virt-sysprep.pod:86 +#: ../clone/virt-sysprep.pod:92 msgid "" "See L below for a list and an explanation of each operation." msgstr "" #. type: verbatim -#: ../clone/virt-sysprep.pod:100 +#: ../clone/virt-sysprep.pod:106 #, no-wrap msgid "" " virt-sysprep --format=raw -a disk.img\n" @@ -3013,7 +3110,7 @@ msgid "" msgstr "" #. type: verbatim -#: ../clone/virt-sysprep.pod:104 +#: ../clone/virt-sysprep.pod:110 #, no-wrap msgid "" " virt-sysprep --format=raw -a disk.img --format -a another.img\n" @@ -3021,49 +3118,72 @@ msgid "" msgstr "" #. type: =item -#: ../clone/virt-sysprep.pod:113 +#: ../clone/virt-sysprep.pod:119 msgid "B<--hostname> newhostname" msgstr "" #. type: textblock -#: ../clone/virt-sysprep.pod:115 +#: ../clone/virt-sysprep.pod:121 msgid "" "Change the hostname. See the L operation below. If not given, " "defaults to C." msgstr "" #. type: =item -#: ../clone/virt-sysprep.pod:118 +#: ../clone/virt-sysprep.pod:124 msgid "B<--list-operations>" msgstr "" #. type: textblock -#: ../clone/virt-sysprep.pod:120 +#: ../clone/virt-sysprep.pod:126 msgid "List the operations supported by the virt-sysprep program." msgstr "" +#. type: =item +#: ../clone/virt-sysprep.pod:128 +msgid "B<--selinux-relabel>" +msgstr "" + +#. type: =item +#: ../clone/virt-sysprep.pod:130 +msgid "B<--no-selinux-relabel>" +msgstr "" + +#. type: textblock +#: ../clone/virt-sysprep.pod:132 +msgid "" +"I<--selinux-relabel> forces SELinux relabelling next time the guest boots. " +"I<--no-selinux-relabel> disables relabelling." +msgstr "" + +#. type: textblock +#: ../clone/virt-sysprep.pod:135 +msgid "" +"The default is to try to detect if SELinux relabelling is required. See L below for more details." +msgstr "" + #. type: =head1 -#: ../clone/virt-sysprep.pod:140 +#: ../clone/virt-sysprep.pod:156 msgid "OPERATIONS" msgstr "" #. type: textblock -#: ../clone/virt-sysprep.pod:142 +#: ../clone/virt-sysprep.pod:158 msgid "" -"If the I<--enable> option is I given, then all sysprep operations in " -"the list below are enabled, although some are skipped depending on the type " -"of guest." +"If the I<--enable> option is I given, then I, although some are skipped depending on the type of guest." msgstr "" #. type: textblock -#: ../clone/virt-sysprep.pod:146 +#: ../clone/virt-sysprep.pod:162 msgid "" "Operations can be individually enabled using the I<--enable> option. Use a " "comma-separated list, for example:" msgstr "" #. type: verbatim -#: ../clone/virt-sysprep.pod:149 +#: ../clone/virt-sysprep.pod:165 #, no-wrap msgid "" " virt-sysprep --enable=ssh-hostkeys,udev-persistent-net [etc..]\n" @@ -3071,69 +3191,163 @@ msgid "" msgstr "" #. type: textblock -#: ../clone/virt-sysprep.pod:151 +#: ../clone/virt-sysprep.pod:167 msgid "" "To list the operations supported by the current version of virt-sysprep, use " "I<--list-operations>." msgstr "" +#. type: textblock +#: ../clone/virt-sysprep.pod:170 +msgid "" +"Future versions of virt-sysprep may add more operations. If you are using " +"virt-sysprep and want predictable behaviour, specify only the operations " +"that you want to have enabled." +msgstr "" + +#. type: =head2 +#: ../clone/virt-sysprep.pod:174 +msgid "cron-spool" +msgstr "" + +#. type: textblock +#: ../clone/virt-sysprep.pod:176 +msgid "Remove user at-jobs and cron-jobs." +msgstr "" + +#. type: =head2 +#: ../clone/virt-sysprep.pod:178 +msgid "dhcp-client-state" +msgstr "" + +#. type: textblock +#: ../clone/virt-sysprep.pod:180 +msgid "Remove DHCP client leases." +msgstr "" + +#. type: =head2 +#: ../clone/virt-sysprep.pod:182 +msgid "dhcp-server-state" +msgstr "" + +#. type: textblock +#: ../clone/virt-sysprep.pod:184 +msgid "Remove DHCP server leases." +msgstr "" + #. type: =head2 -#: ../clone/virt-sysprep.pod:154 +#: ../clone/virt-sysprep.pod:186 msgid "hostname" msgstr "" #. type: textblock -#: ../clone/virt-sysprep.pod:156 +#: ../clone/virt-sysprep.pod:188 msgid "" -"This changes the hostname of the guest to the value given in the I<--" -"hostname> parameter." +"Changes the hostname of the guest to the value given in the I<--hostname> " +"parameter." msgstr "" #. type: textblock -#: ../clone/virt-sysprep.pod:159 +#: ../clone/virt-sysprep.pod:191 msgid "" "If the I<--hostname> parameter is not given, then the hostname is changed to " "C." msgstr "" #. type: =head2 -#: ../clone/virt-sysprep.pod:162 +#: ../clone/virt-sysprep.pod:194 +msgid "logfiles" +msgstr "" + +#. type: textblock +#: ../clone/virt-sysprep.pod:196 +msgid "Remove many log files." +msgstr "" + +#. type: =head2 +#: ../clone/virt-sysprep.pod:198 +msgid "mail-spool" +msgstr "" + +#. type: textblock +#: ../clone/virt-sysprep.pod:200 +msgid "Remove email from the local mail spool directory." +msgstr "" + +#. type: =head2 +#: ../clone/virt-sysprep.pod:202 msgid "net-hwaddr" msgstr "" #. type: textblock -#: ../clone/virt-sysprep.pod:164 +#: ../clone/virt-sysprep.pod:204 msgid "" "Remove HWADDR (hard-coded MAC address) configuration. For Fedora and Red " "Hat Enterprise Linux, this is removed from C files." msgstr "" #. type: =head2 -#: ../clone/virt-sysprep.pod:167 +#: ../clone/virt-sysprep.pod:207 +msgid "random-seed" +msgstr "" + +#. type: textblock +#: ../clone/virt-sysprep.pod:209 +msgid "" +"Write some random bytes from the host into the random seed file of the guest." +msgstr "" + +#. type: textblock +#: ../clone/virt-sysprep.pod:212 +msgid "See L below." +msgstr "" + +#. type: =head2 +#: ../clone/virt-sysprep.pod:214 +msgid "rhn-systemid" +msgstr "" + +#. type: textblock +#: ../clone/virt-sysprep.pod:216 +msgid "Remove the RHN system ID." +msgstr "" + +#. type: =head2 +#: ../clone/virt-sysprep.pod:218 +msgid "smolt-uuid" +msgstr "" + +#. type: textblock +#: ../clone/virt-sysprep.pod:220 +msgid "Remove the Smolt hardware UUID." +msgstr "" + +#. type: =head2 +#: ../clone/virt-sysprep.pod:222 msgid "ssh-hostkeys" msgstr "" #. type: textblock -#: ../clone/virt-sysprep.pod:169 -msgid "This erases the SSH host keys in the guest." +#: ../clone/virt-sysprep.pod:224 +msgid "Remove the SSH host keys in the guest." msgstr "" #. type: textblock -#: ../clone/virt-sysprep.pod:171 +#: ../clone/virt-sysprep.pod:226 msgid "" "The SSH host keys are regenerated (differently) next time the guest is " "booted." msgstr "" #. type: textblock -#: ../clone/virt-sysprep.pod:174 +#: ../clone/virt-sysprep.pod:229 msgid "" "If, after cloning, the guest gets the same IP address, ssh will give you a " "stark warning about the host key changing:" msgstr "" #. type: verbatim -#: ../clone/virt-sysprep.pod:177 +#: ../clone/virt-sysprep.pod:232 #, no-wrap msgid "" " @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\n" @@ -3144,19 +3358,19 @@ msgid "" msgstr "" #. type: =head2 -#: ../clone/virt-sysprep.pod:182 +#: ../clone/virt-sysprep.pod:237 msgid "udev-persistent-net" msgstr "" #. type: textblock -#: ../clone/virt-sysprep.pod:184 +#: ../clone/virt-sysprep.pod:239 msgid "" -"This erases udev persistent net rules which map the guest's existing MAC " -"address to a fixed ethernet device (eg. eth0)." +"Remove udev persistent net rules which map the guest's existing MAC address " +"to a fixed ethernet device (eg. eth0)." msgstr "" #. type: textblock -#: ../clone/virt-sysprep.pod:187 +#: ../clone/virt-sysprep.pod:242 msgid "" "After a guest is cloned, the MAC address usually changes. Since the old MAC " "address occupies the old name (eg. eth0), this means the fresh MAC address " @@ -3164,13 +3378,48 @@ msgid "" "Erasing the udev persistent net rules avoids this." msgstr "" +#. type: =head2 +#: ../clone/virt-sysprep.pod:247 +msgid "utmp" +msgstr "" + +#. type: textblock +#: ../clone/virt-sysprep.pod:249 +msgid "Remove the utmp file." +msgstr "" + +#. type: textblock +#: ../clone/virt-sysprep.pod:251 +msgid "" +"This records who is currently logged in on a machine. In modern Linux " +"distros it is stored in a ramdisk and hence not part of the virtual " +"machine's disk, but it was stored on disk in older distros." +msgstr "" + +#. type: =head2 +#: ../clone/virt-sysprep.pod:255 +msgid "yum-uuid" +msgstr "" + +#. type: textblock +#: ../clone/virt-sysprep.pod:257 +msgid "Remove the yum UUID." +msgstr "" + +#. type: textblock +#: ../clone/virt-sysprep.pod:259 +msgid "" +"Yum creates a fresh UUID the next time it runs when it notices that the " +"original UUID has been erased." +msgstr "" + #. type: =head1 -#: ../clone/virt-sysprep.pod:192 +#: ../clone/virt-sysprep.pod:262 msgid "COPYING AND CLONING" msgstr "" #. type: textblock -#: ../clone/virt-sysprep.pod:194 +#: ../clone/virt-sysprep.pod:264 msgid "" "Virt-sysprep can be used as part of a process of cloning guests, or to " "prepare a template from which guests can be cloned. There are many " @@ -3179,17 +3428,17 @@ msgid "" msgstr "" #. type: textblock -#: ../clone/virt-sysprep.pod:199 +#: ../clone/virt-sysprep.pod:269 msgid "A virtual machine (when switched off) consists of two parts:" msgstr "" #. type: =item -#: ../clone/virt-sysprep.pod:203 +#: ../clone/virt-sysprep.pod:273 msgid "I" msgstr "" #. type: textblock -#: ../clone/virt-sysprep.pod:205 +#: ../clone/virt-sysprep.pod:275 msgid "" "The configuration or description of the guest. eg. The libvirt XML (see " "C), the running configuration of the guest, or another " @@ -3197,74 +3446,74 @@ msgid "" msgstr "" #. type: textblock -#: ../clone/virt-sysprep.pod:209 +#: ../clone/virt-sysprep.pod:279 msgid "Some configuration items that might need to be changed:" msgstr "" #. type: textblock -#: ../clone/virt-sysprep.pod:215 +#: ../clone/virt-sysprep.pod:285 msgid "name" msgstr "" #. type: textblock -#: ../clone/virt-sysprep.pod:219 ../clone/virt-sysprep.pod:246 +#: ../clone/virt-sysprep.pod:289 ../clone/virt-sysprep.pod:316 msgid "UUID" msgstr "" #. type: textblock -#: ../clone/virt-sysprep.pod:223 +#: ../clone/virt-sysprep.pod:293 msgid "path to block device(s)" msgstr "" #. type: textblock -#: ../clone/virt-sysprep.pod:227 +#: ../clone/virt-sysprep.pod:297 msgid "network card MAC address" msgstr "" #. type: =item -#: ../clone/virt-sysprep.pod:231 +#: ../clone/virt-sysprep.pod:301 msgid "I" msgstr "" #. type: textblock -#: ../clone/virt-sysprep.pod:233 +#: ../clone/virt-sysprep.pod:303 msgid "" "One or more hard disk images, themselves containing files, directories, " "applications, kernels, configuration, etc." msgstr "" #. type: textblock -#: ../clone/virt-sysprep.pod:236 +#: ../clone/virt-sysprep.pod:306 msgid "Some things inside the block devices that might need to be changed:" msgstr "" #. type: textblock -#: ../clone/virt-sysprep.pod:242 +#: ../clone/virt-sysprep.pod:312 msgid "hostname and other net configuration" msgstr "" #. type: textblock -#: ../clone/virt-sysprep.pod:250 +#: ../clone/virt-sysprep.pod:320 msgid "SSH host keys" msgstr "" #. type: textblock -#: ../clone/virt-sysprep.pod:254 +#: ../clone/virt-sysprep.pod:324 msgid "Windows unique security ID (SID)" msgstr "" #. type: textblock -#: ../clone/virt-sysprep.pod:258 +#: ../clone/virt-sysprep.pod:328 msgid "Puppet registration" msgstr "" #. type: =head2 -#: ../clone/virt-sysprep.pod:264 +#: ../clone/virt-sysprep.pod:334 msgid "COPYING THE BLOCK DEVICE" msgstr "" #. type: textblock -#: ../clone/virt-sysprep.pod:266 +#: ../clone/virt-sysprep.pod:336 msgid "" "Starting with an original guest, you probably wish to copy the guest block " "device and its configuration to make a template. Then once you are happy " @@ -3272,7 +3521,7 @@ msgid "" msgstr "" #. type: verbatim -#: ../clone/virt-sysprep.pod:271 +#: ../clone/virt-sysprep.pod:341 #, no-wrap msgid "" " virt-sysprep\n" @@ -3286,14 +3535,14 @@ msgid "" msgstr "" #. type: textblock -#: ../clone/virt-sysprep.pod:279 +#: ../clone/virt-sysprep.pod:349 msgid "" "You can, of course, just copy the block device on the host using L or " "L." msgstr "" #. type: verbatim -#: ../clone/virt-sysprep.pod:282 +#: ../clone/virt-sysprep.pod:352 #, no-wrap msgid "" " dd dd\n" @@ -3305,12 +3554,12 @@ msgid "" msgstr "" #. type: textblock -#: ../clone/virt-sysprep.pod:288 +#: ../clone/virt-sysprep.pod:358 msgid "There are some smarter (and faster) ways too:" msgstr "" #. type: verbatim -#: ../clone/virt-sysprep.pod:294 +#: ../clone/virt-sysprep.pod:364 #, no-wrap msgid "" " snapshot\n" @@ -3322,7 +3571,7 @@ msgid "" msgstr "" #. type: textblock -#: ../clone/virt-sysprep.pod:300 +#: ../clone/virt-sysprep.pod:370 msgid "" "Use the block device as a backing file and create a snapshot on top for each " "guest. The advantage is that you don't need to copy the block device (very " @@ -3330,14 +3579,14 @@ msgid "" msgstr "" #. type: textblock -#: ../clone/virt-sysprep.pod:305 +#: ../clone/virt-sysprep.pod:375 msgid "" "Note that writing to the backing file once you have created guests on top of " "it is not possible: you will corrupt the guests." msgstr "" #. type: textblock -#: ../clone/virt-sysprep.pod:308 +#: ../clone/virt-sysprep.pod:378 msgid "" "Tools that can do this include: L (with the I option), L (I<--snapshot> option). Some " @@ -3346,22 +3595,22 @@ msgid "" msgstr "" #. type: textblock -#: ../clone/virt-sysprep.pod:316 +#: ../clone/virt-sysprep.pod:386 msgid "Get your NAS to snapshot and/or duplicate the LUN." msgstr "" #. type: textblock -#: ../clone/virt-sysprep.pod:320 +#: ../clone/virt-sysprep.pod:390 msgid "Prepare your template using L. See below." msgstr "" #. type: =head2 -#: ../clone/virt-sysprep.pod:324 +#: ../clone/virt-sysprep.pod:394 msgid "VIRT-CLONE" msgstr "" #. type: textblock -#: ../clone/virt-sysprep.pod:326 +#: ../clone/virt-sysprep.pod:396 msgid "" "A separate tool, L, can be used to duplicate the block device " "and/or modify the external libvirt configuration of a guest. It will reset " @@ -3369,19 +3618,19 @@ msgid "" msgstr "" #. type: textblock -#: ../clone/virt-sysprep.pod:331 +#: ../clone/virt-sysprep.pod:401 msgid "" "L does not use libguestfs and cannot look inside the disk " "image. This was the original motivation to write virt-sysprep." msgstr "" #. type: =head2 -#: ../clone/virt-sysprep.pod:334 +#: ../clone/virt-sysprep.pod:404 msgid "SPARSIFY" msgstr "" #. type: verbatim -#: ../clone/virt-sysprep.pod:336 +#: ../clone/virt-sysprep.pod:406 #, no-wrap msgid "" " virt-sparsify\n" @@ -3390,26 +3639,26 @@ msgid "" msgstr "" #. type: textblock -#: ../clone/virt-sysprep.pod:339 +#: ../clone/virt-sysprep.pod:409 msgid "" "L can be used to make the cloning template smaller, making " "it easier to compress and/or faster to copy." msgstr "" #. type: textblock -#: ../clone/virt-sysprep.pod:342 +#: ../clone/virt-sysprep.pod:412 msgid "" "Notice that since virt-sparsify also copies the image, you can use it to " "make the initial copy (instead of C
)." msgstr "" #. type: =head2 -#: ../clone/virt-sysprep.pod:345 +#: ../clone/virt-sysprep.pod:415 msgid "RESIZE" msgstr "" #. type: verbatim -#: ../clone/virt-sysprep.pod:347 +#: ../clone/virt-sysprep.pod:417 #, no-wrap msgid "" " virt-resize\n" @@ -3421,7 +3670,7 @@ msgid "" msgstr "" #. type: textblock -#: ../clone/virt-sysprep.pod:353 +#: ../clone/virt-sysprep.pod:423 msgid "" "If you want to give people cloned guests, but let them pick the size of the " "guest themselves (eg. depending on how much they are prepared to pay for " @@ -3430,17 +3679,115 @@ msgid "" "guests from a template." msgstr "" +#. type: =head1 +#: ../clone/virt-sysprep.pod:429 ../src/guestfs.pod:1164 +msgid "SECURITY" +msgstr "" + +#. type: textblock +#: ../clone/virt-sysprep.pod:431 +msgid "" +"Although virt-sysprep removes some sensitive information from the guest, it " +"does not pretend to remove all of it. You should examine the L " +"above, and the implementation of the operations in the shell script. You " +"should also examine the guest afterwards." +msgstr "" + +#. type: textblock +#: ../clone/virt-sysprep.pod:436 +msgid "" +"Sensitive files are simply removed. The data they contained may still exist " +"on the disk, easily recovered with a hex editor or undelete tool. Use " +"L as one way to remove this content. See also the L command to get rid of deleted content in directory entries and inodes." +msgstr "" + +#. type: =head2 +#: ../clone/virt-sysprep.pod:442 +msgid "RANDOM SEED" +msgstr "" + +#. type: textblock +#: ../clone/virt-sysprep.pod:444 +msgid "I<(This section applies to Linux guests only)>" +msgstr "" + +#. type: textblock +#: ../clone/virt-sysprep.pod:446 +msgid "" +"The virt-sysprep C operation writes a few bytes of randomness " +"from the host into the guest's random seed file." +msgstr "" + +#. type: textblock +#: ../clone/virt-sysprep.pod:449 +msgid "" +"If this is just done once and the guest is cloned from the same template, " +"then each guest will start with the same entropy, and things like SSH host " +"keys and TCP sequence numbers may be predictable." +msgstr "" + +#. type: textblock +#: ../clone/virt-sysprep.pod:453 +msgid "" +"Therefore you should arrange to add more randomness I cloning from a " +"template too, which can be done by just enabling the C " +"operation:" +msgstr "" + +#. type: verbatim +#: ../clone/virt-sysprep.pod:457 +#, no-wrap +msgid "" +" cp template.img newguest.img\n" +" virt-sysprep --enable=random-seed -a newguest.img\n" +"\n" +msgstr "" + +#. type: =head2 +#: ../clone/virt-sysprep.pod:460 +msgid "SELINUX RELABELLING" +msgstr "" + +#. type: textblock +#: ../clone/virt-sysprep.pod:462 +msgid "I<(This section applies to Linux guests using SELinux only)>" +msgstr "" + +#. type: textblock +#: ../clone/virt-sysprep.pod:464 +msgid "" +"If any new files are created by virt-sysprep, then virt-sysprep touches C so that these will be correctly labelled by SELinux the next " +"time the guest is booted. This process interrupts boot and can take some " +"time." +msgstr "" + +#. type: textblock +#: ../clone/virt-sysprep.pod:469 +msgid "" +"You can force relabelling for all guests by supplying the I<--selinux-" +"relabel> option." +msgstr "" + +#. type: textblock +#: ../clone/virt-sysprep.pod:472 +msgid "" +"You can disable relabelling entirely by supplying the I<--no-selinux-" +"relabel> option." +msgstr "" + #. type: textblock -#: ../clone/virt-sysprep.pod:368 +#: ../clone/virt-sysprep.pod:484 msgid "This program returns 0 on success, or 1 if there was an error." msgstr "" #. type: textblock -#: ../clone/virt-sysprep.pod:372 +#: ../clone/virt-sysprep.pod:488 msgid "" "L, L, L, L, L, L, L, L, L, L, L." +"resize(1)>, L, L, L, L, L, L, L." msgstr "" #. type: textblock @@ -3583,7 +3930,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:155 +#: ../df/virt-df.pod:133 ../fish/guestfish.pod:258 ../fuse/guestmount.pod:164 msgid "B<-i>" msgstr "" @@ -3836,7 +4183,7 @@ msgstr "" #. type: =item #: ../edit/virt-edit.pod:95 ../fish/guestfish.pod:181 -#: ../fuse/guestmount.pod:96 ../inspector/virt-inspector.pod:74 +#: ../fuse/guestmount.pod:105 ../inspector/virt-inspector.pod:74 #: ../tools/virt-list-filesystems.pl:77 ../tools/virt-list-partitions.pl:78 #: ../tools/virt-tar.pl:127 ../tools/virt-win-reg.pl:128 msgid "B<-c URI>" @@ -3844,7 +4191,7 @@ msgstr "" #. type: =item #: ../edit/virt-edit.pod:97 ../fish/guestfish.pod:183 -#: ../fuse/guestmount.pod:98 ../inspector/virt-inspector.pod:76 +#: ../fuse/guestmount.pod:107 ../inspector/virt-inspector.pod:76 #: ../tools/virt-list-filesystems.pl:79 ../tools/virt-list-partitions.pl:80 #: ../tools/virt-tar.pl:129 ../tools/virt-win-reg.pl:130 msgid "B<--connect URI>" @@ -4071,11 +4418,6 @@ msgid "" "\n" msgstr "" -#. type: =head1 -#: ../edit/virt-edit.pod:257 ../fish/guestfish.pod:858 -msgid "WINDOWS PATHS" -msgstr "" - #. type: textblock #: ../edit/virt-edit.pod:259 msgid "" @@ -4084,25 +4426,6 @@ msgid "" msgstr "" #. type: textblock -#: ../edit/virt-edit.pod:262 -msgid "If and only if the guest is running Windows then:" -msgstr "" - -#. type: textblock -#: ../edit/virt-edit.pod:268 -msgid "" -"Drive letter prefixes like C are resolved against the Windows Registry " -"to the correct filesystem." -msgstr "" - -#. type: textblock -#: ../edit/virt-edit.pod:273 -msgid "" -"Any backslash (C<\\>) characters in the path are replaced with forward " -"slashes so that libguestfs can process it." -msgstr "" - -#. type: textblock #: ../edit/virt-edit.pod:278 msgid "" "The path is resolved case insensitively to locate the file that should be " @@ -4110,21 +4433,6 @@ msgid "" msgstr "" #. type: textblock -#: ../edit/virt-edit.pod:283 -msgid "There are some known shortcomings:" -msgstr "" - -#. type: textblock -#: ../edit/virt-edit.pod:289 -msgid "Some NTFS symbolic links may not be followed correctly." -msgstr "" - -#. type: textblock -#: ../edit/virt-edit.pod:293 -msgid "NTFS junction points that cross filesystems are not followed." -msgstr "" - -#. type: textblock #: ../edit/virt-edit.pod:299 msgid "" "L is a more powerful, lower level tool which you can use when " @@ -4207,9 +4515,9 @@ msgid "" msgstr "" #. type: =head1 -#: ../edit/virt-edit.pod:329 ../fish/guestfish.pod:1118 +#: ../edit/virt-edit.pod:329 ../fish/guestfish.pod:1119 #: ../rescue/virt-rescue.pod:261 ../sparsify/virt-sparsify.pod:232 -#: ../src/guestfs.pod:3123 ../test-tool/libguestfs-test-tool.pod:95 +#: ../src/guestfs.pod:3209 ../test-tool/libguestfs-test-tool.pod:95 msgid "ENVIRONMENT VARIABLES" msgstr "" @@ -4469,13 +4777,13 @@ msgstr "" #. type: =head1 #: ../erlang/examples/guestfs-erlang.pod:110 #: ../examples/guestfs-examples.pod:45 ../examples/guestfs-recipes.pod:397 -#: ../fish/guestfish.pod:1295 ../fish/virt-copy-in.pod:60 +#: ../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:319 +#: ../fish/virt-tar-out.pod:51 ../fuse/guestmount.pod:328 #: ../inspector/virt-inspector.pod:389 ../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:3261 +#: ../ruby/examples/guestfs-ruby.pod:48 ../src/guestfs.pod:3348 #: ../test-tool/libguestfs-test-tool.pod:106 msgid "AUTHORS" msgstr "" @@ -4483,13 +4791,13 @@ msgstr "" #. type: textblock #: ../erlang/examples/guestfs-erlang.pod:112 #: ../examples/guestfs-examples.pod:47 ../examples/guestfs-recipes.pod:399 -#: ../fish/guestfish.pod:1297 ../fish/virt-copy-in.pod:62 +#: ../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:321 +#: ../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:3263 +#: ../ruby/examples/guestfs-ruby.pod:50 ../src/guestfs.pod:3350 #: ../test-tool/libguestfs-test-tool.pod:108 msgid "Richard W.M. Jones (C)" msgstr "" @@ -4519,7 +4827,7 @@ msgstr "" #: ../ocaml/examples/guestfs-ocaml.pod:102 #: ../perl/examples/guestfs-perl.pod:63 #: ../python/examples/guestfs-python.pod:65 -#: ../ruby/examples/guestfs-ruby.pod:59 ../src/guestfs.pod:3270 +#: ../ruby/examples/guestfs-ruby.pod:59 ../src/guestfs.pod:3357 msgid "" "This library is free software; you can redistribute it and/or modify it " "under the terms of the GNU Lesser General Public License as published by the " @@ -4534,7 +4842,7 @@ msgstr "" #: ../ocaml/examples/guestfs-ocaml.pod:107 #: ../perl/examples/guestfs-perl.pod:68 #: ../python/examples/guestfs-python.pod:70 -#: ../ruby/examples/guestfs-ruby.pod:64 ../src/guestfs.pod:3275 +#: ../ruby/examples/guestfs-ruby.pod:64 ../src/guestfs.pod:3362 msgid "" "This library is distributed in the hope that it will be useful, but WITHOUT " "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or " @@ -4549,7 +4857,7 @@ msgstr "" #: ../ocaml/examples/guestfs-ocaml.pod:112 #: ../perl/examples/guestfs-perl.pod:73 #: ../python/examples/guestfs-python.pod:75 -#: ../ruby/examples/guestfs-ruby.pod:69 ../src/guestfs.pod:3280 +#: ../ruby/examples/guestfs-ruby.pod:69 ../src/guestfs.pod:3367 msgid "" "You should have received a copy of the GNU Lesser General Public License " "along with this library; if not, write to the Free Software Foundation, " @@ -4567,7 +4875,7 @@ msgstr "" msgid "" " #include \n" " \n" -msgstr "" +msgstr "#include \n" #. type: verbatim #: ../examples/guestfs-examples.pod:11 @@ -4588,6 +4896,10 @@ msgid "" " cc prog.c -o prog `pkg-config libguestfs --cflags --libs`\n" "\n" msgstr "" +" cc prog.c -o prog -lguestfs\n" +"or:\n" +" cc prog.c -o prog `pkg-config libguestfs --cflags --libs`\n" +"\n" #. type: textblock #: ../examples/guestfs-examples.pod:21 @@ -4894,11 +5206,11 @@ msgstr "" #. type: textblock #: ../examples/guestfs-recipes.pod:128 ../fish/guestfish-actions.pod:9 -#: ../fish/guestfish-actions.pod:1327 ../fish/guestfish-actions.pod:1592 -#: ../fish/guestfish-actions.pod:2001 ../src/guestfs-actions.pod:18 -#: ../src/guestfs-actions.pod:2033 ../src/guestfs-actions.pod:2457 -#: ../src/guestfs-actions.pod:3008 ../src/guestfs.pod:1670 -#: ../tools/virt-win-reg.pl:706 +#: ../fish/guestfish-actions.pod:1450 ../fish/guestfish-actions.pod:1715 +#: ../fish/guestfish-actions.pod:2132 ../src/guestfs-actions.pod:18 +#: ../src/guestfs-actions.pod:2334 ../src/guestfs-actions.pod:2758 +#: ../src/guestfs-actions.pod:3317 ../src/guestfs.pod:1685 +#: ../tools/virt-win-reg.pl:717 msgid "Notes:" msgstr "" @@ -5492,30 +5804,32 @@ msgid "" msgstr "" #. type: textblock -#: ../fish/guestfish-actions.pod:28 ../fish/guestfish-actions.pod:163 -#: ../fish/guestfish-actions.pod:177 +#: ../fish/guestfish-actions.pod:28 ../fish/guestfish-actions.pod:214 +#: ../fish/guestfish-actions.pod:228 msgid "" "I In new code, use the L call " "instead." msgstr "" #. type: textblock -#: ../fish/guestfish-actions.pod:31 ../fish/guestfish-actions.pod:166 -#: ../fish/guestfish-actions.pod:180 ../fish/guestfish-actions.pod:1026 -#: ../fish/guestfish-actions.pod:1386 ../fish/guestfish-actions.pod:1400 -#: ../fish/guestfish-actions.pod:3157 ../fish/guestfish-actions.pod:3468 -#: ../fish/guestfish-actions.pod:3516 ../fish/guestfish-actions.pod:4429 -#: ../fish/guestfish-actions.pod:4452 ../fish/guestfish-actions.pod:4474 -#: ../fish/guestfish-actions.pod:4512 ../fish/guestfish-actions.pod:5161 -#: ../fish/guestfish-actions.pod:5267 ../src/guestfs-actions.pod:10 -#: ../src/guestfs-actions.pod:252 ../src/guestfs-actions.pod:273 -#: ../src/guestfs-actions.pod:1619 ../src/guestfs-actions.pod:2118 -#: ../src/guestfs-actions.pod:2139 ../src/guestfs-actions.pod:4771 -#: ../src/guestfs-actions.pod:5293 ../src/guestfs-actions.pod:5393 -#: ../src/guestfs-actions.pod:6675 ../src/guestfs-actions.pod:6719 -#: ../src/guestfs-actions.pod:6753 ../src/guestfs-actions.pod:6816 -#: ../src/guestfs-actions.pod:7748 ../src/guestfs-actions.pod:7857 -#: ../src/guestfs-actions.pod:8040 +#: ../fish/guestfish-actions.pod:31 ../fish/guestfish-actions.pod:217 +#: ../fish/guestfish-actions.pod:231 ../fish/guestfish-actions.pod:941 +#: ../fish/guestfish-actions.pod:976 ../fish/guestfish-actions.pod:1149 +#: ../fish/guestfish-actions.pod:1509 ../fish/guestfish-actions.pod:1523 +#: ../fish/guestfish-actions.pod:3284 ../fish/guestfish-actions.pod:3595 +#: ../fish/guestfish-actions.pod:3643 ../fish/guestfish-actions.pod:4561 +#: ../fish/guestfish-actions.pod:4581 ../fish/guestfish-actions.pod:4600 +#: ../fish/guestfish-actions.pod:4638 ../fish/guestfish-actions.pod:5287 +#: ../fish/guestfish-actions.pod:5390 ../src/guestfs-actions.pod:10 +#: ../src/guestfs-actions.pod:305 ../src/guestfs-actions.pod:326 +#: ../src/guestfs-actions.pod:1580 ../src/guestfs-actions.pod:1637 +#: ../src/guestfs-actions.pod:1920 ../src/guestfs-actions.pod:2419 +#: ../src/guestfs-actions.pod:2440 ../src/guestfs-actions.pod:5076 +#: ../src/guestfs-actions.pod:5598 ../src/guestfs-actions.pod:5698 +#: ../src/guestfs-actions.pod:6994 ../src/guestfs-actions.pod:7035 +#: ../src/guestfs-actions.pod:7066 ../src/guestfs-actions.pod:7126 +#: ../src/guestfs-actions.pod:8058 ../src/guestfs-actions.pod:8167 +#: ../src/guestfs-actions.pod:8347 msgid "" "Deprecated functions will not be removed from the API, but the fact that " "they are deprecated indicates that there are problems with correct use of " @@ -5536,7 +5850,7 @@ msgstr "" #: ../fish/guestfish-actions.pod:39 #, no-wrap msgid "" -" add-domain dom [libvirturi:..] [readonly:..] [iface:..] [live:..] [allowuuid:..]\n" +" add-domain dom [libvirturi:..] [readonly:..] [iface:..] [live:..] [allowuuid:..] [readonlydisk:..]\n" "\n" msgstr "" @@ -5549,14 +5863,14 @@ msgid "" msgstr "" #. type: textblock -#: ../fish/guestfish-actions.pod:46 ../src/guestfs-actions.pod:64 +#: ../fish/guestfish-actions.pod:46 ../src/guestfs-actions.pod:65 msgid "" "The number of disks added is returned. This operation is atomic: if an " "error is returned, then no disks are added." msgstr "" #. type: textblock -#: ../fish/guestfish-actions.pod:49 ../src/guestfs-actions.pod:67 +#: ../fish/guestfish-actions.pod:49 ../src/guestfs-actions.pod:68 msgid "" "This function does some minimal checks to make sure the libvirt domain is " "not running (unless C is true). In a future version we will try " @@ -5564,7 +5878,7 @@ msgid "" msgstr "" #. type: textblock -#: ../fish/guestfish-actions.pod:53 ../src/guestfs-actions.pod:71 +#: ../fish/guestfish-actions.pod:53 ../src/guestfs-actions.pod:72 msgid "" "Disks must be accessible locally. This often means that adding disks from a " "remote libvirt connection (see L) will fail " @@ -5572,7 +5886,7 @@ msgid "" msgstr "" #. type: textblock -#: ../fish/guestfish-actions.pod:58 ../src/guestfs-actions.pod:76 +#: ../fish/guestfish-actions.pod:58 ../src/guestfs-actions.pod:77 msgid "" "The optional C parameter sets the libvirt URI (see L). If this is not set then we connect to the default " @@ -5581,7 +5895,7 @@ msgid "" msgstr "" #. type: textblock -#: ../fish/guestfish-actions.pod:64 ../src/guestfs-actions.pod:82 +#: ../fish/guestfish-actions.pod:64 ../src/guestfs-actions.pod:83 msgid "" "The optional C flag controls whether this call will try to connect to " "a running virtual machine C process if it sees a suitable " @@ -5591,7 +5905,7 @@ msgid "" msgstr "" #. type: textblock -#: ../fish/guestfish-actions.pod:71 ../src/guestfs-actions.pod:89 +#: ../fish/guestfish-actions.pod:71 ../src/guestfs-actions.pod:90 msgid "" "If the C flag is true (default is false) then a UUID I be " "passed instead of the domain name. The C string is treated as a UUID " @@ -5600,29 +5914,108 @@ msgid "" msgstr "" #. type: textblock -#: ../fish/guestfish-actions.pod:76 +#: ../fish/guestfish-actions.pod:76 ../src/guestfs-actions.pod:95 +msgid "" +"The optional C parameter controls what we do for disks which " +"are marked Ereadonly/E in the libvirt XML. Possible values are:" +msgstr "" + +#. type: =item +#: ../fish/guestfish-actions.pod:82 ../src/guestfs-actions.pod:101 +msgid "readonlydisk = \"error\"" +msgstr "" + +#. type: textblock +#: ../fish/guestfish-actions.pod:84 ../fish/guestfish-actions.pod:95 +#: ../fish/guestfish-actions.pod:106 ../src/guestfs-actions.pod:103 +#: ../src/guestfs-actions.pod:114 ../src/guestfs-actions.pod:125 +msgid "If C is false:" +msgstr "" + +#. type: textblock +#: ../fish/guestfish-actions.pod:86 ../src/guestfs-actions.pod:105 +msgid "" +"The whole call is aborted with an error if any disk with the Ereadonly/" +"E flag is found." +msgstr "" + +#. type: textblock +#: ../fish/guestfish-actions.pod:89 ../fish/guestfish-actions.pod:100 +#: ../fish/guestfish-actions.pod:110 ../src/guestfs-actions.pod:108 +#: ../src/guestfs-actions.pod:119 ../src/guestfs-actions.pod:129 +msgid "If C is true:" +msgstr "" + +#. type: textblock +#: ../fish/guestfish-actions.pod:91 ../fish/guestfish-actions.pod:102 +#: ../fish/guestfish-actions.pod:112 ../src/guestfs-actions.pod:110 +#: ../src/guestfs-actions.pod:121 ../src/guestfs-actions.pod:131 +msgid "Disks with the Ereadonly/E flag are added read-only." +msgstr "" + +#. type: =item +#: ../fish/guestfish-actions.pod:93 ../src/guestfs-actions.pod:112 +msgid "readonlydisk = \"read\"" +msgstr "" + +#. type: textblock +#: ../fish/guestfish-actions.pod:97 ../src/guestfs-actions.pod:116 +msgid "" +"Disks with the Ereadonly/E flag are added read-only. Other disks " +"are added read/write." +msgstr "" + +#. type: =item +#: ../fish/guestfish-actions.pod:104 ../src/guestfs-actions.pod:123 +msgid "readonlydisk = \"write\" (default)" +msgstr "" + +#. type: textblock +#: ../fish/guestfish-actions.pod:108 ../src/guestfs-actions.pod:127 +msgid "Disks with the Ereadonly/E flag are added read/write." +msgstr "" + +#. type: =item +#: ../fish/guestfish-actions.pod:114 ../src/guestfs-actions.pod:133 +msgid "readonlydisk = \"ignore\"" +msgstr "" + +#. type: textblock +#: ../fish/guestfish-actions.pod:116 ../src/guestfs-actions.pod:135 +msgid "If C is true or false:" +msgstr "" + +#. type: textblock +#: ../fish/guestfish-actions.pod:118 ../src/guestfs-actions.pod:137 +msgid "Disks with the Ereadonly/E flag are skipped." +msgstr "" + +#. type: textblock +#: ../fish/guestfish-actions.pod:122 msgid "" "The other optional parameters are passed directly through to L." msgstr "" #. type: textblock -#: ../fish/guestfish-actions.pod:79 ../fish/guestfish-actions.pod:143 -#: ../fish/guestfish-actions.pod:573 ../fish/guestfish-actions.pod:784 -#: ../fish/guestfish-actions.pod:805 ../fish/guestfish-actions.pod:2040 -#: ../fish/guestfish-actions.pod:3206 ../fish/guestfish-actions.pod:3369 -#: ../fish/guestfish-actions.pod:3504 +#: ../fish/guestfish-actions.pod:125 ../fish/guestfish-actions.pod:194 +#: ../fish/guestfish-actions.pod:624 ../fish/guestfish-actions.pod:835 +#: ../fish/guestfish-actions.pod:856 ../fish/guestfish-actions.pod:894 +#: ../fish/guestfish-actions.pod:903 ../fish/guestfish-actions.pod:912 +#: ../fish/guestfish-actions.pod:926 ../fish/guestfish-actions.pod:2171 +#: ../fish/guestfish-actions.pod:3333 ../fish/guestfish-actions.pod:3496 +#: ../fish/guestfish-actions.pod:3631 msgid "" "This command has one or more optional arguments. See L." msgstr "" #. type: =head2 -#: ../fish/guestfish-actions.pod:81 +#: ../fish/guestfish-actions.pod:127 msgid "add-drive" msgstr "" #. type: verbatim -#: ../fish/guestfish-actions.pod:83 +#: ../fish/guestfish-actions.pod:129 #, no-wrap msgid "" " add-drive filename\n" @@ -5630,7 +6023,7 @@ msgid "" msgstr "" #. type: textblock -#: ../fish/guestfish-actions.pod:85 +#: ../fish/guestfish-actions.pod:131 msgid "" "This function is the equivalent of calling L with no " "optional parameters, so the disk is added writable, with the format being " @@ -5638,7 +6031,7 @@ msgid "" msgstr "" #. type: textblock -#: ../fish/guestfish-actions.pod:89 +#: ../fish/guestfish-actions.pod:135 msgid "" "Automatic detection of the format opens you up to a potential security hole " "when dealing with untrusted raw-format images. See CVE-2010-3851 and " @@ -5648,25 +6041,25 @@ msgid "" msgstr "" #. type: =head2 -#: ../fish/guestfish-actions.pod:96 +#: ../fish/guestfish-actions.pod:142 msgid "add-drive-opts" msgstr "" #. type: =head2 -#: ../fish/guestfish-actions.pod:98 +#: ../fish/guestfish-actions.pod:144 msgid "add" msgstr "" #. type: verbatim -#: ../fish/guestfish-actions.pod:100 +#: ../fish/guestfish-actions.pod:146 #, no-wrap msgid "" -" add-drive-opts filename [readonly:..] [format:..] [iface:..]\n" +" add-drive-opts filename [readonly:..] [format:..] [iface:..] [name:..]\n" "\n" msgstr "" #. type: textblock -#: ../fish/guestfish-actions.pod:102 ../src/guestfs-actions.pod:160 +#: ../fish/guestfish-actions.pod:148 ../src/guestfs-actions.pod:208 msgid "" "This function adds a virtual machine disk image C to libguestfs. " "The first time you call this function, the disk appears as C, the " @@ -5674,7 +6067,7 @@ msgid "" msgstr "" #. type: textblock -#: ../fish/guestfish-actions.pod:107 ../src/guestfs-actions.pod:165 +#: ../fish/guestfish-actions.pod:153 ../src/guestfs-actions.pod:213 msgid "" "You don't necessarily need to be root when using libguestfs. However you " "obviously do need sufficient permissions to access the filename for whatever " @@ -5683,23 +6076,23 @@ msgid "" msgstr "" #. type: textblock -#: ../fish/guestfish-actions.pod:113 ../src/guestfs-actions.pod:171 +#: ../fish/guestfish-actions.pod:159 ../src/guestfs-actions.pod:219 msgid "This call checks that C exists." msgstr "" #. type: textblock -#: ../fish/guestfish-actions.pod:115 ../fish/guestfish-actions.pod:3168 -#: ../src/guestfs-actions.pod:173 ../src/guestfs-actions.pod:4808 +#: ../fish/guestfish-actions.pod:161 ../fish/guestfish-actions.pod:3295 +#: ../src/guestfs-actions.pod:221 ../src/guestfs-actions.pod:5113 msgid "The optional arguments are:" msgstr "" #. type: =item -#: ../fish/guestfish-actions.pod:119 ../src/guestfs-actions.pod:177 +#: ../fish/guestfish-actions.pod:165 ../src/guestfs-actions.pod:225 msgid "C" msgstr "" #. type: textblock -#: ../fish/guestfish-actions.pod:121 ../src/guestfs-actions.pod:179 +#: ../fish/guestfish-actions.pod:167 ../src/guestfs-actions.pod:227 msgid "" "If true then the image is treated as read-only. Writes are still allowed, " "but they are stored in a temporary snapshot overlay which is discarded at " @@ -5707,12 +6100,12 @@ msgid "" msgstr "" #. type: =item -#: ../fish/guestfish-actions.pod:125 ../src/guestfs-actions.pod:183 +#: ../fish/guestfish-actions.pod:171 ../src/guestfs-actions.pod:231 msgid "C" msgstr "" #. type: textblock -#: ../fish/guestfish-actions.pod:127 +#: ../fish/guestfish-actions.pod:173 msgid "" "This forces the image format. If you omit this (or use L or L) then the format is automatically detected. Possible formats " @@ -5720,7 +6113,7 @@ msgid "" msgstr "" #. type: textblock -#: ../fish/guestfish-actions.pod:131 ../src/guestfs-actions.pod:189 +#: ../fish/guestfish-actions.pod:177 ../src/guestfs-actions.pod:237 msgid "" "Automatic detection of the format opens you up to a potential security hole " "when dealing with untrusted raw-format images. See CVE-2010-3851 and " @@ -5728,29 +6121,41 @@ msgid "" msgstr "" #. type: =item -#: ../fish/guestfish-actions.pod:136 ../src/guestfs-actions.pod:194 +#: ../fish/guestfish-actions.pod:182 ../src/guestfs-actions.pod:242 msgid "C" msgstr "" #. type: textblock -#: ../fish/guestfish-actions.pod:138 +#: ../fish/guestfish-actions.pod:184 msgid "" "This rarely-used option lets you emulate the behaviour of the deprecated L call (q.v.)" msgstr "" +#. type: =item +#: ../fish/guestfish-actions.pod:187 ../src/guestfs-actions.pod:247 +msgid "C" +msgstr "" + +#. type: textblock +#: ../fish/guestfish-actions.pod:189 ../src/guestfs-actions.pod:249 +msgid "" +"The name the drive had in the original guest, e.g. /dev/sdb. This is used as " +"a hint to the guest inspection process if it is available." +msgstr "" + #. type: =head2 -#: ../fish/guestfish-actions.pod:145 +#: ../fish/guestfish-actions.pod:196 msgid "add-drive-ro" msgstr "" #. type: =head2 -#: ../fish/guestfish-actions.pod:147 +#: ../fish/guestfish-actions.pod:198 msgid "add-ro" msgstr "" #. type: verbatim -#: ../fish/guestfish-actions.pod:149 +#: ../fish/guestfish-actions.pod:200 #, no-wrap msgid "" " add-drive-ro filename\n" @@ -5758,7 +6163,7 @@ msgid "" msgstr "" #. type: textblock -#: ../fish/guestfish-actions.pod:151 +#: ../fish/guestfish-actions.pod:202 msgid "" "This function is the equivalent of calling L with the " "optional parameter C set to 1, so the disk " @@ -5766,12 +6171,12 @@ msgid "" msgstr "" #. type: =head2 -#: ../fish/guestfish-actions.pod:156 +#: ../fish/guestfish-actions.pod:207 msgid "add-drive-ro-with-if" msgstr "" #. type: verbatim -#: ../fish/guestfish-actions.pod:158 +#: ../fish/guestfish-actions.pod:209 #, no-wrap msgid "" " add-drive-ro-with-if filename iface\n" @@ -5779,19 +6184,19 @@ msgid "" msgstr "" #. type: textblock -#: ../fish/guestfish-actions.pod:160 +#: ../fish/guestfish-actions.pod:211 msgid "" "This is the same as L but it allows you to specify the QEMU " "interface emulation to use at run time." msgstr "" #. type: =head2 -#: ../fish/guestfish-actions.pod:170 +#: ../fish/guestfish-actions.pod:221 msgid "add-drive-with-if" msgstr "" #. type: verbatim -#: ../fish/guestfish-actions.pod:172 +#: ../fish/guestfish-actions.pod:223 #, no-wrap msgid "" " add-drive-with-if filename iface\n" @@ -5799,19 +6204,19 @@ msgid "" msgstr "" #. type: textblock -#: ../fish/guestfish-actions.pod:174 +#: ../fish/guestfish-actions.pod:225 msgid "" "This is the same as L but it allows you to specify the QEMU " "interface emulation to use at run time." msgstr "" #. type: =head2 -#: ../fish/guestfish-actions.pod:184 +#: ../fish/guestfish-actions.pod:235 msgid "aug-clear" msgstr "" #. type: verbatim -#: ../fish/guestfish-actions.pod:186 +#: ../fish/guestfish-actions.pod:237 #, no-wrap msgid "" " aug-clear augpath\n" @@ -5819,19 +6224,19 @@ msgid "" msgstr "" #. type: textblock -#: ../fish/guestfish-actions.pod:188 ../src/guestfs-actions.pod:290 +#: ../fish/guestfish-actions.pod:239 ../src/guestfs-actions.pod:343 msgid "" "Set the value associated with C to C. This is the same as the " "L C command." msgstr "" #. type: =head2 -#: ../fish/guestfish-actions.pod:191 +#: ../fish/guestfish-actions.pod:242 msgid "aug-close" msgstr "" #. type: verbatim -#: ../fish/guestfish-actions.pod:193 +#: ../fish/guestfish-actions.pod:244 #, no-wrap msgid "" " aug-close\n" @@ -5839,7 +6244,7 @@ msgid "" msgstr "" #. type: textblock -#: ../fish/guestfish-actions.pod:195 +#: ../fish/guestfish-actions.pod:246 msgid "" "Close the current Augeas handle and free up any resources used by it. After " "calling this, you have to call L again before you can use any " @@ -5847,12 +6252,12 @@ msgid "" msgstr "" #. type: =head2 -#: ../fish/guestfish-actions.pod:200 +#: ../fish/guestfish-actions.pod:251 msgid "aug-defnode" msgstr "" #. type: verbatim -#: ../fish/guestfish-actions.pod:202 +#: ../fish/guestfish-actions.pod:253 #, no-wrap msgid "" " aug-defnode name expr val\n" @@ -5860,13 +6265,13 @@ msgid "" msgstr "" #. type: textblock -#: ../fish/guestfish-actions.pod:204 ../src/guestfs-actions.pod:319 +#: ../fish/guestfish-actions.pod:255 ../src/guestfs-actions.pod:372 msgid "" "Defines a variable C whose value is the result of evaluating C." msgstr "" #. type: textblock -#: ../fish/guestfish-actions.pod:207 +#: ../fish/guestfish-actions.pod:258 msgid "" "If C evaluates to an empty nodeset, a node is created, equivalent to " "calling L C, C. C will be the nodeset " @@ -5874,19 +6279,19 @@ msgid "" msgstr "" #. type: textblock -#: ../fish/guestfish-actions.pod:211 ../src/guestfs-actions.pod:326 +#: ../fish/guestfish-actions.pod:262 ../src/guestfs-actions.pod:379 msgid "" "On success this returns a pair containing the number of nodes in the " "nodeset, and a boolean flag if a node was created." msgstr "" #. type: =head2 -#: ../fish/guestfish-actions.pod:215 +#: ../fish/guestfish-actions.pod:266 msgid "aug-defvar" msgstr "" #. type: verbatim -#: ../fish/guestfish-actions.pod:217 +#: ../fish/guestfish-actions.pod:268 #, no-wrap msgid "" " aug-defvar name expr\n" @@ -5894,26 +6299,26 @@ msgid "" msgstr "" #. type: textblock -#: ../fish/guestfish-actions.pod:219 ../src/guestfs-actions.pod:343 +#: ../fish/guestfish-actions.pod:270 ../src/guestfs-actions.pod:396 msgid "" "Defines an Augeas variable C whose value is the result of evaluating " "C. If C is NULL, then C is undefined." msgstr "" #. type: textblock -#: ../fish/guestfish-actions.pod:223 ../src/guestfs-actions.pod:347 +#: ../fish/guestfish-actions.pod:274 ../src/guestfs-actions.pod:400 msgid "" "On success this returns the number of nodes in C, or C<0> if C " "evaluates to something which is not a nodeset." msgstr "" #. type: =head2 -#: ../fish/guestfish-actions.pod:226 +#: ../fish/guestfish-actions.pod:277 msgid "aug-get" msgstr "" #. type: verbatim -#: ../fish/guestfish-actions.pod:228 +#: ../fish/guestfish-actions.pod:279 #, no-wrap msgid "" " aug-get augpath\n" @@ -5921,19 +6326,19 @@ msgid "" msgstr "" #. type: textblock -#: ../fish/guestfish-actions.pod:230 ../src/guestfs-actions.pod:360 +#: ../fish/guestfish-actions.pod:281 ../src/guestfs-actions.pod:413 msgid "" "Look up the value associated with C. If C matches exactly one " "node, the C is returned." msgstr "" #. type: =head2 -#: ../fish/guestfish-actions.pod:233 +#: ../fish/guestfish-actions.pod:284 msgid "aug-init" msgstr "" #. type: verbatim -#: ../fish/guestfish-actions.pod:235 +#: ../fish/guestfish-actions.pod:286 #, no-wrap msgid "" " aug-init root flags\n" @@ -5941,7 +6346,7 @@ msgid "" msgstr "" #. type: textblock -#: ../fish/guestfish-actions.pod:237 ../src/guestfs-actions.pod:375 +#: ../fish/guestfish-actions.pod:288 ../src/guestfs-actions.pod:428 msgid "" "Create a new Augeas handle for editing configuration files. If there was " "any previous Augeas handle associated with this guestfs session, then it is " @@ -5949,57 +6354,57 @@ msgid "" msgstr "" #. type: textblock -#: ../fish/guestfish-actions.pod:241 +#: ../fish/guestfish-actions.pod:292 msgid "You must call this before using any other L commands." msgstr "" #. type: textblock -#: ../fish/guestfish-actions.pod:244 ../src/guestfs-actions.pod:382 +#: ../fish/guestfish-actions.pod:295 ../src/guestfs-actions.pod:435 msgid "" "C is the filesystem root. C must not be NULL, use C instead." msgstr "" #. type: textblock -#: ../fish/guestfish-actions.pod:247 ../src/guestfs-actions.pod:385 +#: ../fish/guestfish-actions.pod:298 ../src/guestfs-actions.pod:438 msgid "" "The flags are the same as the flags defined in Eaugeas.hE, the " "logical I of the following integers:" msgstr "" #. type: =item -#: ../fish/guestfish-actions.pod:253 ../src/guestfs-actions.pod:391 +#: ../fish/guestfish-actions.pod:304 ../src/guestfs-actions.pod:444 msgid "C = 1" msgstr "" #. type: textblock -#: ../fish/guestfish-actions.pod:255 ../src/guestfs-actions.pod:393 +#: ../fish/guestfish-actions.pod:306 ../src/guestfs-actions.pod:446 msgid "Keep the original file with a C<.augsave> extension." msgstr "" #. type: =item -#: ../fish/guestfish-actions.pod:257 ../src/guestfs-actions.pod:395 +#: ../fish/guestfish-actions.pod:308 ../src/guestfs-actions.pod:448 msgid "C = 2" msgstr "" #. type: textblock -#: ../fish/guestfish-actions.pod:259 ../src/guestfs-actions.pod:397 +#: ../fish/guestfish-actions.pod:310 ../src/guestfs-actions.pod:450 msgid "" "Save changes into a file with extension C<.augnew>, and do not overwrite " "original. Overrides C." msgstr "" #. type: =item -#: ../fish/guestfish-actions.pod:262 ../src/guestfs-actions.pod:400 +#: ../fish/guestfish-actions.pod:313 ../src/guestfs-actions.pod:453 msgid "C = 4" msgstr "" #. type: textblock -#: ../fish/guestfish-actions.pod:264 ../src/guestfs-actions.pod:402 +#: ../fish/guestfish-actions.pod:315 ../src/guestfs-actions.pod:455 msgid "Typecheck lenses." msgstr "" #. type: textblock -#: ../fish/guestfish-actions.pod:266 +#: ../fish/guestfish-actions.pod:317 msgid "" "This option is only useful when debugging Augeas lenses. Use of this option " "may require additional memory for the libguestfs appliance. You may need to " @@ -6007,52 +6412,52 @@ msgid "" msgstr "" #. type: =item -#: ../fish/guestfish-actions.pod:271 ../src/guestfs-actions.pod:409 +#: ../fish/guestfish-actions.pod:322 ../src/guestfs-actions.pod:462 msgid "C = 8" msgstr "" #. type: textblock -#: ../fish/guestfish-actions.pod:273 ../src/guestfs-actions.pod:411 +#: ../fish/guestfish-actions.pod:324 ../src/guestfs-actions.pod:464 msgid "Do not use standard load path for modules." msgstr "" #. type: =item -#: ../fish/guestfish-actions.pod:275 ../src/guestfs-actions.pod:413 +#: ../fish/guestfish-actions.pod:326 ../src/guestfs-actions.pod:466 msgid "C = 16" msgstr "" #. type: textblock -#: ../fish/guestfish-actions.pod:277 ../src/guestfs-actions.pod:415 +#: ../fish/guestfish-actions.pod:328 ../src/guestfs-actions.pod:468 msgid "Make save a no-op, just record what would have been changed." msgstr "" #. type: =item -#: ../fish/guestfish-actions.pod:279 ../src/guestfs-actions.pod:417 +#: ../fish/guestfish-actions.pod:330 ../src/guestfs-actions.pod:470 msgid "C = 32" msgstr "" #. type: textblock -#: ../fish/guestfish-actions.pod:281 +#: ../fish/guestfish-actions.pod:332 msgid "Do not load the tree in L." msgstr "" #. type: textblock -#: ../fish/guestfish-actions.pod:285 +#: ../fish/guestfish-actions.pod:336 msgid "To close the handle, you can call L." msgstr "" #. type: textblock -#: ../fish/guestfish-actions.pod:287 ../src/guestfs-actions.pod:425 +#: ../fish/guestfish-actions.pod:338 ../src/guestfs-actions.pod:478 msgid "To find out more about Augeas, see L." msgstr "" #. type: =head2 -#: ../fish/guestfish-actions.pod:289 +#: ../fish/guestfish-actions.pod:340 msgid "aug-insert" msgstr "" #. type: verbatim -#: ../fish/guestfish-actions.pod:291 +#: ../fish/guestfish-actions.pod:342 #, no-wrap msgid "" " aug-insert augpath label true|false\n" @@ -6060,26 +6465,26 @@ msgid "" msgstr "" #. type: textblock -#: ../fish/guestfish-actions.pod:293 ../src/guestfs-actions.pod:439 +#: ../fish/guestfish-actions.pod:344 ../src/guestfs-actions.pod:492 msgid "" "Create a new sibling C