X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=po-docs%2Fja.po;h=0e7861acb536c761da082c25e6344cb073013dde;hb=2f6ec8b4da27c550e2c7187fd17df28f1bdd51a7;hp=1e547f0514d5049582db43617e680adb66eebe24;hpb=54ea124b160eda705c96dfc664b4056848887856;p=libguestfs.git diff --git a/po-docs/ja.po b/po-docs/ja.po index 1e547f0..0e7861a 100644 --- a/po-docs/ja.po +++ b/po-docs/ja.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: libguestfs\n" "Report-Msgid-Bugs-To: libguestfs@redhat.com\n" -"POT-Creation-Date: 2011-08-07 23:15+0200\n" +"POT-Creation-Date: 2011-10-14 15:06+0200\n" "PO-Revision-Date: 2011-07-17 20:50+0000\n" "Last-Translator: rjones \n" "Language-Team: Japanese (http://www.transifex.net/projects/p/fedora/team/" @@ -19,16 +19,18 @@ msgstr "" "Plural-Forms: nplurals=1; plural=0\n" #. type: =head1 -#: ../cat/virt-cat.pod:3 ../cat/virt-filesystems.pod:3 ../cat/virt-ls.pod:3 -#: ../df/virt-df.pod:3 ../edit/virt-edit.pod:3 -#: ../examples/guestfs-examples.pod:3 ../examples/guestfs-recipes.pod:14 -#: ../fish/guestfish.pod:3 ../fish/virt-copy-in.pod:3 -#: ../fish/virt-copy-out.pod:3 ../fish/virt-tar-in.pod:3 -#: ../fish/virt-tar-out.pod:3 ../fuse/guestmount.pod:3 -#: ../inspector/virt-inspector.pod:3 ../java/examples/guestfs-java.pod:3 -#: ../ocaml/examples/guestfs-ocaml.pod:3 ../perl/examples/guestfs-perl.pod:3 -#: ../python/examples/guestfs-python.pod:3 ../rescue/virt-rescue.pod:3 -#: ../resize/virt-resize.pod:3 ../ruby/examples/guestfs-ruby.pod:3 +#: ../align/virt-alignment-scan.pod:3 ../cat/virt-cat.pod:3 +#: ../cat/virt-filesystems.pod:3 ../cat/virt-ls.pod:3 +#: ../clone/virt-sysprep.pod:3 ../df/virt-df.pod:3 ../edit/virt-edit.pod:3 +#: ../erlang/examples/guestfs-erlang.pod:3 ../examples/guestfs-examples.pod:3 +#: ../examples/guestfs-recipes.pod:14 ../fish/guestfish.pod:3 +#: ../fish/virt-copy-in.pod:3 ../fish/virt-copy-out.pod:3 +#: ../fish/virt-tar-in.pod:3 ../fish/virt-tar-out.pod:3 +#: ../fuse/guestmount.pod:3 ../inspector/virt-inspector.pod:3 +#: ../java/examples/guestfs-java.pod:3 ../ocaml/examples/guestfs-ocaml.pod:3 +#: ../perl/examples/guestfs-perl.pod:3 ../python/examples/guestfs-python.pod:3 +#: ../rescue/virt-rescue.pod:3 ../resize/virt-resize.pod:3 +#: ../ruby/examples/guestfs-ruby.pod:3 ../sparsify/virt-sparsify.pod:3 #: ../src/guestfs.pod:3 ../test-tool/libguestfs-test-tool.pod:3 #: ../tools/virt-list-filesystems.pl:30 ../tools/virt-list-partitions.pl:30 #: ../tools/virt-make-fs.pl:35 ../tools/virt-tar.pl:31 @@ -37,21 +39,23 @@ msgid "NAME" msgstr "名前" #. type: textblock -#: ../cat/virt-cat.pod:5 -msgid "virt-cat - Display files in a virtual machine" +#: ../align/virt-alignment-scan.pod:5 +msgid "virt-alignment-scan - Check alignment of virtual machine partitions" msgstr "" #. type: =head1 -#: ../cat/virt-cat.pod:7 ../cat/virt-filesystems.pod:7 ../cat/virt-ls.pod:7 -#: ../df/virt-df.pod:7 ../edit/virt-edit.pod:7 -#: ../examples/guestfs-examples.pod:7 ../fish/guestfish.pod:7 -#: ../fish/virt-copy-in.pod:7 ../fish/virt-copy-out.pod:7 -#: ../fish/virt-tar-in.pod:7 ../fish/virt-tar-out.pod:7 -#: ../fuse/guestmount.pod:7 ../inspector/virt-inspector.pod:7 -#: ../java/examples/guestfs-java.pod:7 ../ocaml/examples/guestfs-ocaml.pod:7 -#: ../perl/examples/guestfs-perl.pod:7 ../python/examples/guestfs-python.pod:7 -#: ../rescue/virt-rescue.pod:7 ../resize/virt-resize.pod:7 -#: ../ruby/examples/guestfs-ruby.pod:7 ../src/guestfs.pod:7 +#: ../align/virt-alignment-scan.pod:7 ../cat/virt-cat.pod:7 +#: ../cat/virt-filesystems.pod:7 ../cat/virt-ls.pod:7 +#: ../clone/virt-sysprep.pod:7 ../df/virt-df.pod:7 ../edit/virt-edit.pod:7 +#: ../erlang/examples/guestfs-erlang.pod:7 ../examples/guestfs-examples.pod:7 +#: ../fish/guestfish.pod:7 ../fish/virt-copy-in.pod:7 +#: ../fish/virt-copy-out.pod:7 ../fish/virt-tar-in.pod:7 +#: ../fish/virt-tar-out.pod:7 ../fuse/guestmount.pod:7 +#: ../inspector/virt-inspector.pod:7 ../java/examples/guestfs-java.pod:7 +#: ../ocaml/examples/guestfs-ocaml.pod:7 ../perl/examples/guestfs-perl.pod:7 +#: ../python/examples/guestfs-python.pod:7 ../rescue/virt-rescue.pod:7 +#: ../resize/virt-resize.pod:7 ../ruby/examples/guestfs-ruby.pod:7 +#: ../sparsify/virt-sparsify.pod:7 ../src/guestfs.pod:7 #: ../test-tool/libguestfs-test-tool.pod:7 #: ../tools/virt-list-filesystems.pl:34 ../tools/virt-list-partitions.pl:34 #: ../tools/virt-make-fs.pl:39 ../tools/virt-tar.pl:35 @@ -60,46 +64,26 @@ msgid "SYNOPSIS" msgstr "" #. type: verbatim -#: ../cat/virt-cat.pod:9 -#, no-wrap -msgid "" -" virt-cat [--options] -d domname file [file ...]\n" -"\n" -msgstr "" - -#. type: verbatim -#: ../cat/virt-cat.pod:11 -#, no-wrap -msgid "" -" virt-cat [--options] -a disk.img [-a disk.img ...] file [file ...]\n" -"\n" -msgstr "" - -#. type: textblock -#: ../cat/virt-cat.pod:13 ../edit/virt-edit.pod:15 -#: ../inspector/virt-inspector.pod:13 -msgid "Old-style:" -msgstr "" - -#. type: verbatim -#: ../cat/virt-cat.pod:15 +#: ../align/virt-alignment-scan.pod:9 #, no-wrap msgid "" -" virt-cat domname file\n" +" virt-alignment-scan [--options] -d domname\n" "\n" msgstr "" #. type: verbatim -#: ../cat/virt-cat.pod:17 +#: ../align/virt-alignment-scan.pod:11 #, no-wrap msgid "" -" virt-cat disk.img file\n" +" virt-alignment-scan [--options] -a disk.img [-a disk.img ...]\n" "\n" msgstr "" #. type: =head1 -#: ../cat/virt-cat.pod:19 ../cat/virt-filesystems.pod:13 ../cat/virt-ls.pod:19 -#: ../df/virt-df.pod:21 ../edit/virt-edit.pod:27 +#: ../align/virt-alignment-scan.pod:13 ../cat/virt-cat.pod:19 +#: ../cat/virt-filesystems.pod:13 ../cat/virt-ls.pod:19 +#: ../clone/virt-sysprep.pod:13 ../df/virt-df.pod:21 ../edit/virt-edit.pod:27 +#: ../erlang/examples/guestfs-erlang.pod:16 #: ../examples/guestfs-examples.pod:19 ../examples/guestfs-recipes.pod:18 #: ../fish/guestfish.pod:30 ../fish/virt-copy-in.pod:19 #: ../fish/virt-copy-out.pod:13 ../fish/virt-tar-in.pod:21 @@ -108,7 +92,8 @@ msgstr "" #: ../ocaml/examples/guestfs-ocaml.pod:25 ../perl/examples/guestfs-perl.pod:18 #: ../python/examples/guestfs-python.pod:14 ../rescue/virt-rescue.pod:29 #: ../resize/virt-resize.pod:13 ../ruby/examples/guestfs-ruby.pod:15 -#: ../src/guestfs.pod:23 ../test-tool/libguestfs-test-tool.pod:11 +#: ../sparsify/virt-sparsify.pod:11 ../src/guestfs.pod:23 +#: ../test-tool/libguestfs-test-tool.pod:11 #: ../tools/virt-list-filesystems.pl:40 ../tools/virt-list-partitions.pl:40 #: ../tools/virt-make-fs.pl:47 ../tools/virt-tar.pl:77 #: ../tools/virt-win-reg.pl:63 @@ -116,128 +101,173 @@ msgid "DESCRIPTION" msgstr "" #. type: textblock -#: ../cat/virt-cat.pod:21 +#: ../align/virt-alignment-scan.pod:15 msgid "" -"C is a command line tool to display the contents of C where " -"C exists in the named virtual machine (or disk image)." +"When older operating systems install themselves, the partitioning tools " +"place partitions at a sector misaligned with the underlying storage " +"(commonly the first partition starts on sector C<63>). Misaligned " +"partitions can result in an operating system issuing more I/O than should be " +"necessary." msgstr "" #. type: textblock -#: ../cat/virt-cat.pod:24 +#: ../align/virt-alignment-scan.pod:21 msgid "" -"Multiple filenames can be given, in which case they are concatenated " -"together. Each filename must be a full path, starting at the root directory " -"(starting with '/')." +"The virt-alignment-scan tool checks the alignment of partitions in virtual " +"machines and disk images and warns you if there are alignment problems." msgstr "" #. type: textblock -#: ../cat/virt-cat.pod:28 +#: ../align/virt-alignment-scan.pod:25 msgid "" -"C can be used to quickly view a file. To edit a file, use C. For more complex cases you should look at the L tool " -"(see L below)." +"Currently there is no virt tool for fixing alignment problems. You can only " +"reinstall the guest operating system. The following NetApp document " +"summarises the problem and possible solutions: L" 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:1007 ../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 ../tools/virt-tar.pl:50 -msgid "EXAMPLES" +#: ../align/virt-alignment-scan.pod:30 +msgid "OUTPUT" msgstr "" #. type: textblock -#: ../cat/virt-cat.pod:34 +#: ../align/virt-alignment-scan.pod:32 +msgid "To run this tool on a disk image directly, use the I<-a> option:" +msgstr "" + +#. type: verbatim +#: ../align/virt-alignment-scan.pod:34 +#, no-wrap msgid "" -"Display C file from inside the libvirt VM called C:" +" $ virt-alignment-scan -a winxp.img\n" +" /dev/sda1 32256 512 bad (alignment < 4K)\n" +"\n" msgstr "" #. type: verbatim -#: ../cat/virt-cat.pod:37 +#: ../align/virt-alignment-scan.pod:37 #, no-wrap msgid "" -" virt-cat -d mydomain /etc/fstab\n" +" $ virt-alignment-scan -a fedora16.img\n" +" /dev/sda1 1048576 1024K ok\n" +" /dev/sda2 2097152 2048K ok\n" +" /dev/sda3 526385152 2048K ok\n" "\n" msgstr "" #. type: textblock -#: ../cat/virt-cat.pod:39 -msgid "List syslog messages from a VM disk image file:" +#: ../align/virt-alignment-scan.pod:42 +msgid "" +"To run the tool on a guest known to libvirt, use the I<-d> option and " +"possibly the I<-c> option:" msgstr "" #. type: verbatim -#: ../cat/virt-cat.pod:41 +#: ../align/virt-alignment-scan.pod:45 #, no-wrap msgid "" -" virt-cat -a disk.img /var/log/messages | tail\n" +" # virt-alignment-scan -d RHEL5\n" +" /dev/sda1 32256 512 bad (alignment < 4K)\n" +" /dev/sda2 106928640 512 bad (alignment < 4K)\n" "\n" msgstr "" -#. type: textblock -#: ../cat/virt-cat.pod:43 -msgid "Find out what DHCP IP address a VM acquired:" -msgstr "" - #. type: verbatim -#: ../cat/virt-cat.pod:45 +#: ../align/virt-alignment-scan.pod:49 #, no-wrap msgid "" -" virt-cat -d mydomain /var/log/messages | \\\n" -" grep 'dhclient: bound to' | tail\n" +" $ virt-alignment-scan -c qemu:///system -d Win7TwoDisks\n" +" /dev/sda1 1048576 1024K ok\n" +" /dev/sda2 105906176 1024K ok\n" +" /dev/sdb1 65536 64K ok\n" "\n" msgstr "" #. type: textblock -#: ../cat/virt-cat.pod:48 -msgid "Find out what packages were recently installed:" +#: ../align/virt-alignment-scan.pod:54 +msgid "" +"The output consists of 4 or more whitespace-separated columns. Only the " +"first 4 columns are signficant if you want to parse this from a program. " +"The columns are:" msgstr "" -#. type: verbatim -#: ../cat/virt-cat.pod:50 -#, no-wrap +#. type: =item +#: ../align/virt-alignment-scan.pod:60 +msgid "col 1" +msgstr "" + +#. type: textblock +#: ../align/virt-alignment-scan.pod:62 msgid "" -" virt-cat -d mydomain /var/log/yum.log | tail\n" -"\n" +"the device and partition name (eg. C meaning the first partition " +"on the first block device)" +msgstr "" + +#. type: =item +#: ../align/virt-alignment-scan.pod:65 +msgid "col 2" msgstr "" #. type: textblock -#: ../cat/virt-cat.pod:52 -msgid "Find out who is logged on inside a virtual machine:" +#: ../align/virt-alignment-scan.pod:67 +msgid "the start of the partition in bytes" msgstr "" -#. type: verbatim -#: ../cat/virt-cat.pod:54 -#, no-wrap +#. type: =item +#: ../align/virt-alignment-scan.pod:69 +msgid "col 3" +msgstr "" + +#. type: textblock +#: ../align/virt-alignment-scan.pod:71 +msgid "the alignment in bytes or Kbytes (eg. C<512> or C<4K>)" +msgstr "" + +#. type: =item +#: ../align/virt-alignment-scan.pod:73 +msgid "col 4" +msgstr "" + +#. type: textblock +#: ../align/virt-alignment-scan.pod:75 msgid "" -" virt-cat -d mydomain /var/run/utmp > /tmp/utmp\n" -" who /tmp/utmp\n" -"\n" +"C if the alignment is best for performance, or C if the alignment " +"can cause performance problems" +msgstr "" + +#. type: =item +#: ../align/virt-alignment-scan.pod:78 +msgid "cols 5+" msgstr "" #. type: textblock -#: ../cat/virt-cat.pod:57 -msgid "or who was logged on:" +#: ../align/virt-alignment-scan.pod:80 +msgid "optional free-text explanation." msgstr "" -#. type: verbatim -#: ../cat/virt-cat.pod:59 -#, no-wrap +#. type: textblock +#: ../align/virt-alignment-scan.pod:84 msgid "" -" virt-cat -d mydomain /var/log/wtmp > /tmp/wtmp\n" -" last -f /tmp/wtmp\n" -"\n" +"The exit code from the program changes depending on whether poorly aligned " +"partitions were found. See L below." +msgstr "" + +#. type: textblock +#: ../align/virt-alignment-scan.pod:87 +msgid "If you just want the exit code with no output, use the I<-q> option." msgstr "" #. type: =head1 -#: ../cat/virt-cat.pod:62 ../cat/virt-filesystems.pod:91 -#: ../cat/virt-ls.pod:261 ../df/virt-df.pod:59 ../edit/virt-edit.pod:62 +#: ../align/virt-alignment-scan.pod:89 ../cat/virt-cat.pod:62 +#: ../cat/virt-filesystems.pod:91 ../cat/virt-ls.pod:261 +#: ../clone/virt-sysprep.pod:42 ../df/virt-df.pod:59 ../edit/virt-edit.pod:62 #: ../fish/guestfish.pod:148 ../fish/virt-copy-in.pod:45 #: ../fish/virt-copy-out.pod:34 ../fish/virt-tar-in.pod:42 -#: ../fish/virt-tar-out.pod:36 ../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 ../test-tool/libguestfs-test-tool.pod:37 +#: ../resize/virt-resize.pod:241 ../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 #: ../tools/virt-win-reg.pl:96 @@ -245,19 +275,23 @@ msgid "OPTIONS" msgstr "" #. type: =item -#: ../cat/virt-cat.pod:66 ../cat/virt-filesystems.pod:95 -#: ../cat/virt-ls.pod:265 ../df/virt-df.pod:63 ../edit/virt-edit.pod:66 -#: ../fish/guestfish.pod:152 ../fuse/guestmount.pod:151 +#: ../align/virt-alignment-scan.pod:93 ../cat/virt-cat.pod:66 +#: ../cat/virt-filesystems.pod:95 ../cat/virt-ls.pod:265 +#: ../clone/virt-sysprep.pod:46 ../df/virt-df.pod:63 ../edit/virt-edit.pod:66 +#: ../fish/guestfish.pod:152 ../fuse/guestmount.pod:160 #: ../inspector/virt-inspector.pod:59 ../rescue/virt-rescue.pod:88 -#: ../resize/virt-resize.pod:245 ../tools/virt-list-filesystems.pl:61 -#: ../tools/virt-list-partitions.pl:62 ../tools/virt-make-fs.pl:161 -#: ../tools/virt-tar.pl:111 ../tools/virt-win-reg.pl:104 +#: ../resize/virt-resize.pod:245 ../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 +#: ../tools/virt-win-reg.pl:104 msgid "B<--help>" msgstr "" #. type: textblock -#: ../cat/virt-cat.pod:68 ../cat/virt-filesystems.pod:97 -#: ../cat/virt-ls.pod:267 ../df/virt-df.pod:65 ../edit/virt-edit.pod:68 +#: ../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: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 @@ -266,33 +300,31 @@ msgid "Display brief help." msgstr "" #. type: =item -#: ../cat/virt-cat.pod:70 ../cat/virt-filesystems.pod:99 -#: ../cat/virt-ls.pod:269 ../df/virt-df.pod:67 ../edit/virt-edit.pod:70 +#: ../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: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 "" #. type: =item -#: ../cat/virt-cat.pod:72 ../cat/virt-filesystems.pod:101 -#: ../cat/virt-ls.pod:271 ../df/virt-df.pod:69 ../edit/virt-edit.pod:72 +#: ../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: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 -#: ../cat/virt-cat.pod:74 ../cat/virt-filesystems.pod:103 -#: ../cat/virt-ls.pod:273 ../df/virt-df.pod:71 ../edit/virt-edit.pod:74 -#: ../inspector/virt-inspector.pod:67 ../rescue/virt-rescue.pod:96 -msgid "" -"Add I which should be a disk image from a virtual machine. If the " -"virtual machine has multiple block devices, you must supply all of them with " -"separate I<-a> options." +#: ../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 -#: ../cat/virt-cat.pod:78 ../cat/virt-filesystems.pod:107 -#: ../cat/virt-ls.pod:277 ../df/virt-df.pod:75 ../edit/virt-edit.pod:78 -#: ../fish/guestfish.pod:174 ../fuse/guestmount.pod:93 +#: ../align/virt-alignment-scan.pod:103 ../cat/virt-cat.pod:78 +#: ../cat/virt-filesystems.pod:107 ../cat/virt-ls.pod:277 +#: ../clone/virt-sysprep.pod:56 ../df/virt-df.pod:75 ../edit/virt-edit.pod:78 +#: ../fish/guestfish.pod:174 ../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 " @@ -300,20 +332,25 @@ msgid "" msgstr "" #. type: =item -#: ../cat/virt-cat.pod:81 ../cat/virt-filesystems.pod:125 -#: ../cat/virt-ls.pod:291 ../df/virt-df.pod:78 ../rescue/virt-rescue.pod:107 +#: ../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:59 ../df/virt-df.pod:78 +#: ../rescue/virt-rescue.pod:107 msgid "B<-c> URI" msgstr "" #. type: =item -#: ../cat/virt-cat.pod:83 ../cat/virt-filesystems.pod:127 -#: ../cat/virt-ls.pod:293 ../df/virt-df.pod:80 ../rescue/virt-rescue.pod:109 +#: ../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:61 ../df/virt-df.pod:80 +#: ../rescue/virt-rescue.pod:109 msgid "B<--connect> URI" msgstr "" #. type: textblock -#: ../cat/virt-cat.pod:85 ../cat/virt-filesystems.pod:129 -#: ../cat/virt-ls.pod:295 ../df/virt-df.pod:82 ../edit/virt-edit.pod:99 +#: ../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: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 @@ -323,30 +360,35 @@ msgid "" msgstr "" #. type: textblock -#: ../cat/virt-cat.pod:88 ../cat/virt-filesystems.pod:132 -#: ../cat/virt-ls.pod:298 ../df/virt-df.pod:85 ../rescue/virt-rescue.pod:114 +#: ../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: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 " "used at all." msgstr "" #. type: =item -#: ../cat/virt-cat.pod:91 ../cat/virt-filesystems.pod:141 -#: ../cat/virt-ls.pod:307 ../df/virt-df.pod:94 ../edit/virt-edit.pod:105 +#: ../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: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 "" #. type: =item -#: ../cat/virt-cat.pod:93 ../cat/virt-filesystems.pod:143 -#: ../cat/virt-ls.pod:309 ../df/virt-df.pod:96 ../edit/virt-edit.pod:107 +#: ../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: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 "" #. type: textblock -#: ../cat/virt-cat.pod:95 ../cat/virt-filesystems.pod:145 -#: ../cat/virt-ls.pod:311 ../df/virt-df.pod:98 ../edit/virt-edit.pod:109 +#: ../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: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 " @@ -354,42 +396,30 @@ msgid "" msgstr "" #. type: =item -#: ../cat/virt-cat.pod:98 ../cat/virt-filesystems.pod:148 -#: ../cat/virt-ls.pod:314 ../edit/virt-edit.pod:112 ../fish/guestfish.pod:217 -#: ../fuse/guestmount.pod:126 ../inspector/virt-inspector.pod:92 -msgid "B<--echo-keys>" -msgstr "" - -#. type: textblock -#: ../cat/virt-cat.pod:100 -msgid "" -"When prompting for keys and passphrases, virt-cat normally turns echoing off " -"so you cannot see what you are typing. If you are not worried about Tempest " -"attacks and there is no one else in the room you can specify this flag to " -"see what you are typing." -msgstr "" - -#. type: =item -#: ../cat/virt-cat.pod:105 ../cat/virt-filesystems.pod:170 -#: ../cat/virt-ls.pod:328 ../df/virt-df.pod:101 ../fish/guestfish.pod:233 -#: ../fuse/guestmount.pod:133 ../inspector/virt-inspector.pod:99 -#: ../rescue/virt-rescue.pod:124 +#: ../align/virt-alignment-scan.pod:123 ../cat/virt-cat.pod:105 +#: ../cat/virt-filesystems.pod:170 ../cat/virt-ls.pod:328 +#: ../clone/virt-sysprep.pod:95 ../df/virt-df.pod:101 +#: ../fish/guestfish.pod:233 ../fuse/guestmount.pod:142 +#: ../inspector/virt-inspector.pod:99 ../rescue/virt-rescue.pod:124 msgid "B<--format=raw|qcow2|..>" msgstr "" #. type: =item -#: ../cat/virt-cat.pod:107 ../cat/virt-filesystems.pod:172 -#: ../cat/virt-ls.pod:330 ../df/virt-df.pod:103 ../edit/virt-edit.pod:134 -#: ../fish/guestfish.pod:235 ../fuse/guestmount.pod:135 -#: ../inspector/virt-inspector.pod:101 ../rescue/virt-rescue.pod:126 +#: ../align/virt-alignment-scan.pod:125 ../cat/virt-cat.pod:107 +#: ../cat/virt-filesystems.pod:172 ../cat/virt-ls.pod:330 +#: ../clone/virt-sysprep.pod:97 ../df/virt-df.pod:103 +#: ../edit/virt-edit.pod:134 ../fish/guestfish.pod:235 +#: ../fuse/guestmount.pod:144 ../inspector/virt-inspector.pod:101 +#: ../rescue/virt-rescue.pod:126 msgid "B<--format>" msgstr "" #. type: textblock -#: ../cat/virt-cat.pod:109 ../cat/virt-filesystems.pod:174 -#: ../cat/virt-ls.pod:332 ../df/virt-df.pod:105 ../edit/virt-edit.pod:136 -#: ../fish/guestfish.pod:237 ../fuse/guestmount.pod:137 -#: ../rescue/virt-rescue.pod:128 +#: ../align/virt-alignment-scan.pod:127 ../cat/virt-cat.pod:109 +#: ../cat/virt-filesystems.pod:174 ../cat/virt-ls.pod:332 +#: ../clone/virt-sysprep.pod:99 ../df/virt-df.pod:105 +#: ../edit/virt-edit.pod:136 ../fish/guestfish.pod:237 +#: ../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 " @@ -398,50 +428,56 @@ msgid "" msgstr "" #. type: textblock -#: ../cat/virt-cat.pod:114 ../cat/virt-filesystems.pod:179 -#: ../cat/virt-ls.pod:337 ../df/virt-df.pod:110 ../edit/virt-edit.pod:141 -#: ../fish/guestfish.pod:242 ../fish/guestfish.pod:673 -#: ../inspector/virt-inspector.pod:335 ../rescue/virt-rescue.pod:133 -#: ../src/guestfs.pod:2653 +#: ../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: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:2862 msgid "For example:" msgstr "" #. type: verbatim -#: ../cat/virt-cat.pod:116 +#: ../align/virt-alignment-scan.pod:134 #, no-wrap msgid "" -" virt-cat --format=raw -a disk.img file\n" +" virt-alignment-scan --format=raw -a disk.img\n" "\n" msgstr "" #. type: textblock -#: ../cat/virt-cat.pod:118 ../cat/virt-filesystems.pod:183 -#: ../cat/virt-ls.pod:341 ../df/virt-df.pod:114 ../edit/virt-edit.pod:145 -#: ../fish/guestfish.pod:246 ../rescue/virt-rescue.pod:137 +#: ../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: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." msgstr "" #. type: verbatim -#: ../cat/virt-cat.pod:120 +#: ../align/virt-alignment-scan.pod:138 #, no-wrap msgid "" -" virt-cat --format=raw -a disk.img --format -a another.img file\n" +" virt-alignment-scan --format=raw -a disk.img --format -a another.img\n" "\n" msgstr "" #. type: textblock -#: ../cat/virt-cat.pod:122 ../cat/virt-filesystems.pod:187 -#: ../cat/virt-ls.pod:345 ../df/virt-df.pod:118 ../edit/virt-edit.pod:149 -#: ../fish/guestfish.pod:250 ../rescue/virt-rescue.pod:141 +#: ../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:112 ../df/virt-df.pod:118 +#: ../edit/virt-edit.pod:149 ../fish/guestfish.pod:250 +#: ../rescue/virt-rescue.pod:141 msgid "" "forces raw format (no auto-detection) for C and reverts to auto-" "detection for C." msgstr "" #. type: textblock -#: ../cat/virt-cat.pod:125 ../cat/virt-filesystems.pod:190 -#: ../cat/virt-ls.pod:348 ../df/virt-df.pod:121 ../edit/virt-edit.pod:152 -#: ../rescue/virt-rescue.pod:144 +#: ../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: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 " "option to specify the disk format. This avoids a possible security problem " @@ -449,210 +485,383 @@ msgid "" msgstr "" #. type: =item -#: ../cat/virt-cat.pod:129 ../cat/virt-filesystems.pod:200 -#: ../cat/virt-ls.pod:361 ../edit/virt-edit.pod:156 ../fish/guestfish.pod:289 -#: ../fuse/guestmount.pod:163 ../inspector/virt-inspector.pod:114 -msgid "B<--keys-from-stdin>" +#: ../align/virt-alignment-scan.pod:147 ../resize/virt-resize.pod:414 +#: ../sparsify/virt-sparsify.pod:153 +msgid "B<-q>" +msgstr "" + +#. type: =item +#: ../align/virt-alignment-scan.pod:149 ../resize/virt-resize.pod:416 +#: ../sparsify/virt-sparsify.pod:155 +msgid "B<--quiet>" 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 +#: ../align/virt-alignment-scan.pod:151 msgid "" -"Read key or passphrase parameters from stdin. The default is to try to read " -"passphrases from the user by opening C." +"Don't produce any output. Just set the exit code (see L " +"below)." msgstr "" #. type: =item -#: ../cat/virt-cat.pod:134 ../cat/virt-filesystems.pod:261 -#: ../cat/virt-ls.pod:425 ../df/virt-df.pod:173 ../edit/virt-edit.pod:161 -#: ../fish/guestfish.pod:390 ../fuse/guestmount.pod:257 -#: ../inspector/virt-inspector.pod:119 ../rescue/virt-rescue.pod:178 +#: ../align/virt-alignment-scan.pod:154 ../cat/virt-cat.pod:134 +#: ../cat/virt-filesystems.pod:261 ../cat/virt-ls.pod:425 +#: ../clone/virt-sysprep.pod:138 ../df/virt-df.pod:173 +#: ../edit/virt-edit.pod:161 ../fish/guestfish.pod:390 +#: ../fuse/guestmount.pod:266 ../inspector/virt-inspector.pod:119 +#: ../rescue/virt-rescue.pod:182 ../sparsify/virt-sparsify.pod:159 msgid "B<-v>" msgstr "" #. type: =item -#: ../cat/virt-cat.pod:136 ../cat/virt-filesystems.pod:263 -#: ../cat/virt-ls.pod:427 ../df/virt-df.pod:175 ../edit/virt-edit.pod:163 -#: ../fish/guestfish.pod:392 ../fuse/guestmount.pod:259 -#: ../inspector/virt-inspector.pod:121 ../rescue/virt-rescue.pod:180 +#: ../align/virt-alignment-scan.pod:156 ../cat/virt-cat.pod:136 +#: ../cat/virt-filesystems.pod:263 ../cat/virt-ls.pod:427 +#: ../clone/virt-sysprep.pod:140 ../df/virt-df.pod:175 +#: ../edit/virt-edit.pod:163 ../fish/guestfish.pod:392 +#: ../fuse/guestmount.pod:268 ../inspector/virt-inspector.pod:121 +#: ../rescue/virt-rescue.pod:184 ../sparsify/virt-sparsify.pod:161 msgid "B<--verbose>" msgstr "" #. type: textblock -#: ../cat/virt-cat.pod:138 ../cat/virt-filesystems.pod:265 -#: ../cat/virt-ls.pod:429 ../df/virt-df.pod:177 ../edit/virt-edit.pod:165 -#: ../inspector/virt-inspector.pod:123 ../rescue/virt-rescue.pod:182 +#: ../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: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." msgstr "" #. type: =item -#: ../cat/virt-cat.pod:140 ../cat/virt-filesystems.pod:267 -#: ../cat/virt-ls.pod:431 ../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:184 -#: ../resize/virt-resize.pod:478 +#: ../align/virt-alignment-scan.pod:160 ../cat/virt-cat.pod:140 +#: ../cat/virt-filesystems.pod:267 ../cat/virt-ls.pod:431 +#: ../clone/virt-sysprep.pod:144 ../df/virt-df.pod:179 +#: ../edit/virt-edit.pod:167 ../fish/guestfish.pod:397 +#: ../fuse/guestmount.pod:272 ../inspector/virt-inspector.pod:125 +#: ../rescue/virt-rescue.pod:188 ../resize/virt-resize.pod:484 +#: ../sparsify/virt-sparsify.pod:165 msgid "B<-V>" msgstr "" #. type: =item -#: ../cat/virt-cat.pod:142 ../cat/virt-filesystems.pod:269 -#: ../cat/virt-ls.pod:433 ../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:186 -#: ../resize/virt-resize.pod:480 ../tools/virt-list-filesystems.pl:69 +#: ../align/virt-alignment-scan.pod:162 ../cat/virt-cat.pod:142 +#: ../cat/virt-filesystems.pod:269 ../cat/virt-ls.pod:433 +#: ../clone/virt-sysprep.pod:146 ../df/virt-df.pod:181 +#: ../edit/virt-edit.pod:169 ../fish/guestfish.pod:399 +#: ../fuse/guestmount.pod:274 ../inspector/virt-inspector.pod:127 +#: ../rescue/virt-rescue.pod:190 ../resize/virt-resize.pod:486 +#: ../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 msgid "B<--version>" msgstr "" #. type: textblock -#: ../cat/virt-cat.pod:144 ../cat/virt-filesystems.pod:271 -#: ../cat/virt-ls.pod:435 ../df/virt-df.pod:183 ../edit/virt-edit.pod:171 -#: ../inspector/virt-inspector.pod:129 ../rescue/virt-rescue.pod:188 -#: ../resize/virt-resize.pod:482 ../tools/virt-list-filesystems.pl:71 +#: ../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: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 +#: ../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 msgid "Display version number and exit." msgstr "" #. type: =item -#: ../cat/virt-cat.pod:146 ../cat/virt-filesystems.pod:281 -#: ../cat/virt-ls.pod:437 ../df/virt-df.pod:185 ../edit/virt-edit.pod:173 -#: ../fish/guestfish.pod:412 ../fuse/guestmount.pod:278 -#: ../inspector/virt-inspector.pod:131 ../rescue/virt-rescue.pod:199 +#: ../align/virt-alignment-scan.pod:166 ../cat/virt-cat.pod:146 +#: ../cat/virt-filesystems.pod:281 ../cat/virt-ls.pod:437 +#: ../clone/virt-sysprep.pod:150 ../df/virt-df.pod:185 +#: ../edit/virt-edit.pod:173 ../fish/guestfish.pod:412 +#: ../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>" msgstr "" #. type: textblock -#: ../cat/virt-cat.pod:148 ../cat/virt-filesystems.pod:283 -#: ../cat/virt-ls.pod:439 ../df/virt-df.pod:187 ../edit/virt-edit.pod:175 -#: ../inspector/virt-inspector.pod:133 ../rescue/virt-rescue.pod:201 +#: ../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: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." msgstr "" #. type: =head1 -#: ../cat/virt-cat.pod:152 ../cat/virt-ls.pod:443 ../edit/virt-edit.pod:179 -#: ../inspector/virt-inspector.pod:137 ../rescue/virt-rescue.pod:205 -msgid "OLD-STYLE COMMAND LINE ARGUMENTS" +#: ../align/virt-alignment-scan.pod:172 +msgid "RECOMMENDED ALIGNMENT" msgstr "" #. type: textblock -#: ../cat/virt-cat.pod:154 -msgid "Previous versions of virt-cat allowed you to write either:" +#: ../align/virt-alignment-scan.pod:174 +msgid "" +"Operating systems older than Windows 2008 and Linux before ca.2010 place the " +"first sector of the first partition at sector 63, with a 512 byte sector " +"size. This happens because of a historical accident. Drives have to report " +"a cylinder / head / sector (CHS) geometry to the BIOS. The geometry is " +"completely meaningless on modern drives, but it happens that the geometry " +"reported always has 63 sectors per track. The operating system therefore " +"places the first partition at the start of the second \"track\", at sector " +"63." +msgstr "" + +#. type: textblock +#: ../align/virt-alignment-scan.pod:183 +msgid "" +"When the guest OS is virtualized, the host operating system and hypervisor " +"may prefer accesses aligned to one of:" +msgstr "" + +#. type: =item +#: ../align/virt-alignment-scan.pod:188 +msgid "* 512 bytes" +msgstr "" + +#. type: textblock +#: ../align/virt-alignment-scan.pod:190 +msgid "" +"if the host OS uses local storage directly on hard drive partitions, and the " +"hard drive has 512 byte physical sectors." +msgstr "" + +#. type: =item +#: ../align/virt-alignment-scan.pod:193 +msgid "* 4 Kbytes" +msgstr "" + +#. type: textblock +#: ../align/virt-alignment-scan.pod:195 +msgid "" +"for local storage on new hard drives with 4Kbyte physical sectors; for file-" +"backed storage on filesystems with 4Kbyte block size; or for some types of " +"network-attached storage." +msgstr "" + +#. type: =item +#: ../align/virt-alignment-scan.pod:199 +msgid "* 64 Kbytes" +msgstr "" + +#. type: textblock +#: ../align/virt-alignment-scan.pod:201 +msgid "" +"for high-end network-attached storage. This is the optimal block size for " +"some NetApp hardware." +msgstr "" + +#. type: =item +#: ../align/virt-alignment-scan.pod:204 +msgid "* 1 Mbyte" +msgstr "" + +#. type: textblock +#: ../align/virt-alignment-scan.pod:206 +msgid "see L below." +msgstr "" + +#. type: textblock +#: ../align/virt-alignment-scan.pod:210 +msgid "" +"Partitions which are not aligned correctly to the underlying storage cause " +"extra I/O. For example:" msgstr "" #. type: verbatim -#: ../cat/virt-cat.pod:156 +#: ../align/virt-alignment-scan.pod:213 #, no-wrap msgid "" -" virt-cat disk.img [disk.img ...] file\n" +" sect#63\n" +" +--------------------------+------\n" +" | guest |\n" +" | filesystem block |\n" +" ---+------------------+------+-------------------+-----+---\n" +" | host block | host block |\n" +" | | |\n" +" ---+-------------------------+-------------------------+---\n" "\n" msgstr "" #. type: textblock -#: ../cat/virt-cat.pod:158 ../cat/virt-ls.pod:449 ../edit/virt-edit.pod:185 -#: ../inspector/virt-inspector.pod:143 ../rescue/virt-rescue.pod:211 -msgid "or" +#: ../align/virt-alignment-scan.pod:222 +msgid "" +"In this example, each time a 4K guest block is read, two blocks on the host " +"must be accessed (so twice as much I/O is done). When a 4K guest block is " +"written, two host blocks must first be read, the old and new data combined, " +"and the two blocks written back (4x I/O)." +msgstr "" + +#. type: =head2 +#: ../align/virt-alignment-scan.pod:227 +msgid "LINUX HOST BLOCK AND I/O SIZE" +msgstr "" + +#. type: textblock +#: ../align/virt-alignment-scan.pod:229 +msgid "" +"New versions of the Linux kernel expose the physical and logical block size, " +"and minimum and recommended I/O size." +msgstr "" + +#. type: textblock +#: ../align/virt-alignment-scan.pod:232 +msgid "For a typical hard drive with 512 byte sectors:" msgstr "" #. type: verbatim -#: ../cat/virt-cat.pod:160 +#: ../align/virt-alignment-scan.pod:234 #, no-wrap msgid "" -" virt-cat guestname file\n" +" $ cat /sys/block/sda/queue/physical_block_size\n" +" 512\n" +" $ cat /sys/block/sda/queue/logical_block_size\n" +" 512\n" +" $ cat /sys/block/sda/queue/minimum_io_size\n" +" 512\n" +" $ cat /sys/block/sda/queue/optimal_io_size\n" +" 0\n" "\n" msgstr "" #. type: textblock -#: ../cat/virt-cat.pod:162 ../cat/virt-ls.pod:453 ../edit/virt-edit.pod:189 -#: ../inspector/virt-inspector.pod:147 ../rescue/virt-rescue.pod:215 +#: ../align/virt-alignment-scan.pod:243 +msgid "For a NetApp LUN:" +msgstr "" + +#. type: verbatim +#: ../align/virt-alignment-scan.pod:245 +#, no-wrap msgid "" -"whereas in this version you should use I<-a> or I<-d> respectively to avoid " -"the confusing case where a disk image might have the same name as a guest." +" $ cat /sys/block/sdc/queue/logical_block_size\n" +" 512\n" +" $ cat /sys/block/sdc/queue/physical_block_size\n" +" 512\n" +" $ cat /sys/block/sdc/queue/minimum_io_size\n" +" 4096\n" +" $ cat /sys/block/sdc/queue/optimal_io_size\n" +" 65536\n" +"\n" msgstr "" #. type: textblock -#: ../cat/virt-cat.pod:166 ../cat/virt-ls.pod:457 ../edit/virt-edit.pod:193 -#: ../inspector/virt-inspector.pod:151 ../rescue/virt-rescue.pod:219 -msgid "For compatibility the old style is still supported." +#: ../align/virt-alignment-scan.pod:254 +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: =head1 -#: ../cat/virt-cat.pod:168 ../edit/virt-edit.pod:297 -msgid "USING GUESTFISH" +#. type: textblock +#: ../align/virt-alignment-scan.pod:258 +msgid "" +"For detailed information about what these numbers mean, see L" msgstr "" #. type: textblock -#: ../cat/virt-cat.pod:170 +#: ../align/virt-alignment-scan.pod:261 msgid "" -"L is a more powerful, lower level tool which you can use when " -"C doesn't work." +"[Thanks to Mike Snitzer for providing NetApp data and additional " +"information.]" +msgstr "" + +#. type: =head2 +#: ../align/virt-alignment-scan.pod:264 +msgid "1 MB PARTITION ALIGNMENT" msgstr "" #. type: textblock -#: ../cat/virt-cat.pod:173 -msgid "Using C is approximately equivalent to doing:" +#: ../align/virt-alignment-scan.pod:266 +msgid "" +"Microsoft picked 1 MB as the default alignment for all partitions starting " +"with Windows 2008 Server, and Linux has followed this." msgstr "" -#. type: verbatim -#: ../cat/virt-cat.pod:175 -#, no-wrap +#. type: textblock +#: ../align/virt-alignment-scan.pod:269 msgid "" -" guestfish --ro -i -d domname download file -\n" -"\n" +"Assuming 512 byte sectors in the guest, you will now see the first partition " +"starting at sector 2048, and subsequent partitions (if any) will start at a " +"multiple of 2048 sectors." msgstr "" #. type: textblock -#: ../cat/virt-cat.pod:177 +#: ../align/virt-alignment-scan.pod:273 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\")." +"1 MB alignment is compatible with all current alignment requirements (4K, " +"64K) and provides room for future growth in physical block sizes." +msgstr "" + +#. type: =head2 +#: ../align/virt-alignment-scan.pod:276 +msgid "SETTING ALIGNMENT" msgstr "" #. type: textblock -#: ../cat/virt-cat.pod:181 +#: ../align/virt-alignment-scan.pod:278 msgid "" -"The command above uses libguestfs's guest inspection feature and so does not " -"work on guests that libguestfs cannot inspect, or on things like arbitrary " -"disk images that don't contain guests. To display a file from a disk image " -"directly, use:" +"Currently there is no virt tool for fixing alignment problems in guests. " +"This is a difficult problem to fix because simply moving partitions around " +"breaks the bootloader, necessitating either manual reinstallation of the " +"bootloader using a rescue disk, or complex and error-prone hacks." msgstr "" -#. type: verbatim -#: ../cat/virt-cat.pod:186 -#, no-wrap +#. type: textblock +#: ../align/virt-alignment-scan.pod:284 msgid "" -" guestfish --ro -a disk.img -m /dev/sda1 download file -\n" -"\n" +"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 -#: ../cat/virt-cat.pod:188 +#: ../align/virt-alignment-scan.pod:292 msgid "" -"where C is the disk image, C is the filesystem within " -"the disk image to edit, and C is the full path to the file." +"The easiest 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 +msgid "" +"For older versions of Windows, the following NetApp document contains useful " +"information: L" +msgstr "" + +#. type: textblock +#: ../align/virt-alignment-scan.pod:300 +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. Do not use the Kickstart C command. The NetApp document above " +"contains an example." msgstr "" #. type: =head1 -#: ../cat/virt-cat.pod:192 ../cat/virt-filesystems.pod:365 -#: ../cat/virt-ls.pod:483 ../df/virt-df.pod:215 ../edit/virt-edit.pod:342 -#: ../inspector/virt-inspector.pod:349 ../rescue/virt-rescue.pod:262 -#: ../resize/virt-resize.pod:543 ../tools/virt-list-filesystems.pl:188 -#: ../tools/virt-list-partitions.pl:258 ../tools/virt-make-fs.pl:532 -#: ../tools/virt-tar.pl:289 ../tools/virt-win-reg.pl:733 +#: ../align/virt-alignment-scan.pod:305 ../cat/virt-cat.pod:191 +#: ../cat/virt-filesystems.pod:365 ../cat/virt-ls.pod:483 +#: ../clone/virt-sysprep.pod:475 ../df/virt-df.pod:215 +#: ../edit/virt-edit.pod:342 ../inspector/virt-inspector.pod:352 +#: ../rescue/virt-rescue.pod:266 ../resize/virt-resize.pod:601 +#: ../tools/virt-list-filesystems.pl:188 ../tools/virt-list-partitions.pl:258 +#: ../tools/virt-make-fs.pl:532 ../tools/virt-tar.pl:289 +#: ../tools/virt-win-reg.pl:733 msgid "SHELL QUOTING" msgstr "" #. type: textblock -#: ../cat/virt-cat.pod:194 ../cat/virt-filesystems.pod:367 -#: ../cat/virt-ls.pod:485 ../df/virt-df.pod:217 ../edit/virt-edit.pod:344 -#: ../inspector/virt-inspector.pod:351 ../rescue/virt-rescue.pod:264 -#: ../resize/virt-resize.pod:545 ../tools/virt-list-filesystems.pl:190 -#: ../tools/virt-list-partitions.pl:260 ../tools/virt-make-fs.pl:534 -#: ../tools/virt-tar.pl:291 ../tools/virt-win-reg.pl:741 +#: ../align/virt-alignment-scan.pod:307 ../cat/virt-cat.pod:193 +#: ../cat/virt-filesystems.pod:367 ../cat/virt-ls.pod:485 +#: ../clone/virt-sysprep.pod:477 ../df/virt-df.pod:217 +#: ../edit/virt-edit.pod:344 ../inspector/virt-inspector.pod:354 +#: ../rescue/virt-rescue.pod:268 ../resize/virt-resize.pod:603 +#: ../tools/virt-list-filesystems.pl:190 ../tools/virt-list-partitions.pl:260 +#: ../tools/virt-make-fs.pl:534 ../tools/virt-tar.pl:291 +#: ../tools/virt-win-reg.pl:741 msgid "" "Libvirt guest names can contain arbitrary characters, some of which have " "meaning to the shell such as C<#> and space. You may need to quote or " @@ -661,17 +870,160 @@ msgid "" msgstr "" #. type: =head1 -#: ../cat/virt-cat.pod:199 ../cat/virt-filesystems.pod:372 -#: ../cat/virt-ls.pod:490 ../df/virt-df.pod:222 ../edit/virt-edit.pod:349 +#: ../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: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:608 ../sparsify/virt-sparsify.pod:227 +#: ../test-tool/libguestfs-test-tool.pod:90 +msgid "EXIT STATUS" +msgstr "" + +#. type: textblock +#: ../align/virt-alignment-scan.pod:314 +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: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 +#: ../examples/guestfs-recipes.pod:98 ../examples/guestfs-recipes.pod:102 +#: ../examples/guestfs-recipes.pod:106 ../examples/guestfs-recipes.pod:132 +#: ../examples/guestfs-recipes.pod:137 ../examples/guestfs-recipes.pod:227 +#: ../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:2013 ../fish/guestfish-actions.pod:2019 +#: ../fish/guestfish-actions.pod:2027 ../fish/guestfish-actions.pod:2034 +#: ../fish/guestfish-actions.pod:2041 ../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 +#: ../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:3020 ../src/guestfs-actions.pod:3026 +#: ../src/guestfs-actions.pod:3034 ../src/guestfs-actions.pod:3041 +#: ../src/guestfs-actions.pod:3048 ../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:2630 ../src/guestfs.pod:2636 +#: ../src/guestfs.pod:2641 ../src/guestfs.pod:2647 ../src/guestfs.pod:3047 +#: ../src/guestfs.pod:3052 ../src/guestfs.pod:3056 ../src/guestfs.pod:3060 +#: ../src/guestfs.pod:3064 ../src/guestfs.pod:3078 ../src/guestfs.pod:3083 +#: ../src/guestfs.pod:3314 ../src/guestfs.pod:3318 ../src/guestfs.pod:3322 +#: ../src/guestfs.pod:3326 ../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 +msgid "*" +msgstr "" + +#. type: textblock +#: ../align/virt-alignment-scan.pod:320 +msgid "0" +msgstr "" + +#. type: textblock +#: ../align/virt-alignment-scan.pod:322 +msgid "" +"successful exit, all partitions are aligned E 64K for best performance" +msgstr "" + +#. type: textblock +#: ../align/virt-alignment-scan.pod:326 +msgid "1" +msgstr "" + +#. type: textblock +#: ../align/virt-alignment-scan.pod:328 +msgid "an error scanning the disk image or guest" +msgstr "" + +#. type: textblock +#: ../align/virt-alignment-scan.pod:332 +msgid "2" +msgstr "" + +#. type: textblock +#: ../align/virt-alignment-scan.pod:334 +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 +msgid "3" +msgstr "" + +#. type: textblock +#: ../align/virt-alignment-scan.pod:341 +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: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:1224 ../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:303 -#: ../inspector/virt-inspector.pod:372 ../java/examples/guestfs-java.pod:45 +#: ../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:284 -#: ../resize/virt-resize.pod:550 ../ruby/examples/guestfs-ruby.pod:36 -#: ../src/guestfs.pod:3027 ../test-tool/libguestfs-test-tool.pod:87 +#: ../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:3255 +#: ../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 @@ -679,16 +1031,18 @@ msgid "SEE ALSO" msgstr "" #. type: textblock -#: ../cat/virt-cat.pod:201 +#: ../align/virt-alignment-scan.pod:348 msgid "" -"L, L, L, L, L, L." +"L, L, L, L, " +"L, L." msgstr "" #. type: =head1 -#: ../cat/virt-cat.pod:208 ../cat/virt-filesystems.pod:383 -#: ../cat/virt-ls.pod:502 ../df/virt-df.pod:230 ../edit/virt-edit.pod:363 -#: ../rescue/virt-rescue.pod:292 ../resize/virt-resize.pod:571 +#: ../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: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 #: ../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 @@ -696,27 +1050,32 @@ msgid "AUTHOR" msgstr "" #. type: textblock -#: ../cat/virt-cat.pod:210 ../cat/virt-filesystems.pod:385 -#: ../cat/virt-ls.pod:504 ../df/virt-df.pod:232 ../edit/virt-edit.pod:365 -#: ../inspector/virt-inspector.pod:386 ../rescue/virt-rescue.pod:294 -#: ../resize/virt-resize.pod:573 ../tools/virt-list-filesystems.pl:210 +#: ../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: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 +#: ../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 msgid "Richard W.M. Jones L" msgstr "" #. type: =head1 -#: ../cat/virt-cat.pod:212 ../cat/virt-filesystems.pod:387 -#: ../cat/virt-ls.pod:506 ../df/virt-df.pod:234 ../edit/virt-edit.pod:367 -#: ../examples/guestfs-examples.pod:48 ../examples/guestfs-recipes.pod:400 -#: ../fish/guestfish.pod:1253 ../fish/virt-copy-in.pod:64 +#: ../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: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: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:318 -#: ../inspector/virt-inspector.pod:394 ../java/examples/guestfs-java.pod:61 -#: ../ocaml/examples/guestfs-ocaml.pod:94 ../perl/examples/guestfs-perl.pod:55 -#: ../python/examples/guestfs-python.pod:57 ../rescue/virt-rescue.pod:296 -#: ../resize/virt-resize.pod:575 ../ruby/examples/guestfs-ruby.pod:51 -#: ../src/guestfs.pod:3103 ../test-tool/libguestfs-test-tool.pod:97 +#: ../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:3337 +#: ../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 @@ -724,19 +1083,21 @@ msgid "COPYRIGHT" msgstr "" #. type: textblock -#: ../cat/virt-cat.pod:214 ../inspector/virt-inspector.pod:396 -#: ../resize/virt-resize.pod:577 -msgid "Copyright (C) 2010-2011 Red Hat Inc." +#: ../align/virt-alignment-scan.pod:361 ../clone/virt-sysprep.pod:507 +#: ../sparsify/virt-sparsify.pod:270 +msgid "Copyright (C) 2011 Red Hat Inc." msgstr "" #. type: textblock -#: ../cat/virt-cat.pod:216 ../cat/virt-filesystems.pod:391 -#: ../cat/virt-ls.pod:510 ../df/virt-df.pod:238 ../edit/virt-edit.pod:371 -#: ../fish/guestfish.pod:1258 ../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:323 -#: ../inspector/virt-inspector.pod:398 ../rescue/virt-rescue.pod:300 -#: ../resize/virt-resize.pod:579 ../test-tool/libguestfs-test-tool.pod:102 +#: ../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: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:337 ../inspector/virt-inspector.pod:407 +#: ../rescue/virt-rescue.pod:304 ../resize/virt-resize.pod:643 +#: ../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 @@ -748,13 +1109,15 @@ msgid "" msgstr "" #. type: textblock -#: ../cat/virt-cat.pod:221 ../cat/virt-filesystems.pod:396 -#: ../cat/virt-ls.pod:515 ../df/virt-df.pod:243 ../edit/virt-edit.pod:376 -#: ../fish/guestfish.pod:1263 ../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:328 -#: ../inspector/virt-inspector.pod:403 ../rescue/virt-rescue.pod:305 -#: ../resize/virt-resize.pod:584 ../test-tool/libguestfs-test-tool.pod:107 +#: ../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: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:342 ../inspector/virt-inspector.pod:412 +#: ../rescue/virt-rescue.pod:309 ../resize/virt-resize.pod:648 +#: ../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 @@ -766,13 +1129,15 @@ msgid "" msgstr "" #. type: textblock -#: ../cat/virt-cat.pod:226 ../cat/virt-filesystems.pod:401 -#: ../cat/virt-ls.pod:520 ../df/virt-df.pod:248 ../edit/virt-edit.pod:381 -#: ../fish/guestfish.pod:1268 ../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:333 -#: ../inspector/virt-inspector.pod:408 ../rescue/virt-rescue.pod:310 -#: ../resize/virt-resize.pod:589 ../test-tool/libguestfs-test-tool.pod:112 +#: ../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: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:347 ../inspector/virt-inspector.pod:417 +#: ../rescue/virt-rescue.pod:314 ../resize/virt-resize.pod:653 +#: ../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 @@ -783,6 +1148,348 @@ msgid "" msgstr "" #. type: textblock +#: ../cat/virt-cat.pod:5 +msgid "virt-cat - Display files in a virtual machine" +msgstr "" + +#. type: verbatim +#: ../cat/virt-cat.pod:9 +#, no-wrap +msgid "" +" virt-cat [--options] -d domname file [file ...]\n" +"\n" +msgstr "" + +#. type: verbatim +#: ../cat/virt-cat.pod:11 +#, no-wrap +msgid "" +" virt-cat [--options] -a disk.img [-a disk.img ...] file [file ...]\n" +"\n" +msgstr "" + +#. type: textblock +#: ../cat/virt-cat.pod:13 ../edit/virt-edit.pod:15 +#: ../inspector/virt-inspector.pod:13 +msgid "Old-style:" +msgstr "" + +#. type: verbatim +#: ../cat/virt-cat.pod:15 +#, no-wrap +msgid "" +" virt-cat domname file\n" +"\n" +msgstr "" + +#. type: verbatim +#: ../cat/virt-cat.pod:17 +#, no-wrap +msgid "" +" virt-cat disk.img file\n" +"\n" +msgstr "" + +#. type: textblock +#: ../cat/virt-cat.pod:21 +msgid "" +"C is a command line tool to display the contents of C where " +"C exists in the named virtual machine (or disk image)." +msgstr "" + +#. type: textblock +#: ../cat/virt-cat.pod:24 +msgid "" +"Multiple filenames can be given, in which case they are concatenated " +"together. Each filename must be a full path, starting at the root directory " +"(starting with '/')." +msgstr "" + +#. type: textblock +#: ../cat/virt-cat.pod:28 +msgid "" +"C can be used to quickly view a file. To edit a file, use C. For more complex cases you should look at the L tool " +"(see L below)." +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: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 +#: ../tools/virt-tar.pl:50 +msgid "EXAMPLES" +msgstr "" + +#. type: textblock +#: ../cat/virt-cat.pod:34 +msgid "" +"Display C file from inside the libvirt VM called C:" +msgstr "" + +#. type: verbatim +#: ../cat/virt-cat.pod:37 +#, no-wrap +msgid "" +" virt-cat -d mydomain /etc/fstab\n" +"\n" +msgstr "" + +#. type: textblock +#: ../cat/virt-cat.pod:39 +msgid "List syslog messages from a VM disk image file:" +msgstr "" + +#. type: verbatim +#: ../cat/virt-cat.pod:41 +#, no-wrap +msgid "" +" virt-cat -a disk.img /var/log/messages | tail\n" +"\n" +msgstr "" + +#. type: textblock +#: ../cat/virt-cat.pod:43 +msgid "Find out what DHCP IP address a VM acquired:" +msgstr "" + +#. type: verbatim +#: ../cat/virt-cat.pod:45 +#, no-wrap +msgid "" +" virt-cat -d mydomain /var/log/messages | \\\n" +" grep 'dhclient: bound to' | tail\n" +"\n" +msgstr "" + +#. type: textblock +#: ../cat/virt-cat.pod:48 +msgid "Find out what packages were recently installed:" +msgstr "" + +#. type: verbatim +#: ../cat/virt-cat.pod:50 +#, no-wrap +msgid "" +" virt-cat -d mydomain /var/log/yum.log | tail\n" +"\n" +msgstr "" + +#. type: textblock +#: ../cat/virt-cat.pod:52 +msgid "Find out who is logged on inside a virtual machine:" +msgstr "" + +#. type: verbatim +#: ../cat/virt-cat.pod:54 +#, no-wrap +msgid "" +" virt-cat -d mydomain /var/run/utmp > /tmp/utmp\n" +" who /tmp/utmp\n" +"\n" +msgstr "" + +#. type: textblock +#: ../cat/virt-cat.pod:57 +msgid "or who was logged on:" +msgstr "" + +#. type: verbatim +#: ../cat/virt-cat.pod:59 +#, no-wrap +msgid "" +" virt-cat -d mydomain /var/log/wtmp > /tmp/wtmp\n" +" last -f /tmp/wtmp\n" +"\n" +msgstr "" + +#. type: textblock +#: ../cat/virt-cat.pod:74 ../cat/virt-filesystems.pod:103 +#: ../cat/virt-ls.pod:273 ../df/virt-df.pod:71 ../edit/virt-edit.pod:74 +#: ../inspector/virt-inspector.pod:67 ../rescue/virt-rescue.pod:96 +msgid "" +"Add I which should be a disk image from a virtual machine. If the " +"virtual machine has multiple block devices, you must supply all of them with " +"separate I<-a> options." +msgstr "" + +#. type: =item +#: ../cat/virt-cat.pod:98 ../cat/virt-filesystems.pod:148 +#: ../cat/virt-ls.pod:314 ../edit/virt-edit.pod:112 ../fish/guestfish.pod:217 +#: ../fuse/guestmount.pod:135 ../inspector/virt-inspector.pod:92 +msgid "B<--echo-keys>" +msgstr "" + +#. type: textblock +#: ../cat/virt-cat.pod:100 +msgid "" +"When prompting for keys and passphrases, virt-cat normally turns echoing off " +"so you cannot see what you are typing. If you are not worried about Tempest " +"attacks and there is no one else in the room you can specify this flag to " +"see what you are typing." +msgstr "" + +#. type: verbatim +#: ../cat/virt-cat.pod:116 +#, no-wrap +msgid "" +" virt-cat --format=raw -a disk.img file\n" +"\n" +msgstr "" + +#. type: verbatim +#: ../cat/virt-cat.pod:120 +#, no-wrap +msgid "" +" virt-cat --format=raw -a disk.img --format -a another.img file\n" +"\n" +msgstr "" + +#. type: =item +#: ../cat/virt-cat.pod:129 ../cat/virt-filesystems.pod:200 +#: ../cat/virt-ls.pod:361 ../edit/virt-edit.pod:156 ../fish/guestfish.pod:289 +#: ../fuse/guestmount.pod:172 ../inspector/virt-inspector.pod: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: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." +msgstr "" + +#. type: =head1 +#: ../cat/virt-cat.pod:152 ../cat/virt-ls.pod:443 ../edit/virt-edit.pod:179 +#: ../inspector/virt-inspector.pod:137 ../rescue/virt-rescue.pod:209 +msgid "OLD-STYLE COMMAND LINE ARGUMENTS" +msgstr "" + +#. type: textblock +#: ../cat/virt-cat.pod:154 +msgid "Previous versions of virt-cat allowed you to write either:" +msgstr "" + +#. type: verbatim +#: ../cat/virt-cat.pod:156 +#, no-wrap +msgid "" +" virt-cat disk.img [disk.img ...] file\n" +"\n" +msgstr "" + +#. type: textblock +#: ../cat/virt-cat.pod:158 ../cat/virt-ls.pod:449 ../edit/virt-edit.pod:185 +#: ../inspector/virt-inspector.pod:143 ../rescue/virt-rescue.pod:215 +msgid "or" +msgstr "" + +#. type: verbatim +#: ../cat/virt-cat.pod:160 +#, no-wrap +msgid "" +" virt-cat guestname file\n" +"\n" +msgstr "" + +#. type: textblock +#: ../cat/virt-cat.pod:162 ../cat/virt-ls.pod:453 ../edit/virt-edit.pod:189 +#: ../inspector/virt-inspector.pod:147 ../rescue/virt-rescue.pod:219 +msgid "" +"whereas in this version you should use I<-a> or I<-d> respectively to avoid " +"the confusing case where a disk image might have the same name as a guest." +msgstr "" + +#. type: textblock +#: ../cat/virt-cat.pod:166 ../cat/virt-ls.pod:457 ../edit/virt-edit.pod:193 +#: ../inspector/virt-inspector.pod:151 ../rescue/virt-rescue.pod:223 +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" +msgstr "" + +#. type: textblock +#: ../cat/virt-cat.pod:170 +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 +msgid "Using C is approximately equivalent to doing:" +msgstr "" + +#. type: verbatim +#: ../cat/virt-cat.pod:175 +#, no-wrap +msgid "" +" guestfish --ro -i -d domname download file -\n" +"\n" +msgstr "" + +#. type: textblock +#: ../cat/virt-cat.pod:177 +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 +msgid "" +"The command above uses libguestfs's guest inspection feature and so does not " +"work on guests that libguestfs cannot inspect, or on things like arbitrary " +"disk images that don't contain guests. To display a file from a disk image " +"directly, use:" +msgstr "" + +#. type: verbatim +#: ../cat/virt-cat.pod:186 +#, no-wrap +msgid "" +" guestfish --ro -a disk.img -m /dev/sda1 download file -\n" +"\n" +msgstr "" + +#. type: textblock +#: ../cat/virt-cat.pod:188 +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-ls.pod:492 ../df/virt-df.pod:224 ../edit/virt-edit.pod:351 +#: ../fuse/guestmount.pod:314 ../inspector/virt-inspector.pod:377 +#: ../resize/virt-resize.pod:610 ../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 +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 +msgid "Copyright (C) 2010-2011 Red Hat Inc." +msgstr "" + +#. type: textblock #: ../cat/virt-filesystems.pod:5 msgid "" "virt-filesystems - List filesystems, partitions, block devices, LVM in a " @@ -1427,7 +2134,7 @@ msgid "Most spreadsheets and databases can import CSV directly." msgstr "" #. type: textblock -#: ../cat/virt-filesystems.pod:374 +#: ../cat/virt-filesystems.pod:379 msgid "" "L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, " @@ -2189,12 +2896,814 @@ msgid "" msgstr "" #. type: textblock -#: ../cat/virt-ls.pod:508 ../df/virt-df.pod:236 ../edit/virt-edit.pod:369 -#: ../rescue/virt-rescue.pod:298 +#: ../cat/virt-ls.pod:513 ../df/virt-df.pod:241 ../edit/virt-edit.pod:374 +#: ../rescue/virt-rescue.pod:302 msgid "Copyright (C) 2009-2011 Red Hat Inc." msgstr "" #. type: textblock +#: ../clone/virt-sysprep.pod:5 +msgid "" +"virt-sysprep - Reset or unconfigure a virtual machine so clones can be made" +msgstr "" + +#. type: verbatim +#: ../clone/virt-sysprep.pod:9 +#, no-wrap +msgid "" +" virt-sysprep [--options] -d domname\n" +"\n" +msgstr "" + +#. type: verbatim +#: ../clone/virt-sysprep.pod:11 +#, no-wrap +msgid "" +" virt-sysprep [--options] -a disk.img [-a disk.img ...]\n" +"\n" +msgstr "" + +#. type: textblock +#: ../clone/virt-sysprep.pod:15 +msgid "" +"Virt-sysprep \"resets\" or \"unconfigures\" a virtual machine so that clones " +"can be made from it. Steps in this process include removing SSH host keys, " +"removing persistent network MAC configuration, and removing user accounts. " +"Each step can be enabled or disabled as required." +msgstr "" + +#. type: textblock +#: ../clone/virt-sysprep.pod:21 +msgid "" +"Virt-sysprep is a simple shell script, allowing easy inspection or " +"customization by the system administrator." +msgstr "" + +#. type: textblock +#: ../clone/virt-sysprep.pod:24 +msgid "" +"Virt-sysprep modifies the guest or disk image I. The guest must " +"be shut down. If you want to preserve the existing contents of the guest, " +"you I. See L below." +msgstr "" + +#. type: textblock +#: ../clone/virt-sysprep.pod:29 +msgid "" +"You do I 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 " +"does I currently work on Microsoft Windows guests. We plan to support " +"Windows sysprepping in a future version, and we already have code to do it." +msgstr "" + +#. type: =item +#: ../clone/virt-sysprep.pod:76 +msgid "B<--enable=...>" +msgstr "" + +#. type: textblock +#: ../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:81 +#, no-wrap +msgid "" +" --enable=ssh-hostkeys,udev-persistent-net\n" +"\n" +msgstr "" + +#. type: textblock +#: ../clone/virt-sysprep.pod:83 +msgid "" +"would enable ONLY C and C operations." +msgstr "" + +#. type: textblock +#: ../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 " +"some guest types." +msgstr "" + +#. type: textblock +#: ../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:92 +msgid "" +"See L below for a list and an explanation of each operation." +msgstr "" + +#. type: verbatim +#: ../clone/virt-sysprep.pod:106 +#, no-wrap +msgid "" +" virt-sysprep --format=raw -a disk.img\n" +"\n" +msgstr "" + +#. type: verbatim +#: ../clone/virt-sysprep.pod:110 +#, no-wrap +msgid "" +" virt-sysprep --format=raw -a disk.img --format -a another.img\n" +"\n" +msgstr "" + +#. type: =item +#: ../clone/virt-sysprep.pod:119 +msgid "B<--hostname> newhostname" +msgstr "" + +#. type: textblock +#: ../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:124 +msgid "B<--list-operations>" +msgstr "" + +#. type: textblock +#: ../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:156 +msgid "OPERATIONS" +msgstr "" + +#. type: textblock +#: ../clone/virt-sysprep.pod:158 +msgid "" +"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: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:165 +#, no-wrap +msgid "" +" virt-sysprep --enable=ssh-hostkeys,udev-persistent-net [etc..]\n" +"\n" +msgstr "" + +#. type: textblock +#: ../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:186 +msgid "hostname" +msgstr "" + +#. type: textblock +#: ../clone/virt-sysprep.pod:188 +msgid "" +"Changes the hostname of the guest to the value given in the I<--hostname> " +"parameter." +msgstr "" + +#. type: textblock +#: ../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: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: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: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 C 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:224 +msgid "Remove the SSH host keys in the guest." +msgstr "" + +#. type: textblock +#: ../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: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:232 +#, no-wrap +msgid "" +" @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\n" +" @ WARNING: REMOTE HOST IDENTIFICATION HAS CHANGED! @\n" +" @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\n" +" IT IS POSSIBLE THAT SOMEONE IS DOING SOMETHING NASTY!\n" +"\n" +msgstr "" + +#. type: =head2 +#: ../clone/virt-sysprep.pod:237 +msgid "udev-persistent-net" +msgstr "" + +#. type: textblock +#: ../clone/virt-sysprep.pod:239 +msgid "" +"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: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 " +"is assigned to a new name (eg. eth1) and this is usually undesirable. " +"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:262 +msgid "COPYING AND CLONING" +msgstr "" + +#. type: textblock +#: ../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 " +"different ways to achieve this using the virt tools, and this section is " +"just an introduction." +msgstr "" + +#. type: textblock +#: ../clone/virt-sysprep.pod:269 +msgid "A virtual machine (when switched off) consists of two parts:" +msgstr "" + +#. type: =item +#: ../clone/virt-sysprep.pod:273 +msgid "I" +msgstr "" + +#. type: textblock +#: ../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 " +"external format like OVF." +msgstr "" + +#. type: textblock +#: ../clone/virt-sysprep.pod:279 +msgid "Some configuration items that might need to be changed:" +msgstr "" + +#. type: textblock +#: ../clone/virt-sysprep.pod:285 +msgid "name" +msgstr "" + +#. type: textblock +#: ../clone/virt-sysprep.pod:289 ../clone/virt-sysprep.pod:316 +msgid "UUID" +msgstr "" + +#. type: textblock +#: ../clone/virt-sysprep.pod:293 +msgid "path to block device(s)" +msgstr "" + +#. type: textblock +#: ../clone/virt-sysprep.pod:297 +msgid "network card MAC address" +msgstr "" + +#. type: =item +#: ../clone/virt-sysprep.pod:301 +msgid "I" +msgstr "" + +#. type: textblock +#: ../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:306 +msgid "Some things inside the block devices that might need to be changed:" +msgstr "" + +#. type: textblock +#: ../clone/virt-sysprep.pod:312 +msgid "hostname and other net configuration" +msgstr "" + +#. type: textblock +#: ../clone/virt-sysprep.pod:320 +msgid "SSH host keys" +msgstr "" + +#. type: textblock +#: ../clone/virt-sysprep.pod:324 +msgid "Windows unique security ID (SID)" +msgstr "" + +#. type: textblock +#: ../clone/virt-sysprep.pod:328 +msgid "Puppet registration" +msgstr "" + +#. type: =head2 +#: ../clone/virt-sysprep.pod:334 +msgid "COPYING THE BLOCK DEVICE" +msgstr "" + +#. type: textblock +#: ../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 " +"with the template, you will want to make many clones from it." +msgstr "" + +#. type: verbatim +#: ../clone/virt-sysprep.pod:341 +#, no-wrap +msgid "" +" virt-sysprep\n" +" |\n" +" v\n" +" original guest --------> template ---------->\n" +" \\------> cloned\n" +" \\-----> guests\n" +" \\---->\n" +"\n" +msgstr "" + +#. type: textblock +#: ../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:352 +#, no-wrap +msgid "" +" dd dd\n" +" original guest --------> template ---------->\n" +" \\------> cloned\n" +" \\-----> guests\n" +" \\---->\n" +"\n" +msgstr "" + +#. type: textblock +#: ../clone/virt-sysprep.pod:358 +msgid "There are some smarter (and faster) ways too:" +msgstr "" + +#. type: verbatim +#: ../clone/virt-sysprep.pod:364 +#, no-wrap +msgid "" +" snapshot\n" +" template ---------->\n" +" \\------> cloned\n" +" \\-----> guests\n" +" \\---->\n" +"\n" +msgstr "" + +#. type: textblock +#: ../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 " +"fast) and only changes are stored (less storage required)." +msgstr "" + +#. type: textblock +#: ../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:378 +msgid "" +"Tools that can do this include: L (with the I option), L (I<--snapshot> option). Some " +"filesystems (such as btrfs) and most Network Attached Storage devices can " +"also create cheap snapshots from files or LUNs." +msgstr "" + +#. type: textblock +#: ../clone/virt-sysprep.pod:386 +msgid "Get your NAS to snapshot and/or duplicate the LUN." +msgstr "" + +#. type: textblock +#: ../clone/virt-sysprep.pod:390 +msgid "Prepare your template using L. See below." +msgstr "" + +#. type: =head2 +#: ../clone/virt-sysprep.pod:394 +msgid "VIRT-CLONE" +msgstr "" + +#. type: textblock +#: ../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 " +"the name, UUID and MAC address of the guest in the libvirt XML." +msgstr "" + +#. type: textblock +#: ../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:404 +msgid "SPARSIFY" +msgstr "" + +#. type: verbatim +#: ../clone/virt-sysprep.pod:406 +#, no-wrap +msgid "" +" virt-sparsify\n" +" original guest --------> template\n" +"\n" +msgstr "" + +#. type: textblock +#: ../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: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:415 +msgid "RESIZE" +msgstr "" + +#. type: verbatim +#: ../clone/virt-sysprep.pod:417 +#, no-wrap +msgid "" +" virt-resize\n" +" template ---------->\n" +" \\------> cloned\n" +" \\-----> guests\n" +" \\---->\n" +"\n" +msgstr "" + +#. type: textblock +#: ../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 " +"disk space), then instead of copying the template, you can run L. Virt-resize performs a copy and resize, and thus is ideal for cloning " +"guests from a template." +msgstr "" + +#. type: =head1 +#: ../clone/virt-sysprep.pod:429 ../src/guestfs.pod:1149 +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:484 +msgid "This program returns 0 on success, or 1 if there was an error." +msgstr "" + +#. type: textblock +#: ../clone/virt-sysprep.pod:488 +msgid "" +"L, L, L, L, L, L, L, L, L, L, L, L." +msgstr "" + +#. type: textblock #: ../df/virt-df.pod:5 msgid "virt-df - Display free space on virtual filesystems" msgstr "" @@ -2334,7 +3843,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 "" @@ -2365,70 +3874,6 @@ msgstr "" msgid "You might use this option in the following circumstances:" msgstr "" -#. type: =item -#: ../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 -#: ../examples/guestfs-recipes.pod:98 ../examples/guestfs-recipes.pod:102 -#: ../examples/guestfs-recipes.pod:106 ../examples/guestfs-recipes.pod:132 -#: ../examples/guestfs-recipes.pod:137 ../examples/guestfs-recipes.pod:227 -#: ../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:385 ../fish/guestfish-actions.pod:393 -#: ../fish/guestfish-actions.pod:400 ../fish/guestfish-actions.pod:407 -#: ../fish/guestfish-actions.pod:1099 ../fish/guestfish-actions.pod:1103 -#: ../fish/guestfish-actions.pod:1107 ../fish/guestfish-actions.pod:1111 -#: ../fish/guestfish-actions.pod:1119 ../fish/guestfish-actions.pod:1123 -#: ../fish/guestfish-actions.pod:1127 ../fish/guestfish-actions.pod:1137 -#: ../fish/guestfish-actions.pod:1141 ../fish/guestfish-actions.pod:1145 -#: ../fish/guestfish-actions.pod:1235 ../fish/guestfish-actions.pod:1239 -#: ../fish/guestfish-actions.pod:1244 ../fish/guestfish-actions.pod:1249 -#: ../fish/guestfish-actions.pod:1291 ../fish/guestfish-actions.pod:1295 -#: ../fish/guestfish-actions.pod:1300 ../fish/guestfish-actions.pod:1933 -#: ../fish/guestfish-actions.pod:1939 ../fish/guestfish-actions.pod:1947 -#: ../fish/guestfish-actions.pod:1954 ../fish/guestfish-actions.pod:1961 -#: ../fish/guestfish.pod:445 ../fish/guestfish.pod:449 -#: ../fish/guestfish.pod:453 ../fish/guestfish.pod:457 -#: ../inspector/virt-inspector.pod:384 ../inspector/virt-inspector.pod:388 -#: ../resize/virt-resize.pod:282 ../resize/virt-resize.pod:286 -#: ../resize/virt-resize.pod:295 ../resize/virt-resize.pod:301 -#: ../src/guestfs-actions.pod:22 ../src/guestfs-actions.pod:29 -#: ../src/guestfs-actions.pod:583 ../src/guestfs-actions.pod:591 -#: ../src/guestfs-actions.pod:598 ../src/guestfs-actions.pod:605 -#: ../src/guestfs-actions.pod:1662 ../src/guestfs-actions.pod:1666 -#: ../src/guestfs-actions.pod:1670 ../src/guestfs-actions.pod:1674 -#: ../src/guestfs-actions.pod:1682 ../src/guestfs-actions.pod:1686 -#: ../src/guestfs-actions.pod:1690 ../src/guestfs-actions.pod:1700 -#: ../src/guestfs-actions.pod:1704 ../src/guestfs-actions.pod:1708 -#: ../src/guestfs-actions.pod:1846 ../src/guestfs-actions.pod:1850 -#: ../src/guestfs-actions.pod:1855 ../src/guestfs-actions.pod:1860 -#: ../src/guestfs-actions.pod:1921 ../src/guestfs-actions.pod:1925 -#: ../src/guestfs-actions.pod:1930 ../src/guestfs-actions.pod:2859 -#: ../src/guestfs-actions.pod:2865 ../src/guestfs-actions.pod:2873 -#: ../src/guestfs-actions.pod:2880 ../src/guestfs-actions.pod:2887 -#: ../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:1064 -#: ../src/guestfs.pod:1068 ../src/guestfs.pod:1072 ../src/guestfs.pod:1077 -#: ../src/guestfs.pod:1085 ../src/guestfs.pod:1104 ../src/guestfs.pod:1112 -#: ../src/guestfs.pod:1134 ../src/guestfs.pod:1138 ../src/guestfs.pod:1142 -#: ../src/guestfs.pod:1146 ../src/guestfs.pod:1150 ../src/guestfs.pod:1154 -#: ../src/guestfs.pod:1644 ../src/guestfs.pod:1649 ../src/guestfs.pod:1653 -#: ../src/guestfs.pod:1755 ../src/guestfs.pod:1760 ../src/guestfs.pod:1764 -#: ../src/guestfs.pod:1774 ../src/guestfs.pod:2048 ../src/guestfs.pod:2053 -#: ../src/guestfs.pod:2059 ../src/guestfs.pod:2067 ../src/guestfs.pod:2421 -#: ../src/guestfs.pod:2427 ../src/guestfs.pod:2432 ../src/guestfs.pod:2438 -#: ../src/guestfs.pod:2819 ../src/guestfs.pod:2824 ../src/guestfs.pod:2828 -#: ../src/guestfs.pod:2832 ../src/guestfs.pod:2836 ../src/guestfs.pod:2850 -#: ../src/guestfs.pod:2855 ../src/guestfs.pod:3080 ../src/guestfs.pod:3084 -#: ../src/guestfs.pod:3088 ../src/guestfs.pod:3092 -#: ../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 -msgid "*" -msgstr "" - #. type: textblock #: ../df/virt-df.pod:150 msgid "" @@ -2462,7 +3907,7 @@ msgid "" msgstr "" #. type: textblock -#: ../df/virt-df.pod:224 +#: ../df/virt-df.pod:229 msgid "" "L, L, L, L, L." @@ -2651,7 +4096,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>" @@ -2659,7 +4104,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>" @@ -3022,9 +4467,9 @@ msgid "" msgstr "" #. type: =head1 -#: ../edit/virt-edit.pod:329 ../fish/guestfish.pod:1075 -#: ../rescue/virt-rescue.pod:257 ../src/guestfs.pod:2966 -#: ../test-tool/libguestfs-test-tool.pod:82 +#: ../edit/virt-edit.pod:329 ../fish/guestfish.pod:1119 +#: ../rescue/virt-rescue.pod:261 ../sparsify/virt-sparsify.pod:232 +#: ../src/guestfs.pod:3194 ../test-tool/libguestfs-test-tool.pod:95 msgid "ENVIRONMENT VARIABLES" msgstr "" @@ -3046,7 +4491,7 @@ msgid "If not set, C is used." msgstr "" #. type: textblock -#: ../edit/virt-edit.pod:351 +#: ../edit/virt-edit.pod:356 msgid "" "L, L, L, L, L, L, L, L, " @@ -3054,47 +4499,191 @@ msgid "" msgstr "" #. type: textblock -#: ../examples/guestfs-examples.pod:5 -msgid "guestfs-examples - Examples of using libguestfs from C" +#: ../erlang/examples/guestfs-erlang.pod:5 +msgid "guestfs-erlang - How to use libguestfs from Erlang" msgstr "" #. type: verbatim -#: ../examples/guestfs-examples.pod:9 ../src/guestfs.pod:9 +#: ../erlang/examples/guestfs-erlang.pod:9 #, no-wrap msgid "" -" #include \n" -" \n" +" {ok, G} = guestfs:create(),\n" +" ok = guestfs:add_drive_opts(G, Disk,\n" +" [{format, \"raw\"}, {readonly, true}]),\n" +" ok = guestfs:launch(G),\n" +" [Device] = guestfs:list_devices(G),\n" +" ok = guestfs:close(G).\n" +"\n" +msgstr "" + +#. type: textblock +#: ../erlang/examples/guestfs-erlang.pod:18 +msgid "" +"This manual page documents how to call libguestfs from the Erlang " +"programming language. This page just documents the differences from the C " +"API and gives some examples. If you are not familiar with using libguestfs, " +"you also need to read L." +msgstr "" + +#. type: =head2 +#: ../erlang/examples/guestfs-erlang.pod:23 +msgid "OPENING AND CLOSING THE HANDLE" +msgstr "" + +#. type: textblock +#: ../erlang/examples/guestfs-erlang.pod:25 +msgid "" +"The Erlang bindings are implemented using an external program called C. This program must be on the current PATH, or else you should " +"specify the full path to the program:" msgstr "" #. type: verbatim -#: ../examples/guestfs-examples.pod:11 +#: ../erlang/examples/guestfs-erlang.pod:29 #, no-wrap msgid "" -" guestfs_h *g = guestfs_create ();\n" -" guestfs_add_drive_ro (g, \"disk.img\");\n" -" guestfs_launch (g);\n" +" {ok, G} = guestfs:create().\n" "\n" msgstr "" #. type: verbatim -#: ../examples/guestfs-examples.pod:15 ../src/guestfs.pod:19 +#: ../erlang/examples/guestfs-erlang.pod:31 #, no-wrap msgid "" -" cc prog.c -o prog -lguestfs\n" -"or:\n" -" cc prog.c -o prog `pkg-config libguestfs --cflags --libs`\n" +" {ok, G} = guestfs:create(\"/path/to/erl-guestfs\").\n" "\n" msgstr "" #. type: textblock -#: ../examples/guestfs-examples.pod:21 +#: ../erlang/examples/guestfs-erlang.pod:33 +msgid "C is the libguestfs handle which you should pass to other functions." +msgstr "" + +#. type: textblock +#: ../erlang/examples/guestfs-erlang.pod:36 +msgid "To close the handle:" +msgstr "" + +#. type: verbatim +#: ../erlang/examples/guestfs-erlang.pod:38 +#, no-wrap msgid "" -"This manual page contains examples of calling libguestfs from the C " -"programming language. If you are not familiar with using libguestfs, you " -"also need to read L." +" ok = guestfs:close(G).\n" +"\n" +msgstr "" + +#. type: =head2 +#: ../erlang/examples/guestfs-erlang.pod:40 +msgid "FUNCTIONS WITH OPTIONAL ARGUMENTS" +msgstr "" + +#. type: textblock +#: ../erlang/examples/guestfs-erlang.pod:42 +msgid "" +"For functions that take optional arguments, the first arguments are the non-" +"optional ones. The last argument is a list of tuples supplying the " +"remaining optional arguments." +msgstr "" + +#. type: verbatim +#: ../erlang/examples/guestfs-erlang.pod:46 +#, no-wrap +msgid "" +" ok = guestfs:add_drive_opts(G, Disk,\n" +" [{format, \"raw\"}, {readonly, true}]).\n" +"\n" +msgstr "" + +#. type: textblock +#: ../erlang/examples/guestfs-erlang.pod:49 +msgid "If the last argument would be an empty list, you can also omit it:" +msgstr "" + +#. type: verbatim +#: ../erlang/examples/guestfs-erlang.pod:51 +#, no-wrap +msgid "" +" ok = guestfs:add_drive_opts(G, Disk).\n" +"\n" +msgstr "" + +#. type: =head2 +#: ../erlang/examples/guestfs-erlang.pod:53 +msgid "RETURN VALUES AND ERRORS" +msgstr "" + +#. type: textblock +#: ../erlang/examples/guestfs-erlang.pod:55 +msgid "" +"On success, most functions return a C term (which could be a list, " +"string, tuple etc.). If there is nothing for the function to return, then " +"the atom C is returned." +msgstr "" + +#. type: textblock +#: ../erlang/examples/guestfs-erlang.pod:59 +msgid "On error, you would see one of the following tuples:" +msgstr "" + +#. type: =item +#: ../erlang/examples/guestfs-erlang.pod:63 +msgid "C<{error, Msg, Errno}>" +msgstr "" + +#. type: textblock +#: ../erlang/examples/guestfs-erlang.pod:65 +msgid "This indicates an ordinary error from the function." +msgstr "" + +#. type: textblock +#: ../erlang/examples/guestfs-erlang.pod:67 +msgid "" +"C is the error message (string) and C is the Unix error " +"(integer)." +msgstr "" + +#. type: textblock +#: ../erlang/examples/guestfs-erlang.pod:70 +msgid "C can be zero. See L." +msgstr "" + +#. type: =item +#: ../erlang/examples/guestfs-erlang.pod:72 +msgid "C<{unknown, Function}>" +msgstr "" + +#. type: textblock +#: ../erlang/examples/guestfs-erlang.pod:74 +msgid "" +"This indicates that the function you called is not known. Generally this " +"means you are mixing C from another version of libguestfs, " +"which you should not do." +msgstr "" + +#. type: textblock +#: ../erlang/examples/guestfs-erlang.pod:78 +msgid "C is the name of the unknown function." +msgstr "" + +#. type: =item +#: ../erlang/examples/guestfs-erlang.pod:80 +msgid "C<{unknownarg, Arg}>" +msgstr "" + +#. type: textblock +#: ../erlang/examples/guestfs-erlang.pod:82 +msgid "" +"This indicates that you called a function with optional arguments, with an " +"unknown argument name." +msgstr "" + +#. type: textblock +#: ../erlang/examples/guestfs-erlang.pod:85 +msgid "C is the name of the unknown argument." msgstr "" #. type: =head1 +#: ../erlang/examples/guestfs-erlang.pod:89 #: ../examples/guestfs-examples.pod:25 ../java/examples/guestfs-java.pod:37 #: ../ocaml/examples/guestfs-ocaml.pod:70 ../perl/examples/guestfs-perl.pod:31 #: ../python/examples/guestfs-python.pod:34 @@ -3103,6 +4692,7 @@ msgid "EXAMPLE 1: CREATE A DISK IMAGE" msgstr "" #. type: textblock +#: ../erlang/examples/guestfs-erlang.pod:91 #: ../examples/guestfs-examples.pod:27 ../java/examples/guestfs-java.pod:39 #: ../ocaml/examples/guestfs-ocaml.pod:72 ../perl/examples/guestfs-perl.pod:33 #: ../python/examples/guestfs-python.pod:36 @@ -3111,6 +4701,7 @@ msgid "@EXAMPLE1@" msgstr "" #. type: =head1 +#: ../erlang/examples/guestfs-erlang.pod:93 #: ../examples/guestfs-examples.pod:29 ../java/examples/guestfs-java.pod:41 #: ../ocaml/examples/guestfs-ocaml.pod:74 ../perl/examples/guestfs-perl.pod:35 #: ../python/examples/guestfs-python.pod:38 @@ -3119,6 +4710,7 @@ msgid "EXAMPLE 2: INSPECT A VIRTUAL MACHINE DISK IMAGE" msgstr "" #. type: textblock +#: ../erlang/examples/guestfs-erlang.pod:95 #: ../examples/guestfs-examples.pod:31 ../java/examples/guestfs-java.pod:43 #: ../ocaml/examples/guestfs-ocaml.pod:76 ../perl/examples/guestfs-perl.pod:37 #: ../python/examples/guestfs-python.pod:40 @@ -3127,64 +4719,67 @@ msgid "@EXAMPLE2@" msgstr "" #. type: textblock -#: ../examples/guestfs-examples.pod:35 +#: ../erlang/examples/guestfs-erlang.pod:99 msgid "" -"L, L, L, L, " -"L, L, L, L." +"L, L, L, L, L, L, L, " +"L, L. L." msgstr "" #. type: =head1 -#: ../examples/guestfs-examples.pod:44 ../examples/guestfs-recipes.pod:396 -#: ../fish/guestfish.pod:1249 ../fish/virt-copy-in.pod:60 +#: ../erlang/examples/guestfs-erlang.pod:110 +#: ../examples/guestfs-examples.pod:45 ../examples/guestfs-recipes.pod:397 +#: ../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:314 -#: ../inspector/virt-inspector.pod:380 ../java/examples/guestfs-java.pod:57 -#: ../ocaml/examples/guestfs-ocaml.pod:90 ../perl/examples/guestfs-perl.pod:51 -#: ../python/examples/guestfs-python.pod:53 -#: ../ruby/examples/guestfs-ruby.pod:47 ../src/guestfs.pod:3099 -#: ../test-tool/libguestfs-test-tool.pod:93 +#: ../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:3333 +#: ../test-tool/libguestfs-test-tool.pod:106 msgid "AUTHORS" msgstr "" #. type: textblock -#: ../examples/guestfs-examples.pod:46 ../examples/guestfs-recipes.pod:398 -#: ../fish/guestfish.pod:1251 ../fish/virt-copy-in.pod:62 +#: ../erlang/examples/guestfs-erlang.pod:112 +#: ../examples/guestfs-examples.pod:47 ../examples/guestfs-recipes.pod:399 +#: ../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:316 -#: ../java/examples/guestfs-java.pod:59 ../ocaml/examples/guestfs-ocaml.pod:92 -#: ../perl/examples/guestfs-perl.pod:53 -#: ../python/examples/guestfs-python.pod:55 -#: ../ruby/examples/guestfs-ruby.pod:49 ../src/guestfs.pod:3101 -#: ../test-tool/libguestfs-test-tool.pod:95 +#: ../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:3335 +#: ../test-tool/libguestfs-test-tool.pod:108 msgid "Richard W.M. Jones (C)" msgstr "" #. type: textblock -#: ../examples/guestfs-examples.pod:50 ../ocaml/examples/guestfs-ocaml.pod:96 -#: ../python/examples/guestfs-python.pod:59 -#: ../ruby/examples/guestfs-ruby.pod:53 -msgid "Copyright (C) 2010 Red Hat Inc. L" +#: ../erlang/examples/guestfs-erlang.pod:116 +#: ../java/examples/guestfs-java.pod:64 ../perl/examples/guestfs-perl.pod:58 +msgid "Copyright (C) 2011 Red Hat Inc. L" msgstr "" #. type: textblock -#: ../examples/guestfs-examples.pod:52 ../examples/guestfs-recipes.pod:404 -#: ../java/examples/guestfs-java.pod:65 ../ocaml/examples/guestfs-ocaml.pod:98 -#: ../perl/examples/guestfs-perl.pod:59 -#: ../python/examples/guestfs-python.pod:61 -#: ../ruby/examples/guestfs-ruby.pod:55 +#: ../erlang/examples/guestfs-erlang.pod:118 +#: ../examples/guestfs-examples.pod:53 ../examples/guestfs-recipes.pod:405 +#: ../java/examples/guestfs-java.pod:66 ../ocaml/examples/guestfs-ocaml.pod:99 +#: ../perl/examples/guestfs-perl.pod:60 +#: ../python/examples/guestfs-python.pod:62 +#: ../ruby/examples/guestfs-ruby.pod:56 msgid "" "The examples in this manual page may be freely copied, modified and " "distributed without any restrictions." msgstr "" #. type: textblock -#: ../examples/guestfs-examples.pod:55 ../examples/guestfs-recipes.pod:407 -#: ../java/examples/guestfs-java.pod:68 -#: ../ocaml/examples/guestfs-ocaml.pod:101 -#: ../perl/examples/guestfs-perl.pod:62 -#: ../python/examples/guestfs-python.pod:64 -#: ../ruby/examples/guestfs-ruby.pod:58 ../src/guestfs.pod:3108 +#: ../erlang/examples/guestfs-erlang.pod:121 +#: ../examples/guestfs-examples.pod:56 ../examples/guestfs-recipes.pod:408 +#: ../java/examples/guestfs-java.pod:69 +#: ../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:3342 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 " @@ -3193,12 +4788,13 @@ msgid "" msgstr "" #. type: textblock -#: ../examples/guestfs-examples.pod:60 ../examples/guestfs-recipes.pod:412 -#: ../java/examples/guestfs-java.pod:73 -#: ../ocaml/examples/guestfs-ocaml.pod:106 -#: ../perl/examples/guestfs-perl.pod:67 -#: ../python/examples/guestfs-python.pod:69 -#: ../ruby/examples/guestfs-ruby.pod:63 ../src/guestfs.pod:3113 +#: ../erlang/examples/guestfs-erlang.pod:126 +#: ../examples/guestfs-examples.pod:61 ../examples/guestfs-recipes.pod:413 +#: ../java/examples/guestfs-java.pod:74 +#: ../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:3347 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 " @@ -3207,18 +4803,75 @@ msgid "" msgstr "" #. type: textblock -#: ../examples/guestfs-examples.pod:65 ../examples/guestfs-recipes.pod:417 -#: ../java/examples/guestfs-java.pod:78 -#: ../ocaml/examples/guestfs-ocaml.pod:111 -#: ../perl/examples/guestfs-perl.pod:72 -#: ../python/examples/guestfs-python.pod:74 -#: ../ruby/examples/guestfs-ruby.pod:68 ../src/guestfs.pod:3118 +#: ../erlang/examples/guestfs-erlang.pod:131 +#: ../examples/guestfs-examples.pod:66 ../examples/guestfs-recipes.pod:418 +#: ../java/examples/guestfs-java.pod:79 +#: ../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:3352 msgid "" "You should have received a copy of the GNU Lesser General Public License " "along with this library; if not, write to the Free Software Foundation, " "Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA" msgstr "" +#. type: textblock +#: ../examples/guestfs-examples.pod:5 +msgid "guestfs-examples - Examples of using libguestfs from C" +msgstr "" + +#. type: verbatim +#: ../examples/guestfs-examples.pod:9 ../src/guestfs.pod:9 +#, no-wrap +msgid "" +" #include \n" +" \n" +msgstr "" + +#. type: verbatim +#: ../examples/guestfs-examples.pod:11 +#, no-wrap +msgid "" +" guestfs_h *g = guestfs_create ();\n" +" guestfs_add_drive_ro (g, \"disk.img\");\n" +" guestfs_launch (g);\n" +"\n" +msgstr "" + +#. type: verbatim +#: ../examples/guestfs-examples.pod:15 ../src/guestfs.pod:19 +#, no-wrap +msgid "" +" cc prog.c -o prog -lguestfs\n" +"or:\n" +" cc prog.c -o prog `pkg-config libguestfs --cflags --libs`\n" +"\n" +msgstr "" + +#. type: textblock +#: ../examples/guestfs-examples.pod:21 +msgid "" +"This manual page contains examples of calling libguestfs from the C " +"programming language. If you are not familiar with using libguestfs, you " +"also need to read L." +msgstr "" + +#. type: textblock +#: ../examples/guestfs-examples.pod:35 +msgid "" +"L, L, L, L, L, L, L, " +"L, L." +msgstr "" + +#. type: textblock +#: ../examples/guestfs-examples.pod:51 ../ocaml/examples/guestfs-ocaml.pod:97 +#: ../python/examples/guestfs-python.pod:60 +#: ../ruby/examples/guestfs-ruby.pod:54 +msgid "Copyright (C) 2010 Red Hat Inc. L" +msgstr "" + #. type: =end #: ../examples/guestfs-recipes.pod:3 ../examples/guestfs-recipes.pod:12 msgid "comment" @@ -3501,9 +5154,10 @@ msgstr "" #. type: textblock #: ../examples/guestfs-recipes.pod:128 ../fish/guestfish-actions.pod:9 -#: ../fish/guestfish-actions.pod:1287 ../fish/guestfish-actions.pod:1929 -#: ../src/guestfs-actions.pod:18 ../src/guestfs-actions.pod:1917 -#: ../src/guestfs-actions.pod:2855 ../src/guestfs.pod:1640 +#: ../fish/guestfish-actions.pod:1327 ../fish/guestfish-actions.pod:1592 +#: ../fish/guestfish-actions.pod:2009 ../src/guestfs-actions.pod:18 +#: ../src/guestfs-actions.pod:2033 ../src/guestfs-actions.pod:2457 +#: ../src/guestfs-actions.pod:3016 ../src/guestfs.pod:1670 #: ../tools/virt-win-reg.pl:706 msgid "Notes:" msgstr "" @@ -3578,7 +5232,7 @@ msgid "" msgstr "" #. type: verbatim -#: ../examples/guestfs-recipes.pod:164 +#: ../examples/guestfs-recipes.pod:164 ../fish/guestfish.pod:984 #, no-wrap msgid "" " set -e\n" @@ -4047,13 +5701,13 @@ msgstr "" #. type: textblock #: ../examples/guestfs-recipes.pod:386 msgid "" -"L, L, L, L, " -"L, L, L, L, L." +"L, L, L, L, L, L, L, L, L, L." msgstr "" #. type: textblock -#: ../examples/guestfs-recipes.pod:402 +#: ../examples/guestfs-recipes.pod:403 msgid "Copyright (C) 2009-2011 Red Hat Inc. L" msgstr "" @@ -4107,22 +5761,21 @@ msgstr "" #. type: textblock #: ../fish/guestfish-actions.pod:31 ../fish/guestfish-actions.pod:166 -#: ../fish/guestfish-actions.pod:180 ../fish/guestfish-actions.pod:986 -#: ../fish/guestfish-actions.pod:1346 ../fish/guestfish-actions.pod:1360 -#: ../fish/guestfish-actions.pod:3085 ../fish/guestfish-actions.pod:3292 -#: ../fish/guestfish-actions.pod:3406 ../fish/guestfish-actions.pod:3454 -#: ../fish/guestfish-actions.pod:4355 ../fish/guestfish-actions.pod:4378 -#: ../fish/guestfish-actions.pod:4400 ../fish/guestfish-actions.pod:4438 -#: ../fish/guestfish-actions.pod:5087 ../fish/guestfish-actions.pod:5185 -#: ../src/guestfs-actions.pod:10 ../src/guestfs-actions.pod:252 -#: ../src/guestfs-actions.pod:273 ../src/guestfs-actions.pod:1503 -#: ../src/guestfs-actions.pod:2002 ../src/guestfs-actions.pod:2023 -#: ../src/guestfs-actions.pod:4618 ../src/guestfs-actions.pod:4921 -#: ../src/guestfs-actions.pod:5150 ../src/guestfs-actions.pod:5250 -#: ../src/guestfs-actions.pod:6516 ../src/guestfs-actions.pod:6560 -#: ../src/guestfs-actions.pod:6594 ../src/guestfs-actions.pod:6657 -#: ../src/guestfs-actions.pod:7589 ../src/guestfs-actions.pod:7698 -#: ../src/guestfs-actions.pod:7873 +#: ../fish/guestfish-actions.pod:180 ../fish/guestfish-actions.pod:1026 +#: ../fish/guestfish-actions.pod:1386 ../fish/guestfish-actions.pod:1400 +#: ../fish/guestfish-actions.pod:3170 ../fish/guestfish-actions.pod:3481 +#: ../fish/guestfish-actions.pod:3529 ../fish/guestfish-actions.pod:4442 +#: ../fish/guestfish-actions.pod:4465 ../fish/guestfish-actions.pod:4487 +#: ../fish/guestfish-actions.pod:4525 ../fish/guestfish-actions.pod:5174 +#: ../fish/guestfish-actions.pod:5280 ../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:4784 +#: ../src/guestfs-actions.pod:5306 ../src/guestfs-actions.pod:5406 +#: ../src/guestfs-actions.pod:6688 ../src/guestfs-actions.pod:6732 +#: ../src/guestfs-actions.pod:6766 ../src/guestfs-actions.pod:6829 +#: ../src/guestfs-actions.pod:7761 ../src/guestfs-actions.pod:7870 +#: ../src/guestfs-actions.pod:8053 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 " @@ -4215,9 +5868,10 @@ msgstr "" #. type: textblock #: ../fish/guestfish-actions.pod:79 ../fish/guestfish-actions.pod:143 -#: ../fish/guestfish-actions.pod:568 ../fish/guestfish-actions.pod:1968 -#: ../fish/guestfish-actions.pod:3134 ../fish/guestfish-actions.pod:3307 -#: ../fish/guestfish-actions.pod:3442 +#: ../fish/guestfish-actions.pod:573 ../fish/guestfish-actions.pod:784 +#: ../fish/guestfish-actions.pod:805 ../fish/guestfish-actions.pod:2048 +#: ../fish/guestfish-actions.pod:3219 ../fish/guestfish-actions.pod:3382 +#: ../fish/guestfish-actions.pod:3517 msgid "" "This command has one or more optional arguments. See L." msgstr "" @@ -4294,8 +5948,8 @@ msgid "This call checks that C exists." msgstr "" #. type: textblock -#: ../fish/guestfish-actions.pod:115 ../fish/guestfish-actions.pod:3096 -#: ../src/guestfs-actions.pod:173 ../src/guestfs-actions.pod:4655 +#: ../fish/guestfish-actions.pod:115 ../fish/guestfish-actions.pod:3181 +#: ../src/guestfs-actions.pod:173 ../src/guestfs-actions.pod:4821 msgid "The optional arguments are:" msgstr "" @@ -4601,56 +6255,64 @@ msgstr "" #. type: textblock #: ../fish/guestfish-actions.pod:264 ../src/guestfs-actions.pod:402 -msgid "Typecheck lenses (can be expensive)." +msgid "Typecheck lenses." +msgstr "" + +#. type: textblock +#: ../fish/guestfish-actions.pod:266 +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 " +"set the C environment variable or call L." msgstr "" #. type: =item -#: ../fish/guestfish-actions.pod:266 ../src/guestfs-actions.pod:404 +#: ../fish/guestfish-actions.pod:271 ../src/guestfs-actions.pod:409 msgid "C = 8" msgstr "" #. type: textblock -#: ../fish/guestfish-actions.pod:268 ../src/guestfs-actions.pod:406 +#: ../fish/guestfish-actions.pod:273 ../src/guestfs-actions.pod:411 msgid "Do not use standard load path for modules." msgstr "" #. type: =item -#: ../fish/guestfish-actions.pod:270 ../src/guestfs-actions.pod:408 +#: ../fish/guestfish-actions.pod:275 ../src/guestfs-actions.pod:413 msgid "C = 16" msgstr "" #. type: textblock -#: ../fish/guestfish-actions.pod:272 ../src/guestfs-actions.pod:410 +#: ../fish/guestfish-actions.pod:277 ../src/guestfs-actions.pod:415 msgid "Make save a no-op, just record what would have been changed." msgstr "" #. type: =item -#: ../fish/guestfish-actions.pod:274 ../src/guestfs-actions.pod:412 +#: ../fish/guestfish-actions.pod:279 ../src/guestfs-actions.pod:417 msgid "C = 32" msgstr "" #. type: textblock -#: ../fish/guestfish-actions.pod:276 +#: ../fish/guestfish-actions.pod:281 msgid "Do not load the tree in L." msgstr "" #. type: textblock -#: ../fish/guestfish-actions.pod:280 +#: ../fish/guestfish-actions.pod:285 msgid "To close the handle, you can call L." msgstr "" #. type: textblock -#: ../fish/guestfish-actions.pod:282 ../src/guestfs-actions.pod:420 +#: ../fish/guestfish-actions.pod:287 ../src/guestfs-actions.pod:425 msgid "To find out more about Augeas, see L." msgstr "" #. type: =head2 -#: ../fish/guestfish-actions.pod:284 +#: ../fish/guestfish-actions.pod:289 msgid "aug-insert" msgstr "" #. type: verbatim -#: ../fish/guestfish-actions.pod:286 +#: ../fish/guestfish-actions.pod:291 #, no-wrap msgid "" " aug-insert augpath label true|false\n" @@ -4658,26 +6320,26 @@ msgid "" msgstr "" #. type: textblock -#: ../fish/guestfish-actions.pod:288 ../src/guestfs-actions.pod:434 +#: ../fish/guestfish-actions.pod:293 ../src/guestfs-actions.pod:439 msgid "" "Create a new sibling C