[Pkg-libvirt-commits] [libguestfs] 153/266: Version 1.27.29.
Hilko Bengen
bengen at moszumanska.debian.org
Fri Oct 3 14:41:55 UTC 2014
This is an automated email from the git hooks/post-receive script.
bengen pushed a commit to annotated tag debian/1%1.27.35-1
in repository libguestfs.
commit 1e1ceb52730d22cf06a0fa098f9382a7071c7ca1
Author: Richard W.M. Jones <rjones at redhat.com>
Date: Thu Aug 21 17:08:35 2014 +0100
Version 1.27.29.
---
BUGS | 2 +-
configure.ac | 2 +-
po-docs/ja.po | 762 ++++++++++++++++++++++++++++++++------------
po-docs/libguestfs-docs.pot | 738 ++++++++++++++++++++++++++++++------------
po-docs/uk.po | 762 ++++++++++++++++++++++++++++++++------------
po/en_GB.po | 228 +++++++------
po/es.po | 228 +++++++------
po/gu.po | 228 +++++++------
po/hi.po | 228 +++++++------
po/kn.po | 228 +++++++------
po/libguestfs.pot | 230 +++++++------
po/ml.po | 228 +++++++------
po/mr.po | 228 +++++++------
po/nl.po | 228 +++++++------
po/or.po | 228 +++++++------
po/pa.po | 228 +++++++------
po/pl.po | 228 +++++++------
po/ta.po | 228 +++++++------
po/te.po | 228 +++++++------
po/uk.po | 228 +++++++------
20 files changed, 3521 insertions(+), 2167 deletions(-)
diff --git a/BUGS b/BUGS
index e1216af..5020ba0 100644
--- a/BUGS
+++ b/BUGS
@@ -1,5 +1,5 @@
NOTE: This file is automatically generated from "update-bugs.sh".
-Last updated: 2014-08-19
+Last updated: 2014-08-21
This contains a local list of the bugs that are open against
libguestfs. Bugs are tracked in the Red Hat Bugzilla database
diff --git a/configure.ac b/configure.ac
index 4cbb5ec..678f9ef 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,7 +26,7 @@
# freeform string.
m4_define([libguestfs_major], [1])
m4_define([libguestfs_minor], [27])
-m4_define([libguestfs_release], [28])
+m4_define([libguestfs_release], [29])
AC_INIT([libguestfs],libguestfs_major.libguestfs_minor.libguestfs_release)
AC_CONFIG_AUX_DIR([build-aux])
diff --git a/po-docs/ja.po b/po-docs/ja.po
index 6ed0bdf..9fb3cc7 100644
--- a/po-docs/ja.po
+++ b/po-docs/ja.po
@@ -12,7 +12,7 @@ msgid ""
msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: libguestfs at redhat.com\n"
-"POT-Creation-Date: 2014-08-19 17:51+0200\n"
+"POT-Creation-Date: 2014-08-21 17:07+0200\n"
"PO-Revision-Date: 2014-07-22 18:04+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Japanese (http://www.transifex.com/projects/p/libguestfs/"
@@ -395,7 +395,7 @@ msgstr ""
#: ../resize/virt-resize.pod:266 ../sparsify/virt-sparsify.pod:114
#: ../sysprep/virt-sysprep.pod:38 ../test-tool/libguestfs-test-tool.pod:34
#: ../tools/virt-list-filesystems:52 ../tools/virt-list-partitions:53
-#: ../tools/virt-tar:100 ../tools/virt-win-reg:93 ../v2v/virt-v2v.pod:29
+#: ../tools/virt-tar:100 ../tools/virt-win-reg:93 ../v2v/virt-v2v.pod:116
msgid "OPTIONS"
msgstr "オプション"
@@ -414,7 +414,7 @@ msgstr "オプション"
#: ../resize/virt-resize.pod:270 ../sparsify/virt-sparsify.pod:118
#: ../sysprep/virt-sysprep.pod:42 ../test-tool/libguestfs-test-tool.pod:38
#: ../tools/virt-list-filesystems:60 ../tools/virt-list-partitions:61
-#: ../tools/virt-tar:108 ../tools/virt-win-reg:101 ../v2v/virt-v2v.pod:33
+#: ../tools/virt-tar:108 ../tools/virt-win-reg:101 ../v2v/virt-v2v.pod:120
msgid "B<--help>"
msgstr "B<--help>"
@@ -718,7 +718,7 @@ msgstr ""
#: ../align/virt-alignment-scan.pod:177 ../customize/virt-customize.pod:178
#: ../fuse/guestunmount.pod:83 ../resize/virt-resize.pod:507
#: ../sparsify/virt-sparsify.pod:243 ../sysprep/virt-sysprep.pod:211
-#: ../v2v/virt-v2v.pod:193
+#: ../v2v/virt-v2v.pod:304
msgid "B<-q>"
msgstr "B<-q>"
@@ -726,7 +726,7 @@ msgstr "B<-q>"
#: ../align/virt-alignment-scan.pod:179 ../builder/virt-builder.pod:452
#: ../customize/virt-customize.pod:180 ../fuse/guestunmount.pod:85
#: ../resize/virt-resize.pod:509 ../sparsify/virt-sparsify.pod:245
-#: ../sysprep/virt-sysprep.pod:213 ../v2v/virt-v2v.pod:195
+#: ../sysprep/virt-sysprep.pod:213 ../v2v/virt-v2v.pod:306
msgid "B<--quiet>"
msgstr "B<--quiet>"
@@ -776,7 +776,7 @@ msgstr ""
#: ../make-fs/virt-make-fs.pod:197 ../p2v/virt-p2v.pod:191
#: ../rescue/virt-rescue.pod:238 ../resize/virt-resize.pod:577
#: ../sparsify/virt-sparsify.pod:292 ../sysprep/virt-sysprep.pod:219
-#: ../v2v/virt-v2v.pod:280
+#: ../v2v/virt-v2v.pod:391
msgid "B<-v>"
msgstr "B<-v>"
@@ -791,7 +791,7 @@ msgstr "B<-v>"
#: ../make-fs/virt-make-fs.pod:199 ../p2v/virt-p2v.pod:193
#: ../rescue/virt-rescue.pod:240 ../resize/virt-resize.pod:579
#: ../sparsify/virt-sparsify.pod:294 ../sysprep/virt-sysprep.pod:221
-#: ../v2v/virt-v2v.pod:282
+#: ../v2v/virt-v2v.pod:393
msgid "B<--verbose>"
msgstr "B<--verbose>"
@@ -803,7 +803,7 @@ msgstr "B<--verbose>"
#: ../edit/virt-edit.pod:207 ../format/virt-format.pod:157
#: ../inspector/virt-inspector.pod:120 ../rescue/virt-rescue.pod:242
#: ../sparsify/virt-sparsify.pod:296 ../sysprep/virt-sysprep.pod:223
-#: ../v2v/virt-v2v.pod:284
+#: ../v2v/virt-v2v.pod:395
msgid "Enable verbose messages for debugging."
msgstr "デバッグ用の冗長なメッセージを有効にします。"
@@ -821,7 +821,7 @@ msgstr "デバッグ用の冗長なメッセージを有効にします。"
#: ../p2v/virt-p2v.pod:197 ../rescue/virt-rescue.pod:244
#: ../resize/virt-resize.pod:583 ../sparsify/virt-sparsify.pod:298
#: ../sysprep/virt-sysprep.pod:225 ../test-tool/libguestfs-test-tool.pod:59
-#: ../v2v/virt-v2v.pod:286
+#: ../v2v/virt-v2v.pod:397
msgid "B<-V>"
msgstr "B<-V>"
@@ -840,7 +840,7 @@ msgstr "B<-V>"
#: ../resize/virt-resize.pod:585 ../sparsify/virt-sparsify.pod:300
#: ../sysprep/virt-sysprep.pod:227 ../test-tool/libguestfs-test-tool.pod:61
#: ../tools/virt-list-filesystems:68 ../tools/virt-list-partitions:69
-#: ../tools/virt-tar:116 ../tools/virt-win-reg:109 ../v2v/virt-v2v.pod:288
+#: ../tools/virt-tar:116 ../tools/virt-win-reg:109 ../v2v/virt-v2v.pod:399
msgid "B<--version>"
msgstr "B<--version>"
@@ -855,7 +855,7 @@ msgstr "B<--version>"
#: ../rescue/virt-rescue.pod:248 ../resize/virt-resize.pod:587
#: ../sparsify/virt-sparsify.pod:302 ../sysprep/virt-sysprep.pod:229
#: ../tools/virt-list-filesystems:70 ../tools/virt-list-partitions:71
-#: ../tools/virt-tar:118 ../tools/virt-win-reg:111 ../v2v/virt-v2v.pod:290
+#: ../tools/virt-tar:118 ../tools/virt-win-reg:111 ../v2v/virt-v2v.pod:401
msgid "Display version number and exit."
msgstr "バージョン番号を表示して、終了します。"
@@ -870,7 +870,7 @@ msgstr "バージョン番号を表示して、終了します。"
#: ../make-fs/virt-make-fs.pod:209 ../rescue/virt-rescue.pod:259
#: ../resize/virt-resize.pod:589 ../sparsify/virt-sparsify.pod:304
#: ../sysprep/virt-sysprep.pod:231 ../tools/virt-tar:155
-#: ../v2v/virt-v2v.pod:301
+#: ../v2v/virt-v2v.pod:412
msgid "B<-x>"
msgstr "B<-x>"
@@ -883,7 +883,7 @@ msgstr "B<-x>"
#: ../format/virt-format.pod:177 ../inspector/virt-inspector.pod:130
#: ../rescue/virt-rescue.pod:261 ../resize/virt-resize.pod:591
#: ../sparsify/virt-sparsify.pod:306 ../sysprep/virt-sysprep.pod:233
-#: ../v2v/virt-v2v.pod:303
+#: ../v2v/virt-v2v.pod:414
msgid "Enable tracing of libguestfs API calls."
msgstr "libguestfs API 呼び出しのトレースを有効にします。"
@@ -1406,9 +1406,9 @@ msgstr "このプログラムは以下を返します:"
#: ../sysprep/virt-sysprep.pod:411 ../tools/virt-win-reg:194
#: ../tools/virt-win-reg:199 ../tools/virt-win-reg:205
#: ../tools/virt-win-reg:754 ../tools/virt-win-reg:760
-#: ../tools/virt-win-reg:766 ../v2v/virt-v2v.pod:209 ../v2v/virt-v2v.pod:213
-#: ../v2v/virt-v2v.pod:217 ../v2v/virt-v2v.pod:435 ../v2v/virt-v2v.pod:440
-#: ../v2v/virt-v2v.pod:445
+#: ../tools/virt-win-reg:766 ../v2v/virt-v2v.pod:320 ../v2v/virt-v2v.pod:324
+#: ../v2v/virt-v2v.pod:328 ../v2v/virt-v2v.pod:540 ../v2v/virt-v2v.pod:545
+#: ../v2v/virt-v2v.pod:550
msgid "*"
msgstr "*"
@@ -1489,7 +1489,7 @@ msgstr ""
#: ../sparsify/virt-sparsify.pod:439 ../src/guestfs.pod:4752
#: ../sysprep/virt-sysprep.pod:548 ../test-tool/libguestfs-test-tool.pod:180
#: ../tools/virt-list-filesystems:181 ../tools/virt-list-partitions:263
-#: ../tools/virt-tar:292 ../tools/virt-win-reg:785 ../v2v/virt-v2v.pod:584
+#: ../tools/virt-tar:292 ../tools/virt-win-reg:785 ../v2v/virt-v2v.pod:738
msgid "SEE ALSO"
msgstr "関連項目"
@@ -1529,7 +1529,7 @@ msgstr "著者"
#: ../resize/virt-resize.pod:776 ../sparsify/virt-sparsify.pod:454
#: ../sysprep/virt-sysprep.pod:567 ../tools/virt-list-filesystems:195
#: ../tools/virt-list-partitions:276 ../tools/virt-tar:308
-#: ../tools/virt-win-reg:801 ../v2v/virt-v2v.pod:599
+#: ../tools/virt-win-reg:801 ../v2v/virt-v2v.pod:753
msgid "Richard W.M. Jones L<http://people.redhat.com/~rjones/>"
msgstr "Richard W.M. Jones L<http://people.redhat.com/~rjones/>"
@@ -1559,7 +1559,7 @@ msgstr "Richard W.M. Jones L<http://people.redhat.com/~rjones/>"
#: ../sparsify/virt-sparsify.pod:456 ../src/guestfs.pod:4816
#: ../sysprep/virt-sysprep.pod:571 ../test-tool/libguestfs-test-tool.pod:190
#: ../tools/virt-list-filesystems:197 ../tools/virt-list-partitions:278
-#: ../tools/virt-tar:310 ../tools/virt-win-reg:803 ../v2v/virt-v2v.pod:605
+#: ../tools/virt-tar:310 ../tools/virt-win-reg:803 ../v2v/virt-v2v.pod:759
msgid "COPYRIGHT"
msgstr "COPYRIGHT"
@@ -1888,7 +1888,7 @@ msgstr ""
#: ../fuse/guestunmount.pod:113 ../rescue/virt-rescue.pod:388
#: ../sparsify/virt-sparsify.pod:395 ../src/guestfs.pod:4644
#: ../sysprep/virt-sysprep.pod:518 ../test-tool/libguestfs-test-tool.pod:175
-#: ../v2v/virt-v2v.pod:521
+#: ../v2v/virt-v2v.pod:675
msgid "ENVIRONMENT VARIABLES"
msgstr "環境変数"
@@ -1926,7 +1926,7 @@ msgstr ""
#: ../python/examples/guestfs-python.pod:65
#: ../ruby/examples/guestfs-ruby.pod:48 ../src/guestfs.pod:4812
#: ../sysprep/virt-sysprep.pod:565 ../test-tool/libguestfs-test-tool.pod:186
-#: ../v2v/virt-v2v.pod:597
+#: ../v2v/virt-v2v.pod:751
msgid "AUTHORS"
msgstr "著者"
@@ -1956,7 +1956,7 @@ msgstr "Richard W.M. Jones (C<rjones at redhat dot com>)"
#: ../guestfs-release-notes.pod:3023 ../p2v-iso/guestfs-p2v-iso.pod:238
#: ../p2v/virt-p2v.pod:219 ../rescue/virt-rescue.pod:428
#: ../src/guestfs.pod:4818 ../test-tool/libguestfs-test-tool.pod:192
-#: ../tools/virt-list-partitions:280 ../v2v/virt-v2v.pod:607
+#: ../tools/virt-list-partitions:280 ../v2v/virt-v2v.pod:761
msgid "Copyright (C) 2009-2014 Red Hat Inc."
msgstr ""
@@ -2078,7 +2078,7 @@ msgstr ""
#: ../fish/virt-copy-out.pod:19 ../fish/virt-tar-in.pod:28
#: ../fish/virt-tar-out.pod:22 ../fuse/guestmount.pod:37
#: ../resize/virt-resize.pod:25 ../sparsify/virt-sparsify.pod:85
-#: ../tools/virt-tar:47
+#: ../tools/virt-tar:47 ../v2v/virt-v2v.pod:64
msgid "EXAMPLES"
msgstr "例"
@@ -2405,7 +2405,7 @@ msgstr ""
#. type: textblock
#: ../builder/virt-builder.pod:180 ../builder/virt-index-validate.pod:64
#: ../p2v/virt-p2v.pod:184 ../resize/virt-resize.pod:272
-#: ../sparsify/virt-sparsify.pod:120 ../v2v/virt-v2v.pod:35
+#: ../sparsify/virt-sparsify.pod:120 ../v2v/virt-v2v.pod:122
msgid "Display help."
msgstr "ヘルプを表示します。"
@@ -2788,13 +2788,13 @@ msgstr ""
#. type: =item
#: ../builder/virt-builder.pod:347 ../resize/virt-resize.pod:441
-#: ../sparsify/virt-sparsify.pod:223 ../v2v/virt-v2v.pod:87
+#: ../sparsify/virt-sparsify.pod:223 ../v2v/virt-v2v.pod:178
msgid "B<--machine-readable>"
msgstr "B<--machine-readable>"
#. type: textblock
#: ../builder/virt-builder.pod:349 ../resize/virt-resize.pod:443
-#: ../sparsify/virt-sparsify.pod:225 ../v2v/virt-v2v.pod:89
+#: ../sparsify/virt-sparsify.pod:225 ../v2v/virt-v2v.pod:180
msgid ""
"This option is used to make the output more machine friendly when being "
"parsed by other programs. See L</MACHINE READABLE OUTPUT> below."
@@ -2893,7 +2893,7 @@ msgstr ""
#: ../resize/virt-resize.pod:29 ../resize/virt-resize.pod:623
#: ../sparsify/virt-sparsify.pod:366 ../src/guestfs.pod:485
#: ../src/guestfs.pod:1819 ../src/guestfs.pod:2091 ../src/guestfs.pod:2389
-#: ../src/guestfs.pod:3883 ../v2v/virt-v2v.pod:404 ../v2v/virt-v2v.pod:456
+#: ../src/guestfs.pod:3883 ../v2v/virt-v2v.pod:561 ../v2v/virt-v2v.pod:637
msgid "1."
msgstr "1."
@@ -2913,7 +2913,7 @@ msgstr ""
#: ../resize/virt-resize.pod:42 ../resize/virt-resize.pod:630
#: ../sparsify/virt-sparsify.pod:373 ../src/guestfs.pod:491
#: ../src/guestfs.pod:1823 ../src/guestfs.pod:2095 ../src/guestfs.pod:2393
-#: ../src/guestfs.pod:3908 ../v2v/virt-v2v.pod:411 ../v2v/virt-v2v.pod:470
+#: ../src/guestfs.pod:3908 ../v2v/virt-v2v.pod:575 ../v2v/virt-v2v.pod:644
msgid "2."
msgstr "2."
@@ -2931,8 +2931,8 @@ msgstr ""
#: ../examples/guestfs-recipes.pod:418 ../rescue/virt-rescue.pod:343
#: ../resize/virt-resize.pod:50 ../resize/virt-resize.pod:636
#: ../sparsify/virt-sparsify.pod:379 ../src/guestfs.pod:502
-#: ../src/guestfs.pod:1827 ../src/guestfs.pod:2399 ../v2v/virt-v2v.pod:417
-#: ../v2v/virt-v2v.pod:478
+#: ../src/guestfs.pod:1827 ../src/guestfs.pod:2399 ../v2v/virt-v2v.pod:583
+#: ../v2v/virt-v2v.pod:650
msgid "3."
msgstr "3."
@@ -2947,7 +2947,7 @@ msgstr ""
#. type: =item
#: ../builder/virt-builder.pod:405 ../customize/virt-customize.pod:172
#: ../rescue/virt-rescue.pod:352 ../resize/virt-resize.pod:59
-#: ../v2v/virt-v2v.pod:499
+#: ../v2v/virt-v2v.pod:604
msgid "4."
msgstr "4."
@@ -5362,7 +5362,7 @@ msgstr ""
#. type: =head1
#: ../builder/virt-builder.pod:1604 ../resize/virt-resize.pod:595
-#: ../sparsify/virt-sparsify.pod:340 ../v2v/virt-v2v.pod:379
+#: ../sparsify/virt-sparsify.pod:340 ../v2v/virt-v2v.pod:612
msgid "MACHINE READABLE OUTPUT"
msgstr "マシン可読な出力"
@@ -5397,7 +5397,7 @@ msgstr ""
#. type: textblock
#: ../builder/virt-builder.pod:1621 ../resize/virt-resize.pod:613
-#: ../sparsify/virt-sparsify.pod:356 ../v2v/virt-v2v.pod:394
+#: ../sparsify/virt-sparsify.pod:356 ../v2v/virt-v2v.pod:627
msgid ""
"A list of features is printed, one per line, and the program exits with "
"status 0."
@@ -5446,7 +5446,7 @@ msgstr ""
#. type: =item
#: ../builder/virt-builder.pod:1645 ../customize/virt-customize.pod:220
-#: ../sysprep/virt-sysprep.pod:522 ../v2v/virt-v2v.pod:544
+#: ../sysprep/virt-sysprep.pod:522 ../v2v/virt-v2v.pod:698
msgid "C<VIRT_TOOLS_DATA_DIR>"
msgstr ""
@@ -5460,7 +5460,7 @@ msgstr ""
#. type: textblock
#: ../builder/virt-builder.pod:1650 ../customize/virt-customize.pod:225
-#: ../sysprep/virt-sysprep.pod:527 ../v2v/virt-v2v.pod:549
+#: ../sysprep/virt-sysprep.pod:527 ../v2v/virt-v2v.pod:703
msgid ""
"Normally you do not need to set this. If not set, a compiled-in default "
"will be used (something like C</usr/share/virt-tools>)."
@@ -5468,13 +5468,13 @@ msgstr ""
#. type: textblock
#: ../builder/virt-builder.pod:1653 ../customize/virt-customize.pod:228
-#: ../sysprep/virt-sysprep.pod:530 ../v2v/virt-v2v.pod:552
+#: ../sysprep/virt-sysprep.pod:530 ../v2v/virt-v2v.pod:706
msgid "This directory may contain the following files:"
msgstr ""
#. type: =item
#: ../builder/virt-builder.pod:1657 ../customize/virt-customize.pod:232
-#: ../sysprep/virt-sysprep.pod:534 ../v2v/virt-v2v.pod:556
+#: ../sysprep/virt-sysprep.pod:534 ../v2v/virt-v2v.pod:710
msgid "C<rhsrvany.exe>"
msgstr ""
@@ -5489,7 +5489,7 @@ msgstr ""
#. type: textblock
#: ../builder/virt-builder.pod:1663 ../customize/virt-customize.pod:238
-#: ../sysprep/virt-sysprep.pod:540 ../v2v/virt-v2v.pod:563
+#: ../sysprep/virt-sysprep.pod:540 ../v2v/virt-v2v.pod:717
msgid "See also: C<https://github.com/rwmjones/rhsrvany>"
msgstr ""
@@ -8627,7 +8627,7 @@ msgstr ""
#. type: textblock
#: ../customize/virt-customize.pod:244 ../sparsify/virt-sparsify.pod:426
-#: ../sysprep/virt-sysprep.pod:546 ../v2v/virt-v2v.pod:582
+#: ../sysprep/virt-sysprep.pod:546 ../v2v/virt-v2v.pod:736
msgid ""
"For other environment variables, see L<guestfs(3)/ENVIRONMENT VARIABLES>."
msgstr "他の環境変数は L<guestfs(3)/環境変数> を参照してください。"
@@ -8766,7 +8766,7 @@ msgstr ""
#. type: =head1
#: ../daemon/guestfsd.pod:76 ../fish/guestfish.pod:1537
#: ../fuse/guestmount.pod:391 ../rescue/virt-rescue.pod:393
-#: ../v2v/virt-v2v.pod:507
+#: ../v2v/virt-v2v.pod:661
msgid "FILES"
msgstr "ファイル"
@@ -51825,7 +51825,7 @@ msgid "L<virt-v2v(1)>, L<qemu-nbd(1)>, L<http://libguestfs.org/>."
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:215 ../v2v/virt-v2v.pod:601
+#: ../p2v/virt-p2v.pod:215 ../v2v/virt-v2v.pod:755
msgid "Matthew Booth"
msgstr ""
@@ -53411,7 +53411,7 @@ msgstr "デバッグメッセージを有効にします。"
#. type: =item
#: ../resize/virt-resize.pod:338 ../sparsify/virt-sparsify.pod:186
-#: ../v2v/virt-v2v.pod:37
+#: ../v2v/virt-v2v.pod:128
msgid "B<--debug-gc>"
msgstr "B<--debug-gc>"
@@ -53897,7 +53897,7 @@ msgstr ""
#. type: textblock
#: ../resize/virt-resize.pod:601 ../sparsify/virt-sparsify.pod:346
-#: ../v2v/virt-v2v.pod:385
+#: ../v2v/virt-v2v.pod:618
msgid "There are two ways to use this option."
msgstr "このオプションを使用するには 2 通りの方法があります。"
@@ -53930,7 +53930,7 @@ msgstr ""
#. type: textblock
#: ../resize/virt-resize.pod:616 ../sparsify/virt-sparsify.pod:359
-#: ../v2v/virt-v2v.pod:397
+#: ../v2v/virt-v2v.pod:630
msgid ""
"Secondly use the option in conjunction with other options to make the "
"regular program output more machine friendly."
@@ -53938,13 +53938,13 @@ msgstr ""
#. type: textblock
#: ../resize/virt-resize.pod:619 ../sparsify/virt-sparsify.pod:362
-#: ../v2v/virt-v2v.pod:400
+#: ../v2v/virt-v2v.pod:633
msgid "At the moment this means:"
msgstr ""
#. type: textblock
#: ../resize/virt-resize.pod:625 ../sparsify/virt-sparsify.pod:368
-#: ../v2v/virt-v2v.pod:406
+#: ../v2v/virt-v2v.pod:639
msgid ""
"Progress bar messages can be parsed from stdout by looking for this regular "
"expression:"
@@ -53952,7 +53952,7 @@ msgstr ""
#. type: verbatim
#: ../resize/virt-resize.pod:628 ../sparsify/virt-sparsify.pod:371
-#: ../v2v/virt-v2v.pod:409
+#: ../v2v/virt-v2v.pod:642
#, no-wrap
msgid ""
" ^[0-9]+/[0-9]+$\n"
@@ -53963,7 +53963,7 @@ msgstr ""
#. type: textblock
#: ../resize/virt-resize.pod:632 ../sparsify/virt-sparsify.pod:375
-#: ../v2v/virt-v2v.pod:413
+#: ../v2v/virt-v2v.pod:646
msgid ""
"The calling program should treat messages sent to stdout (except for "
"progress bar messages) as status messages. They can be logged and/or "
@@ -54661,7 +54661,7 @@ msgstr ""
"\n"
#. type: textblock
-#: ../sparsify/virt-sparsify.pod:247 ../v2v/virt-v2v.pod:197
+#: ../sparsify/virt-sparsify.pod:247 ../v2v/virt-v2v.pod:308
msgid "This disables progress bars and other unnecessary output."
msgstr ""
@@ -54844,7 +54844,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../sparsify/virt-sparsify.pod:401 ../v2v/virt-v2v.pod:527
+#: ../sparsify/virt-sparsify.pod:401 ../v2v/virt-v2v.pod:681
msgid ""
"Location of the temporary directory used for the potentially large temporary "
"overlay file."
@@ -54858,7 +54858,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../sparsify/virt-sparsify.pod:407 ../v2v/virt-v2v.pod:530
+#: ../sparsify/virt-sparsify.pod:407 ../v2v/virt-v2v.pod:684
msgid ""
"You should ensure there is enough free space in the worst case for a full "
"copy of the source disk (I<virtual> size), or else set C<$TMPDIR> to point "
@@ -54866,7 +54866,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../sparsify/virt-sparsify.pod:411 ../v2v/virt-v2v.pod:534
+#: ../sparsify/virt-sparsify.pod:411 ../v2v/virt-v2v.pod:688
msgid "This defaults to C</tmp>."
msgstr "この初期値は C</tmp> です。"
@@ -54881,7 +54881,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../sparsify/virt-sparsify.pod:419 ../v2v/virt-v2v.pod:542
+#: ../sparsify/virt-sparsify.pod:419 ../v2v/virt-v2v.pod:696
#, no-wrap
msgid ""
" mount -o remount,size=10G /tmp\n"
@@ -87549,12 +87549,12 @@ msgstr ""
#: ../v2v/virt-v2v.pod:7
#, no-wrap
msgid ""
-" virt-v2v -ic esx://esx.example.com/ -os imported esx_guest\n"
+" virt-v2v -ic esx://esx.example.com/ esx_guest\n"
"\n"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:9
+#: ../v2v/virt-v2v.pod:9 ../v2v/virt-v2v.pod:86
#, no-wrap
msgid ""
" virt-v2v -ic esx://esx.example.com/ \\\n"
@@ -87563,7 +87563,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:12
+#: ../v2v/virt-v2v.pod:12 ../v2v/virt-v2v.pod:110
#, no-wrap
msgid ""
" virt-v2v -i libvirtxml -o local -os /tmp guest-domain.xml\n"
@@ -87571,7 +87571,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:14
+#: ../v2v/virt-v2v.pod:14 ../v2v/virt-v2v.pod:100
#, no-wrap
msgid ""
" virt-v2v -i disk -o local -os /tmp disk.img\n"
@@ -87601,27 +87601,207 @@ msgid ""
"E<ge> 1.28."
msgstr ""
+#. type: =head1
+#: ../v2v/virt-v2v.pod:29
+#, fuzzy
+#| msgid "OUTPUT MODES"
+msgid "INPUT AND OUTPUT MODES"
+msgstr "出力モード"
+
+#. type: verbatim
+#: ../v2v/virt-v2v.pod:31
+#, no-wrap
+msgid ""
+" ┌────────────┐\n"
+" -i disk ───────────┐ │ │ ┌───────> -o local\n"
+" │ │ virt-v2v │ │\n"
+" └──> │ conversion │ ──┘\n"
+" -i libvirt ───────────> │ server │ ────────> -o libvirt\n"
+" (default) ┌──> │ │ ──┐ (default)\n"
+" │ │ │ │\n"
+" -i libvirtxml ─────┘ │ │ └────────> -o rhev\n"
+" └────────────┘\n"
+"\n"
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:41
+msgid ""
+"Virt-v2v has a number of possible input and output modes, selected using the "
+"I<-i> and I<-o> options. Only one input and output mode can be selected for "
+"each run of virt-v2v."
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:45
+msgid ""
+"I<-i libvirt> is used for reading from any libvirt source. Since libvirt "
+"can connect to many different hypervisors, it is used for reading guests "
+"from VMware ESX, RHEL 5 Xen and more. The I<-ic> option selects the precise "
+"libvirt source."
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:50
+msgid ""
+"I<-i disk> is used for reading from local disk images (mainly for testing)."
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:53
+msgid ""
+"I<-i libvirtxml> is used to read from libvirt XML files. This is the method "
+"used by L<virt-p2v(1)> behind the scenes."
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:56
+msgid ""
+"I<-o libvirt> is used for writing to any libvirt target. Libvirt can "
+"connect to local or remote KVM hypervisors. The I<-oc> option selects the "
+"precise libvirt target."
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:60
+msgid ""
+"I<-o local> is used to write to a local disk image (mainly for testing)."
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:62
+msgid "I<-o rhev> is used to write to a RHEV-M / oVirt target."
+msgstr ""
+
+#. type: =head2
+#: ../v2v/virt-v2v.pod:66
+msgid "Convert from VMware ESX server to local libvirt"
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:68
+msgid ""
+"You have a VMware ESX server called C<esx.example.com>. You want to convert "
+"a guest called C<esx_guest> to run locally under libvirt."
+msgstr ""
+
+#. type: verbatim
+#: ../v2v/virt-v2v.pod:71
+#, no-wrap
+msgid ""
+" virt-v2v -ic esx://example.com esx_guest\n"
+"\n"
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:73
+msgid ""
+"In this case you will most likely have to run virt-v2v as C<root>, since it "
+"needs to talk to the system libvirt daemon and copy the guest disks to C</"
+"var/lib/libvirt/images>."
+msgstr ""
+
+#. type: =head2
+#: ../v2v/virt-v2v.pod:77
+msgid "Convert from ESX to RHEV-M/oVirt"
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:79
+msgid ""
+"This is the same as the previous example, except you want to send the guest "
+"to a RHEV-M Export Storage Domain which is located remotely (over NFS) at "
+"C<rhev.nfs:/export_domain>. If you are unclear about the location of the "
+"Export Storage Domain you should check the settings on your RHEV-M "
+"management console. Guest network interface(s) are connected to the target "
+"network called C<rhevm>."
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:89
+msgid "In this case the host running virt-v2v acts as a B<conversion server>."
+msgstr ""
+
#. type: textblock
-#: ../v2v/virt-v2v.pod:39
+#: ../v2v/virt-v2v.pod:91
+msgid ""
+"Note that after conversion, the guest will appear in the RHEV-M Export "
+"Storage Domain, from where you will need to import it using the RHEV-M user "
+"interface."
+msgstr ""
+
+#. type: =head2
+#: ../v2v/virt-v2v.pod:95
+#, fuzzy
+#| msgid "Create empty disk images"
+msgid "Convert disk image to disk image"
+msgstr "空のディスクイメージを作成します"
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:97
+msgid ""
+"Given a disk image from another hypervisor that you want to convert to run "
+"on KVM, you have two options. The simplest way is to try:"
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:102
+msgid ""
+"where virt-v2v guesses everything about the input C<disk.img> and (in this "
+"case) writes the converted result to C</tmp>."
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:105
+msgid ""
+"A more complex method is to write some L<libvirt XML|http://libvirt.org/"
+"formatdomain.html> describing the input guest (if you can get the source "
+"hypervisor to provide you with libvirt XML, then so much the better). You "
+"can then do:"
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:112
+msgid ""
+"Since C<guest-domain.xml> contains the path(s) to the guest disk image(s) "
+"you do not need to specify the name of the disk image on the command line."
+msgstr ""
+
+#. type: =item
+#: ../v2v/virt-v2v.pod:124
+#, fuzzy
+#| msgid "B<--merge>"
+msgid "B<--bridge> ..."
+msgstr "B<--merge>"
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:126
+#, fuzzy
+#| msgid "B<--network>"
+msgid "See I<--network> below."
+msgstr "B<--network>"
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:130
msgid ""
"Debug garbage collection and memory allocation. This is only useful when "
"debugging memory problems in virt-v2v or the OCaml libguestfs bindings."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:43
+#: ../v2v/virt-v2v.pod:134
#, fuzzy
#| msgid "B<-i>"
msgid "B<-i disk>"
msgstr "B<-i>"
#. type: textblock
-#: ../v2v/virt-v2v.pod:45
+#: ../v2v/virt-v2v.pod:136
msgid "Set the input method to I<disk>."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:47
+#: ../v2v/virt-v2v.pod:138
msgid ""
"In this mode you can read a virtual machine disk image with no metadata. "
"virt-v2v tries to guess the best default metadata. This is usually adequate "
@@ -87631,34 +87811,34 @@ msgid ""
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:53
+#: ../v2v/virt-v2v.pod:144
msgid "B<-i libvirt>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:55
+#: ../v2v/virt-v2v.pod:146
msgid "Set the input method to I<libvirt>. This is the default."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:57
+#: ../v2v/virt-v2v.pod:148
msgid ""
"In this mode you have to specify a libvirt guest name on the command line. "
"You may also specify a libvirt connection URI (see I<-ic>)."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:60
+#: ../v2v/virt-v2v.pod:151
msgid "B<-i libvirtxml>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:62
+#: ../v2v/virt-v2v.pod:153
msgid "Set the input method to I<libvirtxml>."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:64
+#: ../v2v/virt-v2v.pod:155
msgid ""
"In this mode you have to pass a libvirt XML file on the command line. This "
"file is read in order to get metadata about the source guest (such as its "
@@ -87666,68 +87846,109 @@ msgid ""
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:69
+#: ../v2v/virt-v2v.pod:160
#, fuzzy
#| msgid "B<-i>"
msgid "B<-i local>"
msgstr "B<-i>"
#. type: textblock
-#: ../v2v/virt-v2v.pod:71
+#: ../v2v/virt-v2v.pod:162
#, fuzzy
#| msgid "This is the same as the tune2fs C<-e> option."
msgid "This is the same as I<-i disk>."
msgstr "これは tune2fs C<-e> オプションと同じです。"
#. type: =item
-#: ../v2v/virt-v2v.pod:73
+#: ../v2v/virt-v2v.pod:164
msgid "B<-ic> libvirtURI"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:75
+#: ../v2v/virt-v2v.pod:166
msgid ""
"Specify a libvirt connection URI to use when reading the guest. This is "
"only used when S<I<-i libvirt>>."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:78
+#: ../v2v/virt-v2v.pod:169
msgid ""
"Only local libvirt connections and ESX connections can be used. Remote "
"libvirt connections will not work in general."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:81
+#: ../v2v/virt-v2v.pod:172
#, fuzzy
#| msgid "B<--format>"
msgid "B<-if> format"
msgstr "B<--format>"
#. type: textblock
-#: ../v2v/virt-v2v.pod:83
+#: ../v2v/virt-v2v.pod:174
msgid ""
"For I<-i disk> only, this specifies the format of the input disk image. For "
"other input methods you should specify the input format in the metadata."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:93
+#: ../v2v/virt-v2v.pod:184
+#, fuzzy
+#| msgid "B<--network>"
+msgid "B<--network> in:out"
+msgstr "B<--network>"
+
+#. type: =item
+#: ../v2v/virt-v2v.pod:186
+#, fuzzy
+#| msgid "B<--network>"
+msgid "B<--network> out"
+msgstr "B<--network>"
+
+#. type: =item
+#: ../v2v/virt-v2v.pod:188
+msgid "B<--bridge> in:out"
+msgstr ""
+
+#. type: =item
+#: ../v2v/virt-v2v.pod:190
+#, fuzzy
+#| msgid "B<--merge>"
+msgid "B<--bridge> out"
+msgstr "B<--merge>"
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:192
+msgid ""
+"Map network (or bridge) called C<in> to network (or bridge) called C<out>. "
+"If no C<in:> prefix is given, all other networks (or bridges) are mapped to "
+"C<out>."
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:196
+#, fuzzy
+#| msgid "See L</OPENING DISKS FOR READ AND WRITE> below."
+msgid "See L</NETWORKS AND BRIDGES> below."
+msgstr "以下の L</OPENING DISKS FOR READ AND WRITE> 参照。"
+
+#. type: =item
+#: ../v2v/virt-v2v.pod:198
#, fuzzy
#| msgid "B<--no-sync>"
msgid "B<--no-copy>"
msgstr "B<--no-sync>"
#. type: textblock
-#: ../v2v/virt-v2v.pod:95
+#: ../v2v/virt-v2v.pod:200
msgid ""
"Don't copy the disks. Instead, conversion is performed (and thrown away), "
"and metadata is written, but no disks are created."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:98
+#: ../v2v/virt-v2v.pod:203
msgid ""
"This is useful in two cases: Either you want to test if conversion is likely "
"to succeed, without the long copying process. Or you are only interested in "
@@ -87735,48 +87956,48 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:102
+#: ../v2v/virt-v2v.pod:207
msgid ""
"This option is not compatible with I<-o libvirt> since it would create a "
"faulty guest (one with no disks)."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:105
+#: ../v2v/virt-v2v.pod:210
msgid "B<-o libvirt>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:107
+#: ../v2v/virt-v2v.pod:212
msgid "Set the output method to I<libvirt>. This is the default."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:109
+#: ../v2v/virt-v2v.pod:214
msgid ""
"In this mode, the converted guest is created as a libvirt guest. You may "
"also specify a libvirt connection URI (see I<-oc>)."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:112
+#: ../v2v/virt-v2v.pod:217
#, fuzzy
#| msgid "see L</1 MB PARTITION ALIGNMENT> below."
msgid "See L</OUTPUT TO LIBVIRT> below."
msgstr "以下の L</1 MB パーティションアライメント> 参照。"
#. type: =item
-#: ../v2v/virt-v2v.pod:114
+#: ../v2v/virt-v2v.pod:219
msgid "B<-o local>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:116
+#: ../v2v/virt-v2v.pod:221
msgid "Set the output method to I<local>."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:118
+#: ../v2v/virt-v2v.pod:223
msgid ""
"In this mode, the converted guest is written to a local directory specified "
"by I<-os /dir> (the directory must exist). The converted guest's disks are "
@@ -87784,7 +88005,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:122
+#: ../v2v/virt-v2v.pod:227
#, no-wrap
msgid ""
" /dir/disk-sda\n"
@@ -87794,38 +88015,38 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:126
+#: ../v2v/virt-v2v.pod:231
msgid ""
"and a libvirt XML file is created containing guest metadata (C</dir/name."
"xml>, where C<name> is the guest name)."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:129
+#: ../v2v/virt-v2v.pod:234
#, fuzzy
#| msgid "B<-o option>"
msgid "B<-o ovirt>"
msgstr "B<-o option>"
#. type: textblock
-#: ../v2v/virt-v2v.pod:131
+#: ../v2v/virt-v2v.pod:236
#, fuzzy
#| msgid "This is the same as the tune2fs C<-e> option."
msgid "This is the same as I<-o rhev>."
msgstr "これは tune2fs C<-e> オプションと同じです。"
#. type: =item
-#: ../v2v/virt-v2v.pod:133
+#: ../v2v/virt-v2v.pod:238
msgid "B<-o rhev>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:135
+#: ../v2v/virt-v2v.pod:240
msgid "Set the output method to I<rhev>."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:137
+#: ../v2v/virt-v2v.pod:242
msgid ""
"The converted guest is written to a RHEV Export Storage Domain. The I<-os> "
"parameter must also be used to specify the location of the Export Storage "
@@ -87834,97 +88055,97 @@ msgid ""
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:142
+#: ../v2v/virt-v2v.pod:247
msgid "B<-oa sparse>"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:144
+#: ../v2v/virt-v2v.pod:249
msgid "B<-oa preallocated>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:146
+#: ../v2v/virt-v2v.pod:251
msgid "Set the output file allocation mode. The default is C<sparse>."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:148
+#: ../v2v/virt-v2v.pod:253
msgid "B<-oc> libvirtURI"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:150
+#: ../v2v/virt-v2v.pod:255
msgid ""
"Specify a libvirt connection to use when writing the converted guest. This "
"is only used when S<I<-o libvirt>>. See L</OUTPUT TO LIBVIRT> below."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:153
+#: ../v2v/virt-v2v.pod:258
msgid ""
"Only local libvirt connections can be used. Remote libvirt connections will "
"not work."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:156
+#: ../v2v/virt-v2v.pod:261
msgid "B<-of> format"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:158
+#: ../v2v/virt-v2v.pod:263
msgid "When converting the guest, convert the disks to the given format."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:160
+#: ../v2v/virt-v2v.pod:265
msgid "If not specified, then the input format is used."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:162
+#: ../v2v/virt-v2v.pod:267
msgid "B<-on> name"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:164
+#: ../v2v/virt-v2v.pod:269
msgid ""
"Rename the guest when converting it. If this option is not used then the "
"output name is the same as the input name."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:167
+#: ../v2v/virt-v2v.pod:272
msgid "B<-os> storage"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:169
+#: ../v2v/virt-v2v.pod:274
msgid "The location of the storage for the converted guest."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:171
+#: ../v2v/virt-v2v.pod:276
msgid ""
"For I<-o libvirt>, this is a libvirt directory pool (see S<C<virsh pool-"
"list>>)."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:174
+#: ../v2v/virt-v2v.pod:279
msgid "For I<-o local>, this is a directory name. The directory must exist."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:176
+#: ../v2v/virt-v2v.pod:281
msgid ""
"For I<-o rhev>, this can be an NFS path of the Export Storage Domain of the "
"form C<E<lt>hostE<gt>:E<lt>pathE<gt>>, eg:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:179
+#: ../v2v/virt-v2v.pod:284
#, no-wrap
msgid ""
" rhev-storage.example.com:/rhev/export\n"
@@ -87932,7 +88153,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:181
+#: ../v2v/virt-v2v.pod:286
msgid ""
"The NFS export must be mountable and writable by the user and host running "
"virt-v2v, since the virt-v2v program has to actually mount it when it runs. "
@@ -87940,7 +88161,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:185
+#: ../v2v/virt-v2v.pod:290
msgid ""
"B<Or:> You can mount the Export Storage Domain yourself, and point I<-os> to "
"the mountpoint. Note that virt-v2v will still need to write to this remote "
@@ -87948,112 +88169,127 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:190
+#: ../v2v/virt-v2v.pod:295
msgid ""
"You will get an error if virt-v2v is unable to mount/write to the Export "
"Storage Domain."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:199
+#: ../v2v/virt-v2v.pod:298
+#, fuzzy
+#| msgid "B<--parts>"
+msgid "B<--print-source>"
+msgstr "B<--parts>"
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:300
+msgid ""
+"Print information about the source guest and stop. This option is useful "
+"when you are setting up network and bridge maps. See L</NETWORKS AND "
+"BRIDGES>."
+msgstr ""
+
+#. type: =item
+#: ../v2v/virt-v2v.pod:310
msgid "B<--rhev-image-uuid> UUID"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:201
+#: ../v2v/virt-v2v.pod:312
msgid "B<--rhev-vol-uuid> UUID"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:203
+#: ../v2v/virt-v2v.pod:314
#, fuzzy
#| msgid "B<lvm-uuids> *"
msgid "B<--rhev-vm-uuid> UUID"
msgstr "B<lvm-uuids> *"
#. type: textblock
-#: ../v2v/virt-v2v.pod:205
+#: ../v2v/virt-v2v.pod:316
msgid "Normally the RHEV output mode chooses a random UUID for each of:"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:211
+#: ../v2v/virt-v2v.pod:322
msgid "the image directory (I<--rhev-image-uuid>)"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:215
+#: ../v2v/virt-v2v.pod:326
msgid "once for each guest disk (I<--rhev-vol-uuid>)"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:219
+#: ../v2v/virt-v2v.pod:330
msgid "the VM and OVF file (I<--rhev-vm-uuid>)."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:223
+#: ../v2v/virt-v2v.pod:334
msgid "However you can force specific UUIDs instead by using these options."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:225
+#: ../v2v/virt-v2v.pod:336
msgid ""
"You can use I<--rhev-image-uuid> and I<--rhev-vm-uuid> on the command line "
"at most once."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:228
+#: ../v2v/virt-v2v.pod:339
msgid ""
"If the guest has more than one virtual disk, then you should use I<--rhev-"
"vol-uuid> multiple times to change the UUID of each guest disk."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:232
+#: ../v2v/virt-v2v.pod:343
msgid ""
"The format of UUIDs is: C<12345678-1234-1234-1234-123456789abc> (each hex "
"digit can be C<0-9> or C<a-f>), conforming to S<OSF DCE 1.1>."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:235
+#: ../v2v/virt-v2v.pod:346
msgid "These options can only be used with I<-o rhev>."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:237
+#: ../v2v/virt-v2v.pod:348
msgid "B<--root ask>"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:239
+#: ../v2v/virt-v2v.pod:350
msgid "B<--root single>"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:241
+#: ../v2v/virt-v2v.pod:352
msgid "B<--root first>"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:243
+#: ../v2v/virt-v2v.pod:354
msgid "B<--root> /dev/sdX"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:245
+#: ../v2v/virt-v2v.pod:356
msgid "B<--root> /dev/VG/LV"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:247
+#: ../v2v/virt-v2v.pod:358
msgid "Choose the root filesystem to be converted."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:249
+#: ../v2v/virt-v2v.pod:360
msgid ""
"In the case where the virtual machine is dual-boot or multi-boot, or where "
"the VM has other filesystems that look like operating systems, this option "
@@ -88064,14 +88300,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:257
+#: ../v2v/virt-v2v.pod:368
msgid ""
"The default in virt-v2v E<le> 0.7.1 was S<I<--root single>>, which causes "
"virt-v2v to die if a multi-boot operating system is found."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:260
+#: ../v2v/virt-v2v.pod:371
msgid ""
"Since virt-v2v E<ge> 0.7.2 the default is now S<I<--root ask>>: If the VM is "
"found to be multi-boot, then virt-v2v will stop and list the possible root "
@@ -88080,7 +88316,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:265
+#: ../v2v/virt-v2v.pod:376
msgid ""
"S<I<--root first>> means to choose the first root device in the case of a "
"multi-boot operating system. Since this is a heuristic, it may sometimes "
@@ -88088,7 +88324,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:269
+#: ../v2v/virt-v2v.pod:380
msgid ""
"You can also name a specific root device, eg. S<I<--root /dev/sda2>> would "
"mean to use the second partition on the first hard drive. If the named root "
@@ -88097,7 +88333,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:274
+#: ../v2v/virt-v2v.pod:385
msgid ""
"Note that there is a bug in grub which prevents it from successfully booting "
"a multiboot system if VirtIO is enabled. Grub is only able to boot an "
@@ -88107,19 +88343,19 @@ msgid ""
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:292
+#: ../v2v/virt-v2v.pod:403
msgid "B<--vmtype desktop>"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:294
+#: ../v2v/virt-v2v.pod:405
#, fuzzy
#| msgid "B<--merge>"
msgid "B<--vmtype server>"
msgstr "B<--merge>"
#. type: textblock
-#: ../v2v/virt-v2v.pod:296
+#: ../v2v/virt-v2v.pod:407
msgid ""
"For the RHEV target only, specify the type of guest. You can set this to "
"C<desktop> or C<server>. If the option is not given, then a suitable "
@@ -88127,12 +88363,12 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../v2v/virt-v2v.pod:307
+#: ../v2v/virt-v2v.pod:418
msgid "XEN PARAVIRTUALIZED GUESTS"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:309
+#: ../v2v/virt-v2v.pod:420
msgid ""
"Older versions of virt-v2v could turn a Xen paravirtualized (PV) guest into "
"a KVM guest by installing a new kernel. This version of virt-v2v does "
@@ -88141,7 +88377,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:314
+#: ../v2v/virt-v2v.pod:425
msgid ""
"Therefore before conversion you should check that a regular kernel is "
"installed. For some older Linux distributions, this means installing a "
@@ -88149,7 +88385,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:318
+#: ../v2v/virt-v2v.pod:429
#, no-wrap
msgid ""
" RHEL 3 (Does not apply, as there was no Xen PV kernel)\n"
@@ -88157,7 +88393,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:320
+#: ../v2v/virt-v2v.pod:431
#, no-wrap
msgid ""
" RHEL 4 i686 with > 10GB of RAM: install 'kernel-hugemem'\n"
@@ -88170,7 +88406,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:327
+#: ../v2v/virt-v2v.pod:438
#, no-wrap
msgid ""
" RHEL 5 i686: install 'kernel-PAE'\n"
@@ -88179,7 +88415,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:330
+#: ../v2v/virt-v2v.pod:441
#, no-wrap
msgid ""
" SLES 10 i586 with > 10GB of RAM: install 'kernel-bigsmp'\n"
@@ -88191,7 +88427,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:336
+#: ../v2v/virt-v2v.pod:447
#, no-wrap
msgid ""
" SLES 11+ i586: install 'kernel-pae'\n"
@@ -88200,7 +88436,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:339
+#: ../v2v/virt-v2v.pod:450
#, no-wrap
msgid ""
" Windows (Does not apply, as there is no Xen PV Windows kernel)\n"
@@ -88208,19 +88444,19 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../v2v/virt-v2v.pod:341
+#: ../v2v/virt-v2v.pod:452
msgid "ENABLING VIRTIO"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:343
+#: ../v2v/virt-v2v.pod:454
msgid ""
"\"Virtio\" is the name for a set of drivers which make disk (block device), "
"network and other guest operations work much faster on KVM."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:346
+#: ../v2v/virt-v2v.pod:457
msgid ""
"Older versions of virt-v2v could install these drivers for certain Linux "
"guests. This version of virt-v2v does I<not> attempt to install new Linux "
@@ -88228,7 +88464,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:351
+#: ../v2v/virt-v2v.pod:462
msgid ""
"In order to enable virtio, and hence improve performance of the guest after "
"conversion, you should ensure that the B<minimum> versions of packages are "
@@ -88236,7 +88472,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:356
+#: ../v2v/virt-v2v.pod:467
#, no-wrap
msgid ""
" RHEL 3 No virtio drivers are available\n"
@@ -88244,7 +88480,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:358
+#: ../v2v/virt-v2v.pod:469
#, no-wrap
msgid ""
" RHEL 4 kernel >= 2.5.9-89.EL\n"
@@ -88252,7 +88488,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:360
+#: ../v2v/virt-v2v.pod:471
#, no-wrap
msgid ""
" RHEL 5 kernel >= 2.6.18-128.el5\n"
@@ -88262,7 +88498,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:364
+#: ../v2v/virt-v2v.pod:475
#, no-wrap
msgid ""
" RHEL 6+ All versions support virtio\n"
@@ -88270,7 +88506,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:366
+#: ../v2v/virt-v2v.pod:477
#, no-wrap
msgid ""
" Fedora All versions support virtio\n"
@@ -88278,7 +88514,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:368
+#: ../v2v/virt-v2v.pod:479
#, no-wrap
msgid ""
" SLES 11+ All versions support virtio\n"
@@ -88286,7 +88522,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:370
+#: ../v2v/virt-v2v.pod:481
#, no-wrap
msgid ""
" SLES 10 kernel >= 2.6.16.60-0.85.1\n"
@@ -88294,7 +88530,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:372
+#: ../v2v/virt-v2v.pod:483
#, no-wrap
msgid ""
" OpenSUSE 11+ All versions support virtio\n"
@@ -88302,7 +88538,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:374
+#: ../v2v/virt-v2v.pod:485
#, no-wrap
msgid ""
" OpenSUSE 10 kernel >= 2.6.25.5-1.1\n"
@@ -88310,7 +88546,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:376
+#: ../v2v/virt-v2v.pod:487
#, no-wrap
msgid ""
" Windows Drivers are installed from /usr/share/virtio-win\n"
@@ -88318,93 +88554,155 @@ msgid ""
"\n"
msgstr ""
+#. type: =head1
+#: ../v2v/virt-v2v.pod:490
+msgid "NETWORKS AND BRIDGES"
+msgstr ""
+
#. type: textblock
-#: ../v2v/virt-v2v.pod:381
+#: ../v2v/virt-v2v.pod:492
msgid ""
-"The I<--machine-readable> option can be used to make the output more machine "
-"friendly, which is useful when calling virt-v2v from other programs, GUIs "
-"etc."
+"Guests are usually connected to one or more networks, and when converted to "
+"the target hypervisor you usually want to reconnect those networks at the "
+"destination. The options I<--network> and I<--bridge> allow you to do that."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:387
+#: ../v2v/virt-v2v.pod:497
msgid ""
-"Firstly use the option on its own to query the capabilities of the virt-v2v "
-"binary. Typical output looks like this:"
+"If you are unsure of what networks and bridges are in use on the source "
+"hypervisor, then you can examine the source metadata (libvirt XML, vCenter "
+"information, etc.). Or you can run virt-v2v with the I<--print-source> "
+"option which causes virt-v2v to print out the information it has about the "
+"guest on the source and then exit."
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:503
+msgid ""
+"In the I<--print-source> output you will see a section showing the guest's "
+"Network Interface Cards (NICs):"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:390
+#: ../v2v/virt-v2v.pod:506
#, no-wrap
msgid ""
-" $ virt-v2v --machine-readable\n"
-" virt-v2v\n"
-" libguestfs-rewrite\n"
+" $ virt-v2v [-i ...] --print-source name\n"
+" [...]\n"
+" NICs:\n"
+" Network \"default\" mac: 52:54:00:d0:cf:0e\n"
"\n"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:419
+#: ../v2v/virt-v2v.pod:511
msgid ""
-"The calling program should treat messages sent to stderr as error messages. "
-"In addition, virt-v2v exits with a non-zero status code if there was a fatal "
-"error."
+"This is typical of a libvirt guest: It has a single network interface "
+"connected to a network called C<default>."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:425
+#: ../v2v/virt-v2v.pod:514
msgid ""
-"Virt-v2v E<le> 0.9.1 did not support the I<--machine-readable> option at "
-"all. The option was added when virt-v2v was rewritten in 2014."
+"To map a specific network to a target network, for example C<default> on the "
+"source to C<rhevm> on the target, use:"
+msgstr ""
+
+#. type: verbatim
+#: ../v2v/virt-v2v.pod:517
+#, no-wrap
+msgid ""
+" virt-v2v [...] --network default:rhevm\n"
+"\n"
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:519
+msgid "To map every network to a target network, use:"
+msgstr ""
+
+#. type: verbatim
+#: ../v2v/virt-v2v.pod:521
+#, no-wrap
+msgid ""
+" virt-v2v [...] --network rhevm\n"
+"\n"
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:523
+msgid ""
+"Bridges are handled in the same way, but you have to use the I<--bridge> "
+"option instead. For example:"
+msgstr ""
+
+#. type: verbatim
+#: ../v2v/virt-v2v.pod:526
+#, no-wrap
+msgid ""
+" $ virt-v2v [-i ...] --print-source name\n"
+" [...]\n"
+" NICs:\n"
+" Bridge \"br0\"\n"
+" \n"
+msgstr ""
+
+#. type: verbatim
+#: ../v2v/virt-v2v.pod:531
+#, no-wrap
+msgid ""
+" $ virt-v2v [...] --bridge br0:targetbr\n"
+"\n"
msgstr ""
#. type: =head1
-#: ../v2v/virt-v2v.pod:428
+#: ../v2v/virt-v2v.pod:533
msgid "OUTPUT TO LIBVIRT"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:430
+#: ../v2v/virt-v2v.pod:535
msgid ""
"The I<-o libvirt> option lets you upload the converted guest to a libvirt-"
"managed host. There are several limitations:"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:437
+#: ../v2v/virt-v2v.pod:542
msgid ""
"You can only use a local libvirt connection [see below for how to workaround "
"this]."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:442
+#: ../v2v/virt-v2v.pod:547
msgid ""
"The I<-os pool> option must specify a directory pool, not anything more "
"exotic such as iSCSI [but see below]."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:447
+#: ../v2v/virt-v2v.pod:552
msgid "You can only upload to a KVM hypervisor."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:451
+#: ../v2v/virt-v2v.pod:556
msgid ""
"B<To output to a remote libvirt instance and/or a non-directory storage "
"pool> you have to use the following workaround:"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:458
+#: ../v2v/virt-v2v.pod:563
msgid ""
"Use virt-v2v in I<-o local> mode to convert the guest disks and metadata "
"into a local temporary directory:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:461
+#: ../v2v/virt-v2v.pod:566
#, no-wrap
msgid ""
" virt-v2v [...] -o local -os /tmp\n"
@@ -88412,14 +88710,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:463
+#: ../v2v/virt-v2v.pod:568
#, fuzzy
#| msgid "This removes temporary files under C</tmp> and C</var/tmp>."
msgid "This creates two (or more) files in C</tmp> called:"
msgstr "これは C</tmp> と C</var/tmp> の中にある一時ファイルを削除します。"
#. type: verbatim
-#: ../v2v/virt-v2v.pod:465
+#: ../v2v/virt-v2v.pod:570
#, no-wrap
msgid ""
" /tmp/NAME.xml # the libvirt XML (metadata)\n"
@@ -88428,17 +88726,17 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:468
+#: ../v2v/virt-v2v.pod:573
msgid "(for C<NAME> substitute the guest's name)."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:472
+#: ../v2v/virt-v2v.pod:577
msgid "Upload the converted disk(s) into the storage pool called C<POOL>:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:474
+#: ../v2v/virt-v2v.pod:579
#, no-wrap
msgid ""
" size=$(stat -c%s /tmp/NAME-sda)\n"
@@ -88448,14 +88746,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:480
+#: ../v2v/virt-v2v.pod:585
msgid ""
"Edit C</tmp/NAME.xml> to change C</tmp/NAME-sda> to the pool name. In other "
"words, locate the following bit of XML:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:483
+#: ../v2v/virt-v2v.pod:588
#, no-wrap
msgid ""
" <disk type='file' device='disk'>\n"
@@ -88467,7 +88765,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:489
+#: ../v2v/virt-v2v.pod:594
msgid ""
"and change two things: The C<type='file'> attribute must be changed to "
"C<type='volume'>, and the C<E<lt>sourceE<gt>> element must be changed to "
@@ -88475,7 +88773,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:493
+#: ../v2v/virt-v2v.pod:598
#, no-wrap
msgid ""
" <disk type='volume' device='disk'>\n"
@@ -88487,42 +88785,82 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:501
+#: ../v2v/virt-v2v.pod:606
msgid "Define the final guest in libvirt:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:503
+#: ../v2v/virt-v2v.pod:608
#, no-wrap
msgid ""
" virsh define /tmp/NAME.xml\n"
"\n"
msgstr ""
+#. type: textblock
+#: ../v2v/virt-v2v.pod:614
+msgid ""
+"The I<--machine-readable> option can be used to make the output more machine "
+"friendly, which is useful when calling virt-v2v from other programs, GUIs "
+"etc."
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:620
+msgid ""
+"Firstly use the option on its own to query the capabilities of the virt-v2v "
+"binary. Typical output looks like this:"
+msgstr ""
+
+#. type: verbatim
+#: ../v2v/virt-v2v.pod:623
+#, no-wrap
+msgid ""
+" $ virt-v2v --machine-readable\n"
+" virt-v2v\n"
+" libguestfs-rewrite\n"
+"\n"
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:652
+msgid ""
+"The calling program should treat messages sent to stderr as error messages. "
+"In addition, virt-v2v exits with a non-zero status code if there was a fatal "
+"error."
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:658
+msgid ""
+"Virt-v2v E<le> 0.9.1 did not support the I<--machine-readable> option at "
+"all. The option was added when virt-v2v was rewritten in 2014."
+msgstr ""
+
#. type: =item
-#: ../v2v/virt-v2v.pod:511
+#: ../v2v/virt-v2v.pod:665
msgid "C</usr/share/virtio-win>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:513 ../v2v/virt-v2v.pod:567
+#: ../v2v/virt-v2v.pod:667 ../v2v/virt-v2v.pod:721
msgid "(Optional)"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:515
+#: ../v2v/virt-v2v.pod:669
msgid ""
"If this directory is present, then virtio drivers for Windows guests will be "
"found from this directory and installed in the guest during conversion."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:525
+#: ../v2v/virt-v2v.pod:679
msgid "C<TMPDIR>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:536
+#: ../v2v/virt-v2v.pod:690
msgid ""
"Note that if C<$TMPDIR> is a tmpfs (eg. if C</tmp> is on tmpfs, or if you "
"use C<TMPDIR=/dev/shm>), tmpfs defaults to a maximum size of I<half> of "
@@ -88532,31 +88870,31 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:546
+#: ../v2v/virt-v2v.pod:700
msgid ""
"This can point to the directory containing data files used for Windows "
"conversion."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:558
+#: ../v2v/virt-v2v.pod:712
msgid "(Required when doing conversions of Windows guests)"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:560
+#: ../v2v/virt-v2v.pod:714
msgid ""
"This is the RHSrvAny Windows binary, used to install a \"firstboot\" script "
"in the guest during conversion of Windows guests."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:565
+#: ../v2v/virt-v2v.pod:719
msgid "C<rhev-apt.exe>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:569
+#: ../v2v/virt-v2v.pod:723
msgid ""
"The RHEV Application Provisioning Tool (RHEV APT). If this file is present, "
"then RHEV APT will be installed in the Windows guest during conversion. "
@@ -88566,14 +88904,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:575
+#: ../v2v/virt-v2v.pod:729
msgid ""
"This file comes from Red Hat Enterprise Virtualization (RHEV), and is not "
"distributed with virt-v2v."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:586
+#: ../v2v/virt-v2v.pod:740
#, fuzzy
#| msgid ""
#| "L<guestfs(3)>, L<guestfish(1)>, L<virt-filesystems(1)>, L<virt-make-"
@@ -88587,6 +88925,6 @@ msgstr ""
"L<virt-rescue(1)>, L<virt-resize(1)>, L<http://libguestfs.org/>."
#. type: textblock
-#: ../v2v/virt-v2v.pod:603
+#: ../v2v/virt-v2v.pod:757
msgid "Mike Latimer"
msgstr ""
diff --git a/po-docs/libguestfs-docs.pot b/po-docs/libguestfs-docs.pot
index b31bccd..7168008 100644
--- a/po-docs/libguestfs-docs.pot
+++ b/po-docs/libguestfs-docs.pot
@@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: libguestfs 1.27.28\n"
+"Project-Id-Version: libguestfs 1.27.29\n"
"Report-Msgid-Bugs-To: libguestfs at redhat.com\n"
-"POT-Creation-Date: 2014-08-19 17:51+0200\n"
+"POT-Creation-Date: 2014-08-21 17:07+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -246,12 +246,12 @@ msgid "If you just want the exit code with no output, use the I<-q> option."
msgstr ""
#. type: =head1
-#: ../align/virt-alignment-scan.pod:101 ../appliance/libguestfs-make-fixed-appliance.pod:97 ../builder/virt-builder.pod:174 ../builder/virt-index-validate.pod:19 ../cat/virt-cat.pod:51 ../cat/virt-filesystems.pod:89 ../cat/virt-log.pod:34 ../cat/virt-ls.pod:249 ../customize/virt-customize.pod:27 ../daemon/guestfsd.pod:43 ../df/virt-df.pod:71 ../diff/virt-diff.pod:35 ../edit/virt-edit.pod:60 ../fish/guestfish.pod:152 ../fish/virt-copy-in.pod:43 ../fish/virt-copy-out.pod:32 ../fish/virt-ta [...]
+#: ../align/virt-alignment-scan.pod:101 ../appliance/libguestfs-make-fixed-appliance.pod:97 ../builder/virt-builder.pod:174 ../builder/virt-index-validate.pod:19 ../cat/virt-cat.pod:51 ../cat/virt-filesystems.pod:89 ../cat/virt-log.pod:34 ../cat/virt-ls.pod:249 ../customize/virt-customize.pod:27 ../daemon/guestfsd.pod:43 ../df/virt-df.pod:71 ../diff/virt-diff.pod:35 ../edit/virt-edit.pod:60 ../fish/guestfish.pod:152 ../fish/virt-copy-in.pod:43 ../fish/virt-copy-out.pod:32 ../fish/virt-ta [...]
msgid "OPTIONS"
msgstr ""
#. type: =item
-#: ../align/virt-alignment-scan.pod:105 ../appliance/libguestfs-make-fixed-appliance.pod:101 ../builder/virt-builder.pod:178 ../builder/virt-index-validate.pod:62 ../cat/virt-cat.pod:55 ../cat/virt-filesystems.pod:93 ../cat/virt-log.pod:38 ../cat/virt-ls.pod:253 ../customize/virt-customize.pod:31 ../daemon/guestfsd.pod:49 ../df/virt-df.pod:75 ../diff/virt-diff.pod:39 ../edit/virt-edit.pod:64 ../fish/guestfish.pod:156 ../format/virt-format.pod:61 ../fuse/guestmount.pod:240 ../fuse/guestun [...]
+#: ../align/virt-alignment-scan.pod:105 ../appliance/libguestfs-make-fixed-appliance.pod:101 ../builder/virt-builder.pod:178 ../builder/virt-index-validate.pod:62 ../cat/virt-cat.pod:55 ../cat/virt-filesystems.pod:93 ../cat/virt-log.pod:38 ../cat/virt-ls.pod:253 ../customize/virt-customize.pod:31 ../daemon/guestfsd.pod:49 ../df/virt-df.pod:75 ../diff/virt-diff.pod:39 ../edit/virt-edit.pod:64 ../fish/guestfish.pod:156 ../format/virt-format.pod:61 ../fuse/guestmount.pod:240 ../fuse/guestun [...]
msgid "B<--help>"
msgstr ""
@@ -421,12 +421,12 @@ msgid ""
msgstr ""
#. type: =item
-#: ../align/virt-alignment-scan.pod:177 ../customize/virt-customize.pod:178 ../fuse/guestunmount.pod:83 ../resize/virt-resize.pod:507 ../sparsify/virt-sparsify.pod:243 ../sysprep/virt-sysprep.pod:211 ../v2v/virt-v2v.pod:193
+#: ../align/virt-alignment-scan.pod:177 ../customize/virt-customize.pod:178 ../fuse/guestunmount.pod:83 ../resize/virt-resize.pod:507 ../sparsify/virt-sparsify.pod:243 ../sysprep/virt-sysprep.pod:211 ../v2v/virt-v2v.pod:304
msgid "B<-q>"
msgstr ""
#. type: =item
-#: ../align/virt-alignment-scan.pod:179 ../builder/virt-builder.pod:452 ../customize/virt-customize.pod:180 ../fuse/guestunmount.pod:85 ../resize/virt-resize.pod:509 ../sparsify/virt-sparsify.pod:245 ../sysprep/virt-sysprep.pod:213 ../v2v/virt-v2v.pod:195
+#: ../align/virt-alignment-scan.pod:179 ../builder/virt-builder.pod:452 ../customize/virt-customize.pod:180 ../fuse/guestunmount.pod:85 ../resize/virt-resize.pod:509 ../sparsify/virt-sparsify.pod:245 ../sysprep/virt-sysprep.pod:213 ../v2v/virt-v2v.pod:306
msgid "B<--quiet>"
msgstr ""
@@ -458,42 +458,42 @@ msgid ""
msgstr ""
#. type: =item
-#: ../align/virt-alignment-scan.pod:193 ../builder/virt-builder.pod:488 ../cat/virt-cat.pod:165 ../cat/virt-filesystems.pod:265 ../cat/virt-log.pod:112 ../cat/virt-ls.pod:455 ../customize/virt-customize.pod:190 ../daemon/guestfsd.pod:60 ../df/virt-df.pod:183 ../diff/virt-diff.pod:200 ../edit/virt-edit.pod:203 ../fish/guestfish.pod:419 ../format/virt-format.pod:153 ../fuse/guestmount.pod:359 ../inspector/virt-inspector.pod:116 ../make-fs/virt-make-fs.pod:197 ../p2v/virt-p2v.pod:191 ../res [...]
+#: ../align/virt-alignment-scan.pod:193 ../builder/virt-builder.pod:488 ../cat/virt-cat.pod:165 ../cat/virt-filesystems.pod:265 ../cat/virt-log.pod:112 ../cat/virt-ls.pod:455 ../customize/virt-customize.pod:190 ../daemon/guestfsd.pod:60 ../df/virt-df.pod:183 ../diff/virt-diff.pod:200 ../edit/virt-edit.pod:203 ../fish/guestfish.pod:419 ../format/virt-format.pod:153 ../fuse/guestmount.pod:359 ../inspector/virt-inspector.pod:116 ../make-fs/virt-make-fs.pod:197 ../p2v/virt-p2v.pod:191 ../res [...]
msgid "B<-v>"
msgstr ""
#. type: =item
-#: ../align/virt-alignment-scan.pod:195 ../builder/virt-builder.pod:490 ../cat/virt-cat.pod:167 ../cat/virt-filesystems.pod:267 ../cat/virt-log.pod:114 ../cat/virt-ls.pod:457 ../customize/virt-customize.pod:192 ../daemon/guestfsd.pod:62 ../df/virt-df.pod:185 ../diff/virt-diff.pod:202 ../edit/virt-edit.pod:205 ../fish/guestfish.pod:421 ../format/virt-format.pod:155 ../fuse/guestmount.pod:361 ../inspector/virt-inspector.pod:118 ../make-fs/virt-make-fs.pod:199 ../p2v/virt-p2v.pod:193 ../res [...]
+#: ../align/virt-alignment-scan.pod:195 ../builder/virt-builder.pod:490 ../cat/virt-cat.pod:167 ../cat/virt-filesystems.pod:267 ../cat/virt-log.pod:114 ../cat/virt-ls.pod:457 ../customize/virt-customize.pod:192 ../daemon/guestfsd.pod:62 ../df/virt-df.pod:185 ../diff/virt-diff.pod:202 ../edit/virt-edit.pod:205 ../fish/guestfish.pod:421 ../format/virt-format.pod:155 ../fuse/guestmount.pod:361 ../inspector/virt-inspector.pod:118 ../make-fs/virt-make-fs.pod:199 ../p2v/virt-p2v.pod:193 ../res [...]
msgid "B<--verbose>"
msgstr ""
#. type: textblock
-#: ../align/virt-alignment-scan.pod:197 ../cat/virt-cat.pod:169 ../cat/virt-filesystems.pod:269 ../cat/virt-log.pod:116 ../cat/virt-ls.pod:459 ../customize/virt-customize.pod:194 ../daemon/guestfsd.pod:64 ../df/virt-df.pod:187 ../diff/virt-diff.pod:204 ../edit/virt-edit.pod:207 ../format/virt-format.pod:157 ../inspector/virt-inspector.pod:120 ../rescue/virt-rescue.pod:242 ../sparsify/virt-sparsify.pod:296 ../sysprep/virt-sysprep.pod:223 ../v2v/virt-v2v.pod:284
+#: ../align/virt-alignment-scan.pod:197 ../cat/virt-cat.pod:169 ../cat/virt-filesystems.pod:269 ../cat/virt-log.pod:116 ../cat/virt-ls.pod:459 ../customize/virt-customize.pod:194 ../daemon/guestfsd.pod:64 ../df/virt-df.pod:187 ../diff/virt-diff.pod:204 ../edit/virt-edit.pod:207 ../format/virt-format.pod:157 ../inspector/virt-inspector.pod:120 ../rescue/virt-rescue.pod:242 ../sparsify/virt-sparsify.pod:296 ../sysprep/virt-sysprep.pod:223 ../v2v/virt-v2v.pod:395
msgid "Enable verbose messages for debugging."
msgstr ""
#. type: =item
-#: ../align/virt-alignment-scan.pod:199 ../appliance/libguestfs-make-fixed-appliance.pod:105 ../builder/virt-builder.pod:497 ../builder/virt-index-validate.pod:66 ../cat/virt-cat.pod:171 ../cat/virt-filesystems.pod:271 ../cat/virt-log.pod:118 ../cat/virt-ls.pod:461 ../customize/virt-customize.pod:196 ../df/virt-df.pod:189 ../diff/virt-diff.pod:206 ../edit/virt-edit.pod:209 ../fish/guestfish.pod:426 ../format/virt-format.pod:159 ../fuse/guestmount.pod:365 ../fuse/guestunmount.pod:105 ../i [...]
+#: ../align/virt-alignment-scan.pod:199 ../appliance/libguestfs-make-fixed-appliance.pod:105 ../builder/virt-builder.pod:497 ../builder/virt-index-validate.pod:66 ../cat/virt-cat.pod:171 ../cat/virt-filesystems.pod:271 ../cat/virt-log.pod:118 ../cat/virt-ls.pod:461 ../customize/virt-customize.pod:196 ../df/virt-df.pod:189 ../diff/virt-diff.pod:206 ../edit/virt-edit.pod:209 ../fish/guestfish.pod:426 ../format/virt-format.pod:159 ../fuse/guestmount.pod:365 ../fuse/guestunmount.pod:105 ../i [...]
msgid "B<-V>"
msgstr ""
#. type: =item
-#: ../align/virt-alignment-scan.pod:201 ../appliance/libguestfs-make-fixed-appliance.pod:107 ../builder/virt-builder.pod:499 ../builder/virt-index-validate.pod:68 ../cat/virt-cat.pod:173 ../cat/virt-filesystems.pod:273 ../cat/virt-log.pod:120 ../cat/virt-ls.pod:463 ../customize/virt-customize.pod:198 ../df/virt-df.pod:191 ../diff/virt-diff.pod:208 ../edit/virt-edit.pod:211 ../fish/guestfish.pod:428 ../format/virt-format.pod:161 ../fuse/guestmount.pod:367 ../fuse/guestunmount.pod:107 ../i [...]
+#: ../align/virt-alignment-scan.pod:201 ../appliance/libguestfs-make-fixed-appliance.pod:107 ../builder/virt-builder.pod:499 ../builder/virt-index-validate.pod:68 ../cat/virt-cat.pod:173 ../cat/virt-filesystems.pod:273 ../cat/virt-log.pod:120 ../cat/virt-ls.pod:463 ../customize/virt-customize.pod:198 ../df/virt-df.pod:191 ../diff/virt-diff.pod:208 ../edit/virt-edit.pod:211 ../fish/guestfish.pod:428 ../format/virt-format.pod:161 ../fuse/guestmount.pod:367 ../fuse/guestunmount.pod:107 ../i [...]
msgid "B<--version>"
msgstr ""
#. type: textblock
-#: ../align/virt-alignment-scan.pod:203 ../builder/virt-builder.pod:501 ../builder/virt-index-validate.pod:70 ../cat/virt-cat.pod:175 ../cat/virt-filesystems.pod:275 ../cat/virt-log.pod:122 ../cat/virt-ls.pod:465 ../customize/virt-customize.pod:200 ../df/virt-df.pod:193 ../diff/virt-diff.pod:210 ../edit/virt-edit.pod:213 ../format/virt-format.pod:163 ../inspector/virt-inspector.pod:126 ../make-fs/virt-make-fs.pod:207 ../p2v/virt-p2v.pod:201 ../rescue/virt-rescue.pod:248 ../resize/virt-re [...]
+#: ../align/virt-alignment-scan.pod:203 ../builder/virt-builder.pod:501 ../builder/virt-index-validate.pod:70 ../cat/virt-cat.pod:175 ../cat/virt-filesystems.pod:275 ../cat/virt-log.pod:122 ../cat/virt-ls.pod:465 ../customize/virt-customize.pod:200 ../df/virt-df.pod:193 ../diff/virt-diff.pod:210 ../edit/virt-edit.pod:213 ../format/virt-format.pod:163 ../inspector/virt-inspector.pod:126 ../make-fs/virt-make-fs.pod:207 ../p2v/virt-p2v.pod:201 ../rescue/virt-rescue.pod:248 ../resize/virt-re [...]
msgid "Display version number and exit."
msgstr ""
#. type: =item
-#: ../align/virt-alignment-scan.pod:205 ../builder/virt-builder.pod:503 ../cat/virt-cat.pod:177 ../cat/virt-filesystems.pod:285 ../cat/virt-log.pod:124 ../cat/virt-ls.pod:467 ../customize/virt-customize.pod:202 ../df/virt-df.pod:195 ../diff/virt-diff.pod:212 ../edit/virt-edit.pod:215 ../fish/guestfish.pod:441 ../format/virt-format.pod:175 ../fuse/guestmount.pod:380 ../inspector/virt-inspector.pod:128 ../make-fs/virt-make-fs.pod:209 ../rescue/virt-rescue.pod:259 ../resize/virt-resize.pod: [...]
+#: ../align/virt-alignment-scan.pod:205 ../builder/virt-builder.pod:503 ../cat/virt-cat.pod:177 ../cat/virt-filesystems.pod:285 ../cat/virt-log.pod:124 ../cat/virt-ls.pod:467 ../customize/virt-customize.pod:202 ../df/virt-df.pod:195 ../diff/virt-diff.pod:212 ../edit/virt-edit.pod:215 ../fish/guestfish.pod:441 ../format/virt-format.pod:175 ../fuse/guestmount.pod:380 ../inspector/virt-inspector.pod:128 ../make-fs/virt-make-fs.pod:209 ../rescue/virt-rescue.pod:259 ../resize/virt-resize.pod: [...]
msgid "B<-x>"
msgstr ""
#. type: textblock
-#: ../align/virt-alignment-scan.pod:207 ../builder/virt-builder.pod:505 ../cat/virt-cat.pod:179 ../cat/virt-filesystems.pod:287 ../cat/virt-log.pod:126 ../cat/virt-ls.pod:469 ../customize/virt-customize.pod:204 ../df/virt-df.pod:197 ../diff/virt-diff.pod:214 ../edit/virt-edit.pod:217 ../format/virt-format.pod:177 ../inspector/virt-inspector.pod:130 ../rescue/virt-rescue.pod:261 ../resize/virt-resize.pod:591 ../sparsify/virt-sparsify.pod:306 ../sysprep/virt-sysprep.pod:233 ../v2v/virt-v2v [...]
+#: ../align/virt-alignment-scan.pod:207 ../builder/virt-builder.pod:505 ../cat/virt-cat.pod:179 ../cat/virt-filesystems.pod:287 ../cat/virt-log.pod:126 ../cat/virt-ls.pod:469 ../customize/virt-customize.pod:204 ../df/virt-df.pod:197 ../diff/virt-diff.pod:214 ../edit/virt-edit.pod:217 ../format/virt-format.pod:177 ../inspector/virt-inspector.pod:130 ../rescue/virt-rescue.pod:261 ../resize/virt-resize.pod:591 ../sparsify/virt-sparsify.pod:306 ../sysprep/virt-sysprep.pod:233 ../v2v/virt-v2v [...]
msgid "Enable tracing of libguestfs API calls."
msgstr ""
@@ -774,7 +774,7 @@ msgid "This program returns:"
msgstr ""
#. type: =item
-#: ../align/virt-alignment-scan.pod:356 ../align/virt-alignment-scan.pod:362 ../align/virt-alignment-scan.pod:368 ../align/virt-alignment-scan.pod:375 ../appliance/libguestfs-make-fixed-appliance.pod:22 ../appliance/libguestfs-make-fixed-appliance.pod:28 ../appliance/libguestfs-make-fixed-appliance.pod:34 ../appliance/libguestfs-make-fixed-appliance.pod:52 ../appliance/libguestfs-make-fixed-appliance.pod:73 ../builder/virt-builder.pod:781 ../builder/virt-builder.pod:788 ../builder/virt-b [...]
+#: ../align/virt-alignment-scan.pod:356 ../align/virt-alignment-scan.pod:362 ../align/virt-alignment-scan.pod:368 ../align/virt-alignment-scan.pod:375 ../appliance/libguestfs-make-fixed-appliance.pod:22 ../appliance/libguestfs-make-fixed-appliance.pod:28 ../appliance/libguestfs-make-fixed-appliance.pod:34 ../appliance/libguestfs-make-fixed-appliance.pod:52 ../appliance/libguestfs-make-fixed-appliance.pod:73 ../builder/virt-builder.pod:781 ../builder/virt-builder.pod:788 ../builder/virt-b [...]
msgid "*"
msgstr ""
@@ -823,7 +823,7 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../align/virt-alignment-scan.pod:384 ../appliance/libguestfs-make-fixed-appliance.pod:164 ../builder/virt-builder.pod:1688 ../builder/virt-index-validate.pod:79 ../cat/virt-cat.pod:273 ../cat/virt-filesystems.pod:386 ../cat/virt-log.pod:135 ../cat/virt-ls.pod:518 ../customize/virt-customize.pod:246 ../daemon/guestfsd.pod:115 ../df/virt-df.pod:256 ../diff/virt-diff.pod:251 ../edit/virt-edit.pod:389 ../erlang/examples/guestfs-erlang.pod:95 ../examples/guestfs-examples.pod:55 ../examples [...]
+#: ../align/virt-alignment-scan.pod:384 ../appliance/libguestfs-make-fixed-appliance.pod:164 ../builder/virt-builder.pod:1688 ../builder/virt-index-validate.pod:79 ../cat/virt-cat.pod:273 ../cat/virt-filesystems.pod:386 ../cat/virt-log.pod:135 ../cat/virt-ls.pod:518 ../customize/virt-customize.pod:246 ../daemon/guestfsd.pod:115 ../df/virt-df.pod:256 ../diff/virt-diff.pod:251 ../edit/virt-edit.pod:389 ../erlang/examples/guestfs-erlang.pod:95 ../examples/guestfs-examples.pod:55 ../examples [...]
msgid "SEE ALSO"
msgstr ""
@@ -840,12 +840,12 @@ msgid "AUTHOR"
msgstr ""
#. type: textblock
-#: ../align/virt-alignment-scan.pod:395 ../builder/virt-builder.pod:1709 ../builder/virt-index-validate.pod:86 ../cat/virt-cat.pod:285 ../cat/virt-filesystems.pod:399 ../cat/virt-log.pod:147 ../cat/virt-ls.pod:530 ../customize/virt-customize.pod:265 ../daemon/guestfsd.pod:122 ../df/virt-df.pod:266 ../diff/virt-diff.pod:263 ../edit/virt-edit.pod:402 ../format/virt-format.pod:197 ../inspector/virt-inspector.pod:507 ../make-fs/virt-make-fs.pod:231 ../p2v/virt-p2v.pod:213 ../rescue/virt-resc [...]
+#: ../align/virt-alignment-scan.pod:395 ../builder/virt-builder.pod:1709 ../builder/virt-index-validate.pod:86 ../cat/virt-cat.pod:285 ../cat/virt-filesystems.pod:399 ../cat/virt-log.pod:147 ../cat/virt-ls.pod:530 ../customize/virt-customize.pod:265 ../daemon/guestfsd.pod:122 ../df/virt-df.pod:266 ../diff/virt-diff.pod:263 ../edit/virt-edit.pod:402 ../format/virt-format.pod:197 ../inspector/virt-inspector.pod:507 ../make-fs/virt-make-fs.pod:231 ../p2v/virt-p2v.pod:213 ../rescue/virt-resc [...]
msgid "Richard W.M. Jones L<http://people.redhat.com/~rjones/>"
msgstr ""
#. type: =head1
-#: ../align/virt-alignment-scan.pod:397 ../appliance/libguestfs-make-fixed-appliance.pod:176 ../builder/virt-builder.pod:1711 ../builder/virt-index-validate.pod:88 ../cat/virt-cat.pod:287 ../cat/virt-filesystems.pod:401 ../cat/virt-log.pod:149 ../cat/virt-ls.pod:532 ../customize/virt-customize.pod:267 ../daemon/guestfsd.pod:124 ../df/virt-df.pod:268 ../diff/virt-diff.pod:265 ../edit/virt-edit.pod:404 ../erlang/examples/guestfs-erlang.pod:114 ../examples/guestfs-examples.pod:73 ../example [...]
+#: ../align/virt-alignment-scan.pod:397 ../appliance/libguestfs-make-fixed-appliance.pod:176 ../builder/virt-builder.pod:1711 ../builder/virt-index-validate.pod:88 ../cat/virt-cat.pod:287 ../cat/virt-filesystems.pod:401 ../cat/virt-log.pod:149 ../cat/virt-ls.pod:532 ../customize/virt-customize.pod:267 ../daemon/guestfsd.pod:124 ../df/virt-df.pod:268 ../diff/virt-diff.pod:265 ../edit/virt-edit.pod:404 ../erlang/examples/guestfs-erlang.pod:114 ../examples/guestfs-examples.pod:73 ../example [...]
msgid "COPYRIGHT"
msgstr ""
@@ -1129,7 +1129,7 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../appliance/libguestfs-make-fixed-appliance.pod:159 ../builder/virt-builder.pod:1624 ../customize/virt-customize.pod:216 ../edit/virt-edit.pod:371 ../fish/guestfish.pod:1385 ../fuse/guestunmount.pod:113 ../rescue/virt-rescue.pod:388 ../sparsify/virt-sparsify.pod:395 ../src/guestfs.pod:4644 ../sysprep/virt-sysprep.pod:518 ../test-tool/libguestfs-test-tool.pod:175 ../v2v/virt-v2v.pod:521
+#: ../appliance/libguestfs-make-fixed-appliance.pod:159 ../builder/virt-builder.pod:1624 ../customize/virt-customize.pod:216 ../edit/virt-edit.pod:371 ../fish/guestfish.pod:1385 ../fuse/guestunmount.pod:113 ../rescue/virt-rescue.pod:388 ../sparsify/virt-sparsify.pod:395 ../src/guestfs.pod:4644 ../sysprep/virt-sysprep.pod:518 ../test-tool/libguestfs-test-tool.pod:175 ../v2v/virt-v2v.pod:675
msgid "ENVIRONMENT VARIABLES"
msgstr ""
@@ -1148,7 +1148,7 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../appliance/libguestfs-make-fixed-appliance.pod:172 ../customize/virt-customize.pod:263 ../erlang/examples/guestfs-erlang.pod:110 ../examples/guestfs-examples.pod:69 ../examples/guestfs-faq.pod:1253 ../examples/guestfs-performance.pod:569 ../examples/guestfs-recipes.pod:674 ../examples/guestfs-testing.pod:391 ../fish/guestfish.pod:1636 ../fish/libguestfs-tools.conf.pod:96 ../fish/virt-copy-in.pod:58 ../fish/virt-copy-out.pod:47 ../fish/virt-tar-in.pod:56 ../fish/virt-tar-out.pod:49 . [...]
+#: ../appliance/libguestfs-make-fixed-appliance.pod:172 ../customize/virt-customize.pod:263 ../erlang/examples/guestfs-erlang.pod:110 ../examples/guestfs-examples.pod:69 ../examples/guestfs-faq.pod:1253 ../examples/guestfs-performance.pod:569 ../examples/guestfs-recipes.pod:674 ../examples/guestfs-testing.pod:391 ../fish/guestfish.pod:1636 ../fish/libguestfs-tools.conf.pod:96 ../fish/virt-copy-in.pod:58 ../fish/virt-copy-out.pod:47 ../fish/virt-tar-in.pod:56 ../fish/virt-tar-out.pod:49 . [...]
msgid "AUTHORS"
msgstr ""
@@ -1158,7 +1158,7 @@ msgid "Richard W.M. Jones (C<rjones at redhat dot com>)"
msgstr ""
#. type: textblock
-#: ../appliance/libguestfs-make-fixed-appliance.pod:178 ../cat/virt-ls.pod:534 ../daemon/guestfsd.pod:126 ../df/virt-df.pod:270 ../diff/virt-diff.pod:267 ../edit/virt-edit.pod:406 ../examples/guestfs-recipes.pod:680 ../fish/guestfish.pod:1642 ../fuse/guestmount.pod:435 ../guestfs-release-notes.pod:3023 ../p2v-iso/guestfs-p2v-iso.pod:238 ../p2v/virt-p2v.pod:219 ../rescue/virt-rescue.pod:428 ../src/guestfs.pod:4818 ../test-tool/libguestfs-test-tool.pod:192 ../tools/virt-list-partitions:280 [...]
+#: ../appliance/libguestfs-make-fixed-appliance.pod:178 ../cat/virt-ls.pod:534 ../daemon/guestfsd.pod:126 ../df/virt-df.pod:270 ../diff/virt-diff.pod:267 ../edit/virt-edit.pod:406 ../examples/guestfs-recipes.pod:680 ../fish/guestfish.pod:1642 ../fuse/guestmount.pod:435 ../guestfs-release-notes.pod:3023 ../p2v-iso/guestfs-p2v-iso.pod:238 ../p2v/virt-p2v.pod:219 ../rescue/virt-rescue.pod:428 ../src/guestfs.pod:4818 ../test-tool/libguestfs-test-tool.pod:192 ../tools/virt-list-partitions:280 [...]
msgid "Copyright (C) 2009-2014 Red Hat Inc."
msgstr ""
@@ -1268,7 +1268,7 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../builder/virt-builder.pod:49 ../cat/virt-cat.pod:30 ../cat/virt-log.pod:24 ../cat/virt-ls.pod:33 ../df/virt-df.pod:45 ../edit/virt-edit.pod:42 ../fish/guestfish.pod:39 ../fish/guestfish.pod:1097 ../fish/virt-copy-in.pod:27 ../fish/virt-copy-out.pod:19 ../fish/virt-tar-in.pod:28 ../fish/virt-tar-out.pod:22 ../fuse/guestmount.pod:37 ../resize/virt-resize.pod:25 ../sparsify/virt-sparsify.pod:85 ../tools/virt-tar:47
+#: ../builder/virt-builder.pod:49 ../cat/virt-cat.pod:30 ../cat/virt-log.pod:24 ../cat/virt-ls.pod:33 ../df/virt-df.pod:45 ../edit/virt-edit.pod:42 ../fish/guestfish.pod:39 ../fish/guestfish.pod:1097 ../fish/virt-copy-in.pod:27 ../fish/virt-copy-out.pod:19 ../fish/virt-tar-in.pod:28 ../fish/virt-tar-out.pod:22 ../fuse/guestmount.pod:37 ../resize/virt-resize.pod:25 ../sparsify/virt-sparsify.pod:85 ../tools/virt-tar:47 ../v2v/virt-v2v.pod:64
msgid "EXAMPLES"
msgstr ""
@@ -1593,7 +1593,7 @@ msgid "You can combine these options, and have multiple options of all types."
msgstr ""
#. type: textblock
-#: ../builder/virt-builder.pod:180 ../builder/virt-index-validate.pod:64 ../p2v/virt-p2v.pod:184 ../resize/virt-resize.pod:272 ../sparsify/virt-sparsify.pod:120 ../v2v/virt-v2v.pod:35
+#: ../builder/virt-builder.pod:180 ../builder/virt-index-validate.pod:64 ../p2v/virt-p2v.pod:184 ../resize/virt-resize.pod:272 ../sparsify/virt-sparsify.pod:120 ../v2v/virt-v2v.pod:122
msgid "Display help."
msgstr ""
@@ -1969,12 +1969,12 @@ msgid "See also: I<--source>, I<--notes>, L</SOURCES OF TEMPLATES>."
msgstr ""
#. type: =item
-#: ../builder/virt-builder.pod:347 ../resize/virt-resize.pod:441 ../sparsify/virt-sparsify.pod:223 ../v2v/virt-v2v.pod:87
+#: ../builder/virt-builder.pod:347 ../resize/virt-resize.pod:441 ../sparsify/virt-sparsify.pod:223 ../v2v/virt-v2v.pod:178
msgid "B<--machine-readable>"
msgstr ""
#. type: textblock
-#: ../builder/virt-builder.pod:349 ../resize/virt-resize.pod:443 ../sparsify/virt-sparsify.pod:225 ../v2v/virt-v2v.pod:89
+#: ../builder/virt-builder.pod:349 ../resize/virt-resize.pod:443 ../sparsify/virt-sparsify.pod:225 ../v2v/virt-v2v.pod:180
msgid ""
"This option is used to make the output more machine friendly when being "
"parsed by other programs. See L</MACHINE READABLE OUTPUT> below."
@@ -2061,7 +2061,7 @@ msgid ""
msgstr ""
#. type: =item
-#: ../builder/virt-builder.pod:388 ../builder/virt-builder.pod:835 ../customize/virt-customize.pod:155 ../examples/guestfs-faq.pod:483 ../examples/guestfs-faq.pod:712 ../examples/guestfs-performance.pod:159 ../examples/guestfs-performance.pod:201 ../examples/guestfs-recipes.pod:406 ../p2v-iso/guestfs-p2v-iso.pod:117 ../rescue/virt-rescue.pod:326 ../resize/virt-resize.pod:29 ../resize/virt-resize.pod:623 ../sparsify/virt-sparsify.pod:366 ../src/guestfs.pod:485 ../src/guestfs.pod:1819 ../s [...]
+#: ../builder/virt-builder.pod:388 ../builder/virt-builder.pod:835 ../customize/virt-customize.pod:155 ../examples/guestfs-faq.pod:483 ../examples/guestfs-faq.pod:712 ../examples/guestfs-performance.pod:159 ../examples/guestfs-performance.pod:201 ../examples/guestfs-recipes.pod:406 ../p2v-iso/guestfs-p2v-iso.pod:117 ../rescue/virt-rescue.pod:326 ../resize/virt-resize.pod:29 ../resize/virt-resize.pod:623 ../sparsify/virt-sparsify.pod:366 ../src/guestfs.pod:485 ../src/guestfs.pod:1819 ../s [...]
msgid "1."
msgstr ""
@@ -2073,7 +2073,7 @@ msgid ""
msgstr ""
#. type: =item
-#: ../builder/virt-builder.pod:393 ../builder/virt-builder.pod:840 ../customize/virt-customize.pod:160 ../examples/guestfs-faq.pod:488 ../examples/guestfs-faq.pod:722 ../examples/guestfs-performance.pod:165 ../examples/guestfs-performance.pod:208 ../examples/guestfs-recipes.pod:412 ../p2v-iso/guestfs-p2v-iso.pod:124 ../rescue/virt-rescue.pod:334 ../resize/virt-resize.pod:42 ../resize/virt-resize.pod:630 ../sparsify/virt-sparsify.pod:373 ../src/guestfs.pod:491 ../src/guestfs.pod:1823 ../s [...]
+#: ../builder/virt-builder.pod:393 ../builder/virt-builder.pod:840 ../customize/virt-customize.pod:160 ../examples/guestfs-faq.pod:488 ../examples/guestfs-faq.pod:722 ../examples/guestfs-performance.pod:165 ../examples/guestfs-performance.pod:208 ../examples/guestfs-recipes.pod:412 ../p2v-iso/guestfs-p2v-iso.pod:124 ../rescue/virt-rescue.pod:334 ../resize/virt-resize.pod:42 ../resize/virt-resize.pod:630 ../sparsify/virt-sparsify.pod:373 ../src/guestfs.pod:491 ../src/guestfs.pod:1823 ../s [...]
msgid "2."
msgstr ""
@@ -2085,7 +2085,7 @@ msgid ""
msgstr ""
#. type: =item
-#: ../builder/virt-builder.pod:398 ../builder/virt-builder.pod:848 ../customize/virt-customize.pod:165 ../examples/guestfs-faq.pod:494 ../examples/guestfs-faq.pod:727 ../examples/guestfs-performance.pod:214 ../examples/guestfs-recipes.pod:418 ../rescue/virt-rescue.pod:343 ../resize/virt-resize.pod:50 ../resize/virt-resize.pod:636 ../sparsify/virt-sparsify.pod:379 ../src/guestfs.pod:502 ../src/guestfs.pod:1827 ../src/guestfs.pod:2399 ../v2v/virt-v2v.pod:417 ../v2v/virt-v2v.pod:478
+#: ../builder/virt-builder.pod:398 ../builder/virt-builder.pod:848 ../customize/virt-customize.pod:165 ../examples/guestfs-faq.pod:494 ../examples/guestfs-faq.pod:727 ../examples/guestfs-performance.pod:214 ../examples/guestfs-recipes.pod:418 ../rescue/virt-rescue.pod:343 ../resize/virt-resize.pod:50 ../resize/virt-resize.pod:636 ../sparsify/virt-sparsify.pod:379 ../src/guestfs.pod:502 ../src/guestfs.pod:1827 ../src/guestfs.pod:2399 ../v2v/virt-v2v.pod:583 ../v2v/virt-v2v.pod:650
msgid "3."
msgstr ""
@@ -2098,7 +2098,7 @@ msgid ""
msgstr ""
#. type: =item
-#: ../builder/virt-builder.pod:405 ../customize/virt-customize.pod:172 ../rescue/virt-rescue.pod:352 ../resize/virt-resize.pod:59 ../v2v/virt-v2v.pod:499
+#: ../builder/virt-builder.pod:405 ../customize/virt-customize.pod:172 ../rescue/virt-rescue.pod:352 ../resize/virt-resize.pod:59 ../v2v/virt-v2v.pod:604
msgid "4."
msgstr ""
@@ -4505,7 +4505,7 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../builder/virt-builder.pod:1604 ../resize/virt-resize.pod:595 ../sparsify/virt-sparsify.pod:340 ../v2v/virt-v2v.pod:379
+#: ../builder/virt-builder.pod:1604 ../resize/virt-resize.pod:595 ../sparsify/virt-sparsify.pod:340 ../v2v/virt-v2v.pod:612
msgid "MACHINE READABLE OUTPUT"
msgstr ""
@@ -4539,7 +4539,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../builder/virt-builder.pod:1621 ../resize/virt-resize.pod:613 ../sparsify/virt-sparsify.pod:356 ../v2v/virt-v2v.pod:394
+#: ../builder/virt-builder.pod:1621 ../resize/virt-resize.pod:613 ../sparsify/virt-sparsify.pod:356 ../v2v/virt-v2v.pod:627
msgid ""
"A list of features is printed, one per line, and the program exits with "
"status 0."
@@ -4587,7 +4587,7 @@ msgid ""
msgstr ""
#. type: =item
-#: ../builder/virt-builder.pod:1645 ../customize/virt-customize.pod:220 ../sysprep/virt-sysprep.pod:522 ../v2v/virt-v2v.pod:544
+#: ../builder/virt-builder.pod:1645 ../customize/virt-customize.pod:220 ../sysprep/virt-sysprep.pod:522 ../v2v/virt-v2v.pod:698
msgid "C<VIRT_TOOLS_DATA_DIR>"
msgstr ""
@@ -4599,19 +4599,19 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../builder/virt-builder.pod:1650 ../customize/virt-customize.pod:225 ../sysprep/virt-sysprep.pod:527 ../v2v/virt-v2v.pod:549
+#: ../builder/virt-builder.pod:1650 ../customize/virt-customize.pod:225 ../sysprep/virt-sysprep.pod:527 ../v2v/virt-v2v.pod:703
msgid ""
"Normally you do not need to set this. If not set, a compiled-in default "
"will be used (something like C</usr/share/virt-tools>)."
msgstr ""
#. type: textblock
-#: ../builder/virt-builder.pod:1653 ../customize/virt-customize.pod:228 ../sysprep/virt-sysprep.pod:530 ../v2v/virt-v2v.pod:552
+#: ../builder/virt-builder.pod:1653 ../customize/virt-customize.pod:228 ../sysprep/virt-sysprep.pod:530 ../v2v/virt-v2v.pod:706
msgid "This directory may contain the following files:"
msgstr ""
#. type: =item
-#: ../builder/virt-builder.pod:1657 ../customize/virt-customize.pod:232 ../sysprep/virt-sysprep.pod:534 ../v2v/virt-v2v.pod:556
+#: ../builder/virt-builder.pod:1657 ../customize/virt-customize.pod:232 ../sysprep/virt-sysprep.pod:534 ../v2v/virt-v2v.pod:710
msgid "C<rhsrvany.exe>"
msgstr ""
@@ -4624,7 +4624,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../builder/virt-builder.pod:1663 ../customize/virt-customize.pod:238 ../sysprep/virt-sysprep.pod:540 ../v2v/virt-v2v.pod:563
+#: ../builder/virt-builder.pod:1663 ../customize/virt-customize.pod:238 ../sysprep/virt-sysprep.pod:540 ../v2v/virt-v2v.pod:717
msgid "See also: C<https://github.com/rwmjones/rhsrvany>"
msgstr ""
@@ -7336,7 +7336,7 @@ msgid "This program returns 0 on success, or 1 if there was an error."
msgstr ""
#. type: textblock
-#: ../customize/virt-customize.pod:244 ../sparsify/virt-sparsify.pod:426 ../sysprep/virt-sysprep.pod:546 ../v2v/virt-v2v.pod:582
+#: ../customize/virt-customize.pod:244 ../sparsify/virt-sparsify.pod:426 ../sysprep/virt-sysprep.pod:546 ../v2v/virt-v2v.pod:736
msgid "For other environment variables, see L<guestfs(3)/ENVIRONMENT VARIABLES>."
msgstr ""
@@ -7462,7 +7462,7 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../daemon/guestfsd.pod:76 ../fish/guestfish.pod:1537 ../fuse/guestmount.pod:391 ../rescue/virt-rescue.pod:393 ../v2v/virt-v2v.pod:507
+#: ../daemon/guestfsd.pod:76 ../fish/guestfish.pod:1537 ../fuse/guestmount.pod:391 ../rescue/virt-rescue.pod:393 ../v2v/virt-v2v.pod:661
msgid "FILES"
msgstr ""
@@ -47502,7 +47502,7 @@ msgid "L<virt-v2v(1)>, L<qemu-nbd(1)>, L<http://libguestfs.org/>."
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:215 ../v2v/virt-v2v.pod:601
+#: ../p2v/virt-p2v.pod:215 ../v2v/virt-v2v.pod:755
msgid "Matthew Booth"
msgstr ""
@@ -48953,7 +48953,7 @@ msgid "Enable debugging messages."
msgstr ""
#. type: =item
-#: ../resize/virt-resize.pod:338 ../sparsify/virt-sparsify.pod:186 ../v2v/virt-v2v.pod:37
+#: ../resize/virt-resize.pod:338 ../sparsify/virt-sparsify.pod:186 ../v2v/virt-v2v.pod:128
msgid "B<--debug-gc>"
msgstr ""
@@ -49401,7 +49401,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../resize/virt-resize.pod:601 ../sparsify/virt-sparsify.pod:346 ../v2v/virt-v2v.pod:385
+#: ../resize/virt-resize.pod:601 ../sparsify/virt-sparsify.pod:346 ../v2v/virt-v2v.pod:618
msgid "There are two ways to use this option."
msgstr ""
@@ -49426,26 +49426,26 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../resize/virt-resize.pod:616 ../sparsify/virt-sparsify.pod:359 ../v2v/virt-v2v.pod:397
+#: ../resize/virt-resize.pod:616 ../sparsify/virt-sparsify.pod:359 ../v2v/virt-v2v.pod:630
msgid ""
"Secondly use the option in conjunction with other options to make the "
"regular program output more machine friendly."
msgstr ""
#. type: textblock
-#: ../resize/virt-resize.pod:619 ../sparsify/virt-sparsify.pod:362 ../v2v/virt-v2v.pod:400
+#: ../resize/virt-resize.pod:619 ../sparsify/virt-sparsify.pod:362 ../v2v/virt-v2v.pod:633
msgid "At the moment this means:"
msgstr ""
#. type: textblock
-#: ../resize/virt-resize.pod:625 ../sparsify/virt-sparsify.pod:368 ../v2v/virt-v2v.pod:406
+#: ../resize/virt-resize.pod:625 ../sparsify/virt-sparsify.pod:368 ../v2v/virt-v2v.pod:639
msgid ""
"Progress bar messages can be parsed from stdout by looking for this regular "
"expression:"
msgstr ""
#. type: verbatim
-#: ../resize/virt-resize.pod:628 ../sparsify/virt-sparsify.pod:371 ../v2v/virt-v2v.pod:409
+#: ../resize/virt-resize.pod:628 ../sparsify/virt-sparsify.pod:371 ../v2v/virt-v2v.pod:642
#, no-wrap
msgid ""
" ^[0-9]+/[0-9]+$\n"
@@ -49453,7 +49453,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../resize/virt-resize.pod:632 ../sparsify/virt-sparsify.pod:375 ../v2v/virt-v2v.pod:413
+#: ../resize/virt-resize.pod:632 ../sparsify/virt-sparsify.pod:375 ../v2v/virt-v2v.pod:646
msgid ""
"The calling program should treat messages sent to stdout (except for "
"progress bar messages) as status messages. They can be logged and/or "
@@ -50095,7 +50095,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../sparsify/virt-sparsify.pod:247 ../v2v/virt-v2v.pod:197
+#: ../sparsify/virt-sparsify.pod:247 ../v2v/virt-v2v.pod:308
msgid "This disables progress bars and other unnecessary output."
msgstr ""
@@ -50268,7 +50268,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../sparsify/virt-sparsify.pod:401 ../v2v/virt-v2v.pod:527
+#: ../sparsify/virt-sparsify.pod:401 ../v2v/virt-v2v.pod:681
msgid ""
"Location of the temporary directory used for the potentially large temporary "
"overlay file."
@@ -50282,7 +50282,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../sparsify/virt-sparsify.pod:407 ../v2v/virt-v2v.pod:530
+#: ../sparsify/virt-sparsify.pod:407 ../v2v/virt-v2v.pod:684
msgid ""
"You should ensure there is enough free space in the worst case for a full "
"copy of the source disk (I<virtual> size), or else set C<$TMPDIR> to point "
@@ -50290,7 +50290,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../sparsify/virt-sparsify.pod:411 ../v2v/virt-v2v.pod:534
+#: ../sparsify/virt-sparsify.pod:411 ../v2v/virt-v2v.pod:688
msgid "This defaults to C</tmp>."
msgstr ""
@@ -50305,7 +50305,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../sparsify/virt-sparsify.pod:419 ../v2v/virt-v2v.pod:542
+#: ../sparsify/virt-sparsify.pod:419 ../v2v/virt-v2v.pod:696
#, no-wrap
msgid ""
" mount -o remount,size=10G /tmp\n"
@@ -78343,12 +78343,12 @@ msgstr ""
#: ../v2v/virt-v2v.pod:7
#, no-wrap
msgid ""
-" virt-v2v -ic esx://esx.example.com/ -os imported esx_guest\n"
+" virt-v2v -ic esx://esx.example.com/ esx_guest\n"
"\n"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:9
+#: ../v2v/virt-v2v.pod:9 ../v2v/virt-v2v.pod:86
#, no-wrap
msgid ""
" virt-v2v -ic esx://esx.example.com/ \\\n"
@@ -78357,7 +78357,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:12
+#: ../v2v/virt-v2v.pod:12 ../v2v/virt-v2v.pod:110
#, no-wrap
msgid ""
" virt-v2v -i libvirtxml -o local -os /tmp guest-domain.xml\n"
@@ -78365,7 +78365,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:14
+#: ../v2v/virt-v2v.pod:14 ../v2v/virt-v2v.pod:100
#, no-wrap
msgid ""
" virt-v2v -i disk -o local -os /tmp disk.img\n"
@@ -78395,25 +78395,195 @@ msgid ""
"E<ge> 1.28."
msgstr ""
+#. type: =head1
+#: ../v2v/virt-v2v.pod:29
+msgid "INPUT AND OUTPUT MODES"
+msgstr ""
+
+#. type: verbatim
+#: ../v2v/virt-v2v.pod:31
+#, no-wrap
+msgid ""
+" ┌────────────┐\n"
+" -i disk ───────────┐ │ │ ┌───────> -o local\n"
+" │ │ virt-v2v │ │\n"
+" └──> │ conversion │ ──┘\n"
+" -i libvirt ───────────> │ server │ ────────> -o libvirt\n"
+" (default) ┌──> │ │ ──┐ (default)\n"
+" │ │ │ │\n"
+" -i libvirtxml ─────┘ │ │ └────────> -o rhev\n"
+" └────────────┘\n"
+"\n"
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:41
+msgid ""
+"Virt-v2v has a number of possible input and output modes, selected using the "
+"I<-i> and I<-o> options. Only one input and output mode can be selected for "
+"each run of virt-v2v."
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:45
+msgid ""
+"I<-i libvirt> is used for reading from any libvirt source. Since libvirt "
+"can connect to many different hypervisors, it is used for reading guests "
+"from VMware ESX, RHEL 5 Xen and more. The I<-ic> option selects the precise "
+"libvirt source."
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:50
+msgid "I<-i disk> is used for reading from local disk images (mainly for testing)."
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:53
+msgid ""
+"I<-i libvirtxml> is used to read from libvirt XML files. This is the method "
+"used by L<virt-p2v(1)> behind the scenes."
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:56
+msgid ""
+"I<-o libvirt> is used for writing to any libvirt target. Libvirt can "
+"connect to local or remote KVM hypervisors. The I<-oc> option selects the "
+"precise libvirt target."
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:60
+msgid "I<-o local> is used to write to a local disk image (mainly for testing)."
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:62
+msgid "I<-o rhev> is used to write to a RHEV-M / oVirt target."
+msgstr ""
+
+#. type: =head2
+#: ../v2v/virt-v2v.pod:66
+msgid "Convert from VMware ESX server to local libvirt"
+msgstr ""
+
#. type: textblock
-#: ../v2v/virt-v2v.pod:39
+#: ../v2v/virt-v2v.pod:68
+msgid ""
+"You have a VMware ESX server called C<esx.example.com>. You want to convert "
+"a guest called C<esx_guest> to run locally under libvirt."
+msgstr ""
+
+#. type: verbatim
+#: ../v2v/virt-v2v.pod:71
+#, no-wrap
+msgid ""
+" virt-v2v -ic esx://example.com esx_guest\n"
+"\n"
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:73
+msgid ""
+"In this case you will most likely have to run virt-v2v as C<root>, since it "
+"needs to talk to the system libvirt daemon and copy the guest disks to "
+"C</var/lib/libvirt/images>."
+msgstr ""
+
+#. type: =head2
+#: ../v2v/virt-v2v.pod:77
+msgid "Convert from ESX to RHEV-M/oVirt"
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:79
+msgid ""
+"This is the same as the previous example, except you want to send the guest "
+"to a RHEV-M Export Storage Domain which is located remotely (over NFS) at "
+"C<rhev.nfs:/export_domain>. If you are unclear about the location of the "
+"Export Storage Domain you should check the settings on your RHEV-M "
+"management console. Guest network interface(s) are connected to the target "
+"network called C<rhevm>."
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:89
+msgid "In this case the host running virt-v2v acts as a B<conversion server>."
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:91
+msgid ""
+"Note that after conversion, the guest will appear in the RHEV-M Export "
+"Storage Domain, from where you will need to import it using the RHEV-M user "
+"interface."
+msgstr ""
+
+#. type: =head2
+#: ../v2v/virt-v2v.pod:95
+msgid "Convert disk image to disk image"
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:97
+msgid ""
+"Given a disk image from another hypervisor that you want to convert to run "
+"on KVM, you have two options. The simplest way is to try:"
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:102
+msgid ""
+"where virt-v2v guesses everything about the input C<disk.img> and (in this "
+"case) writes the converted result to C</tmp>."
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:105
+msgid ""
+"A more complex method is to write some L<libvirt "
+"XML|http://libvirt.org/formatdomain.html> describing the input guest (if you "
+"can get the source hypervisor to provide you with libvirt XML, then so much "
+"the better). You can then do:"
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:112
+msgid ""
+"Since C<guest-domain.xml> contains the path(s) to the guest disk image(s) "
+"you do not need to specify the name of the disk image on the command line."
+msgstr ""
+
+#. type: =item
+#: ../v2v/virt-v2v.pod:124
+msgid "B<--bridge> ..."
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:126
+msgid "See I<--network> below."
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:130
msgid ""
"Debug garbage collection and memory allocation. This is only useful when "
"debugging memory problems in virt-v2v or the OCaml libguestfs bindings."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:43
+#: ../v2v/virt-v2v.pod:134
msgid "B<-i disk>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:45
+#: ../v2v/virt-v2v.pod:136
msgid "Set the input method to I<disk>."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:47
+#: ../v2v/virt-v2v.pod:138
msgid ""
"In this mode you can read a virtual machine disk image with no metadata. "
"virt-v2v tries to guess the best default metadata. This is usually adequate "
@@ -78423,34 +78593,34 @@ msgid ""
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:53
+#: ../v2v/virt-v2v.pod:144
msgid "B<-i libvirt>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:55
+#: ../v2v/virt-v2v.pod:146
msgid "Set the input method to I<libvirt>. This is the default."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:57
+#: ../v2v/virt-v2v.pod:148
msgid ""
"In this mode you have to specify a libvirt guest name on the command line. "
"You may also specify a libvirt connection URI (see I<-ic>)."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:60
+#: ../v2v/virt-v2v.pod:151
msgid "B<-i libvirtxml>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:62
+#: ../v2v/virt-v2v.pod:153
msgid "Set the input method to I<libvirtxml>."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:64
+#: ../v2v/virt-v2v.pod:155
msgid ""
"In this mode you have to pass a libvirt XML file on the command line. This "
"file is read in order to get metadata about the source guest (such as its "
@@ -78458,60 +78628,93 @@ msgid ""
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:69
+#: ../v2v/virt-v2v.pod:160
msgid "B<-i local>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:71
+#: ../v2v/virt-v2v.pod:162
msgid "This is the same as I<-i disk>."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:73
+#: ../v2v/virt-v2v.pod:164
msgid "B<-ic> libvirtURI"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:75
+#: ../v2v/virt-v2v.pod:166
msgid ""
"Specify a libvirt connection URI to use when reading the guest. This is "
"only used when S<I<-i libvirt>>."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:78
+#: ../v2v/virt-v2v.pod:169
msgid ""
"Only local libvirt connections and ESX connections can be used. Remote "
"libvirt connections will not work in general."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:81
+#: ../v2v/virt-v2v.pod:172
msgid "B<-if> format"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:83
+#: ../v2v/virt-v2v.pod:174
msgid ""
"For I<-i disk> only, this specifies the format of the input disk image. For "
"other input methods you should specify the input format in the metadata."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:93
+#: ../v2v/virt-v2v.pod:184
+msgid "B<--network> in:out"
+msgstr ""
+
+#. type: =item
+#: ../v2v/virt-v2v.pod:186
+msgid "B<--network> out"
+msgstr ""
+
+#. type: =item
+#: ../v2v/virt-v2v.pod:188
+msgid "B<--bridge> in:out"
+msgstr ""
+
+#. type: =item
+#: ../v2v/virt-v2v.pod:190
+msgid "B<--bridge> out"
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:192
+msgid ""
+"Map network (or bridge) called C<in> to network (or bridge) called C<out>. "
+"If no C<in:> prefix is given, all other networks (or bridges) are mapped to "
+"C<out>."
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:196
+msgid "See L</NETWORKS AND BRIDGES> below."
+msgstr ""
+
+#. type: =item
+#: ../v2v/virt-v2v.pod:198
msgid "B<--no-copy>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:95
+#: ../v2v/virt-v2v.pod:200
msgid ""
"Don't copy the disks. Instead, conversion is performed (and thrown away), "
"and metadata is written, but no disks are created."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:98
+#: ../v2v/virt-v2v.pod:203
msgid ""
"This is useful in two cases: Either you want to test if conversion is likely "
"to succeed, without the long copying process. Or you are only interested in "
@@ -78519,46 +78722,46 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:102
+#: ../v2v/virt-v2v.pod:207
msgid ""
"This option is not compatible with I<-o libvirt> since it would create a "
"faulty guest (one with no disks)."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:105
+#: ../v2v/virt-v2v.pod:210
msgid "B<-o libvirt>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:107
+#: ../v2v/virt-v2v.pod:212
msgid "Set the output method to I<libvirt>. This is the default."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:109
+#: ../v2v/virt-v2v.pod:214
msgid ""
"In this mode, the converted guest is created as a libvirt guest. You may "
"also specify a libvirt connection URI (see I<-oc>)."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:112
+#: ../v2v/virt-v2v.pod:217
msgid "See L</OUTPUT TO LIBVIRT> below."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:114
+#: ../v2v/virt-v2v.pod:219
msgid "B<-o local>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:116
+#: ../v2v/virt-v2v.pod:221
msgid "Set the output method to I<local>."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:118
+#: ../v2v/virt-v2v.pod:223
msgid ""
"In this mode, the converted guest is written to a local directory specified "
"by I<-os /dir> (the directory must exist). The converted guest's disks are "
@@ -78566,7 +78769,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:122
+#: ../v2v/virt-v2v.pod:227
#, no-wrap
msgid ""
" /dir/disk-sda\n"
@@ -78576,34 +78779,34 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:126
+#: ../v2v/virt-v2v.pod:231
msgid ""
"and a libvirt XML file is created containing guest metadata "
"(C</dir/name.xml>, where C<name> is the guest name)."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:129
+#: ../v2v/virt-v2v.pod:234
msgid "B<-o ovirt>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:131
+#: ../v2v/virt-v2v.pod:236
msgid "This is the same as I<-o rhev>."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:133
+#: ../v2v/virt-v2v.pod:238
msgid "B<-o rhev>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:135
+#: ../v2v/virt-v2v.pod:240
msgid "Set the output method to I<rhev>."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:137
+#: ../v2v/virt-v2v.pod:242
msgid ""
"The converted guest is written to a RHEV Export Storage Domain. The I<-os> "
"parameter must also be used to specify the location of the Export Storage "
@@ -78612,97 +78815,97 @@ msgid ""
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:142
+#: ../v2v/virt-v2v.pod:247
msgid "B<-oa sparse>"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:144
+#: ../v2v/virt-v2v.pod:249
msgid "B<-oa preallocated>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:146
+#: ../v2v/virt-v2v.pod:251
msgid "Set the output file allocation mode. The default is C<sparse>."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:148
+#: ../v2v/virt-v2v.pod:253
msgid "B<-oc> libvirtURI"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:150
+#: ../v2v/virt-v2v.pod:255
msgid ""
"Specify a libvirt connection to use when writing the converted guest. This "
"is only used when S<I<-o libvirt>>. See L</OUTPUT TO LIBVIRT> below."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:153
+#: ../v2v/virt-v2v.pod:258
msgid ""
"Only local libvirt connections can be used. Remote libvirt connections will "
"not work."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:156
+#: ../v2v/virt-v2v.pod:261
msgid "B<-of> format"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:158
+#: ../v2v/virt-v2v.pod:263
msgid "When converting the guest, convert the disks to the given format."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:160
+#: ../v2v/virt-v2v.pod:265
msgid "If not specified, then the input format is used."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:162
+#: ../v2v/virt-v2v.pod:267
msgid "B<-on> name"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:164
+#: ../v2v/virt-v2v.pod:269
msgid ""
"Rename the guest when converting it. If this option is not used then the "
"output name is the same as the input name."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:167
+#: ../v2v/virt-v2v.pod:272
msgid "B<-os> storage"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:169
+#: ../v2v/virt-v2v.pod:274
msgid "The location of the storage for the converted guest."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:171
+#: ../v2v/virt-v2v.pod:276
msgid ""
"For I<-o libvirt>, this is a libvirt directory pool (see S<C<virsh "
"pool-list>>)."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:174
+#: ../v2v/virt-v2v.pod:279
msgid "For I<-o local>, this is a directory name. The directory must exist."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:176
+#: ../v2v/virt-v2v.pod:281
msgid ""
"For I<-o rhev>, this can be an NFS path of the Export Storage Domain of the "
"form C<E<lt>hostE<gt>:E<lt>pathE<gt>>, eg:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:179
+#: ../v2v/virt-v2v.pod:284
#, no-wrap
msgid ""
" rhev-storage.example.com:/rhev/export\n"
@@ -78710,7 +78913,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:181
+#: ../v2v/virt-v2v.pod:286
msgid ""
"The NFS export must be mountable and writable by the user and host running "
"virt-v2v, since the virt-v2v program has to actually mount it when it runs. "
@@ -78718,7 +78921,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:185
+#: ../v2v/virt-v2v.pod:290
msgid ""
"B<Or:> You can mount the Export Storage Domain yourself, and point I<-os> to "
"the mountpoint. Note that virt-v2v will still need to write to this remote "
@@ -78726,110 +78929,123 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:190
+#: ../v2v/virt-v2v.pod:295
msgid ""
"You will get an error if virt-v2v is unable to mount/write to the Export "
"Storage Domain."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:199
+#: ../v2v/virt-v2v.pod:298
+msgid "B<--print-source>"
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:300
+msgid ""
+"Print information about the source guest and stop. This option is useful "
+"when you are setting up network and bridge maps. See L</NETWORKS AND "
+"BRIDGES>."
+msgstr ""
+
+#. type: =item
+#: ../v2v/virt-v2v.pod:310
msgid "B<--rhev-image-uuid> UUID"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:201
+#: ../v2v/virt-v2v.pod:312
msgid "B<--rhev-vol-uuid> UUID"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:203
+#: ../v2v/virt-v2v.pod:314
msgid "B<--rhev-vm-uuid> UUID"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:205
+#: ../v2v/virt-v2v.pod:316
msgid "Normally the RHEV output mode chooses a random UUID for each of:"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:211
+#: ../v2v/virt-v2v.pod:322
msgid "the image directory (I<--rhev-image-uuid>)"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:215
+#: ../v2v/virt-v2v.pod:326
msgid "once for each guest disk (I<--rhev-vol-uuid>)"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:219
+#: ../v2v/virt-v2v.pod:330
msgid "the VM and OVF file (I<--rhev-vm-uuid>)."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:223
+#: ../v2v/virt-v2v.pod:334
msgid "However you can force specific UUIDs instead by using these options."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:225
+#: ../v2v/virt-v2v.pod:336
msgid ""
"You can use I<--rhev-image-uuid> and I<--rhev-vm-uuid> on the command line "
"at most once."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:228
+#: ../v2v/virt-v2v.pod:339
msgid ""
"If the guest has more than one virtual disk, then you should use "
"I<--rhev-vol-uuid> multiple times to change the UUID of each guest disk."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:232
+#: ../v2v/virt-v2v.pod:343
msgid ""
"The format of UUIDs is: C<12345678-1234-1234-1234-123456789abc> (each hex "
"digit can be C<0-9> or C<a-f>), conforming to S<OSF DCE 1.1>."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:235
+#: ../v2v/virt-v2v.pod:346
msgid "These options can only be used with I<-o rhev>."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:237
+#: ../v2v/virt-v2v.pod:348
msgid "B<--root ask>"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:239
+#: ../v2v/virt-v2v.pod:350
msgid "B<--root single>"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:241
+#: ../v2v/virt-v2v.pod:352
msgid "B<--root first>"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:243
+#: ../v2v/virt-v2v.pod:354
msgid "B<--root> /dev/sdX"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:245
+#: ../v2v/virt-v2v.pod:356
msgid "B<--root> /dev/VG/LV"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:247
+#: ../v2v/virt-v2v.pod:358
msgid "Choose the root filesystem to be converted."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:249
+#: ../v2v/virt-v2v.pod:360
msgid ""
"In the case where the virtual machine is dual-boot or multi-boot, or where "
"the VM has other filesystems that look like operating systems, this option "
@@ -78840,14 +79056,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:257
+#: ../v2v/virt-v2v.pod:368
msgid ""
"The default in virt-v2v E<le> 0.7.1 was S<I<--root single>>, which causes "
"virt-v2v to die if a multi-boot operating system is found."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:260
+#: ../v2v/virt-v2v.pod:371
msgid ""
"Since virt-v2v E<ge> 0.7.2 the default is now S<I<--root ask>>: If the VM is "
"found to be multi-boot, then virt-v2v will stop and list the possible root "
@@ -78856,7 +79072,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:265
+#: ../v2v/virt-v2v.pod:376
msgid ""
"S<I<--root first>> means to choose the first root device in the case of a "
"multi-boot operating system. Since this is a heuristic, it may sometimes "
@@ -78864,7 +79080,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:269
+#: ../v2v/virt-v2v.pod:380
msgid ""
"You can also name a specific root device, eg. S<I<--root /dev/sda2>> would "
"mean to use the second partition on the first hard drive. If the named root "
@@ -78873,7 +79089,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:274
+#: ../v2v/virt-v2v.pod:385
msgid ""
"Note that there is a bug in grub which prevents it from successfully booting "
"a multiboot system if VirtIO is enabled. Grub is only able to boot an "
@@ -78883,17 +79099,17 @@ msgid ""
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:292
+#: ../v2v/virt-v2v.pod:403
msgid "B<--vmtype desktop>"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:294
+#: ../v2v/virt-v2v.pod:405
msgid "B<--vmtype server>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:296
+#: ../v2v/virt-v2v.pod:407
msgid ""
"For the RHEV target only, specify the type of guest. You can set this to "
"C<desktop> or C<server>. If the option is not given, then a suitable "
@@ -78901,12 +79117,12 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../v2v/virt-v2v.pod:307
+#: ../v2v/virt-v2v.pod:418
msgid "XEN PARAVIRTUALIZED GUESTS"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:309
+#: ../v2v/virt-v2v.pod:420
msgid ""
"Older versions of virt-v2v could turn a Xen paravirtualized (PV) guest into "
"a KVM guest by installing a new kernel. This version of virt-v2v does "
@@ -78915,7 +79131,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:314
+#: ../v2v/virt-v2v.pod:425
msgid ""
"Therefore before conversion you should check that a regular kernel is "
"installed. For some older Linux distributions, this means installing a "
@@ -78923,7 +79139,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:318
+#: ../v2v/virt-v2v.pod:429
#, no-wrap
msgid ""
" RHEL 3 (Does not apply, as there was no Xen PV kernel)\n"
@@ -78931,7 +79147,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:320
+#: ../v2v/virt-v2v.pod:431
#, no-wrap
msgid ""
" RHEL 4 i686 with > 10GB of RAM: install 'kernel-hugemem'\n"
@@ -78944,7 +79160,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:327
+#: ../v2v/virt-v2v.pod:438
#, no-wrap
msgid ""
" RHEL 5 i686: install 'kernel-PAE'\n"
@@ -78953,7 +79169,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:330
+#: ../v2v/virt-v2v.pod:441
#, no-wrap
msgid ""
" SLES 10 i586 with > 10GB of RAM: install 'kernel-bigsmp'\n"
@@ -78965,7 +79181,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:336
+#: ../v2v/virt-v2v.pod:447
#, no-wrap
msgid ""
" SLES 11+ i586: install 'kernel-pae'\n"
@@ -78974,7 +79190,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:339
+#: ../v2v/virt-v2v.pod:450
#, no-wrap
msgid ""
" Windows (Does not apply, as there is no Xen PV Windows kernel)\n"
@@ -78982,19 +79198,19 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../v2v/virt-v2v.pod:341
+#: ../v2v/virt-v2v.pod:452
msgid "ENABLING VIRTIO"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:343
+#: ../v2v/virt-v2v.pod:454
msgid ""
"\"Virtio\" is the name for a set of drivers which make disk (block device), "
"network and other guest operations work much faster on KVM."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:346
+#: ../v2v/virt-v2v.pod:457
msgid ""
"Older versions of virt-v2v could install these drivers for certain Linux "
"guests. This version of virt-v2v does I<not> attempt to install new Linux "
@@ -79002,7 +79218,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:351
+#: ../v2v/virt-v2v.pod:462
msgid ""
"In order to enable virtio, and hence improve performance of the guest after "
"conversion, you should ensure that the B<minimum> versions of packages are "
@@ -79010,7 +79226,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:356
+#: ../v2v/virt-v2v.pod:467
#, no-wrap
msgid ""
" RHEL 3 No virtio drivers are available\n"
@@ -79018,7 +79234,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:358
+#: ../v2v/virt-v2v.pod:469
#, no-wrap
msgid ""
" RHEL 4 kernel >= 2.5.9-89.EL\n"
@@ -79026,7 +79242,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:360
+#: ../v2v/virt-v2v.pod:471
#, no-wrap
msgid ""
" RHEL 5 kernel >= 2.6.18-128.el5\n"
@@ -79036,7 +79252,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:364
+#: ../v2v/virt-v2v.pod:475
#, no-wrap
msgid ""
" RHEL 6+ All versions support virtio\n"
@@ -79044,7 +79260,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:366
+#: ../v2v/virt-v2v.pod:477
#, no-wrap
msgid ""
" Fedora All versions support virtio\n"
@@ -79052,7 +79268,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:368
+#: ../v2v/virt-v2v.pod:479
#, no-wrap
msgid ""
" SLES 11+ All versions support virtio\n"
@@ -79060,7 +79276,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:370
+#: ../v2v/virt-v2v.pod:481
#, no-wrap
msgid ""
" SLES 10 kernel >= 2.6.16.60-0.85.1\n"
@@ -79068,7 +79284,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:372
+#: ../v2v/virt-v2v.pod:483
#, no-wrap
msgid ""
" OpenSUSE 11+ All versions support virtio\n"
@@ -79076,7 +79292,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:374
+#: ../v2v/virt-v2v.pod:485
#, no-wrap
msgid ""
" OpenSUSE 10 kernel >= 2.6.25.5-1.1\n"
@@ -79084,7 +79300,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:376
+#: ../v2v/virt-v2v.pod:487
#, no-wrap
msgid ""
" Windows Drivers are installed from /usr/share/virtio-win\n"
@@ -79092,93 +79308,155 @@ msgid ""
"\n"
msgstr ""
+#. type: =head1
+#: ../v2v/virt-v2v.pod:490
+msgid "NETWORKS AND BRIDGES"
+msgstr ""
+
#. type: textblock
-#: ../v2v/virt-v2v.pod:381
+#: ../v2v/virt-v2v.pod:492
msgid ""
-"The I<--machine-readable> option can be used to make the output more machine "
-"friendly, which is useful when calling virt-v2v from other programs, GUIs "
-"etc."
+"Guests are usually connected to one or more networks, and when converted to "
+"the target hypervisor you usually want to reconnect those networks at the "
+"destination. The options I<--network> and I<--bridge> allow you to do that."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:387
+#: ../v2v/virt-v2v.pod:497
msgid ""
-"Firstly use the option on its own to query the capabilities of the virt-v2v "
-"binary. Typical output looks like this:"
+"If you are unsure of what networks and bridges are in use on the source "
+"hypervisor, then you can examine the source metadata (libvirt XML, vCenter "
+"information, etc.). Or you can run virt-v2v with the I<--print-source> "
+"option which causes virt-v2v to print out the information it has about the "
+"guest on the source and then exit."
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:503
+msgid ""
+"In the I<--print-source> output you will see a section showing the guest's "
+"Network Interface Cards (NICs):"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:390
+#: ../v2v/virt-v2v.pod:506
#, no-wrap
msgid ""
-" $ virt-v2v --machine-readable\n"
-" virt-v2v\n"
-" libguestfs-rewrite\n"
+" $ virt-v2v [-i ...] --print-source name\n"
+" [...]\n"
+" NICs:\n"
+" Network \"default\" mac: 52:54:00:d0:cf:0e\n"
"\n"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:419
+#: ../v2v/virt-v2v.pod:511
msgid ""
-"The calling program should treat messages sent to stderr as error messages. "
-"In addition, virt-v2v exits with a non-zero status code if there was a fatal "
-"error."
+"This is typical of a libvirt guest: It has a single network interface "
+"connected to a network called C<default>."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:425
+#: ../v2v/virt-v2v.pod:514
msgid ""
-"Virt-v2v E<le> 0.9.1 did not support the I<--machine-readable> option at "
-"all. The option was added when virt-v2v was rewritten in 2014."
+"To map a specific network to a target network, for example C<default> on the "
+"source to C<rhevm> on the target, use:"
+msgstr ""
+
+#. type: verbatim
+#: ../v2v/virt-v2v.pod:517
+#, no-wrap
+msgid ""
+" virt-v2v [...] --network default:rhevm\n"
+"\n"
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:519
+msgid "To map every network to a target network, use:"
+msgstr ""
+
+#. type: verbatim
+#: ../v2v/virt-v2v.pod:521
+#, no-wrap
+msgid ""
+" virt-v2v [...] --network rhevm\n"
+"\n"
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:523
+msgid ""
+"Bridges are handled in the same way, but you have to use the I<--bridge> "
+"option instead. For example:"
+msgstr ""
+
+#. type: verbatim
+#: ../v2v/virt-v2v.pod:526
+#, no-wrap
+msgid ""
+" $ virt-v2v [-i ...] --print-source name\n"
+" [...]\n"
+" NICs:\n"
+" Bridge \"br0\"\n"
+" \n"
+msgstr ""
+
+#. type: verbatim
+#: ../v2v/virt-v2v.pod:531
+#, no-wrap
+msgid ""
+" $ virt-v2v [...] --bridge br0:targetbr\n"
+"\n"
msgstr ""
#. type: =head1
-#: ../v2v/virt-v2v.pod:428
+#: ../v2v/virt-v2v.pod:533
msgid "OUTPUT TO LIBVIRT"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:430
+#: ../v2v/virt-v2v.pod:535
msgid ""
"The I<-o libvirt> option lets you upload the converted guest to a "
"libvirt-managed host. There are several limitations:"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:437
+#: ../v2v/virt-v2v.pod:542
msgid ""
"You can only use a local libvirt connection [see below for how to workaround "
"this]."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:442
+#: ../v2v/virt-v2v.pod:547
msgid ""
"The I<-os pool> option must specify a directory pool, not anything more "
"exotic such as iSCSI [but see below]."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:447
+#: ../v2v/virt-v2v.pod:552
msgid "You can only upload to a KVM hypervisor."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:451
+#: ../v2v/virt-v2v.pod:556
msgid ""
"B<To output to a remote libvirt instance and/or a non-directory storage "
"pool> you have to use the following workaround:"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:458
+#: ../v2v/virt-v2v.pod:563
msgid ""
"Use virt-v2v in I<-o local> mode to convert the guest disks and metadata "
"into a local temporary directory:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:461
+#: ../v2v/virt-v2v.pod:566
#, no-wrap
msgid ""
" virt-v2v [...] -o local -os /tmp\n"
@@ -79186,12 +79464,12 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:463
+#: ../v2v/virt-v2v.pod:568
msgid "This creates two (or more) files in C</tmp> called:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:465
+#: ../v2v/virt-v2v.pod:570
#, no-wrap
msgid ""
" /tmp/NAME.xml # the libvirt XML (metadata)\n"
@@ -79200,17 +79478,17 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:468
+#: ../v2v/virt-v2v.pod:573
msgid "(for C<NAME> substitute the guest's name)."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:472
+#: ../v2v/virt-v2v.pod:577
msgid "Upload the converted disk(s) into the storage pool called C<POOL>:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:474
+#: ../v2v/virt-v2v.pod:579
#, no-wrap
msgid ""
" size=$(stat -c%s /tmp/NAME-sda)\n"
@@ -79220,14 +79498,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:480
+#: ../v2v/virt-v2v.pod:585
msgid ""
"Edit C</tmp/NAME.xml> to change C</tmp/NAME-sda> to the pool name. In other "
"words, locate the following bit of XML:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:483
+#: ../v2v/virt-v2v.pod:588
#, no-wrap
msgid ""
" <disk type='file' device='disk'>\n"
@@ -79239,7 +79517,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:489
+#: ../v2v/virt-v2v.pod:594
msgid ""
"and change two things: The C<type='file'> attribute must be changed to "
"C<type='volume'>, and the C<E<lt>sourceE<gt>> element must be changed to "
@@ -79247,7 +79525,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:493
+#: ../v2v/virt-v2v.pod:598
#, no-wrap
msgid ""
" <disk type='volume' device='disk'>\n"
@@ -79259,42 +79537,82 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:501
+#: ../v2v/virt-v2v.pod:606
msgid "Define the final guest in libvirt:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:503
+#: ../v2v/virt-v2v.pod:608
#, no-wrap
msgid ""
" virsh define /tmp/NAME.xml\n"
"\n"
msgstr ""
+#. type: textblock
+#: ../v2v/virt-v2v.pod:614
+msgid ""
+"The I<--machine-readable> option can be used to make the output more machine "
+"friendly, which is useful when calling virt-v2v from other programs, GUIs "
+"etc."
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:620
+msgid ""
+"Firstly use the option on its own to query the capabilities of the virt-v2v "
+"binary. Typical output looks like this:"
+msgstr ""
+
+#. type: verbatim
+#: ../v2v/virt-v2v.pod:623
+#, no-wrap
+msgid ""
+" $ virt-v2v --machine-readable\n"
+" virt-v2v\n"
+" libguestfs-rewrite\n"
+"\n"
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:652
+msgid ""
+"The calling program should treat messages sent to stderr as error messages. "
+"In addition, virt-v2v exits with a non-zero status code if there was a fatal "
+"error."
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:658
+msgid ""
+"Virt-v2v E<le> 0.9.1 did not support the I<--machine-readable> option at "
+"all. The option was added when virt-v2v was rewritten in 2014."
+msgstr ""
+
#. type: =item
-#: ../v2v/virt-v2v.pod:511
+#: ../v2v/virt-v2v.pod:665
msgid "C</usr/share/virtio-win>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:513 ../v2v/virt-v2v.pod:567
+#: ../v2v/virt-v2v.pod:667 ../v2v/virt-v2v.pod:721
msgid "(Optional)"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:515
+#: ../v2v/virt-v2v.pod:669
msgid ""
"If this directory is present, then virtio drivers for Windows guests will be "
"found from this directory and installed in the guest during conversion."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:525
+#: ../v2v/virt-v2v.pod:679
msgid "C<TMPDIR>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:536
+#: ../v2v/virt-v2v.pod:690
msgid ""
"Note that if C<$TMPDIR> is a tmpfs (eg. if C</tmp> is on tmpfs, or if you "
"use C<TMPDIR=/dev/shm>), tmpfs defaults to a maximum size of I<half> of "
@@ -79304,31 +79622,31 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:546
+#: ../v2v/virt-v2v.pod:700
msgid ""
"This can point to the directory containing data files used for Windows "
"conversion."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:558
+#: ../v2v/virt-v2v.pod:712
msgid "(Required when doing conversions of Windows guests)"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:560
+#: ../v2v/virt-v2v.pod:714
msgid ""
"This is the RHSrvAny Windows binary, used to install a \"firstboot\" script "
"in the guest during conversion of Windows guests."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:565
+#: ../v2v/virt-v2v.pod:719
msgid "C<rhev-apt.exe>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:569
+#: ../v2v/virt-v2v.pod:723
msgid ""
"The RHEV Application Provisioning Tool (RHEV APT). If this file is present, "
"then RHEV APT will be installed in the Windows guest during conversion. "
@@ -79338,14 +79656,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:575
+#: ../v2v/virt-v2v.pod:729
msgid ""
"This file comes from Red Hat Enterprise Virtualization (RHEV), and is not "
"distributed with virt-v2v."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:586
+#: ../v2v/virt-v2v.pod:740
msgid ""
"L<virt-p2v(1)>, L<virt-customize(1)>, L<virt-df(1)>, L<virt-filesystems(1)>, "
"L<virt-sparsify(1)>, L<virt-sysprep(1)>, L<guestfs(3)>, L<guestfish(1)>, "
@@ -79353,6 +79671,6 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:603
+#: ../v2v/virt-v2v.pod:757
msgid "Mike Latimer"
msgstr ""
diff --git a/po-docs/uk.po b/po-docs/uk.po
index b782051..b74d0ec 100644
--- a/po-docs/uk.po
+++ b/po-docs/uk.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: libguestfs at redhat.com\n"
-"POT-Creation-Date: 2014-08-19 17:51+0200\n"
+"POT-Creation-Date: 2014-08-21 17:07+0200\n"
"PO-Revision-Date: 2014-07-22 18:04+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Ukrainian (http://www.transifex.com/projects/p/libguestfs/"
@@ -397,7 +397,7 @@ msgstr ""
#: ../resize/virt-resize.pod:266 ../sparsify/virt-sparsify.pod:114
#: ../sysprep/virt-sysprep.pod:38 ../test-tool/libguestfs-test-tool.pod:34
#: ../tools/virt-list-filesystems:52 ../tools/virt-list-partitions:53
-#: ../tools/virt-tar:100 ../tools/virt-win-reg:93 ../v2v/virt-v2v.pod:29
+#: ../tools/virt-tar:100 ../tools/virt-win-reg:93 ../v2v/virt-v2v.pod:116
msgid "OPTIONS"
msgstr "ПАРАМЕТРИ"
@@ -416,7 +416,7 @@ msgstr "ПАРАМЕТРИ"
#: ../resize/virt-resize.pod:270 ../sparsify/virt-sparsify.pod:118
#: ../sysprep/virt-sysprep.pod:42 ../test-tool/libguestfs-test-tool.pod:38
#: ../tools/virt-list-filesystems:60 ../tools/virt-list-partitions:61
-#: ../tools/virt-tar:108 ../tools/virt-win-reg:101 ../v2v/virt-v2v.pod:33
+#: ../tools/virt-tar:108 ../tools/virt-win-reg:101 ../v2v/virt-v2v.pod:120
msgid "B<--help>"
msgstr "B<--help>"
@@ -731,7 +731,7 @@ msgstr ""
#: ../align/virt-alignment-scan.pod:177 ../customize/virt-customize.pod:178
#: ../fuse/guestunmount.pod:83 ../resize/virt-resize.pod:507
#: ../sparsify/virt-sparsify.pod:243 ../sysprep/virt-sysprep.pod:211
-#: ../v2v/virt-v2v.pod:193
+#: ../v2v/virt-v2v.pod:304
msgid "B<-q>"
msgstr "B<-q>"
@@ -739,7 +739,7 @@ msgstr "B<-q>"
#: ../align/virt-alignment-scan.pod:179 ../builder/virt-builder.pod:452
#: ../customize/virt-customize.pod:180 ../fuse/guestunmount.pod:85
#: ../resize/virt-resize.pod:509 ../sparsify/virt-sparsify.pod:245
-#: ../sysprep/virt-sysprep.pod:213 ../v2v/virt-v2v.pod:195
+#: ../sysprep/virt-sysprep.pod:213 ../v2v/virt-v2v.pod:306
msgid "B<--quiet>"
msgstr "B<--quiet>"
@@ -789,7 +789,7 @@ msgstr ""
#: ../make-fs/virt-make-fs.pod:197 ../p2v/virt-p2v.pod:191
#: ../rescue/virt-rescue.pod:238 ../resize/virt-resize.pod:577
#: ../sparsify/virt-sparsify.pod:292 ../sysprep/virt-sysprep.pod:219
-#: ../v2v/virt-v2v.pod:280
+#: ../v2v/virt-v2v.pod:391
msgid "B<-v>"
msgstr "B<-v>"
@@ -804,7 +804,7 @@ msgstr "B<-v>"
#: ../make-fs/virt-make-fs.pod:199 ../p2v/virt-p2v.pod:193
#: ../rescue/virt-rescue.pod:240 ../resize/virt-resize.pod:579
#: ../sparsify/virt-sparsify.pod:294 ../sysprep/virt-sysprep.pod:221
-#: ../v2v/virt-v2v.pod:282
+#: ../v2v/virt-v2v.pod:393
msgid "B<--verbose>"
msgstr "B<--verbose>"
@@ -816,7 +816,7 @@ msgstr "B<--verbose>"
#: ../edit/virt-edit.pod:207 ../format/virt-format.pod:157
#: ../inspector/virt-inspector.pod:120 ../rescue/virt-rescue.pod:242
#: ../sparsify/virt-sparsify.pod:296 ../sysprep/virt-sysprep.pod:223
-#: ../v2v/virt-v2v.pod:284
+#: ../v2v/virt-v2v.pod:395
msgid "Enable verbose messages for debugging."
msgstr "Увімкнути докладний показ повідомлень з метою діагностики."
@@ -834,7 +834,7 @@ msgstr "Увімкнути докладний показ повідомлень
#: ../p2v/virt-p2v.pod:197 ../rescue/virt-rescue.pod:244
#: ../resize/virt-resize.pod:583 ../sparsify/virt-sparsify.pod:298
#: ../sysprep/virt-sysprep.pod:225 ../test-tool/libguestfs-test-tool.pod:59
-#: ../v2v/virt-v2v.pod:286
+#: ../v2v/virt-v2v.pod:397
msgid "B<-V>"
msgstr "B<-V>"
@@ -853,7 +853,7 @@ msgstr "B<-V>"
#: ../resize/virt-resize.pod:585 ../sparsify/virt-sparsify.pod:300
#: ../sysprep/virt-sysprep.pod:227 ../test-tool/libguestfs-test-tool.pod:61
#: ../tools/virt-list-filesystems:68 ../tools/virt-list-partitions:69
-#: ../tools/virt-tar:116 ../tools/virt-win-reg:109 ../v2v/virt-v2v.pod:288
+#: ../tools/virt-tar:116 ../tools/virt-win-reg:109 ../v2v/virt-v2v.pod:399
msgid "B<--version>"
msgstr "B<--version>"
@@ -868,7 +868,7 @@ msgstr "B<--version>"
#: ../rescue/virt-rescue.pod:248 ../resize/virt-resize.pod:587
#: ../sparsify/virt-sparsify.pod:302 ../sysprep/virt-sysprep.pod:229
#: ../tools/virt-list-filesystems:70 ../tools/virt-list-partitions:71
-#: ../tools/virt-tar:118 ../tools/virt-win-reg:111 ../v2v/virt-v2v.pod:290
+#: ../tools/virt-tar:118 ../tools/virt-win-reg:111 ../v2v/virt-v2v.pod:401
msgid "Display version number and exit."
msgstr "Показати дані щодо версії і завершити роботу."
@@ -883,7 +883,7 @@ msgstr "Показати дані щодо версії і завершити р
#: ../make-fs/virt-make-fs.pod:209 ../rescue/virt-rescue.pod:259
#: ../resize/virt-resize.pod:589 ../sparsify/virt-sparsify.pod:304
#: ../sysprep/virt-sysprep.pod:231 ../tools/virt-tar:155
-#: ../v2v/virt-v2v.pod:301
+#: ../v2v/virt-v2v.pod:412
msgid "B<-x>"
msgstr "B<-x>"
@@ -896,7 +896,7 @@ msgstr "B<-x>"
#: ../format/virt-format.pod:177 ../inspector/virt-inspector.pod:130
#: ../rescue/virt-rescue.pod:261 ../resize/virt-resize.pod:591
#: ../sparsify/virt-sparsify.pod:306 ../sysprep/virt-sysprep.pod:233
-#: ../v2v/virt-v2v.pod:303
+#: ../v2v/virt-v2v.pod:414
msgid "Enable tracing of libguestfs API calls."
msgstr "Увімкнути трасування викликів програмного інтерфейсу libguestfs."
@@ -1380,9 +1380,9 @@ msgstr "Ця програма повертає:"
#: ../sysprep/virt-sysprep.pod:411 ../tools/virt-win-reg:194
#: ../tools/virt-win-reg:199 ../tools/virt-win-reg:205
#: ../tools/virt-win-reg:754 ../tools/virt-win-reg:760
-#: ../tools/virt-win-reg:766 ../v2v/virt-v2v.pod:209 ../v2v/virt-v2v.pod:213
-#: ../v2v/virt-v2v.pod:217 ../v2v/virt-v2v.pod:435 ../v2v/virt-v2v.pod:440
-#: ../v2v/virt-v2v.pod:445
+#: ../tools/virt-win-reg:766 ../v2v/virt-v2v.pod:320 ../v2v/virt-v2v.pod:324
+#: ../v2v/virt-v2v.pod:328 ../v2v/virt-v2v.pod:540 ../v2v/virt-v2v.pod:545
+#: ../v2v/virt-v2v.pod:550
msgid "*"
msgstr "*"
@@ -1459,7 +1459,7 @@ msgstr ""
#: ../sparsify/virt-sparsify.pod:439 ../src/guestfs.pod:4752
#: ../sysprep/virt-sysprep.pod:548 ../test-tool/libguestfs-test-tool.pod:180
#: ../tools/virt-list-filesystems:181 ../tools/virt-list-partitions:263
-#: ../tools/virt-tar:292 ../tools/virt-win-reg:785 ../v2v/virt-v2v.pod:584
+#: ../tools/virt-tar:292 ../tools/virt-win-reg:785 ../v2v/virt-v2v.pod:738
msgid "SEE ALSO"
msgstr "ТАКОЖ ПЕРЕГЛЯНЬТЕ"
@@ -1499,7 +1499,7 @@ msgstr "АВТОР"
#: ../resize/virt-resize.pod:776 ../sparsify/virt-sparsify.pod:454
#: ../sysprep/virt-sysprep.pod:567 ../tools/virt-list-filesystems:195
#: ../tools/virt-list-partitions:276 ../tools/virt-tar:308
-#: ../tools/virt-win-reg:801 ../v2v/virt-v2v.pod:599
+#: ../tools/virt-win-reg:801 ../v2v/virt-v2v.pod:753
msgid "Richard W.M. Jones L<http://people.redhat.com/~rjones/>"
msgstr "Richard W.M. Jones L<http://people.redhat.com/~rjones/>"
@@ -1529,7 +1529,7 @@ msgstr "Richard W.M. Jones L<http://people.redhat.com/~rjones/>"
#: ../sparsify/virt-sparsify.pod:456 ../src/guestfs.pod:4816
#: ../sysprep/virt-sysprep.pod:571 ../test-tool/libguestfs-test-tool.pod:190
#: ../tools/virt-list-filesystems:197 ../tools/virt-list-partitions:278
-#: ../tools/virt-tar:310 ../tools/virt-win-reg:803 ../v2v/virt-v2v.pod:605
+#: ../tools/virt-tar:310 ../tools/virt-win-reg:803 ../v2v/virt-v2v.pod:759
msgid "COPYRIGHT"
msgstr "АВТОРСЬКІ ПРАВА"
@@ -1845,7 +1845,7 @@ msgstr ""
#: ../fuse/guestunmount.pod:113 ../rescue/virt-rescue.pod:388
#: ../sparsify/virt-sparsify.pod:395 ../src/guestfs.pod:4644
#: ../sysprep/virt-sysprep.pod:518 ../test-tool/libguestfs-test-tool.pod:175
-#: ../v2v/virt-v2v.pod:521
+#: ../v2v/virt-v2v.pod:675
msgid "ENVIRONMENT VARIABLES"
msgstr "ЗМІННІ СЕРЕДОВИЩА"
@@ -1883,7 +1883,7 @@ msgstr ""
#: ../python/examples/guestfs-python.pod:65
#: ../ruby/examples/guestfs-ruby.pod:48 ../src/guestfs.pod:4812
#: ../sysprep/virt-sysprep.pod:565 ../test-tool/libguestfs-test-tool.pod:186
-#: ../v2v/virt-v2v.pod:597
+#: ../v2v/virt-v2v.pod:751
msgid "AUTHORS"
msgstr "АВТОРИ"
@@ -1913,7 +1913,7 @@ msgstr "Richard W.M. Jones (C<rjones at redhat dot com>)"
#: ../guestfs-release-notes.pod:3023 ../p2v-iso/guestfs-p2v-iso.pod:238
#: ../p2v/virt-p2v.pod:219 ../rescue/virt-rescue.pod:428
#: ../src/guestfs.pod:4818 ../test-tool/libguestfs-test-tool.pod:192
-#: ../tools/virt-list-partitions:280 ../v2v/virt-v2v.pod:607
+#: ../tools/virt-list-partitions:280 ../v2v/virt-v2v.pod:761
msgid "Copyright (C) 2009-2014 Red Hat Inc."
msgstr "© Red Hat Inc., 2009–2014"
@@ -2048,7 +2048,7 @@ msgstr ""
#: ../fish/virt-copy-out.pod:19 ../fish/virt-tar-in.pod:28
#: ../fish/virt-tar-out.pod:22 ../fuse/guestmount.pod:37
#: ../resize/virt-resize.pod:25 ../sparsify/virt-sparsify.pod:85
-#: ../tools/virt-tar:47
+#: ../tools/virt-tar:47 ../v2v/virt-v2v.pod:64
msgid "EXAMPLES"
msgstr "ПРИКЛАДИ"
@@ -2409,7 +2409,7 @@ msgstr ""
#. type: textblock
#: ../builder/virt-builder.pod:180 ../builder/virt-index-validate.pod:64
#: ../p2v/virt-p2v.pod:184 ../resize/virt-resize.pod:272
-#: ../sparsify/virt-sparsify.pod:120 ../v2v/virt-v2v.pod:35
+#: ../sparsify/virt-sparsify.pod:120 ../v2v/virt-v2v.pod:122
msgid "Display help."
msgstr "Показати довідкове повідомлення."
@@ -2799,13 +2799,13 @@ msgstr ""
#. type: =item
#: ../builder/virt-builder.pod:347 ../resize/virt-resize.pod:441
-#: ../sparsify/virt-sparsify.pod:223 ../v2v/virt-v2v.pod:87
+#: ../sparsify/virt-sparsify.pod:223 ../v2v/virt-v2v.pod:178
msgid "B<--machine-readable>"
msgstr "B<--machine-readable>"
#. type: textblock
#: ../builder/virt-builder.pod:349 ../resize/virt-resize.pod:443
-#: ../sparsify/virt-sparsify.pod:225 ../v2v/virt-v2v.pod:89
+#: ../sparsify/virt-sparsify.pod:225 ../v2v/virt-v2v.pod:180
msgid ""
"This option is used to make the output more machine friendly when being "
"parsed by other programs. See L</MACHINE READABLE OUTPUT> below."
@@ -2902,7 +2902,7 @@ msgstr ""
#: ../resize/virt-resize.pod:29 ../resize/virt-resize.pod:623
#: ../sparsify/virt-sparsify.pod:366 ../src/guestfs.pod:485
#: ../src/guestfs.pod:1819 ../src/guestfs.pod:2091 ../src/guestfs.pod:2389
-#: ../src/guestfs.pod:3883 ../v2v/virt-v2v.pod:404 ../v2v/virt-v2v.pod:456
+#: ../src/guestfs.pod:3883 ../v2v/virt-v2v.pod:561 ../v2v/virt-v2v.pod:637
msgid "1."
msgstr "1."
@@ -2922,7 +2922,7 @@ msgstr ""
#: ../resize/virt-resize.pod:42 ../resize/virt-resize.pod:630
#: ../sparsify/virt-sparsify.pod:373 ../src/guestfs.pod:491
#: ../src/guestfs.pod:1823 ../src/guestfs.pod:2095 ../src/guestfs.pod:2393
-#: ../src/guestfs.pod:3908 ../v2v/virt-v2v.pod:411 ../v2v/virt-v2v.pod:470
+#: ../src/guestfs.pod:3908 ../v2v/virt-v2v.pod:575 ../v2v/virt-v2v.pod:644
msgid "2."
msgstr "2."
@@ -2940,8 +2940,8 @@ msgstr ""
#: ../examples/guestfs-recipes.pod:418 ../rescue/virt-rescue.pod:343
#: ../resize/virt-resize.pod:50 ../resize/virt-resize.pod:636
#: ../sparsify/virt-sparsify.pod:379 ../src/guestfs.pod:502
-#: ../src/guestfs.pod:1827 ../src/guestfs.pod:2399 ../v2v/virt-v2v.pod:417
-#: ../v2v/virt-v2v.pod:478
+#: ../src/guestfs.pod:1827 ../src/guestfs.pod:2399 ../v2v/virt-v2v.pod:583
+#: ../v2v/virt-v2v.pod:650
msgid "3."
msgstr "3."
@@ -2956,7 +2956,7 @@ msgstr ""
#. type: =item
#: ../builder/virt-builder.pod:405 ../customize/virt-customize.pod:172
#: ../rescue/virt-rescue.pod:352 ../resize/virt-resize.pod:59
-#: ../v2v/virt-v2v.pod:499
+#: ../v2v/virt-v2v.pod:604
msgid "4."
msgstr "4."
@@ -5507,7 +5507,7 @@ msgstr ""
#. type: =head1
#: ../builder/virt-builder.pod:1604 ../resize/virt-resize.pod:595
-#: ../sparsify/virt-sparsify.pod:340 ../v2v/virt-v2v.pod:379
+#: ../sparsify/virt-sparsify.pod:340 ../v2v/virt-v2v.pod:612
msgid "MACHINE READABLE OUTPUT"
msgstr ""
@@ -5542,7 +5542,7 @@ msgstr ""
#. type: textblock
#: ../builder/virt-builder.pod:1621 ../resize/virt-resize.pod:613
-#: ../sparsify/virt-sparsify.pod:356 ../v2v/virt-v2v.pod:394
+#: ../sparsify/virt-sparsify.pod:356 ../v2v/virt-v2v.pod:627
msgid ""
"A list of features is printed, one per line, and the program exits with "
"status 0."
@@ -5591,7 +5591,7 @@ msgstr ""
#. type: =item
#: ../builder/virt-builder.pod:1645 ../customize/virt-customize.pod:220
-#: ../sysprep/virt-sysprep.pod:522 ../v2v/virt-v2v.pod:544
+#: ../sysprep/virt-sysprep.pod:522 ../v2v/virt-v2v.pod:698
msgid "C<VIRT_TOOLS_DATA_DIR>"
msgstr ""
@@ -5605,7 +5605,7 @@ msgstr ""
#. type: textblock
#: ../builder/virt-builder.pod:1650 ../customize/virt-customize.pod:225
-#: ../sysprep/virt-sysprep.pod:527 ../v2v/virt-v2v.pod:549
+#: ../sysprep/virt-sysprep.pod:527 ../v2v/virt-v2v.pod:703
msgid ""
"Normally you do not need to set this. If not set, a compiled-in default "
"will be used (something like C</usr/share/virt-tools>)."
@@ -5613,13 +5613,13 @@ msgstr ""
#. type: textblock
#: ../builder/virt-builder.pod:1653 ../customize/virt-customize.pod:228
-#: ../sysprep/virt-sysprep.pod:530 ../v2v/virt-v2v.pod:552
+#: ../sysprep/virt-sysprep.pod:530 ../v2v/virt-v2v.pod:706
msgid "This directory may contain the following files:"
msgstr ""
#. type: =item
#: ../builder/virt-builder.pod:1657 ../customize/virt-customize.pod:232
-#: ../sysprep/virt-sysprep.pod:534 ../v2v/virt-v2v.pod:556
+#: ../sysprep/virt-sysprep.pod:534 ../v2v/virt-v2v.pod:710
msgid "C<rhsrvany.exe>"
msgstr ""
@@ -5634,7 +5634,7 @@ msgstr ""
#. type: textblock
#: ../builder/virt-builder.pod:1663 ../customize/virt-customize.pod:238
-#: ../sysprep/virt-sysprep.pod:540 ../v2v/virt-v2v.pod:563
+#: ../sysprep/virt-sysprep.pod:540 ../v2v/virt-v2v.pod:717
msgid "See also: C<https://github.com/rwmjones/rhsrvany>"
msgstr ""
@@ -8694,7 +8694,7 @@ msgstr ""
#. type: textblock
#: ../customize/virt-customize.pod:244 ../sparsify/virt-sparsify.pod:426
-#: ../sysprep/virt-sysprep.pod:546 ../v2v/virt-v2v.pod:582
+#: ../sysprep/virt-sysprep.pod:546 ../v2v/virt-v2v.pod:736
msgid ""
"For other environment variables, see L<guestfs(3)/ENVIRONMENT VARIABLES>."
msgstr ""
@@ -8829,7 +8829,7 @@ msgstr ""
#. type: =head1
#: ../daemon/guestfsd.pod:76 ../fish/guestfish.pod:1537
#: ../fuse/guestmount.pod:391 ../rescue/virt-rescue.pod:393
-#: ../v2v/virt-v2v.pod:507
+#: ../v2v/virt-v2v.pod:661
msgid "FILES"
msgstr "ФАЙЛИ"
@@ -50843,7 +50843,7 @@ msgid "L<virt-v2v(1)>, L<qemu-nbd(1)>, L<http://libguestfs.org/>."
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:215 ../v2v/virt-v2v.pod:601
+#: ../p2v/virt-p2v.pod:215 ../v2v/virt-v2v.pod:755
msgid "Matthew Booth"
msgstr ""
@@ -52382,7 +52382,7 @@ msgstr "Увімкнути показ діагностичних повідом
#. type: =item
#: ../resize/virt-resize.pod:338 ../sparsify/virt-sparsify.pod:186
-#: ../v2v/virt-v2v.pod:37
+#: ../v2v/virt-v2v.pod:128
msgid "B<--debug-gc>"
msgstr "B<--debug-gc>"
@@ -52847,7 +52847,7 @@ msgstr ""
#. type: textblock
#: ../resize/virt-resize.pod:601 ../sparsify/virt-sparsify.pod:346
-#: ../v2v/virt-v2v.pod:385
+#: ../v2v/virt-v2v.pod:618
msgid "There are two ways to use this option."
msgstr "Існує два способи використання цього параметра."
@@ -52880,7 +52880,7 @@ msgstr ""
#. type: textblock
#: ../resize/virt-resize.pod:616 ../sparsify/virt-sparsify.pod:359
-#: ../v2v/virt-v2v.pod:397
+#: ../v2v/virt-v2v.pod:630
msgid ""
"Secondly use the option in conjunction with other options to make the "
"regular program output more machine friendly."
@@ -52888,13 +52888,13 @@ msgstr ""
#. type: textblock
#: ../resize/virt-resize.pod:619 ../sparsify/virt-sparsify.pod:362
-#: ../v2v/virt-v2v.pod:400
+#: ../v2v/virt-v2v.pod:633
msgid "At the moment this means:"
msgstr "У поточній версії це означає таке:"
#. type: textblock
#: ../resize/virt-resize.pod:625 ../sparsify/virt-sparsify.pod:368
-#: ../v2v/virt-v2v.pod:406
+#: ../v2v/virt-v2v.pod:639
msgid ""
"Progress bar messages can be parsed from stdout by looking for this regular "
"expression:"
@@ -52902,7 +52902,7 @@ msgstr ""
#. type: verbatim
#: ../resize/virt-resize.pod:628 ../sparsify/virt-sparsify.pod:371
-#: ../v2v/virt-v2v.pod:409
+#: ../v2v/virt-v2v.pod:642
#, no-wrap
msgid ""
" ^[0-9]+/[0-9]+$\n"
@@ -52913,7 +52913,7 @@ msgstr ""
#. type: textblock
#: ../resize/virt-resize.pod:632 ../sparsify/virt-sparsify.pod:375
-#: ../v2v/virt-v2v.pod:413
+#: ../v2v/virt-v2v.pod:646
msgid ""
"The calling program should treat messages sent to stdout (except for "
"progress bar messages) as status messages. They can be logged and/or "
@@ -53589,7 +53589,7 @@ msgstr ""
"\n"
#. type: textblock
-#: ../sparsify/virt-sparsify.pod:247 ../v2v/virt-v2v.pod:197
+#: ../sparsify/virt-sparsify.pod:247 ../v2v/virt-v2v.pod:308
msgid "This disables progress bars and other unnecessary output."
msgstr ""
@@ -53769,7 +53769,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../sparsify/virt-sparsify.pod:401 ../v2v/virt-v2v.pod:527
+#: ../sparsify/virt-sparsify.pod:401 ../v2v/virt-v2v.pod:681
msgid ""
"Location of the temporary directory used for the potentially large temporary "
"overlay file."
@@ -53783,7 +53783,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../sparsify/virt-sparsify.pod:407 ../v2v/virt-v2v.pod:530
+#: ../sparsify/virt-sparsify.pod:407 ../v2v/virt-v2v.pod:684
msgid ""
"You should ensure there is enough free space in the worst case for a full "
"copy of the source disk (I<virtual> size), or else set C<$TMPDIR> to point "
@@ -53791,7 +53791,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../sparsify/virt-sparsify.pod:411 ../v2v/virt-v2v.pod:534
+#: ../sparsify/virt-sparsify.pod:411 ../v2v/virt-v2v.pod:688
msgid "This defaults to C</tmp>."
msgstr "Типовим значенням є C</tmp>."
@@ -53806,7 +53806,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../sparsify/virt-sparsify.pod:419 ../v2v/virt-v2v.pod:542
+#: ../sparsify/virt-sparsify.pod:419 ../v2v/virt-v2v.pod:696
#, no-wrap
msgid ""
" mount -o remount,size=10G /tmp\n"
@@ -86472,12 +86472,12 @@ msgstr ""
#: ../v2v/virt-v2v.pod:7
#, no-wrap
msgid ""
-" virt-v2v -ic esx://esx.example.com/ -os imported esx_guest\n"
+" virt-v2v -ic esx://esx.example.com/ esx_guest\n"
"\n"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:9
+#: ../v2v/virt-v2v.pod:9 ../v2v/virt-v2v.pod:86
#, no-wrap
msgid ""
" virt-v2v -ic esx://esx.example.com/ \\\n"
@@ -86486,7 +86486,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:12
+#: ../v2v/virt-v2v.pod:12 ../v2v/virt-v2v.pod:110
#, no-wrap
msgid ""
" virt-v2v -i libvirtxml -o local -os /tmp guest-domain.xml\n"
@@ -86494,7 +86494,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:14
+#: ../v2v/virt-v2v.pod:14 ../v2v/virt-v2v.pod:100
#, fuzzy, no-wrap
#| msgid ""
#| " virt-builder fedora-20 -o mydisk.img\n"
@@ -86529,27 +86529,207 @@ msgid ""
"E<ge> 1.28."
msgstr ""
+#. type: =head1
+#: ../v2v/virt-v2v.pod:29
+#, fuzzy
+#| msgid "OUTPUT MODES"
+msgid "INPUT AND OUTPUT MODES"
+msgstr "РЕЖИМИ ВИВЕДЕННЯ ДАНИХ"
+
+#. type: verbatim
+#: ../v2v/virt-v2v.pod:31
+#, no-wrap
+msgid ""
+" ┌────────────┐\n"
+" -i disk ───────────┐ │ │ ┌───────> -o local\n"
+" │ │ virt-v2v │ │\n"
+" └──> │ conversion │ ──┘\n"
+" -i libvirt ───────────> │ server │ ────────> -o libvirt\n"
+" (default) ┌──> │ │ ──┐ (default)\n"
+" │ │ │ │\n"
+" -i libvirtxml ─────┘ │ │ └────────> -o rhev\n"
+" └────────────┘\n"
+"\n"
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:41
+msgid ""
+"Virt-v2v has a number of possible input and output modes, selected using the "
+"I<-i> and I<-o> options. Only one input and output mode can be selected for "
+"each run of virt-v2v."
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:45
+msgid ""
+"I<-i libvirt> is used for reading from any libvirt source. Since libvirt "
+"can connect to many different hypervisors, it is used for reading guests "
+"from VMware ESX, RHEL 5 Xen and more. The I<-ic> option selects the precise "
+"libvirt source."
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:50
+msgid ""
+"I<-i disk> is used for reading from local disk images (mainly for testing)."
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:53
+msgid ""
+"I<-i libvirtxml> is used to read from libvirt XML files. This is the method "
+"used by L<virt-p2v(1)> behind the scenes."
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:56
+msgid ""
+"I<-o libvirt> is used for writing to any libvirt target. Libvirt can "
+"connect to local or remote KVM hypervisors. The I<-oc> option selects the "
+"precise libvirt target."
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:60
+msgid ""
+"I<-o local> is used to write to a local disk image (mainly for testing)."
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:62
+msgid "I<-o rhev> is used to write to a RHEV-M / oVirt target."
+msgstr ""
+
+#. type: =head2
+#: ../v2v/virt-v2v.pod:66
+msgid "Convert from VMware ESX server to local libvirt"
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:68
+msgid ""
+"You have a VMware ESX server called C<esx.example.com>. You want to convert "
+"a guest called C<esx_guest> to run locally under libvirt."
+msgstr ""
+
+#. type: verbatim
+#: ../v2v/virt-v2v.pod:71
+#, no-wrap
+msgid ""
+" virt-v2v -ic esx://example.com esx_guest\n"
+"\n"
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:73
+msgid ""
+"In this case you will most likely have to run virt-v2v as C<root>, since it "
+"needs to talk to the system libvirt daemon and copy the guest disks to C</"
+"var/lib/libvirt/images>."
+msgstr ""
+
+#. type: =head2
+#: ../v2v/virt-v2v.pod:77
+msgid "Convert from ESX to RHEV-M/oVirt"
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:79
+msgid ""
+"This is the same as the previous example, except you want to send the guest "
+"to a RHEV-M Export Storage Domain which is located remotely (over NFS) at "
+"C<rhev.nfs:/export_domain>. If you are unclear about the location of the "
+"Export Storage Domain you should check the settings on your RHEV-M "
+"management console. Guest network interface(s) are connected to the target "
+"network called C<rhevm>."
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:89
+msgid "In this case the host running virt-v2v acts as a B<conversion server>."
+msgstr ""
+
#. type: textblock
-#: ../v2v/virt-v2v.pod:39
+#: ../v2v/virt-v2v.pod:91
+msgid ""
+"Note that after conversion, the guest will appear in the RHEV-M Export "
+"Storage Domain, from where you will need to import it using the RHEV-M user "
+"interface."
+msgstr ""
+
+#. type: =head2
+#: ../v2v/virt-v2v.pod:95
+#, fuzzy
+#| msgid "Create empty disk images"
+msgid "Convert disk image to disk image"
+msgstr "Створення порожніх образів дисків"
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:97
+msgid ""
+"Given a disk image from another hypervisor that you want to convert to run "
+"on KVM, you have two options. The simplest way is to try:"
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:102
+msgid ""
+"where virt-v2v guesses everything about the input C<disk.img> and (in this "
+"case) writes the converted result to C</tmp>."
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:105
+msgid ""
+"A more complex method is to write some L<libvirt XML|http://libvirt.org/"
+"formatdomain.html> describing the input guest (if you can get the source "
+"hypervisor to provide you with libvirt XML, then so much the better). You "
+"can then do:"
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:112
+msgid ""
+"Since C<guest-domain.xml> contains the path(s) to the guest disk image(s) "
+"you do not need to specify the name of the disk image on the command line."
+msgstr ""
+
+#. type: =item
+#: ../v2v/virt-v2v.pod:124
+#, fuzzy
+#| msgid "B<--merge>"
+msgid "B<--bridge> ..."
+msgstr "B<--merge>"
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:126
+#, fuzzy
+#| msgid "B<--network>"
+msgid "See I<--network> below."
+msgstr "B<--network>"
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:130
msgid ""
"Debug garbage collection and memory allocation. This is only useful when "
"debugging memory problems in virt-v2v or the OCaml libguestfs bindings."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:43
+#: ../v2v/virt-v2v.pod:134
#, fuzzy
#| msgid "B<gdisk>"
msgid "B<-i disk>"
msgstr "B<gdisk>"
#. type: textblock
-#: ../v2v/virt-v2v.pod:45
+#: ../v2v/virt-v2v.pod:136
msgid "Set the input method to I<disk>."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:47
+#: ../v2v/virt-v2v.pod:138
msgid ""
"In this mode you can read a virtual machine disk image with no metadata. "
"virt-v2v tries to guess the best default metadata. This is usually adequate "
@@ -86559,34 +86739,34 @@ msgid ""
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:53
+#: ../v2v/virt-v2v.pod:144
msgid "B<-i libvirt>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:55
+#: ../v2v/virt-v2v.pod:146
msgid "Set the input method to I<libvirt>. This is the default."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:57
+#: ../v2v/virt-v2v.pod:148
msgid ""
"In this mode you have to specify a libvirt guest name on the command line. "
"You may also specify a libvirt connection URI (see I<-ic>)."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:60
+#: ../v2v/virt-v2v.pod:151
msgid "B<-i libvirtxml>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:62
+#: ../v2v/virt-v2v.pod:153
msgid "Set the input method to I<libvirtxml>."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:64
+#: ../v2v/virt-v2v.pod:155
msgid ""
"In this mode you have to pass a libvirt XML file on the command line. This "
"file is read in order to get metadata about the source guest (such as its "
@@ -86594,66 +86774,107 @@ msgid ""
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:69
+#: ../v2v/virt-v2v.pod:160
#, fuzzy
#| msgid "B<-i>"
msgid "B<-i local>"
msgstr "B<-i>"
#. type: textblock
-#: ../v2v/virt-v2v.pod:71
+#: ../v2v/virt-v2v.pod:162
msgid "This is the same as I<-i disk>."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:73
+#: ../v2v/virt-v2v.pod:164
msgid "B<-ic> libvirtURI"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:75
+#: ../v2v/virt-v2v.pod:166
msgid ""
"Specify a libvirt connection URI to use when reading the guest. This is "
"only used when S<I<-i libvirt>>."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:78
+#: ../v2v/virt-v2v.pod:169
msgid ""
"Only local libvirt connections and ESX connections can be used. Remote "
"libvirt connections will not work in general."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:81
+#: ../v2v/virt-v2v.pod:172
#, fuzzy
#| msgid "B<--format>"
msgid "B<-if> format"
msgstr "B<--format>"
#. type: textblock
-#: ../v2v/virt-v2v.pod:83
+#: ../v2v/virt-v2v.pod:174
msgid ""
"For I<-i disk> only, this specifies the format of the input disk image. For "
"other input methods you should specify the input format in the metadata."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:93
+#: ../v2v/virt-v2v.pod:184
+#, fuzzy
+#| msgid "B<--network>"
+msgid "B<--network> in:out"
+msgstr "B<--network>"
+
+#. type: =item
+#: ../v2v/virt-v2v.pod:186
+#, fuzzy
+#| msgid "B<--network>"
+msgid "B<--network> out"
+msgstr "B<--network>"
+
+#. type: =item
+#: ../v2v/virt-v2v.pod:188
+msgid "B<--bridge> in:out"
+msgstr ""
+
+#. type: =item
+#: ../v2v/virt-v2v.pod:190
+#, fuzzy
+#| msgid "B<--merge>"
+msgid "B<--bridge> out"
+msgstr "B<--merge>"
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:192
+msgid ""
+"Map network (or bridge) called C<in> to network (or bridge) called C<out>. "
+"If no C<in:> prefix is given, all other networks (or bridges) are mapped to "
+"C<out>."
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:196
+#, fuzzy
+#| msgid "See L</OPENING DISKS FOR READ AND WRITE> below."
+msgid "See L</NETWORKS AND BRIDGES> below."
+msgstr "Див. L</OPENING DISKS FOR READ AND WRITE> нижче."
+
+#. type: =item
+#: ../v2v/virt-v2v.pod:198
#, fuzzy
#| msgid "B<--no-sync>"
msgid "B<--no-copy>"
msgstr "B<--no-sync>"
#. type: textblock
-#: ../v2v/virt-v2v.pod:95
+#: ../v2v/virt-v2v.pod:200
msgid ""
"Don't copy the disks. Instead, conversion is performed (and thrown away), "
"and metadata is written, but no disks are created."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:98
+#: ../v2v/virt-v2v.pod:203
msgid ""
"This is useful in two cases: Either you want to test if conversion is likely "
"to succeed, without the long copying process. Or you are only interested in "
@@ -86661,48 +86882,48 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:102
+#: ../v2v/virt-v2v.pod:207
msgid ""
"This option is not compatible with I<-o libvirt> since it would create a "
"faulty guest (one with no disks)."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:105
+#: ../v2v/virt-v2v.pod:210
msgid "B<-o libvirt>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:107
+#: ../v2v/virt-v2v.pod:212
msgid "Set the output method to I<libvirt>. This is the default."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:109
+#: ../v2v/virt-v2v.pod:214
msgid ""
"In this mode, the converted guest is created as a libvirt guest. You may "
"also specify a libvirt connection URI (see I<-oc>)."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:112
+#: ../v2v/virt-v2v.pod:217
#, fuzzy
#| msgid "see L</1 MB PARTITION ALIGNMENT> below."
msgid "See L</OUTPUT TO LIBVIRT> below."
msgstr "див. L</ВИРІВНЮВАННЯ РОЗДІЛІВ НА ПОЗНАЧКИ 1 МБ> нижче."
#. type: =item
-#: ../v2v/virt-v2v.pod:114
+#: ../v2v/virt-v2v.pod:219
msgid "B<-o local>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:116
+#: ../v2v/virt-v2v.pod:221
msgid "Set the output method to I<local>."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:118
+#: ../v2v/virt-v2v.pod:223
msgid ""
"In this mode, the converted guest is written to a local directory specified "
"by I<-os /dir> (the directory must exist). The converted guest's disks are "
@@ -86710,7 +86931,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:122
+#: ../v2v/virt-v2v.pod:227
#, no-wrap
msgid ""
" /dir/disk-sda\n"
@@ -86720,36 +86941,36 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:126
+#: ../v2v/virt-v2v.pod:231
msgid ""
"and a libvirt XML file is created containing guest metadata (C</dir/name."
"xml>, where C<name> is the guest name)."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:129
+#: ../v2v/virt-v2v.pod:234
#, fuzzy
#| msgid "B<-o option>"
msgid "B<-o ovirt>"
msgstr "B<-o параметр>"
#. type: textblock
-#: ../v2v/virt-v2v.pod:131
+#: ../v2v/virt-v2v.pod:236
msgid "This is the same as I<-o rhev>."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:133
+#: ../v2v/virt-v2v.pod:238
msgid "B<-o rhev>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:135
+#: ../v2v/virt-v2v.pod:240
msgid "Set the output method to I<rhev>."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:137
+#: ../v2v/virt-v2v.pod:242
msgid ""
"The converted guest is written to a RHEV Export Storage Domain. The I<-os> "
"parameter must also be used to specify the location of the Export Storage "
@@ -86758,97 +86979,97 @@ msgid ""
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:142
+#: ../v2v/virt-v2v.pod:247
msgid "B<-oa sparse>"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:144
+#: ../v2v/virt-v2v.pod:249
msgid "B<-oa preallocated>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:146
+#: ../v2v/virt-v2v.pod:251
msgid "Set the output file allocation mode. The default is C<sparse>."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:148
+#: ../v2v/virt-v2v.pod:253
msgid "B<-oc> libvirtURI"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:150
+#: ../v2v/virt-v2v.pod:255
msgid ""
"Specify a libvirt connection to use when writing the converted guest. This "
"is only used when S<I<-o libvirt>>. See L</OUTPUT TO LIBVIRT> below."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:153
+#: ../v2v/virt-v2v.pod:258
msgid ""
"Only local libvirt connections can be used. Remote libvirt connections will "
"not work."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:156
+#: ../v2v/virt-v2v.pod:261
msgid "B<-of> format"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:158
+#: ../v2v/virt-v2v.pod:263
msgid "When converting the guest, convert the disks to the given format."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:160
+#: ../v2v/virt-v2v.pod:265
msgid "If not specified, then the input format is used."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:162
+#: ../v2v/virt-v2v.pod:267
msgid "B<-on> name"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:164
+#: ../v2v/virt-v2v.pod:269
msgid ""
"Rename the guest when converting it. If this option is not used then the "
"output name is the same as the input name."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:167
+#: ../v2v/virt-v2v.pod:272
msgid "B<-os> storage"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:169
+#: ../v2v/virt-v2v.pod:274
msgid "The location of the storage for the converted guest."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:171
+#: ../v2v/virt-v2v.pod:276
msgid ""
"For I<-o libvirt>, this is a libvirt directory pool (see S<C<virsh pool-"
"list>>)."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:174
+#: ../v2v/virt-v2v.pod:279
msgid "For I<-o local>, this is a directory name. The directory must exist."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:176
+#: ../v2v/virt-v2v.pod:281
msgid ""
"For I<-o rhev>, this can be an NFS path of the Export Storage Domain of the "
"form C<E<lt>hostE<gt>:E<lt>pathE<gt>>, eg:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:179
+#: ../v2v/virt-v2v.pod:284
#, no-wrap
msgid ""
" rhev-storage.example.com:/rhev/export\n"
@@ -86856,7 +87077,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:181
+#: ../v2v/virt-v2v.pod:286
msgid ""
"The NFS export must be mountable and writable by the user and host running "
"virt-v2v, since the virt-v2v program has to actually mount it when it runs. "
@@ -86864,7 +87085,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:185
+#: ../v2v/virt-v2v.pod:290
msgid ""
"B<Or:> You can mount the Export Storage Domain yourself, and point I<-os> to "
"the mountpoint. Note that virt-v2v will still need to write to this remote "
@@ -86872,112 +87093,127 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:190
+#: ../v2v/virt-v2v.pod:295
msgid ""
"You will get an error if virt-v2v is unable to mount/write to the Export "
"Storage Domain."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:199
+#: ../v2v/virt-v2v.pod:298
+#, fuzzy
+#| msgid "B<--print-cache>"
+msgid "B<--print-source>"
+msgstr "B<--print-cache>"
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:300
+msgid ""
+"Print information about the source guest and stop. This option is useful "
+"when you are setting up network and bridge maps. See L</NETWORKS AND "
+"BRIDGES>."
+msgstr ""
+
+#. type: =item
+#: ../v2v/virt-v2v.pod:310
msgid "B<--rhev-image-uuid> UUID"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:201
+#: ../v2v/virt-v2v.pod:312
msgid "B<--rhev-vol-uuid> UUID"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:203
+#: ../v2v/virt-v2v.pod:314
#, fuzzy
#| msgid "B<lvm-uuids> *"
msgid "B<--rhev-vm-uuid> UUID"
msgstr "B<lvm-uuids> *"
#. type: textblock
-#: ../v2v/virt-v2v.pod:205
+#: ../v2v/virt-v2v.pod:316
msgid "Normally the RHEV output mode chooses a random UUID for each of:"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:211
+#: ../v2v/virt-v2v.pod:322
msgid "the image directory (I<--rhev-image-uuid>)"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:215
+#: ../v2v/virt-v2v.pod:326
msgid "once for each guest disk (I<--rhev-vol-uuid>)"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:219
+#: ../v2v/virt-v2v.pod:330
msgid "the VM and OVF file (I<--rhev-vm-uuid>)."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:223
+#: ../v2v/virt-v2v.pod:334
msgid "However you can force specific UUIDs instead by using these options."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:225
+#: ../v2v/virt-v2v.pod:336
msgid ""
"You can use I<--rhev-image-uuid> and I<--rhev-vm-uuid> on the command line "
"at most once."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:228
+#: ../v2v/virt-v2v.pod:339
msgid ""
"If the guest has more than one virtual disk, then you should use I<--rhev-"
"vol-uuid> multiple times to change the UUID of each guest disk."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:232
+#: ../v2v/virt-v2v.pod:343
msgid ""
"The format of UUIDs is: C<12345678-1234-1234-1234-123456789abc> (each hex "
"digit can be C<0-9> or C<a-f>), conforming to S<OSF DCE 1.1>."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:235
+#: ../v2v/virt-v2v.pod:346
msgid "These options can only be used with I<-o rhev>."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:237
+#: ../v2v/virt-v2v.pod:348
msgid "B<--root ask>"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:239
+#: ../v2v/virt-v2v.pod:350
msgid "B<--root single>"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:241
+#: ../v2v/virt-v2v.pod:352
msgid "B<--root first>"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:243
+#: ../v2v/virt-v2v.pod:354
msgid "B<--root> /dev/sdX"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:245
+#: ../v2v/virt-v2v.pod:356
msgid "B<--root> /dev/VG/LV"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:247
+#: ../v2v/virt-v2v.pod:358
msgid "Choose the root filesystem to be converted."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:249
+#: ../v2v/virt-v2v.pod:360
msgid ""
"In the case where the virtual machine is dual-boot or multi-boot, or where "
"the VM has other filesystems that look like operating systems, this option "
@@ -86988,14 +87224,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:257
+#: ../v2v/virt-v2v.pod:368
msgid ""
"The default in virt-v2v E<le> 0.7.1 was S<I<--root single>>, which causes "
"virt-v2v to die if a multi-boot operating system is found."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:260
+#: ../v2v/virt-v2v.pod:371
msgid ""
"Since virt-v2v E<ge> 0.7.2 the default is now S<I<--root ask>>: If the VM is "
"found to be multi-boot, then virt-v2v will stop and list the possible root "
@@ -87004,7 +87240,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:265
+#: ../v2v/virt-v2v.pod:376
msgid ""
"S<I<--root first>> means to choose the first root device in the case of a "
"multi-boot operating system. Since this is a heuristic, it may sometimes "
@@ -87012,7 +87248,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:269
+#: ../v2v/virt-v2v.pod:380
msgid ""
"You can also name a specific root device, eg. S<I<--root /dev/sda2>> would "
"mean to use the second partition on the first hard drive. If the named root "
@@ -87021,7 +87257,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:274
+#: ../v2v/virt-v2v.pod:385
msgid ""
"Note that there is a bug in grub which prevents it from successfully booting "
"a multiboot system if VirtIO is enabled. Grub is only able to boot an "
@@ -87031,19 +87267,19 @@ msgid ""
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:292
+#: ../v2v/virt-v2v.pod:403
msgid "B<--vmtype desktop>"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:294
+#: ../v2v/virt-v2v.pod:405
#, fuzzy
#| msgid "B<--merge>"
msgid "B<--vmtype server>"
msgstr "B<--merge>"
#. type: textblock
-#: ../v2v/virt-v2v.pod:296
+#: ../v2v/virt-v2v.pod:407
msgid ""
"For the RHEV target only, specify the type of guest. You can set this to "
"C<desktop> or C<server>. If the option is not given, then a suitable "
@@ -87051,12 +87287,12 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../v2v/virt-v2v.pod:307
+#: ../v2v/virt-v2v.pod:418
msgid "XEN PARAVIRTUALIZED GUESTS"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:309
+#: ../v2v/virt-v2v.pod:420
msgid ""
"Older versions of virt-v2v could turn a Xen paravirtualized (PV) guest into "
"a KVM guest by installing a new kernel. This version of virt-v2v does "
@@ -87065,7 +87301,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:314
+#: ../v2v/virt-v2v.pod:425
msgid ""
"Therefore before conversion you should check that a regular kernel is "
"installed. For some older Linux distributions, this means installing a "
@@ -87073,7 +87309,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:318
+#: ../v2v/virt-v2v.pod:429
#, no-wrap
msgid ""
" RHEL 3 (Does not apply, as there was no Xen PV kernel)\n"
@@ -87081,7 +87317,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:320
+#: ../v2v/virt-v2v.pod:431
#, no-wrap
msgid ""
" RHEL 4 i686 with > 10GB of RAM: install 'kernel-hugemem'\n"
@@ -87094,7 +87330,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:327
+#: ../v2v/virt-v2v.pod:438
#, no-wrap
msgid ""
" RHEL 5 i686: install 'kernel-PAE'\n"
@@ -87103,7 +87339,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:330
+#: ../v2v/virt-v2v.pod:441
#, no-wrap
msgid ""
" SLES 10 i586 with > 10GB of RAM: install 'kernel-bigsmp'\n"
@@ -87115,7 +87351,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:336
+#: ../v2v/virt-v2v.pod:447
#, no-wrap
msgid ""
" SLES 11+ i586: install 'kernel-pae'\n"
@@ -87124,7 +87360,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:339
+#: ../v2v/virt-v2v.pod:450
#, no-wrap
msgid ""
" Windows (Does not apply, as there is no Xen PV Windows kernel)\n"
@@ -87132,19 +87368,19 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../v2v/virt-v2v.pod:341
+#: ../v2v/virt-v2v.pod:452
msgid "ENABLING VIRTIO"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:343
+#: ../v2v/virt-v2v.pod:454
msgid ""
"\"Virtio\" is the name for a set of drivers which make disk (block device), "
"network and other guest operations work much faster on KVM."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:346
+#: ../v2v/virt-v2v.pod:457
msgid ""
"Older versions of virt-v2v could install these drivers for certain Linux "
"guests. This version of virt-v2v does I<not> attempt to install new Linux "
@@ -87152,7 +87388,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:351
+#: ../v2v/virt-v2v.pod:462
msgid ""
"In order to enable virtio, and hence improve performance of the guest after "
"conversion, you should ensure that the B<minimum> versions of packages are "
@@ -87160,7 +87396,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:356
+#: ../v2v/virt-v2v.pod:467
#, no-wrap
msgid ""
" RHEL 3 No virtio drivers are available\n"
@@ -87168,7 +87404,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:358
+#: ../v2v/virt-v2v.pod:469
#, no-wrap
msgid ""
" RHEL 4 kernel >= 2.5.9-89.EL\n"
@@ -87176,7 +87412,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:360
+#: ../v2v/virt-v2v.pod:471
#, no-wrap
msgid ""
" RHEL 5 kernel >= 2.6.18-128.el5\n"
@@ -87186,7 +87422,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:364
+#: ../v2v/virt-v2v.pod:475
#, no-wrap
msgid ""
" RHEL 6+ All versions support virtio\n"
@@ -87194,7 +87430,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:366
+#: ../v2v/virt-v2v.pod:477
#, no-wrap
msgid ""
" Fedora All versions support virtio\n"
@@ -87202,7 +87438,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:368
+#: ../v2v/virt-v2v.pod:479
#, no-wrap
msgid ""
" SLES 11+ All versions support virtio\n"
@@ -87210,7 +87446,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:370
+#: ../v2v/virt-v2v.pod:481
#, no-wrap
msgid ""
" SLES 10 kernel >= 2.6.16.60-0.85.1\n"
@@ -87218,7 +87454,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:372
+#: ../v2v/virt-v2v.pod:483
#, no-wrap
msgid ""
" OpenSUSE 11+ All versions support virtio\n"
@@ -87226,7 +87462,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:374
+#: ../v2v/virt-v2v.pod:485
#, no-wrap
msgid ""
" OpenSUSE 10 kernel >= 2.6.25.5-1.1\n"
@@ -87234,7 +87470,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:376
+#: ../v2v/virt-v2v.pod:487
#, no-wrap
msgid ""
" Windows Drivers are installed from /usr/share/virtio-win\n"
@@ -87242,93 +87478,155 @@ msgid ""
"\n"
msgstr ""
+#. type: =head1
+#: ../v2v/virt-v2v.pod:490
+msgid "NETWORKS AND BRIDGES"
+msgstr ""
+
#. type: textblock
-#: ../v2v/virt-v2v.pod:381
+#: ../v2v/virt-v2v.pod:492
msgid ""
-"The I<--machine-readable> option can be used to make the output more machine "
-"friendly, which is useful when calling virt-v2v from other programs, GUIs "
-"etc."
+"Guests are usually connected to one or more networks, and when converted to "
+"the target hypervisor you usually want to reconnect those networks at the "
+"destination. The options I<--network> and I<--bridge> allow you to do that."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:387
+#: ../v2v/virt-v2v.pod:497
msgid ""
-"Firstly use the option on its own to query the capabilities of the virt-v2v "
-"binary. Typical output looks like this:"
+"If you are unsure of what networks and bridges are in use on the source "
+"hypervisor, then you can examine the source metadata (libvirt XML, vCenter "
+"information, etc.). Or you can run virt-v2v with the I<--print-source> "
+"option which causes virt-v2v to print out the information it has about the "
+"guest on the source and then exit."
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:503
+msgid ""
+"In the I<--print-source> output you will see a section showing the guest's "
+"Network Interface Cards (NICs):"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:390
+#: ../v2v/virt-v2v.pod:506
#, no-wrap
msgid ""
-" $ virt-v2v --machine-readable\n"
-" virt-v2v\n"
-" libguestfs-rewrite\n"
+" $ virt-v2v [-i ...] --print-source name\n"
+" [...]\n"
+" NICs:\n"
+" Network \"default\" mac: 52:54:00:d0:cf:0e\n"
"\n"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:419
+#: ../v2v/virt-v2v.pod:511
msgid ""
-"The calling program should treat messages sent to stderr as error messages. "
-"In addition, virt-v2v exits with a non-zero status code if there was a fatal "
-"error."
+"This is typical of a libvirt guest: It has a single network interface "
+"connected to a network called C<default>."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:425
+#: ../v2v/virt-v2v.pod:514
msgid ""
-"Virt-v2v E<le> 0.9.1 did not support the I<--machine-readable> option at "
-"all. The option was added when virt-v2v was rewritten in 2014."
+"To map a specific network to a target network, for example C<default> on the "
+"source to C<rhevm> on the target, use:"
+msgstr ""
+
+#. type: verbatim
+#: ../v2v/virt-v2v.pod:517
+#, no-wrap
+msgid ""
+" virt-v2v [...] --network default:rhevm\n"
+"\n"
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:519
+msgid "To map every network to a target network, use:"
+msgstr ""
+
+#. type: verbatim
+#: ../v2v/virt-v2v.pod:521
+#, no-wrap
+msgid ""
+" virt-v2v [...] --network rhevm\n"
+"\n"
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:523
+msgid ""
+"Bridges are handled in the same way, but you have to use the I<--bridge> "
+"option instead. For example:"
+msgstr ""
+
+#. type: verbatim
+#: ../v2v/virt-v2v.pod:526
+#, no-wrap
+msgid ""
+" $ virt-v2v [-i ...] --print-source name\n"
+" [...]\n"
+" NICs:\n"
+" Bridge \"br0\"\n"
+" \n"
+msgstr ""
+
+#. type: verbatim
+#: ../v2v/virt-v2v.pod:531
+#, no-wrap
+msgid ""
+" $ virt-v2v [...] --bridge br0:targetbr\n"
+"\n"
msgstr ""
#. type: =head1
-#: ../v2v/virt-v2v.pod:428
+#: ../v2v/virt-v2v.pod:533
msgid "OUTPUT TO LIBVIRT"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:430
+#: ../v2v/virt-v2v.pod:535
msgid ""
"The I<-o libvirt> option lets you upload the converted guest to a libvirt-"
"managed host. There are several limitations:"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:437
+#: ../v2v/virt-v2v.pod:542
msgid ""
"You can only use a local libvirt connection [see below for how to workaround "
"this]."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:442
+#: ../v2v/virt-v2v.pod:547
msgid ""
"The I<-os pool> option must specify a directory pool, not anything more "
"exotic such as iSCSI [but see below]."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:447
+#: ../v2v/virt-v2v.pod:552
msgid "You can only upload to a KVM hypervisor."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:451
+#: ../v2v/virt-v2v.pod:556
msgid ""
"B<To output to a remote libvirt instance and/or a non-directory storage "
"pool> you have to use the following workaround:"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:458
+#: ../v2v/virt-v2v.pod:563
msgid ""
"Use virt-v2v in I<-o local> mode to convert the guest disks and metadata "
"into a local temporary directory:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:461
+#: ../v2v/virt-v2v.pod:566
#, no-wrap
msgid ""
" virt-v2v [...] -o local -os /tmp\n"
@@ -87336,14 +87634,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:463
+#: ../v2v/virt-v2v.pod:568
#, fuzzy
#| msgid "This removes temporary files under C</tmp> and C</var/tmp>."
msgid "This creates two (or more) files in C</tmp> called:"
msgstr "Вилучає тимчасові файли з C</tmp> і C</var/tmp>."
#. type: verbatim
-#: ../v2v/virt-v2v.pod:465
+#: ../v2v/virt-v2v.pod:570
#, no-wrap
msgid ""
" /tmp/NAME.xml # the libvirt XML (metadata)\n"
@@ -87352,17 +87650,17 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:468
+#: ../v2v/virt-v2v.pod:573
msgid "(for C<NAME> substitute the guest's name)."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:472
+#: ../v2v/virt-v2v.pod:577
msgid "Upload the converted disk(s) into the storage pool called C<POOL>:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:474
+#: ../v2v/virt-v2v.pod:579
#, no-wrap
msgid ""
" size=$(stat -c%s /tmp/NAME-sda)\n"
@@ -87372,14 +87670,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:480
+#: ../v2v/virt-v2v.pod:585
msgid ""
"Edit C</tmp/NAME.xml> to change C</tmp/NAME-sda> to the pool name. In other "
"words, locate the following bit of XML:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:483
+#: ../v2v/virt-v2v.pod:588
#, no-wrap
msgid ""
" <disk type='file' device='disk'>\n"
@@ -87391,7 +87689,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:489
+#: ../v2v/virt-v2v.pod:594
msgid ""
"and change two things: The C<type='file'> attribute must be changed to "
"C<type='volume'>, and the C<E<lt>sourceE<gt>> element must be changed to "
@@ -87399,7 +87697,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:493
+#: ../v2v/virt-v2v.pod:598
#, no-wrap
msgid ""
" <disk type='volume' device='disk'>\n"
@@ -87411,42 +87709,82 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:501
+#: ../v2v/virt-v2v.pod:606
msgid "Define the final guest in libvirt:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:503
+#: ../v2v/virt-v2v.pod:608
#, no-wrap
msgid ""
" virsh define /tmp/NAME.xml\n"
"\n"
msgstr ""
+#. type: textblock
+#: ../v2v/virt-v2v.pod:614
+msgid ""
+"The I<--machine-readable> option can be used to make the output more machine "
+"friendly, which is useful when calling virt-v2v from other programs, GUIs "
+"etc."
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:620
+msgid ""
+"Firstly use the option on its own to query the capabilities of the virt-v2v "
+"binary. Typical output looks like this:"
+msgstr ""
+
+#. type: verbatim
+#: ../v2v/virt-v2v.pod:623
+#, no-wrap
+msgid ""
+" $ virt-v2v --machine-readable\n"
+" virt-v2v\n"
+" libguestfs-rewrite\n"
+"\n"
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:652
+msgid ""
+"The calling program should treat messages sent to stderr as error messages. "
+"In addition, virt-v2v exits with a non-zero status code if there was a fatal "
+"error."
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:658
+msgid ""
+"Virt-v2v E<le> 0.9.1 did not support the I<--machine-readable> option at "
+"all. The option was added when virt-v2v was rewritten in 2014."
+msgstr ""
+
#. type: =item
-#: ../v2v/virt-v2v.pod:511
+#: ../v2v/virt-v2v.pod:665
msgid "C</usr/share/virtio-win>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:513 ../v2v/virt-v2v.pod:567
+#: ../v2v/virt-v2v.pod:667 ../v2v/virt-v2v.pod:721
msgid "(Optional)"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:515
+#: ../v2v/virt-v2v.pod:669
msgid ""
"If this directory is present, then virtio drivers for Windows guests will be "
"found from this directory and installed in the guest during conversion."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:525
+#: ../v2v/virt-v2v.pod:679
msgid "C<TMPDIR>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:536
+#: ../v2v/virt-v2v.pod:690
msgid ""
"Note that if C<$TMPDIR> is a tmpfs (eg. if C</tmp> is on tmpfs, or if you "
"use C<TMPDIR=/dev/shm>), tmpfs defaults to a maximum size of I<half> of "
@@ -87456,31 +87794,31 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:546
+#: ../v2v/virt-v2v.pod:700
msgid ""
"This can point to the directory containing data files used for Windows "
"conversion."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:558
+#: ../v2v/virt-v2v.pod:712
msgid "(Required when doing conversions of Windows guests)"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:560
+#: ../v2v/virt-v2v.pod:714
msgid ""
"This is the RHSrvAny Windows binary, used to install a \"firstboot\" script "
"in the guest during conversion of Windows guests."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:565
+#: ../v2v/virt-v2v.pod:719
msgid "C<rhev-apt.exe>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:569
+#: ../v2v/virt-v2v.pod:723
msgid ""
"The RHEV Application Provisioning Tool (RHEV APT). If this file is present, "
"then RHEV APT will be installed in the Windows guest during conversion. "
@@ -87490,14 +87828,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:575
+#: ../v2v/virt-v2v.pod:729
msgid ""
"This file comes from Red Hat Enterprise Virtualization (RHEV), and is not "
"distributed with virt-v2v."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:586
+#: ../v2v/virt-v2v.pod:740
#, fuzzy
#| msgid ""
#| "L<guestfs(3)>, L<guestfish(1)>, L<virt-cat(1)>, L<virt-df(1)>, L<virt-"
@@ -87513,6 +87851,6 @@ msgstr ""
"libguestfs.org/>."
#. type: textblock
-#: ../v2v/virt-v2v.pod:603
+#: ../v2v/virt-v2v.pod:757
msgid "Mike Latimer"
msgstr ""
diff --git a/po/en_GB.po b/po/en_GB.po
index 2dab059..18ba659 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-08-19 17:51+0100\n"
+"POT-Creation-Date: 2014-08-21 17:07+0100\n"
"PO-Revision-Date: 2014-07-22 18:03+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/"
@@ -69,7 +69,7 @@ msgstr ""
msgid "%s (ignored)\n"
msgstr ""
-#: ../v2v/convert_linux.ml:1134
+#: ../v2v/convert_linux.ml:1136
msgid ""
"%s references unknown device \"%s\". You may have to fix this entry "
"manually after conversion."
@@ -79,7 +79,7 @@ msgstr ""
msgid "%s: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:147
+#: ../v2v/v2v.ml:180
msgid "%s: %s (ignored)"
msgstr ""
@@ -220,7 +220,7 @@ msgstr ""
msgid "%s: cannot output to a character device or /dev/null\n"
msgstr ""
-#: ../v2v/cmdline.ml:126
+#: ../v2v/cmdline.ml:143
msgid ""
"%s: convert a guest to use KVM\n"
"\n"
@@ -272,7 +272,7 @@ msgstr ""
msgid "%s: error: %s"
msgstr ""
-#: ../v2v/v2v.ml:369 ../sysprep/main.ml:297
+#: ../v2v/v2v.ml:377 ../sysprep/main.ml:297
msgid "%s: error: %s\n"
msgstr ""
@@ -282,13 +282,13 @@ msgstr ""
#. ../resize/resize.ml:1309
#. ../builder/builder.ml:743
-#: ../v2v/v2v.ml:362 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
+#: ../v2v/v2v.ml:370 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
msgid "%s: error: %s: %s\n"
msgstr ""
#. ../resize/resize.ml:1312
#. ../builder/builder.ml:746
-#: ../v2v/v2v.ml:365 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
+#: ../v2v/v2v.ml:373 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
msgid "%s: error: %s: %s: %s\n"
msgstr ""
@@ -309,7 +309,7 @@ msgstr ""
#. ../resize/resize.ml:1331
#. ../customize/customize_main.ml:262
#. ../builder/builder.ml:764
-#: ../v2v/v2v.ml:387 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
+#: ../v2v/v2v.ml:395 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
msgid "%s: exception: %s\n"
msgstr ""
@@ -319,7 +319,7 @@ msgstr ""
#. ../resize/resize.ml:1319
#. ../builder/builder.ml:752
-#: ../v2v/v2v.ml:375 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
+#: ../v2v/v2v.ml:383 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
msgid "%s: failure: %s\n"
msgstr ""
@@ -346,14 +346,14 @@ msgstr ""
#. ../resize/resize.ml:1328
#. ../customize/customize_main.ml:259
#. ../builder/builder.ml:761
-#: ../v2v/v2v.ml:384 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
+#: ../v2v/v2v.ml:392 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
msgid "%s: internal error: Not_found exception was thrown\n"
msgstr ""
#. ../resize/resize.ml:1325
#. ../customize/customize_main.ml:255
#. ../builder/builder.ml:758
-#: ../v2v/v2v.ml:381 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
+#: ../v2v/v2v.ml:389 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
msgid "%s: internal error: assertion failed at %s, line %d, char %d\n"
msgstr ""
@@ -361,7 +361,7 @@ msgstr ""
#. ../customize/customize_main.ml:252
#. ../builder/sources.ml:135
#. ../builder/builder.ml:755
-#: ../v2v/v2v.ml:378 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
+#: ../v2v/v2v.ml:386 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
msgid "%s: internal error: invalid argument: %s\n"
msgstr ""
@@ -379,7 +379,7 @@ msgstr ""
#. ../resize/resize.ml:1316
#. ../builder/builder.ml:749
-#: ../v2v/v2v.ml:372 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
+#: ../v2v/v2v.ml:380 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
msgid "%s: libguestfs error: %s\n"
msgstr ""
@@ -628,7 +628,7 @@ msgstr ""
msgid "--expand option given twice"
msgstr ""
-#: ../v2v/cmdline.ml:226
+#: ../v2v/cmdline.ml:245
msgid "--no-copy and '-o libvirt' cannot be used at the same time"
msgstr ""
@@ -653,40 +653,40 @@ msgstr ""
msgid "--tmp prebuilt:file: %s: file format is not qcow2"
msgstr ""
-#: ../v2v/cmdline.ml:236 ../v2v/cmdline.ml:224
+#: ../v2v/cmdline.ml:255 ../v2v/cmdline.ml:243
msgid "--vmtype option can only be used with '-o rhev'"
msgstr ""
-#: ../v2v/source_disk.ml:34
+#: ../v2v/input_disk.ml:44
msgid "-i disk: invalid input filename (%s)"
msgstr ""
-#: ../v2v/target_libvirt.ml:219
+#: ../v2v/output_libvirt.ml:231
msgid ""
"-o libvirt: output pool '%s' has type='dir' but the /pool/target/path "
"element either does not exist or is not a local directory. See virt-v2v(1) "
"section \"OUTPUT TO LIBVIRT\""
msgstr ""
-#: ../v2v/target_libvirt.ml:216
+#: ../v2v/output_libvirt.ml:228
msgid ""
"-o libvirt: output pool '%s' is not a directory (type='dir'). See virt-"
"v2v(1) section \"OUTPUT TO LIBVIRT\""
msgstr ""
-#: ../v2v/cmdline.ml:231
+#: ../v2v/cmdline.ml:250
msgid "-o local: output directory was not specified, use '-os /dir'"
msgstr ""
-#: ../v2v/cmdline.ml:241
+#: ../v2v/cmdline.ml:260
msgid "-o rhev: output storage was not specified, use '-os'"
msgstr ""
-#: ../v2v/cmdline.ml:233
+#: ../v2v/cmdline.ml:252
msgid "-os %s: output directory does not exist or is not a directory"
msgstr ""
-#: ../v2v/source_libvirt.ml:174
+#: ../v2v/input_libvirt.ml:171
msgid "<disk type='%s'> was ignored"
msgstr ""
@@ -754,7 +754,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:151
+#: ../v2v/v2v.ml:184
msgid "Closing the overlay"
msgstr ""
@@ -766,11 +766,11 @@ msgstr ""
msgid "Converting %s to %s"
msgstr ""
-#: ../v2v/v2v.ml:112
+#: ../v2v/v2v.ml:148
msgid "Converting %s to run on KVM"
msgstr ""
-#: ../v2v/v2v.ml:110
+#: ../v2v/v2v.ml:146
msgid "Converting the guest to run on KVM"
msgstr ""
@@ -790,7 +790,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:170
+#: ../v2v/v2v.ml:203
msgid "Copying disk %d/%d to %s (%s)"
msgstr ""
@@ -814,11 +814,11 @@ msgstr ""
msgid "Create symbolic links"
msgstr ""
-#: ../v2v/v2v.ml:59
+#: ../v2v/v2v.ml:95
msgid "Creating an overlay to protect the source from being modified"
msgstr ""
-#: ../v2v/v2v.ml:196
+#: ../v2v/v2v.ml:229
msgid "Creating output metadata"
msgstr ""
@@ -857,7 +857,7 @@ msgstr ""
msgid "DIR"
msgstr ""
-#: ../v2v/cmdline.ml:92 ../sparsify/cmdline.ml:73 ../resize/resize.ml:186
+#: ../v2v/cmdline.ml:107 ../sparsify/cmdline.ml:73 ../resize/resize.ml:186
msgid "Debug GC and memory allocations"
msgstr ""
@@ -909,7 +909,7 @@ msgstr ""
#. ../customize/customize_main.ml:99
#. ../builder/cmdline.ml:158
#. ../builder/cmdline.ml:157
-#: ../v2v/cmdline.ml:117 ../sysprep/main.ml:155 ../sysprep/main.ml:154
+#: ../v2v/cmdline.ml:134 ../sysprep/main.ml:155 ../sysprep/main.ml:154
msgid "Display version and exit"
msgstr ""
@@ -986,7 +986,7 @@ msgstr ""
#. ../customize/customize_main.ml:97
#. ../builder/cmdline.ml:156
#. ../builder/cmdline.ml:155
-#: ../v2v/cmdline.ml:115 ../sysprep/main.ml:153 ../sysprep/main.ml:152
+#: ../v2v/cmdline.ml:132 ../sysprep/main.ml:153 ../sysprep/main.ml:152
msgid "Enable debugging messages"
msgstr ""
@@ -997,7 +997,7 @@ msgstr ""
#. ../resize/resize.ml:214
#. ../customize/customize_main.ml:101
#. ../builder/cmdline.ml:159
-#: ../v2v/cmdline.ml:120 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
+#: ../v2v/cmdline.ml:137 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
msgid "Enable tracing of libguestfs calls"
msgstr ""
@@ -1005,7 +1005,7 @@ msgstr ""
msgid "Enable/disable specific operations"
msgstr ""
-#: ../v2v/v2v.ml:293
+#: ../v2v/v2v.ml:301
msgid "Enter number between 1 and %d: "
msgstr ""
@@ -1093,7 +1093,7 @@ msgstr ""
msgid "Fingerprint: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:212 ../customize/customize_main.ml:237
+#: ../v2v/v2v.ml:232 ../customize/customize_main.ml:237
#: ../builder/builder.ml:711
msgid "Finishing off"
msgstr ""
@@ -1151,7 +1151,7 @@ msgstr ""
msgid "HOSTNAME"
msgstr ""
-#: ../v2v/cmdline.ml:114
+#: ../v2v/cmdline.ml:131
msgid "How to choose root filesystem"
msgstr ""
@@ -1163,7 +1163,7 @@ msgstr ""
msgid "Ignore partition"
msgstr ""
-#: ../v2v/v2v.ml:97
+#: ../v2v/v2v.ml:133
msgid "Initializing the target %s"
msgstr ""
@@ -1173,11 +1173,11 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/cmdline.ml:96
+#: ../v2v/cmdline.ml:111
msgid "Input format (for -i disk)"
msgstr ""
-#: ../v2v/v2v.ml:103
+#: ../v2v/v2v.ml:139
msgid "Inspecting the overlay"
msgstr ""
@@ -1197,7 +1197,7 @@ msgstr ""
msgid "Installing packages: %s"
msgstr ""
-#: ../v2v/cmdline.ml:99
+#: ../v2v/cmdline.ml:115
msgid "Just write the metadata"
msgstr ""
@@ -1205,7 +1205,7 @@ msgstr ""
msgid "Key: %s\n"
msgstr ""
-#: ../v2v/cmdline.ml:102 ../v2v/cmdline.ml:94
+#: ../v2v/cmdline.ml:118 ../v2v/cmdline.ml:109
msgid "Libvirt URI"
msgstr ""
@@ -1220,7 +1220,7 @@ msgstr ""
#. ../resize/resize.ml:193
#. ../customize/customize_main.ml:89
#. ../builder/cmdline.ml:139
-#: ../v2v/cmdline.ml:97 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
+#: ../v2v/cmdline.ml:112 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
msgid "List long options"
msgstr ""
@@ -1229,7 +1229,7 @@ msgid "List supported operations"
msgstr ""
#. ../builder/cmdline.ml:140
-#: ../v2v/cmdline.ml:98 ../sparsify/cmdline.ml:79 ../resize/resize.ml:198
+#: ../v2v/cmdline.ml:113 ../sparsify/cmdline.ml:79 ../resize/resize.ml:198
msgid "Make output machine readable"
msgstr ""
@@ -1237,6 +1237,14 @@ msgstr ""
msgid "Making directory: %s"
msgstr ""
+#: ../v2v/cmdline.ml:106
+msgid "Map bridge 'in' to 'out'"
+msgstr ""
+
+#: ../v2v/cmdline.ml:114
+msgid "Map network 'in' to 'out'"
+msgstr ""
+
#: ../builder/list_entries.ml:77
msgid "Minimum/default size:"
msgstr ""
@@ -1294,11 +1302,15 @@ msgstr ""
msgid "Opening the new disk"
msgstr ""
-#: ../v2v/v2v.ml:80
+#: ../v2v/v2v.ml:116
msgid "Opening the overlay"
msgstr ""
-#: ../v2v/cmdline.ml:113
+#: ../v2v/v2v.ml:42
+msgid "Opening the source %s"
+msgstr ""
+
+#: ../v2v/cmdline.ml:130
msgid "Output VM UUID"
msgstr ""
@@ -1314,7 +1326,7 @@ msgstr ""
msgid "Output format (default: raw)"
msgstr ""
-#: ../v2v/cmdline.ml:109
+#: ../v2v/cmdline.ml:126
msgid "Output image UUID"
msgstr ""
@@ -1322,7 +1334,7 @@ msgstr ""
msgid "Output size"
msgstr ""
-#: ../v2v/cmdline.ml:111
+#: ../v2v/cmdline.ml:128
msgid "Output vol UUID(s)"
msgstr ""
@@ -1353,11 +1365,15 @@ msgstr ""
msgid "Print info about template cache"
msgstr ""
-#: ../v2v/cmdline.ml:106 ../sparsify/cmdline.ml:81
+#: ../v2v/cmdline.ml:122
+msgid "Print source and stop"
+msgstr ""
+
+#: ../v2v/cmdline.ml:123 ../sparsify/cmdline.ml:81
msgid "Quiet output"
msgstr ""
-#: ../v2v/target_RHEV.ml:544 ../v2v/target_RHEV.ml:141
+#: ../v2v/output_RHEV.ml:475 ../v2v/output_RHEV.ml:293
msgid "RHEV does not support the output format '%s', only raw or qcow2"
msgstr ""
@@ -1550,7 +1566,7 @@ msgstr ""
msgid "Remove user at-jobs and cron-jobs"
msgstr ""
-#: ../v2v/cmdline.ml:104
+#: ../v2v/cmdline.ml:120
msgid "Rename guest when converting"
msgstr ""
@@ -1654,7 +1670,7 @@ msgstr ""
msgid "Set format (default: auto)"
msgstr ""
-#: ../v2v/cmdline.ml:93
+#: ../v2v/cmdline.ml:108
msgid "Set input mode (default: libvirt)"
msgstr ""
@@ -1684,7 +1700,7 @@ msgstr ""
msgid "Set number of vCPUs"
msgstr ""
-#: ../v2v/cmdline.ml:101
+#: ../v2v/cmdline.ml:117
msgid "Set output allocation mode"
msgstr ""
@@ -1696,15 +1712,15 @@ msgstr ""
msgid "Set output filename"
msgstr ""
-#: ../v2v/cmdline.ml:103
+#: ../v2v/cmdline.ml:119
msgid "Set output format"
msgstr ""
-#: ../v2v/cmdline.ml:100
+#: ../v2v/cmdline.ml:116
msgid "Set output mode (default: libvirt)"
msgstr ""
-#: ../v2v/cmdline.ml:105
+#: ../v2v/cmdline.ml:121
msgid "Set output storage location"
msgstr ""
@@ -1752,7 +1768,7 @@ msgstr ""
msgid "Set user password"
msgstr ""
-#: ../v2v/cmdline.ml:119
+#: ../v2v/cmdline.ml:136
msgid "Set vmtype (for RHEV)"
msgstr ""
@@ -1796,6 +1812,10 @@ msgstr ""
msgid "Source URI: %s\n"
msgstr ""
+#: ../v2v/v2v.ml:47
+msgid "Source guest information (--print-source option):\n"
+msgstr ""
+
#: ../sparsify/in_place.ml:153
msgid "Sparsify in-place operation completed with no errors.\n"
msgstr ""
@@ -1854,7 +1874,7 @@ msgid ""
" IT IS POSSIBLE THAT SOMEONE IS DOING SOMETHING NASTY!"
msgstr ""
-#: ../v2v/convert_linux.ml:1042
+#: ../v2v/convert_linux.ml:1044
msgid ""
"The display driver was updated to '%s', but X11 does not seem to be "
"installed in the guest. X may not function correctly."
@@ -1918,7 +1938,7 @@ msgid ""
"virtual machine's disk, but it was stored on disk in older distros."
msgstr ""
-#: ../v2v/target_RHEV.ml:378
+#: ../v2v/output_RHEV.ml:692
msgid ""
"This guest required a password for connection to its display, but this is "
"not supported by RHEV. Therefore the converted guest's display will not "
@@ -1948,7 +1968,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:142
+#: ../v2v/v2v.ml:175
msgid "Trimming filesystems to reduce amount of data to copy"
msgstr ""
@@ -2062,7 +2082,7 @@ msgstr ""
msgid "cannot detect input disk format; use the --format parameter"
msgstr ""
-#: ../v2v/source_disk.ml:50
+#: ../v2v/input_disk.ml:60
msgid "cannot detect the input disk format; use the -if parameter"
msgstr ""
@@ -2076,11 +2096,11 @@ msgid ""
"\\Windows\\CurrentVersion\\Uninstall\\%s' does not contain an '%s' key"
msgstr ""
-#: ../v2v/v2v.ml:296
+#: ../v2v/v2v.ml:304
msgid "connection closed"
msgstr ""
-#: ../v2v/target_libvirt.ml:257
+#: ../v2v/output_libvirt.ml:269
msgid ""
"could not define libvirt domain. The libvirt XML is still available in "
"'%s'. Try running 'virsh define %s' yourself instead."
@@ -2092,14 +2112,18 @@ msgid ""
"\\CurrentVersion"
msgstr ""
-#: ../v2v/target_RHEV.ml:208
+#: ../v2v/input_libvirt.ml:289
+msgid "could not parse '-ic %s'. Original error message was: %s"
+msgstr ""
+
+#: ../v2v/output_RHEV.ml:154
msgid ""
"could not read the Export Storage Domain specified by the '-os %s' parameter "
"on the command line. Is it really an OVirt or RHEV-M Export Storage "
"Domain? The original error is: %s"
msgstr ""
-#: ../v2v/target_libvirt.ml:239
+#: ../v2v/output_libvirt.ml:251
msgid "could not refresh libvirt pool %s"
msgstr ""
@@ -2131,14 +2155,14 @@ msgstr ""
msgid "discard/trim is not supported: %s"
msgstr ""
-#: ../v2v/v2v.ml:234
+#: ../v2v/v2v.ml:254
msgid ""
"disk %s (%s) has no defined format, you have to either define the original "
"format in the source metadata, or use the '-of' option to force the output "
"format"
msgstr ""
-#: ../v2v/source_libvirt.ml:106
+#: ../v2v/input_libvirt.ml:99
msgid "display <graphics type='%s'> was ignored"
msgstr ""
@@ -2160,7 +2184,7 @@ msgstr ""
msgid "don't know how to remove packages using %s: packages: %s"
msgstr ""
-#: ../v2v/v2v.ml:280
+#: ../v2v/v2v.ml:288
msgid ""
"dual- or multi-boot operating system detected. Choose the root filesystem\n"
"that contains the main operating system from the list below:\n"
@@ -2174,19 +2198,19 @@ msgstr ""
msgid "error parsing URI '%s'. Look for error messages printed above."
msgstr ""
-#: ../v2v/source_libvirt.ml:63
+#: ../v2v/input_libvirt.ml:56
msgid "expecting XML expression to return an integer (expression: %s)"
msgstr ""
-#: ../v2v/cmdline.ml:194
+#: ../v2v/cmdline.ml:213
msgid "expecting a disk image (filename) on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:214
+#: ../v2v/cmdline.ml:233
msgid "expecting a libvirt XML file name on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:205
+#: ../v2v/cmdline.ml:224
msgid "expecting a libvirt guest name on the command line"
msgstr ""
@@ -2247,23 +2271,23 @@ msgstr ""
msgid "hostname could not be set for this type of guest"
msgstr ""
-#: ../v2v/v2v.ml:318
+#: ../v2v/cmdline.ml:65
+msgid "invalid --bridge or --network parameter"
+msgstr ""
+
+#: ../v2v/v2v.ml:326
msgid ""
"libguestfs thinks this is not an installed operating system (it might be, "
"for example, an installer disk or live CD). If this is wrong, it is "
"probably a bug in libguestfs. root=%s fmt=%s"
msgstr ""
-#: ../v2v/source_libvirt.ml:39
-msgid "libvirt returned a non-absolute path in the XML (%s)"
-msgstr ""
-
#. ../resize/resize.ml:194
#: ../resize/resize.ml:197 ../resize/resize.ml:196 ../resize/resize.ml:195
msgid "lv"
msgstr ""
-#: ../v2v/target_RHEV.ml:185
+#: ../v2v/output_RHEV.ml:131
msgid ""
"mount command failed, see earlier errors.\n"
"\n"
@@ -2271,7 +2295,7 @@ msgid ""
"[-os %s], or else you need to rerun virt-v2v as root."
msgstr ""
-#: ../v2v/v2v.ml:303
+#: ../v2v/v2v.ml:311
msgid ""
"multi-boot operating systems are not supported by virt-v2v. Use the --root "
"option to change how virt-v2v handles this."
@@ -2283,7 +2307,7 @@ msgid ""
"be a bug in virt-v2v."
msgstr ""
-#: ../v2v/source_libvirt.ml:170
+#: ../v2v/input_libvirt.ml:167
msgid "network <disk> with <source protocol='%s'> was ignored"
msgstr ""
@@ -2318,10 +2342,16 @@ msgid ""
"of this guest."
msgstr ""
-#: ../v2v/v2v.ml:273
+#: ../v2v/v2v.ml:281
msgid "no root device found in this operating system image."
msgstr ""
+#: ../v2v/input_libvirt.ml:304
+msgid ""
+"no support for remote libvirt connections to '-ic %s'. The conversion may "
+"fail when it tries to read the source disks."
+msgstr ""
+
#: ../resize/resize.ml:129
msgid "ntfsresize"
msgstr ""
@@ -2382,7 +2412,7 @@ msgstr ""
msgid "pwrite: short write restoring swap partition header"
msgstr ""
-#: ../v2v/v2v.ml:191 ../v2v/v2v.ml:75
+#: ../v2v/v2v.ml:224 ../v2v/v2v.ml:111
msgid "qemu-img command failed, see earlier errors"
msgstr ""
@@ -2394,7 +2424,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:311
+#: ../v2v/v2v.ml:319
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2410,14 +2440,14 @@ msgstr ""
msgid "sectors"
msgstr ""
-#: ../v2v/target_RHEV.ml:228
+#: ../v2v/output_RHEV.ml:174
msgid ""
"the Export Storage Domain (%s) has not been attached to any Data Center.\n"
"\n"
"You have to do this through the RHEV-M / OVirt user interface first."
msgstr ""
-#: ../v2v/target_RHEV.ml:233
+#: ../v2v/output_RHEV.ml:179
msgid ""
"the Export Storage Domain (%s) is not writable.\n"
"\n"
@@ -2426,7 +2456,7 @@ msgid ""
"Original error was: %s"
msgstr ""
-#: ../v2v/target_RHEV.ml:275
+#: ../v2v/output_RHEV.ml:223
msgid ""
"the number of '--rhev-vol-uuid' parameters passed on the command line has to "
"match the number of guest disk images (for this guest: %d)"
@@ -2436,7 +2466,7 @@ msgstr ""
msgid "the source disk has no partitions"
msgstr ""
-#: ../v2v/target_RHEV.ml:133
+#: ../v2v/output_RHEV.ml:285
msgid ""
"the virtual size of the input disk %s is not an exact multiple of 512 "
"bytes. The virtual size is: %Ld.\n"
@@ -2445,13 +2475,13 @@ msgid ""
"about this issue."
msgstr ""
-#: ../v2v/target_RHEV.ml:222
+#: ../v2v/output_RHEV.ml:168
msgid ""
"there are multiple UUIDs in the Export Storage Domain (%s). This is "
"unexpected, and may be a bug in virt-v2v or OVirt."
msgstr ""
-#: ../v2v/target_RHEV.ml:220
+#: ../v2v/output_RHEV.ml:166
msgid ""
"there are no UUIDs in the Export Storage Domain (%s). Is it really an OVirt "
"or RHEV-M Export Storage Domain?"
@@ -2481,7 +2511,7 @@ msgid ""
"The guest will be configured to use a slower emulated device."
msgstr ""
-#: ../v2v/source_libvirt.ml:127
+#: ../v2v/input_libvirt.ml:120
msgid "this guest has no non-removable disks"
msgstr ""
@@ -2499,33 +2529,27 @@ msgstr ""
msgid "unknown --align-first option: use never|always|auto"
msgstr ""
-#: ../v2v/cmdline.ml:84
+#: ../v2v/cmdline.ml:98
msgid "unknown --root option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:174
+#: ../v2v/cmdline.ml:193
msgid "unknown --vmtype option, must be \"server\" or \"desktop\""
msgstr ""
-#: ../v2v/cmdline.ml:57
+#: ../v2v/cmdline.ml:58
msgid "unknown -i option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:66
+#: ../v2v/cmdline.ml:80
msgid "unknown -o option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:74
+#: ../v2v/cmdline.ml:88
msgid "unknown -oa option: %s"
msgstr ""
-#: ../v2v/target_RHEV.ml:638
-msgid ""
-"unknown NIC model %s for ethernet device %s. This NIC will be imported as "
-"rtl8139 instead."
-msgstr ""
-
-#: ../v2v/target_RHEV.ml:494
+#: ../v2v/output_RHEV.ml:423
msgid "unknown guest operating system: %s %s %d.%d (%s)"
msgstr ""
@@ -2724,11 +2748,11 @@ msgstr ""
msgid "virt-sysprep: script: killed by signal (%d)\n"
msgstr ""
-#: ../v2v/v2v.ml:132
+#: ../v2v/v2v.ml:165
msgid "virt-v2v is unable to convert this guest type (linux/distro=%s)"
msgstr ""
-#: ../v2v/v2v.ml:138
+#: ../v2v/v2v.ml:171
msgid "virt-v2v is unable to convert this guest type (type=%s)"
msgstr ""
diff --git a/po/es.po b/po/es.po
index 305633e..8930312 100644
--- a/po/es.po
+++ b/po/es.po
@@ -11,7 +11,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-08-19 17:51+0100\n"
+"POT-Creation-Date: 2014-08-21 17:07+0100\n"
"PO-Revision-Date: 2014-07-22 18:03+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/libguestfs/"
@@ -71,7 +71,7 @@ msgstr ""
msgid "%s (ignored)\n"
msgstr ""
-#: ../v2v/convert_linux.ml:1134
+#: ../v2v/convert_linux.ml:1136
msgid ""
"%s references unknown device \"%s\". You may have to fix this entry "
"manually after conversion."
@@ -81,7 +81,7 @@ msgstr ""
msgid "%s: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:147
+#: ../v2v/v2v.ml:180
msgid "%s: %s (ignored)"
msgstr ""
@@ -222,7 +222,7 @@ msgstr ""
msgid "%s: cannot output to a character device or /dev/null\n"
msgstr ""
-#: ../v2v/cmdline.ml:126
+#: ../v2v/cmdline.ml:143
msgid ""
"%s: convert a guest to use KVM\n"
"\n"
@@ -274,7 +274,7 @@ msgstr ""
msgid "%s: error: %s"
msgstr ""
-#: ../v2v/v2v.ml:369 ../sysprep/main.ml:297
+#: ../v2v/v2v.ml:377 ../sysprep/main.ml:297
msgid "%s: error: %s\n"
msgstr ""
@@ -284,13 +284,13 @@ msgstr ""
#. ../resize/resize.ml:1309
#. ../builder/builder.ml:743
-#: ../v2v/v2v.ml:362 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
+#: ../v2v/v2v.ml:370 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
msgid "%s: error: %s: %s\n"
msgstr ""
#. ../resize/resize.ml:1312
#. ../builder/builder.ml:746
-#: ../v2v/v2v.ml:365 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
+#: ../v2v/v2v.ml:373 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
msgid "%s: error: %s: %s: %s\n"
msgstr ""
@@ -311,7 +311,7 @@ msgstr ""
#. ../resize/resize.ml:1331
#. ../customize/customize_main.ml:262
#. ../builder/builder.ml:764
-#: ../v2v/v2v.ml:387 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
+#: ../v2v/v2v.ml:395 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
msgid "%s: exception: %s\n"
msgstr ""
@@ -321,7 +321,7 @@ msgstr ""
#. ../resize/resize.ml:1319
#. ../builder/builder.ml:752
-#: ../v2v/v2v.ml:375 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
+#: ../v2v/v2v.ml:383 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
msgid "%s: failure: %s\n"
msgstr ""
@@ -348,14 +348,14 @@ msgstr ""
#. ../resize/resize.ml:1328
#. ../customize/customize_main.ml:259
#. ../builder/builder.ml:761
-#: ../v2v/v2v.ml:384 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
+#: ../v2v/v2v.ml:392 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
msgid "%s: internal error: Not_found exception was thrown\n"
msgstr ""
#. ../resize/resize.ml:1325
#. ../customize/customize_main.ml:255
#. ../builder/builder.ml:758
-#: ../v2v/v2v.ml:381 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
+#: ../v2v/v2v.ml:389 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
msgid "%s: internal error: assertion failed at %s, line %d, char %d\n"
msgstr ""
@@ -363,7 +363,7 @@ msgstr ""
#. ../customize/customize_main.ml:252
#. ../builder/sources.ml:135
#. ../builder/builder.ml:755
-#: ../v2v/v2v.ml:378 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
+#: ../v2v/v2v.ml:386 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
msgid "%s: internal error: invalid argument: %s\n"
msgstr ""
@@ -381,7 +381,7 @@ msgstr ""
#. ../resize/resize.ml:1316
#. ../builder/builder.ml:749
-#: ../v2v/v2v.ml:372 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
+#: ../v2v/v2v.ml:380 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
msgid "%s: libguestfs error: %s\n"
msgstr ""
@@ -630,7 +630,7 @@ msgstr ""
msgid "--expand option given twice"
msgstr ""
-#: ../v2v/cmdline.ml:226
+#: ../v2v/cmdline.ml:245
msgid "--no-copy and '-o libvirt' cannot be used at the same time"
msgstr ""
@@ -655,40 +655,40 @@ msgstr ""
msgid "--tmp prebuilt:file: %s: file format is not qcow2"
msgstr ""
-#: ../v2v/cmdline.ml:236 ../v2v/cmdline.ml:224
+#: ../v2v/cmdline.ml:255 ../v2v/cmdline.ml:243
msgid "--vmtype option can only be used with '-o rhev'"
msgstr ""
-#: ../v2v/source_disk.ml:34
+#: ../v2v/input_disk.ml:44
msgid "-i disk: invalid input filename (%s)"
msgstr ""
-#: ../v2v/target_libvirt.ml:219
+#: ../v2v/output_libvirt.ml:231
msgid ""
"-o libvirt: output pool '%s' has type='dir' but the /pool/target/path "
"element either does not exist or is not a local directory. See virt-v2v(1) "
"section \"OUTPUT TO LIBVIRT\""
msgstr ""
-#: ../v2v/target_libvirt.ml:216
+#: ../v2v/output_libvirt.ml:228
msgid ""
"-o libvirt: output pool '%s' is not a directory (type='dir'). See virt-"
"v2v(1) section \"OUTPUT TO LIBVIRT\""
msgstr ""
-#: ../v2v/cmdline.ml:231
+#: ../v2v/cmdline.ml:250
msgid "-o local: output directory was not specified, use '-os /dir'"
msgstr ""
-#: ../v2v/cmdline.ml:241
+#: ../v2v/cmdline.ml:260
msgid "-o rhev: output storage was not specified, use '-os'"
msgstr ""
-#: ../v2v/cmdline.ml:233
+#: ../v2v/cmdline.ml:252
msgid "-os %s: output directory does not exist or is not a directory"
msgstr ""
-#: ../v2v/source_libvirt.ml:174
+#: ../v2v/input_libvirt.ml:171
msgid "<disk type='%s'> was ignored"
msgstr ""
@@ -756,7 +756,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:151
+#: ../v2v/v2v.ml:184
msgid "Closing the overlay"
msgstr ""
@@ -768,11 +768,11 @@ msgstr ""
msgid "Converting %s to %s"
msgstr ""
-#: ../v2v/v2v.ml:112
+#: ../v2v/v2v.ml:148
msgid "Converting %s to run on KVM"
msgstr ""
-#: ../v2v/v2v.ml:110
+#: ../v2v/v2v.ml:146
msgid "Converting the guest to run on KVM"
msgstr ""
@@ -792,7 +792,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:170
+#: ../v2v/v2v.ml:203
msgid "Copying disk %d/%d to %s (%s)"
msgstr ""
@@ -816,11 +816,11 @@ msgstr ""
msgid "Create symbolic links"
msgstr ""
-#: ../v2v/v2v.ml:59
+#: ../v2v/v2v.ml:95
msgid "Creating an overlay to protect the source from being modified"
msgstr ""
-#: ../v2v/v2v.ml:196
+#: ../v2v/v2v.ml:229
msgid "Creating output metadata"
msgstr ""
@@ -859,7 +859,7 @@ msgstr ""
msgid "DIR"
msgstr ""
-#: ../v2v/cmdline.ml:92 ../sparsify/cmdline.ml:73 ../resize/resize.ml:186
+#: ../v2v/cmdline.ml:107 ../sparsify/cmdline.ml:73 ../resize/resize.ml:186
msgid "Debug GC and memory allocations"
msgstr ""
@@ -911,7 +911,7 @@ msgstr ""
#. ../customize/customize_main.ml:99
#. ../builder/cmdline.ml:158
#. ../builder/cmdline.ml:157
-#: ../v2v/cmdline.ml:117 ../sysprep/main.ml:155 ../sysprep/main.ml:154
+#: ../v2v/cmdline.ml:134 ../sysprep/main.ml:155 ../sysprep/main.ml:154
msgid "Display version and exit"
msgstr ""
@@ -988,7 +988,7 @@ msgstr ""
#. ../customize/customize_main.ml:97
#. ../builder/cmdline.ml:156
#. ../builder/cmdline.ml:155
-#: ../v2v/cmdline.ml:115 ../sysprep/main.ml:153 ../sysprep/main.ml:152
+#: ../v2v/cmdline.ml:132 ../sysprep/main.ml:153 ../sysprep/main.ml:152
msgid "Enable debugging messages"
msgstr ""
@@ -999,7 +999,7 @@ msgstr ""
#. ../resize/resize.ml:214
#. ../customize/customize_main.ml:101
#. ../builder/cmdline.ml:159
-#: ../v2v/cmdline.ml:120 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
+#: ../v2v/cmdline.ml:137 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
msgid "Enable tracing of libguestfs calls"
msgstr ""
@@ -1007,7 +1007,7 @@ msgstr ""
msgid "Enable/disable specific operations"
msgstr ""
-#: ../v2v/v2v.ml:293
+#: ../v2v/v2v.ml:301
msgid "Enter number between 1 and %d: "
msgstr ""
@@ -1095,7 +1095,7 @@ msgstr ""
msgid "Fingerprint: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:212 ../customize/customize_main.ml:237
+#: ../v2v/v2v.ml:232 ../customize/customize_main.ml:237
#: ../builder/builder.ml:711
msgid "Finishing off"
msgstr ""
@@ -1153,7 +1153,7 @@ msgstr ""
msgid "HOSTNAME"
msgstr ""
-#: ../v2v/cmdline.ml:114
+#: ../v2v/cmdline.ml:131
msgid "How to choose root filesystem"
msgstr ""
@@ -1165,7 +1165,7 @@ msgstr ""
msgid "Ignore partition"
msgstr ""
-#: ../v2v/v2v.ml:97
+#: ../v2v/v2v.ml:133
msgid "Initializing the target %s"
msgstr ""
@@ -1175,11 +1175,11 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/cmdline.ml:96
+#: ../v2v/cmdline.ml:111
msgid "Input format (for -i disk)"
msgstr ""
-#: ../v2v/v2v.ml:103
+#: ../v2v/v2v.ml:139
msgid "Inspecting the overlay"
msgstr ""
@@ -1199,7 +1199,7 @@ msgstr ""
msgid "Installing packages: %s"
msgstr ""
-#: ../v2v/cmdline.ml:99
+#: ../v2v/cmdline.ml:115
msgid "Just write the metadata"
msgstr ""
@@ -1207,7 +1207,7 @@ msgstr ""
msgid "Key: %s\n"
msgstr ""
-#: ../v2v/cmdline.ml:102 ../v2v/cmdline.ml:94
+#: ../v2v/cmdline.ml:118 ../v2v/cmdline.ml:109
msgid "Libvirt URI"
msgstr ""
@@ -1222,7 +1222,7 @@ msgstr ""
#. ../resize/resize.ml:193
#. ../customize/customize_main.ml:89
#. ../builder/cmdline.ml:139
-#: ../v2v/cmdline.ml:97 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
+#: ../v2v/cmdline.ml:112 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
msgid "List long options"
msgstr ""
@@ -1231,7 +1231,7 @@ msgid "List supported operations"
msgstr ""
#. ../builder/cmdline.ml:140
-#: ../v2v/cmdline.ml:98 ../sparsify/cmdline.ml:79 ../resize/resize.ml:198
+#: ../v2v/cmdline.ml:113 ../sparsify/cmdline.ml:79 ../resize/resize.ml:198
msgid "Make output machine readable"
msgstr ""
@@ -1239,6 +1239,14 @@ msgstr ""
msgid "Making directory: %s"
msgstr ""
+#: ../v2v/cmdline.ml:106
+msgid "Map bridge 'in' to 'out'"
+msgstr ""
+
+#: ../v2v/cmdline.ml:114
+msgid "Map network 'in' to 'out'"
+msgstr ""
+
#: ../builder/list_entries.ml:77
msgid "Minimum/default size:"
msgstr ""
@@ -1296,11 +1304,15 @@ msgstr ""
msgid "Opening the new disk"
msgstr ""
-#: ../v2v/v2v.ml:80
+#: ../v2v/v2v.ml:116
msgid "Opening the overlay"
msgstr ""
-#: ../v2v/cmdline.ml:113
+#: ../v2v/v2v.ml:42
+msgid "Opening the source %s"
+msgstr ""
+
+#: ../v2v/cmdline.ml:130
msgid "Output VM UUID"
msgstr ""
@@ -1316,7 +1328,7 @@ msgstr ""
msgid "Output format (default: raw)"
msgstr ""
-#: ../v2v/cmdline.ml:109
+#: ../v2v/cmdline.ml:126
msgid "Output image UUID"
msgstr ""
@@ -1324,7 +1336,7 @@ msgstr ""
msgid "Output size"
msgstr ""
-#: ../v2v/cmdline.ml:111
+#: ../v2v/cmdline.ml:128
msgid "Output vol UUID(s)"
msgstr ""
@@ -1355,11 +1367,15 @@ msgstr ""
msgid "Print info about template cache"
msgstr ""
-#: ../v2v/cmdline.ml:106 ../sparsify/cmdline.ml:81
+#: ../v2v/cmdline.ml:122
+msgid "Print source and stop"
+msgstr ""
+
+#: ../v2v/cmdline.ml:123 ../sparsify/cmdline.ml:81
msgid "Quiet output"
msgstr ""
-#: ../v2v/target_RHEV.ml:544 ../v2v/target_RHEV.ml:141
+#: ../v2v/output_RHEV.ml:475 ../v2v/output_RHEV.ml:293
msgid "RHEV does not support the output format '%s', only raw or qcow2"
msgstr ""
@@ -1552,7 +1568,7 @@ msgstr ""
msgid "Remove user at-jobs and cron-jobs"
msgstr ""
-#: ../v2v/cmdline.ml:104
+#: ../v2v/cmdline.ml:120
msgid "Rename guest when converting"
msgstr ""
@@ -1656,7 +1672,7 @@ msgstr ""
msgid "Set format (default: auto)"
msgstr ""
-#: ../v2v/cmdline.ml:93
+#: ../v2v/cmdline.ml:108
msgid "Set input mode (default: libvirt)"
msgstr ""
@@ -1686,7 +1702,7 @@ msgstr ""
msgid "Set number of vCPUs"
msgstr ""
-#: ../v2v/cmdline.ml:101
+#: ../v2v/cmdline.ml:117
msgid "Set output allocation mode"
msgstr ""
@@ -1698,15 +1714,15 @@ msgstr ""
msgid "Set output filename"
msgstr ""
-#: ../v2v/cmdline.ml:103
+#: ../v2v/cmdline.ml:119
msgid "Set output format"
msgstr ""
-#: ../v2v/cmdline.ml:100
+#: ../v2v/cmdline.ml:116
msgid "Set output mode (default: libvirt)"
msgstr ""
-#: ../v2v/cmdline.ml:105
+#: ../v2v/cmdline.ml:121
msgid "Set output storage location"
msgstr ""
@@ -1754,7 +1770,7 @@ msgstr ""
msgid "Set user password"
msgstr ""
-#: ../v2v/cmdline.ml:119
+#: ../v2v/cmdline.ml:136
msgid "Set vmtype (for RHEV)"
msgstr ""
@@ -1798,6 +1814,10 @@ msgstr ""
msgid "Source URI: %s\n"
msgstr ""
+#: ../v2v/v2v.ml:47
+msgid "Source guest information (--print-source option):\n"
+msgstr ""
+
#: ../sparsify/in_place.ml:153
msgid "Sparsify in-place operation completed with no errors.\n"
msgstr ""
@@ -1856,7 +1876,7 @@ msgid ""
" IT IS POSSIBLE THAT SOMEONE IS DOING SOMETHING NASTY!"
msgstr ""
-#: ../v2v/convert_linux.ml:1042
+#: ../v2v/convert_linux.ml:1044
msgid ""
"The display driver was updated to '%s', but X11 does not seem to be "
"installed in the guest. X may not function correctly."
@@ -1920,7 +1940,7 @@ msgid ""
"virtual machine's disk, but it was stored on disk in older distros."
msgstr ""
-#: ../v2v/target_RHEV.ml:378
+#: ../v2v/output_RHEV.ml:692
msgid ""
"This guest required a password for connection to its display, but this is "
"not supported by RHEV. Therefore the converted guest's display will not "
@@ -1950,7 +1970,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:142
+#: ../v2v/v2v.ml:175
msgid "Trimming filesystems to reduce amount of data to copy"
msgstr ""
@@ -2064,7 +2084,7 @@ msgstr ""
msgid "cannot detect input disk format; use the --format parameter"
msgstr ""
-#: ../v2v/source_disk.ml:50
+#: ../v2v/input_disk.ml:60
msgid "cannot detect the input disk format; use the -if parameter"
msgstr ""
@@ -2078,11 +2098,11 @@ msgid ""
"\\Windows\\CurrentVersion\\Uninstall\\%s' does not contain an '%s' key"
msgstr ""
-#: ../v2v/v2v.ml:296
+#: ../v2v/v2v.ml:304
msgid "connection closed"
msgstr ""
-#: ../v2v/target_libvirt.ml:257
+#: ../v2v/output_libvirt.ml:269
msgid ""
"could not define libvirt domain. The libvirt XML is still available in "
"'%s'. Try running 'virsh define %s' yourself instead."
@@ -2094,14 +2114,18 @@ msgid ""
"\\CurrentVersion"
msgstr ""
-#: ../v2v/target_RHEV.ml:208
+#: ../v2v/input_libvirt.ml:289
+msgid "could not parse '-ic %s'. Original error message was: %s"
+msgstr ""
+
+#: ../v2v/output_RHEV.ml:154
msgid ""
"could not read the Export Storage Domain specified by the '-os %s' parameter "
"on the command line. Is it really an OVirt or RHEV-M Export Storage "
"Domain? The original error is: %s"
msgstr ""
-#: ../v2v/target_libvirt.ml:239
+#: ../v2v/output_libvirt.ml:251
msgid "could not refresh libvirt pool %s"
msgstr ""
@@ -2133,14 +2157,14 @@ msgstr ""
msgid "discard/trim is not supported: %s"
msgstr ""
-#: ../v2v/v2v.ml:234
+#: ../v2v/v2v.ml:254
msgid ""
"disk %s (%s) has no defined format, you have to either define the original "
"format in the source metadata, or use the '-of' option to force the output "
"format"
msgstr ""
-#: ../v2v/source_libvirt.ml:106
+#: ../v2v/input_libvirt.ml:99
msgid "display <graphics type='%s'> was ignored"
msgstr ""
@@ -2162,7 +2186,7 @@ msgstr ""
msgid "don't know how to remove packages using %s: packages: %s"
msgstr ""
-#: ../v2v/v2v.ml:280
+#: ../v2v/v2v.ml:288
msgid ""
"dual- or multi-boot operating system detected. Choose the root filesystem\n"
"that contains the main operating system from the list below:\n"
@@ -2176,19 +2200,19 @@ msgstr ""
msgid "error parsing URI '%s'. Look for error messages printed above."
msgstr ""
-#: ../v2v/source_libvirt.ml:63
+#: ../v2v/input_libvirt.ml:56
msgid "expecting XML expression to return an integer (expression: %s)"
msgstr ""
-#: ../v2v/cmdline.ml:194
+#: ../v2v/cmdline.ml:213
msgid "expecting a disk image (filename) on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:214
+#: ../v2v/cmdline.ml:233
msgid "expecting a libvirt XML file name on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:205
+#: ../v2v/cmdline.ml:224
msgid "expecting a libvirt guest name on the command line"
msgstr ""
@@ -2249,23 +2273,23 @@ msgstr ""
msgid "hostname could not be set for this type of guest"
msgstr ""
-#: ../v2v/v2v.ml:318
+#: ../v2v/cmdline.ml:65
+msgid "invalid --bridge or --network parameter"
+msgstr ""
+
+#: ../v2v/v2v.ml:326
msgid ""
"libguestfs thinks this is not an installed operating system (it might be, "
"for example, an installer disk or live CD). If this is wrong, it is "
"probably a bug in libguestfs. root=%s fmt=%s"
msgstr ""
-#: ../v2v/source_libvirt.ml:39
-msgid "libvirt returned a non-absolute path in the XML (%s)"
-msgstr ""
-
#. ../resize/resize.ml:194
#: ../resize/resize.ml:197 ../resize/resize.ml:196 ../resize/resize.ml:195
msgid "lv"
msgstr ""
-#: ../v2v/target_RHEV.ml:185
+#: ../v2v/output_RHEV.ml:131
msgid ""
"mount command failed, see earlier errors.\n"
"\n"
@@ -2273,7 +2297,7 @@ msgid ""
"[-os %s], or else you need to rerun virt-v2v as root."
msgstr ""
-#: ../v2v/v2v.ml:303
+#: ../v2v/v2v.ml:311
msgid ""
"multi-boot operating systems are not supported by virt-v2v. Use the --root "
"option to change how virt-v2v handles this."
@@ -2285,7 +2309,7 @@ msgid ""
"be a bug in virt-v2v."
msgstr ""
-#: ../v2v/source_libvirt.ml:170
+#: ../v2v/input_libvirt.ml:167
msgid "network <disk> with <source protocol='%s'> was ignored"
msgstr ""
@@ -2320,10 +2344,16 @@ msgid ""
"of this guest."
msgstr ""
-#: ../v2v/v2v.ml:273
+#: ../v2v/v2v.ml:281
msgid "no root device found in this operating system image."
msgstr ""
+#: ../v2v/input_libvirt.ml:304
+msgid ""
+"no support for remote libvirt connections to '-ic %s'. The conversion may "
+"fail when it tries to read the source disks."
+msgstr ""
+
#: ../resize/resize.ml:129
msgid "ntfsresize"
msgstr ""
@@ -2384,7 +2414,7 @@ msgstr ""
msgid "pwrite: short write restoring swap partition header"
msgstr ""
-#: ../v2v/v2v.ml:191 ../v2v/v2v.ml:75
+#: ../v2v/v2v.ml:224 ../v2v/v2v.ml:111
msgid "qemu-img command failed, see earlier errors"
msgstr ""
@@ -2396,7 +2426,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:311
+#: ../v2v/v2v.ml:319
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2412,14 +2442,14 @@ msgstr ""
msgid "sectors"
msgstr ""
-#: ../v2v/target_RHEV.ml:228
+#: ../v2v/output_RHEV.ml:174
msgid ""
"the Export Storage Domain (%s) has not been attached to any Data Center.\n"
"\n"
"You have to do this through the RHEV-M / OVirt user interface first."
msgstr ""
-#: ../v2v/target_RHEV.ml:233
+#: ../v2v/output_RHEV.ml:179
msgid ""
"the Export Storage Domain (%s) is not writable.\n"
"\n"
@@ -2428,7 +2458,7 @@ msgid ""
"Original error was: %s"
msgstr ""
-#: ../v2v/target_RHEV.ml:275
+#: ../v2v/output_RHEV.ml:223
msgid ""
"the number of '--rhev-vol-uuid' parameters passed on the command line has to "
"match the number of guest disk images (for this guest: %d)"
@@ -2438,7 +2468,7 @@ msgstr ""
msgid "the source disk has no partitions"
msgstr ""
-#: ../v2v/target_RHEV.ml:133
+#: ../v2v/output_RHEV.ml:285
msgid ""
"the virtual size of the input disk %s is not an exact multiple of 512 "
"bytes. The virtual size is: %Ld.\n"
@@ -2447,13 +2477,13 @@ msgid ""
"about this issue."
msgstr ""
-#: ../v2v/target_RHEV.ml:222
+#: ../v2v/output_RHEV.ml:168
msgid ""
"there are multiple UUIDs in the Export Storage Domain (%s). This is "
"unexpected, and may be a bug in virt-v2v or OVirt."
msgstr ""
-#: ../v2v/target_RHEV.ml:220
+#: ../v2v/output_RHEV.ml:166
msgid ""
"there are no UUIDs in the Export Storage Domain (%s). Is it really an OVirt "
"or RHEV-M Export Storage Domain?"
@@ -2483,7 +2513,7 @@ msgid ""
"The guest will be configured to use a slower emulated device."
msgstr ""
-#: ../v2v/source_libvirt.ml:127
+#: ../v2v/input_libvirt.ml:120
msgid "this guest has no non-removable disks"
msgstr ""
@@ -2501,33 +2531,27 @@ msgstr ""
msgid "unknown --align-first option: use never|always|auto"
msgstr ""
-#: ../v2v/cmdline.ml:84
+#: ../v2v/cmdline.ml:98
msgid "unknown --root option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:174
+#: ../v2v/cmdline.ml:193
msgid "unknown --vmtype option, must be \"server\" or \"desktop\""
msgstr ""
-#: ../v2v/cmdline.ml:57
+#: ../v2v/cmdline.ml:58
msgid "unknown -i option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:66
+#: ../v2v/cmdline.ml:80
msgid "unknown -o option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:74
+#: ../v2v/cmdline.ml:88
msgid "unknown -oa option: %s"
msgstr ""
-#: ../v2v/target_RHEV.ml:638
-msgid ""
-"unknown NIC model %s for ethernet device %s. This NIC will be imported as "
-"rtl8139 instead."
-msgstr ""
-
-#: ../v2v/target_RHEV.ml:494
+#: ../v2v/output_RHEV.ml:423
msgid "unknown guest operating system: %s %s %d.%d (%s)"
msgstr ""
@@ -2726,11 +2750,11 @@ msgstr ""
msgid "virt-sysprep: script: killed by signal (%d)\n"
msgstr ""
-#: ../v2v/v2v.ml:132
+#: ../v2v/v2v.ml:165
msgid "virt-v2v is unable to convert this guest type (linux/distro=%s)"
msgstr ""
-#: ../v2v/v2v.ml:138
+#: ../v2v/v2v.ml:171
msgid "virt-v2v is unable to convert this guest type (type=%s)"
msgstr ""
diff --git a/po/gu.po b/po/gu.po
index 5ad7c88..3f170b9 100644
--- a/po/gu.po
+++ b/po/gu.po
@@ -10,7 +10,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-08-19 17:51+0100\n"
+"POT-Creation-Date: 2014-08-21 17:07+0100\n"
"PO-Revision-Date: 2014-07-22 18:03+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Gujarati (http://www.transifex.com/projects/p/libguestfs/"
@@ -70,7 +70,7 @@ msgstr ""
msgid "%s (ignored)\n"
msgstr ""
-#: ../v2v/convert_linux.ml:1134
+#: ../v2v/convert_linux.ml:1136
msgid ""
"%s references unknown device \"%s\". You may have to fix this entry "
"manually after conversion."
@@ -80,7 +80,7 @@ msgstr ""
msgid "%s: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:147
+#: ../v2v/v2v.ml:180
msgid "%s: %s (ignored)"
msgstr ""
@@ -221,7 +221,7 @@ msgstr ""
msgid "%s: cannot output to a character device or /dev/null\n"
msgstr ""
-#: ../v2v/cmdline.ml:126
+#: ../v2v/cmdline.ml:143
msgid ""
"%s: convert a guest to use KVM\n"
"\n"
@@ -273,7 +273,7 @@ msgstr ""
msgid "%s: error: %s"
msgstr ""
-#: ../v2v/v2v.ml:369 ../sysprep/main.ml:297
+#: ../v2v/v2v.ml:377 ../sysprep/main.ml:297
msgid "%s: error: %s\n"
msgstr ""
@@ -283,13 +283,13 @@ msgstr ""
#. ../resize/resize.ml:1309
#. ../builder/builder.ml:743
-#: ../v2v/v2v.ml:362 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
+#: ../v2v/v2v.ml:370 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
msgid "%s: error: %s: %s\n"
msgstr ""
#. ../resize/resize.ml:1312
#. ../builder/builder.ml:746
-#: ../v2v/v2v.ml:365 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
+#: ../v2v/v2v.ml:373 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
msgid "%s: error: %s: %s: %s\n"
msgstr ""
@@ -310,7 +310,7 @@ msgstr ""
#. ../resize/resize.ml:1331
#. ../customize/customize_main.ml:262
#. ../builder/builder.ml:764
-#: ../v2v/v2v.ml:387 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
+#: ../v2v/v2v.ml:395 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
msgid "%s: exception: %s\n"
msgstr ""
@@ -320,7 +320,7 @@ msgstr ""
#. ../resize/resize.ml:1319
#. ../builder/builder.ml:752
-#: ../v2v/v2v.ml:375 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
+#: ../v2v/v2v.ml:383 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
msgid "%s: failure: %s\n"
msgstr ""
@@ -347,14 +347,14 @@ msgstr ""
#. ../resize/resize.ml:1328
#. ../customize/customize_main.ml:259
#. ../builder/builder.ml:761
-#: ../v2v/v2v.ml:384 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
+#: ../v2v/v2v.ml:392 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
msgid "%s: internal error: Not_found exception was thrown\n"
msgstr ""
#. ../resize/resize.ml:1325
#. ../customize/customize_main.ml:255
#. ../builder/builder.ml:758
-#: ../v2v/v2v.ml:381 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
+#: ../v2v/v2v.ml:389 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
msgid "%s: internal error: assertion failed at %s, line %d, char %d\n"
msgstr ""
@@ -362,7 +362,7 @@ msgstr ""
#. ../customize/customize_main.ml:252
#. ../builder/sources.ml:135
#. ../builder/builder.ml:755
-#: ../v2v/v2v.ml:378 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
+#: ../v2v/v2v.ml:386 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
msgid "%s: internal error: invalid argument: %s\n"
msgstr ""
@@ -380,7 +380,7 @@ msgstr ""
#. ../resize/resize.ml:1316
#. ../builder/builder.ml:749
-#: ../v2v/v2v.ml:372 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
+#: ../v2v/v2v.ml:380 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
msgid "%s: libguestfs error: %s\n"
msgstr ""
@@ -629,7 +629,7 @@ msgstr ""
msgid "--expand option given twice"
msgstr ""
-#: ../v2v/cmdline.ml:226
+#: ../v2v/cmdline.ml:245
msgid "--no-copy and '-o libvirt' cannot be used at the same time"
msgstr ""
@@ -654,40 +654,40 @@ msgstr ""
msgid "--tmp prebuilt:file: %s: file format is not qcow2"
msgstr ""
-#: ../v2v/cmdline.ml:236 ../v2v/cmdline.ml:224
+#: ../v2v/cmdline.ml:255 ../v2v/cmdline.ml:243
msgid "--vmtype option can only be used with '-o rhev'"
msgstr ""
-#: ../v2v/source_disk.ml:34
+#: ../v2v/input_disk.ml:44
msgid "-i disk: invalid input filename (%s)"
msgstr ""
-#: ../v2v/target_libvirt.ml:219
+#: ../v2v/output_libvirt.ml:231
msgid ""
"-o libvirt: output pool '%s' has type='dir' but the /pool/target/path "
"element either does not exist or is not a local directory. See virt-v2v(1) "
"section \"OUTPUT TO LIBVIRT\""
msgstr ""
-#: ../v2v/target_libvirt.ml:216
+#: ../v2v/output_libvirt.ml:228
msgid ""
"-o libvirt: output pool '%s' is not a directory (type='dir'). See virt-"
"v2v(1) section \"OUTPUT TO LIBVIRT\""
msgstr ""
-#: ../v2v/cmdline.ml:231
+#: ../v2v/cmdline.ml:250
msgid "-o local: output directory was not specified, use '-os /dir'"
msgstr ""
-#: ../v2v/cmdline.ml:241
+#: ../v2v/cmdline.ml:260
msgid "-o rhev: output storage was not specified, use '-os'"
msgstr ""
-#: ../v2v/cmdline.ml:233
+#: ../v2v/cmdline.ml:252
msgid "-os %s: output directory does not exist or is not a directory"
msgstr ""
-#: ../v2v/source_libvirt.ml:174
+#: ../v2v/input_libvirt.ml:171
msgid "<disk type='%s'> was ignored"
msgstr ""
@@ -755,7 +755,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:151
+#: ../v2v/v2v.ml:184
msgid "Closing the overlay"
msgstr ""
@@ -767,11 +767,11 @@ msgstr ""
msgid "Converting %s to %s"
msgstr ""
-#: ../v2v/v2v.ml:112
+#: ../v2v/v2v.ml:148
msgid "Converting %s to run on KVM"
msgstr ""
-#: ../v2v/v2v.ml:110
+#: ../v2v/v2v.ml:146
msgid "Converting the guest to run on KVM"
msgstr ""
@@ -791,7 +791,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:170
+#: ../v2v/v2v.ml:203
msgid "Copying disk %d/%d to %s (%s)"
msgstr ""
@@ -815,11 +815,11 @@ msgstr ""
msgid "Create symbolic links"
msgstr ""
-#: ../v2v/v2v.ml:59
+#: ../v2v/v2v.ml:95
msgid "Creating an overlay to protect the source from being modified"
msgstr ""
-#: ../v2v/v2v.ml:196
+#: ../v2v/v2v.ml:229
msgid "Creating output metadata"
msgstr ""
@@ -858,7 +858,7 @@ msgstr ""
msgid "DIR"
msgstr ""
-#: ../v2v/cmdline.ml:92 ../sparsify/cmdline.ml:73 ../resize/resize.ml:186
+#: ../v2v/cmdline.ml:107 ../sparsify/cmdline.ml:73 ../resize/resize.ml:186
msgid "Debug GC and memory allocations"
msgstr ""
@@ -910,7 +910,7 @@ msgstr ""
#. ../customize/customize_main.ml:99
#. ../builder/cmdline.ml:158
#. ../builder/cmdline.ml:157
-#: ../v2v/cmdline.ml:117 ../sysprep/main.ml:155 ../sysprep/main.ml:154
+#: ../v2v/cmdline.ml:134 ../sysprep/main.ml:155 ../sysprep/main.ml:154
msgid "Display version and exit"
msgstr ""
@@ -987,7 +987,7 @@ msgstr ""
#. ../customize/customize_main.ml:97
#. ../builder/cmdline.ml:156
#. ../builder/cmdline.ml:155
-#: ../v2v/cmdline.ml:115 ../sysprep/main.ml:153 ../sysprep/main.ml:152
+#: ../v2v/cmdline.ml:132 ../sysprep/main.ml:153 ../sysprep/main.ml:152
msgid "Enable debugging messages"
msgstr ""
@@ -998,7 +998,7 @@ msgstr ""
#. ../resize/resize.ml:214
#. ../customize/customize_main.ml:101
#. ../builder/cmdline.ml:159
-#: ../v2v/cmdline.ml:120 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
+#: ../v2v/cmdline.ml:137 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
msgid "Enable tracing of libguestfs calls"
msgstr ""
@@ -1006,7 +1006,7 @@ msgstr ""
msgid "Enable/disable specific operations"
msgstr ""
-#: ../v2v/v2v.ml:293
+#: ../v2v/v2v.ml:301
msgid "Enter number between 1 and %d: "
msgstr ""
@@ -1094,7 +1094,7 @@ msgstr ""
msgid "Fingerprint: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:212 ../customize/customize_main.ml:237
+#: ../v2v/v2v.ml:232 ../customize/customize_main.ml:237
#: ../builder/builder.ml:711
msgid "Finishing off"
msgstr ""
@@ -1152,7 +1152,7 @@ msgstr ""
msgid "HOSTNAME"
msgstr ""
-#: ../v2v/cmdline.ml:114
+#: ../v2v/cmdline.ml:131
msgid "How to choose root filesystem"
msgstr ""
@@ -1164,7 +1164,7 @@ msgstr ""
msgid "Ignore partition"
msgstr ""
-#: ../v2v/v2v.ml:97
+#: ../v2v/v2v.ml:133
msgid "Initializing the target %s"
msgstr ""
@@ -1174,11 +1174,11 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/cmdline.ml:96
+#: ../v2v/cmdline.ml:111
msgid "Input format (for -i disk)"
msgstr ""
-#: ../v2v/v2v.ml:103
+#: ../v2v/v2v.ml:139
msgid "Inspecting the overlay"
msgstr ""
@@ -1198,7 +1198,7 @@ msgstr ""
msgid "Installing packages: %s"
msgstr ""
-#: ../v2v/cmdline.ml:99
+#: ../v2v/cmdline.ml:115
msgid "Just write the metadata"
msgstr ""
@@ -1206,7 +1206,7 @@ msgstr ""
msgid "Key: %s\n"
msgstr ""
-#: ../v2v/cmdline.ml:102 ../v2v/cmdline.ml:94
+#: ../v2v/cmdline.ml:118 ../v2v/cmdline.ml:109
msgid "Libvirt URI"
msgstr ""
@@ -1221,7 +1221,7 @@ msgstr ""
#. ../resize/resize.ml:193
#. ../customize/customize_main.ml:89
#. ../builder/cmdline.ml:139
-#: ../v2v/cmdline.ml:97 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
+#: ../v2v/cmdline.ml:112 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
msgid "List long options"
msgstr ""
@@ -1230,7 +1230,7 @@ msgid "List supported operations"
msgstr ""
#. ../builder/cmdline.ml:140
-#: ../v2v/cmdline.ml:98 ../sparsify/cmdline.ml:79 ../resize/resize.ml:198
+#: ../v2v/cmdline.ml:113 ../sparsify/cmdline.ml:79 ../resize/resize.ml:198
msgid "Make output machine readable"
msgstr ""
@@ -1238,6 +1238,14 @@ msgstr ""
msgid "Making directory: %s"
msgstr ""
+#: ../v2v/cmdline.ml:106
+msgid "Map bridge 'in' to 'out'"
+msgstr ""
+
+#: ../v2v/cmdline.ml:114
+msgid "Map network 'in' to 'out'"
+msgstr ""
+
#: ../builder/list_entries.ml:77
msgid "Minimum/default size:"
msgstr ""
@@ -1295,11 +1303,15 @@ msgstr ""
msgid "Opening the new disk"
msgstr ""
-#: ../v2v/v2v.ml:80
+#: ../v2v/v2v.ml:116
msgid "Opening the overlay"
msgstr ""
-#: ../v2v/cmdline.ml:113
+#: ../v2v/v2v.ml:42
+msgid "Opening the source %s"
+msgstr ""
+
+#: ../v2v/cmdline.ml:130
msgid "Output VM UUID"
msgstr ""
@@ -1315,7 +1327,7 @@ msgstr ""
msgid "Output format (default: raw)"
msgstr ""
-#: ../v2v/cmdline.ml:109
+#: ../v2v/cmdline.ml:126
msgid "Output image UUID"
msgstr ""
@@ -1323,7 +1335,7 @@ msgstr ""
msgid "Output size"
msgstr ""
-#: ../v2v/cmdline.ml:111
+#: ../v2v/cmdline.ml:128
msgid "Output vol UUID(s)"
msgstr ""
@@ -1354,11 +1366,15 @@ msgstr ""
msgid "Print info about template cache"
msgstr ""
-#: ../v2v/cmdline.ml:106 ../sparsify/cmdline.ml:81
+#: ../v2v/cmdline.ml:122
+msgid "Print source and stop"
+msgstr ""
+
+#: ../v2v/cmdline.ml:123 ../sparsify/cmdline.ml:81
msgid "Quiet output"
msgstr ""
-#: ../v2v/target_RHEV.ml:544 ../v2v/target_RHEV.ml:141
+#: ../v2v/output_RHEV.ml:475 ../v2v/output_RHEV.ml:293
msgid "RHEV does not support the output format '%s', only raw or qcow2"
msgstr ""
@@ -1551,7 +1567,7 @@ msgstr ""
msgid "Remove user at-jobs and cron-jobs"
msgstr ""
-#: ../v2v/cmdline.ml:104
+#: ../v2v/cmdline.ml:120
msgid "Rename guest when converting"
msgstr ""
@@ -1655,7 +1671,7 @@ msgstr ""
msgid "Set format (default: auto)"
msgstr ""
-#: ../v2v/cmdline.ml:93
+#: ../v2v/cmdline.ml:108
msgid "Set input mode (default: libvirt)"
msgstr ""
@@ -1685,7 +1701,7 @@ msgstr ""
msgid "Set number of vCPUs"
msgstr ""
-#: ../v2v/cmdline.ml:101
+#: ../v2v/cmdline.ml:117
msgid "Set output allocation mode"
msgstr ""
@@ -1697,15 +1713,15 @@ msgstr ""
msgid "Set output filename"
msgstr ""
-#: ../v2v/cmdline.ml:103
+#: ../v2v/cmdline.ml:119
msgid "Set output format"
msgstr ""
-#: ../v2v/cmdline.ml:100
+#: ../v2v/cmdline.ml:116
msgid "Set output mode (default: libvirt)"
msgstr ""
-#: ../v2v/cmdline.ml:105
+#: ../v2v/cmdline.ml:121
msgid "Set output storage location"
msgstr ""
@@ -1753,7 +1769,7 @@ msgstr ""
msgid "Set user password"
msgstr ""
-#: ../v2v/cmdline.ml:119
+#: ../v2v/cmdline.ml:136
msgid "Set vmtype (for RHEV)"
msgstr ""
@@ -1797,6 +1813,10 @@ msgstr ""
msgid "Source URI: %s\n"
msgstr ""
+#: ../v2v/v2v.ml:47
+msgid "Source guest information (--print-source option):\n"
+msgstr ""
+
#: ../sparsify/in_place.ml:153
msgid "Sparsify in-place operation completed with no errors.\n"
msgstr ""
@@ -1855,7 +1875,7 @@ msgid ""
" IT IS POSSIBLE THAT SOMEONE IS DOING SOMETHING NASTY!"
msgstr ""
-#: ../v2v/convert_linux.ml:1042
+#: ../v2v/convert_linux.ml:1044
msgid ""
"The display driver was updated to '%s', but X11 does not seem to be "
"installed in the guest. X may not function correctly."
@@ -1919,7 +1939,7 @@ msgid ""
"virtual machine's disk, but it was stored on disk in older distros."
msgstr ""
-#: ../v2v/target_RHEV.ml:378
+#: ../v2v/output_RHEV.ml:692
msgid ""
"This guest required a password for connection to its display, but this is "
"not supported by RHEV. Therefore the converted guest's display will not "
@@ -1949,7 +1969,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:142
+#: ../v2v/v2v.ml:175
msgid "Trimming filesystems to reduce amount of data to copy"
msgstr ""
@@ -2063,7 +2083,7 @@ msgstr ""
msgid "cannot detect input disk format; use the --format parameter"
msgstr ""
-#: ../v2v/source_disk.ml:50
+#: ../v2v/input_disk.ml:60
msgid "cannot detect the input disk format; use the -if parameter"
msgstr ""
@@ -2077,11 +2097,11 @@ msgid ""
"\\Windows\\CurrentVersion\\Uninstall\\%s' does not contain an '%s' key"
msgstr ""
-#: ../v2v/v2v.ml:296
+#: ../v2v/v2v.ml:304
msgid "connection closed"
msgstr ""
-#: ../v2v/target_libvirt.ml:257
+#: ../v2v/output_libvirt.ml:269
msgid ""
"could not define libvirt domain. The libvirt XML is still available in "
"'%s'. Try running 'virsh define %s' yourself instead."
@@ -2093,14 +2113,18 @@ msgid ""
"\\CurrentVersion"
msgstr ""
-#: ../v2v/target_RHEV.ml:208
+#: ../v2v/input_libvirt.ml:289
+msgid "could not parse '-ic %s'. Original error message was: %s"
+msgstr ""
+
+#: ../v2v/output_RHEV.ml:154
msgid ""
"could not read the Export Storage Domain specified by the '-os %s' parameter "
"on the command line. Is it really an OVirt or RHEV-M Export Storage "
"Domain? The original error is: %s"
msgstr ""
-#: ../v2v/target_libvirt.ml:239
+#: ../v2v/output_libvirt.ml:251
msgid "could not refresh libvirt pool %s"
msgstr ""
@@ -2132,14 +2156,14 @@ msgstr ""
msgid "discard/trim is not supported: %s"
msgstr ""
-#: ../v2v/v2v.ml:234
+#: ../v2v/v2v.ml:254
msgid ""
"disk %s (%s) has no defined format, you have to either define the original "
"format in the source metadata, or use the '-of' option to force the output "
"format"
msgstr ""
-#: ../v2v/source_libvirt.ml:106
+#: ../v2v/input_libvirt.ml:99
msgid "display <graphics type='%s'> was ignored"
msgstr ""
@@ -2161,7 +2185,7 @@ msgstr ""
msgid "don't know how to remove packages using %s: packages: %s"
msgstr ""
-#: ../v2v/v2v.ml:280
+#: ../v2v/v2v.ml:288
msgid ""
"dual- or multi-boot operating system detected. Choose the root filesystem\n"
"that contains the main operating system from the list below:\n"
@@ -2175,19 +2199,19 @@ msgstr ""
msgid "error parsing URI '%s'. Look for error messages printed above."
msgstr ""
-#: ../v2v/source_libvirt.ml:63
+#: ../v2v/input_libvirt.ml:56
msgid "expecting XML expression to return an integer (expression: %s)"
msgstr ""
-#: ../v2v/cmdline.ml:194
+#: ../v2v/cmdline.ml:213
msgid "expecting a disk image (filename) on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:214
+#: ../v2v/cmdline.ml:233
msgid "expecting a libvirt XML file name on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:205
+#: ../v2v/cmdline.ml:224
msgid "expecting a libvirt guest name on the command line"
msgstr ""
@@ -2248,23 +2272,23 @@ msgstr ""
msgid "hostname could not be set for this type of guest"
msgstr ""
-#: ../v2v/v2v.ml:318
+#: ../v2v/cmdline.ml:65
+msgid "invalid --bridge or --network parameter"
+msgstr ""
+
+#: ../v2v/v2v.ml:326
msgid ""
"libguestfs thinks this is not an installed operating system (it might be, "
"for example, an installer disk or live CD). If this is wrong, it is "
"probably a bug in libguestfs. root=%s fmt=%s"
msgstr ""
-#: ../v2v/source_libvirt.ml:39
-msgid "libvirt returned a non-absolute path in the XML (%s)"
-msgstr ""
-
#. ../resize/resize.ml:194
#: ../resize/resize.ml:197 ../resize/resize.ml:196 ../resize/resize.ml:195
msgid "lv"
msgstr ""
-#: ../v2v/target_RHEV.ml:185
+#: ../v2v/output_RHEV.ml:131
msgid ""
"mount command failed, see earlier errors.\n"
"\n"
@@ -2272,7 +2296,7 @@ msgid ""
"[-os %s], or else you need to rerun virt-v2v as root."
msgstr ""
-#: ../v2v/v2v.ml:303
+#: ../v2v/v2v.ml:311
msgid ""
"multi-boot operating systems are not supported by virt-v2v. Use the --root "
"option to change how virt-v2v handles this."
@@ -2284,7 +2308,7 @@ msgid ""
"be a bug in virt-v2v."
msgstr ""
-#: ../v2v/source_libvirt.ml:170
+#: ../v2v/input_libvirt.ml:167
msgid "network <disk> with <source protocol='%s'> was ignored"
msgstr ""
@@ -2319,10 +2343,16 @@ msgid ""
"of this guest."
msgstr ""
-#: ../v2v/v2v.ml:273
+#: ../v2v/v2v.ml:281
msgid "no root device found in this operating system image."
msgstr ""
+#: ../v2v/input_libvirt.ml:304
+msgid ""
+"no support for remote libvirt connections to '-ic %s'. The conversion may "
+"fail when it tries to read the source disks."
+msgstr ""
+
#: ../resize/resize.ml:129
msgid "ntfsresize"
msgstr ""
@@ -2383,7 +2413,7 @@ msgstr ""
msgid "pwrite: short write restoring swap partition header"
msgstr ""
-#: ../v2v/v2v.ml:191 ../v2v/v2v.ml:75
+#: ../v2v/v2v.ml:224 ../v2v/v2v.ml:111
msgid "qemu-img command failed, see earlier errors"
msgstr ""
@@ -2395,7 +2425,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:311
+#: ../v2v/v2v.ml:319
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2411,14 +2441,14 @@ msgstr ""
msgid "sectors"
msgstr ""
-#: ../v2v/target_RHEV.ml:228
+#: ../v2v/output_RHEV.ml:174
msgid ""
"the Export Storage Domain (%s) has not been attached to any Data Center.\n"
"\n"
"You have to do this through the RHEV-M / OVirt user interface first."
msgstr ""
-#: ../v2v/target_RHEV.ml:233
+#: ../v2v/output_RHEV.ml:179
msgid ""
"the Export Storage Domain (%s) is not writable.\n"
"\n"
@@ -2427,7 +2457,7 @@ msgid ""
"Original error was: %s"
msgstr ""
-#: ../v2v/target_RHEV.ml:275
+#: ../v2v/output_RHEV.ml:223
msgid ""
"the number of '--rhev-vol-uuid' parameters passed on the command line has to "
"match the number of guest disk images (for this guest: %d)"
@@ -2437,7 +2467,7 @@ msgstr ""
msgid "the source disk has no partitions"
msgstr ""
-#: ../v2v/target_RHEV.ml:133
+#: ../v2v/output_RHEV.ml:285
msgid ""
"the virtual size of the input disk %s is not an exact multiple of 512 "
"bytes. The virtual size is: %Ld.\n"
@@ -2446,13 +2476,13 @@ msgid ""
"about this issue."
msgstr ""
-#: ../v2v/target_RHEV.ml:222
+#: ../v2v/output_RHEV.ml:168
msgid ""
"there are multiple UUIDs in the Export Storage Domain (%s). This is "
"unexpected, and may be a bug in virt-v2v or OVirt."
msgstr ""
-#: ../v2v/target_RHEV.ml:220
+#: ../v2v/output_RHEV.ml:166
msgid ""
"there are no UUIDs in the Export Storage Domain (%s). Is it really an OVirt "
"or RHEV-M Export Storage Domain?"
@@ -2482,7 +2512,7 @@ msgid ""
"The guest will be configured to use a slower emulated device."
msgstr ""
-#: ../v2v/source_libvirt.ml:127
+#: ../v2v/input_libvirt.ml:120
msgid "this guest has no non-removable disks"
msgstr ""
@@ -2500,33 +2530,27 @@ msgstr ""
msgid "unknown --align-first option: use never|always|auto"
msgstr ""
-#: ../v2v/cmdline.ml:84
+#: ../v2v/cmdline.ml:98
msgid "unknown --root option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:174
+#: ../v2v/cmdline.ml:193
msgid "unknown --vmtype option, must be \"server\" or \"desktop\""
msgstr ""
-#: ../v2v/cmdline.ml:57
+#: ../v2v/cmdline.ml:58
msgid "unknown -i option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:66
+#: ../v2v/cmdline.ml:80
msgid "unknown -o option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:74
+#: ../v2v/cmdline.ml:88
msgid "unknown -oa option: %s"
msgstr ""
-#: ../v2v/target_RHEV.ml:638
-msgid ""
-"unknown NIC model %s for ethernet device %s. This NIC will be imported as "
-"rtl8139 instead."
-msgstr ""
-
-#: ../v2v/target_RHEV.ml:494
+#: ../v2v/output_RHEV.ml:423
msgid "unknown guest operating system: %s %s %d.%d (%s)"
msgstr ""
@@ -2725,11 +2749,11 @@ msgstr ""
msgid "virt-sysprep: script: killed by signal (%d)\n"
msgstr ""
-#: ../v2v/v2v.ml:132
+#: ../v2v/v2v.ml:165
msgid "virt-v2v is unable to convert this guest type (linux/distro=%s)"
msgstr ""
-#: ../v2v/v2v.ml:138
+#: ../v2v/v2v.ml:171
msgid "virt-v2v is unable to convert this guest type (type=%s)"
msgstr ""
diff --git a/po/hi.po b/po/hi.po
index d9616cb..d423cce 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -10,7 +10,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-08-19 17:51+0100\n"
+"POT-Creation-Date: 2014-08-21 17:07+0100\n"
"PO-Revision-Date: 2014-07-22 18:03+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Hindi (http://www.transifex.com/projects/p/libguestfs/"
@@ -70,7 +70,7 @@ msgstr ""
msgid "%s (ignored)\n"
msgstr ""
-#: ../v2v/convert_linux.ml:1134
+#: ../v2v/convert_linux.ml:1136
msgid ""
"%s references unknown device \"%s\". You may have to fix this entry "
"manually after conversion."
@@ -80,7 +80,7 @@ msgstr ""
msgid "%s: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:147
+#: ../v2v/v2v.ml:180
msgid "%s: %s (ignored)"
msgstr ""
@@ -221,7 +221,7 @@ msgstr ""
msgid "%s: cannot output to a character device or /dev/null\n"
msgstr ""
-#: ../v2v/cmdline.ml:126
+#: ../v2v/cmdline.ml:143
msgid ""
"%s: convert a guest to use KVM\n"
"\n"
@@ -273,7 +273,7 @@ msgstr ""
msgid "%s: error: %s"
msgstr ""
-#: ../v2v/v2v.ml:369 ../sysprep/main.ml:297
+#: ../v2v/v2v.ml:377 ../sysprep/main.ml:297
msgid "%s: error: %s\n"
msgstr ""
@@ -283,13 +283,13 @@ msgstr ""
#. ../resize/resize.ml:1309
#. ../builder/builder.ml:743
-#: ../v2v/v2v.ml:362 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
+#: ../v2v/v2v.ml:370 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
msgid "%s: error: %s: %s\n"
msgstr ""
#. ../resize/resize.ml:1312
#. ../builder/builder.ml:746
-#: ../v2v/v2v.ml:365 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
+#: ../v2v/v2v.ml:373 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
msgid "%s: error: %s: %s: %s\n"
msgstr ""
@@ -310,7 +310,7 @@ msgstr ""
#. ../resize/resize.ml:1331
#. ../customize/customize_main.ml:262
#. ../builder/builder.ml:764
-#: ../v2v/v2v.ml:387 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
+#: ../v2v/v2v.ml:395 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
msgid "%s: exception: %s\n"
msgstr ""
@@ -320,7 +320,7 @@ msgstr ""
#. ../resize/resize.ml:1319
#. ../builder/builder.ml:752
-#: ../v2v/v2v.ml:375 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
+#: ../v2v/v2v.ml:383 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
msgid "%s: failure: %s\n"
msgstr ""
@@ -347,14 +347,14 @@ msgstr ""
#. ../resize/resize.ml:1328
#. ../customize/customize_main.ml:259
#. ../builder/builder.ml:761
-#: ../v2v/v2v.ml:384 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
+#: ../v2v/v2v.ml:392 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
msgid "%s: internal error: Not_found exception was thrown\n"
msgstr ""
#. ../resize/resize.ml:1325
#. ../customize/customize_main.ml:255
#. ../builder/builder.ml:758
-#: ../v2v/v2v.ml:381 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
+#: ../v2v/v2v.ml:389 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
msgid "%s: internal error: assertion failed at %s, line %d, char %d\n"
msgstr ""
@@ -362,7 +362,7 @@ msgstr ""
#. ../customize/customize_main.ml:252
#. ../builder/sources.ml:135
#. ../builder/builder.ml:755
-#: ../v2v/v2v.ml:378 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
+#: ../v2v/v2v.ml:386 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
msgid "%s: internal error: invalid argument: %s\n"
msgstr ""
@@ -380,7 +380,7 @@ msgstr ""
#. ../resize/resize.ml:1316
#. ../builder/builder.ml:749
-#: ../v2v/v2v.ml:372 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
+#: ../v2v/v2v.ml:380 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
msgid "%s: libguestfs error: %s\n"
msgstr ""
@@ -629,7 +629,7 @@ msgstr ""
msgid "--expand option given twice"
msgstr ""
-#: ../v2v/cmdline.ml:226
+#: ../v2v/cmdline.ml:245
msgid "--no-copy and '-o libvirt' cannot be used at the same time"
msgstr ""
@@ -654,40 +654,40 @@ msgstr ""
msgid "--tmp prebuilt:file: %s: file format is not qcow2"
msgstr ""
-#: ../v2v/cmdline.ml:236 ../v2v/cmdline.ml:224
+#: ../v2v/cmdline.ml:255 ../v2v/cmdline.ml:243
msgid "--vmtype option can only be used with '-o rhev'"
msgstr ""
-#: ../v2v/source_disk.ml:34
+#: ../v2v/input_disk.ml:44
msgid "-i disk: invalid input filename (%s)"
msgstr ""
-#: ../v2v/target_libvirt.ml:219
+#: ../v2v/output_libvirt.ml:231
msgid ""
"-o libvirt: output pool '%s' has type='dir' but the /pool/target/path "
"element either does not exist or is not a local directory. See virt-v2v(1) "
"section \"OUTPUT TO LIBVIRT\""
msgstr ""
-#: ../v2v/target_libvirt.ml:216
+#: ../v2v/output_libvirt.ml:228
msgid ""
"-o libvirt: output pool '%s' is not a directory (type='dir'). See virt-"
"v2v(1) section \"OUTPUT TO LIBVIRT\""
msgstr ""
-#: ../v2v/cmdline.ml:231
+#: ../v2v/cmdline.ml:250
msgid "-o local: output directory was not specified, use '-os /dir'"
msgstr ""
-#: ../v2v/cmdline.ml:241
+#: ../v2v/cmdline.ml:260
msgid "-o rhev: output storage was not specified, use '-os'"
msgstr ""
-#: ../v2v/cmdline.ml:233
+#: ../v2v/cmdline.ml:252
msgid "-os %s: output directory does not exist or is not a directory"
msgstr ""
-#: ../v2v/source_libvirt.ml:174
+#: ../v2v/input_libvirt.ml:171
msgid "<disk type='%s'> was ignored"
msgstr ""
@@ -755,7 +755,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:151
+#: ../v2v/v2v.ml:184
msgid "Closing the overlay"
msgstr ""
@@ -767,11 +767,11 @@ msgstr ""
msgid "Converting %s to %s"
msgstr ""
-#: ../v2v/v2v.ml:112
+#: ../v2v/v2v.ml:148
msgid "Converting %s to run on KVM"
msgstr ""
-#: ../v2v/v2v.ml:110
+#: ../v2v/v2v.ml:146
msgid "Converting the guest to run on KVM"
msgstr ""
@@ -791,7 +791,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:170
+#: ../v2v/v2v.ml:203
msgid "Copying disk %d/%d to %s (%s)"
msgstr ""
@@ -815,11 +815,11 @@ msgstr ""
msgid "Create symbolic links"
msgstr ""
-#: ../v2v/v2v.ml:59
+#: ../v2v/v2v.ml:95
msgid "Creating an overlay to protect the source from being modified"
msgstr ""
-#: ../v2v/v2v.ml:196
+#: ../v2v/v2v.ml:229
msgid "Creating output metadata"
msgstr ""
@@ -858,7 +858,7 @@ msgstr ""
msgid "DIR"
msgstr ""
-#: ../v2v/cmdline.ml:92 ../sparsify/cmdline.ml:73 ../resize/resize.ml:186
+#: ../v2v/cmdline.ml:107 ../sparsify/cmdline.ml:73 ../resize/resize.ml:186
msgid "Debug GC and memory allocations"
msgstr ""
@@ -910,7 +910,7 @@ msgstr ""
#. ../customize/customize_main.ml:99
#. ../builder/cmdline.ml:158
#. ../builder/cmdline.ml:157
-#: ../v2v/cmdline.ml:117 ../sysprep/main.ml:155 ../sysprep/main.ml:154
+#: ../v2v/cmdline.ml:134 ../sysprep/main.ml:155 ../sysprep/main.ml:154
msgid "Display version and exit"
msgstr ""
@@ -987,7 +987,7 @@ msgstr ""
#. ../customize/customize_main.ml:97
#. ../builder/cmdline.ml:156
#. ../builder/cmdline.ml:155
-#: ../v2v/cmdline.ml:115 ../sysprep/main.ml:153 ../sysprep/main.ml:152
+#: ../v2v/cmdline.ml:132 ../sysprep/main.ml:153 ../sysprep/main.ml:152
msgid "Enable debugging messages"
msgstr ""
@@ -998,7 +998,7 @@ msgstr ""
#. ../resize/resize.ml:214
#. ../customize/customize_main.ml:101
#. ../builder/cmdline.ml:159
-#: ../v2v/cmdline.ml:120 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
+#: ../v2v/cmdline.ml:137 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
msgid "Enable tracing of libguestfs calls"
msgstr ""
@@ -1006,7 +1006,7 @@ msgstr ""
msgid "Enable/disable specific operations"
msgstr ""
-#: ../v2v/v2v.ml:293
+#: ../v2v/v2v.ml:301
msgid "Enter number between 1 and %d: "
msgstr ""
@@ -1094,7 +1094,7 @@ msgstr ""
msgid "Fingerprint: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:212 ../customize/customize_main.ml:237
+#: ../v2v/v2v.ml:232 ../customize/customize_main.ml:237
#: ../builder/builder.ml:711
msgid "Finishing off"
msgstr ""
@@ -1152,7 +1152,7 @@ msgstr ""
msgid "HOSTNAME"
msgstr ""
-#: ../v2v/cmdline.ml:114
+#: ../v2v/cmdline.ml:131
msgid "How to choose root filesystem"
msgstr ""
@@ -1164,7 +1164,7 @@ msgstr ""
msgid "Ignore partition"
msgstr ""
-#: ../v2v/v2v.ml:97
+#: ../v2v/v2v.ml:133
msgid "Initializing the target %s"
msgstr ""
@@ -1174,11 +1174,11 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/cmdline.ml:96
+#: ../v2v/cmdline.ml:111
msgid "Input format (for -i disk)"
msgstr ""
-#: ../v2v/v2v.ml:103
+#: ../v2v/v2v.ml:139
msgid "Inspecting the overlay"
msgstr ""
@@ -1198,7 +1198,7 @@ msgstr ""
msgid "Installing packages: %s"
msgstr ""
-#: ../v2v/cmdline.ml:99
+#: ../v2v/cmdline.ml:115
msgid "Just write the metadata"
msgstr ""
@@ -1206,7 +1206,7 @@ msgstr ""
msgid "Key: %s\n"
msgstr ""
-#: ../v2v/cmdline.ml:102 ../v2v/cmdline.ml:94
+#: ../v2v/cmdline.ml:118 ../v2v/cmdline.ml:109
msgid "Libvirt URI"
msgstr ""
@@ -1221,7 +1221,7 @@ msgstr ""
#. ../resize/resize.ml:193
#. ../customize/customize_main.ml:89
#. ../builder/cmdline.ml:139
-#: ../v2v/cmdline.ml:97 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
+#: ../v2v/cmdline.ml:112 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
msgid "List long options"
msgstr ""
@@ -1230,7 +1230,7 @@ msgid "List supported operations"
msgstr ""
#. ../builder/cmdline.ml:140
-#: ../v2v/cmdline.ml:98 ../sparsify/cmdline.ml:79 ../resize/resize.ml:198
+#: ../v2v/cmdline.ml:113 ../sparsify/cmdline.ml:79 ../resize/resize.ml:198
msgid "Make output machine readable"
msgstr ""
@@ -1238,6 +1238,14 @@ msgstr ""
msgid "Making directory: %s"
msgstr ""
+#: ../v2v/cmdline.ml:106
+msgid "Map bridge 'in' to 'out'"
+msgstr ""
+
+#: ../v2v/cmdline.ml:114
+msgid "Map network 'in' to 'out'"
+msgstr ""
+
#: ../builder/list_entries.ml:77
msgid "Minimum/default size:"
msgstr ""
@@ -1295,11 +1303,15 @@ msgstr ""
msgid "Opening the new disk"
msgstr ""
-#: ../v2v/v2v.ml:80
+#: ../v2v/v2v.ml:116
msgid "Opening the overlay"
msgstr ""
-#: ../v2v/cmdline.ml:113
+#: ../v2v/v2v.ml:42
+msgid "Opening the source %s"
+msgstr ""
+
+#: ../v2v/cmdline.ml:130
msgid "Output VM UUID"
msgstr ""
@@ -1315,7 +1327,7 @@ msgstr ""
msgid "Output format (default: raw)"
msgstr ""
-#: ../v2v/cmdline.ml:109
+#: ../v2v/cmdline.ml:126
msgid "Output image UUID"
msgstr ""
@@ -1323,7 +1335,7 @@ msgstr ""
msgid "Output size"
msgstr ""
-#: ../v2v/cmdline.ml:111
+#: ../v2v/cmdline.ml:128
msgid "Output vol UUID(s)"
msgstr ""
@@ -1354,11 +1366,15 @@ msgstr ""
msgid "Print info about template cache"
msgstr ""
-#: ../v2v/cmdline.ml:106 ../sparsify/cmdline.ml:81
+#: ../v2v/cmdline.ml:122
+msgid "Print source and stop"
+msgstr ""
+
+#: ../v2v/cmdline.ml:123 ../sparsify/cmdline.ml:81
msgid "Quiet output"
msgstr ""
-#: ../v2v/target_RHEV.ml:544 ../v2v/target_RHEV.ml:141
+#: ../v2v/output_RHEV.ml:475 ../v2v/output_RHEV.ml:293
msgid "RHEV does not support the output format '%s', only raw or qcow2"
msgstr ""
@@ -1551,7 +1567,7 @@ msgstr ""
msgid "Remove user at-jobs and cron-jobs"
msgstr ""
-#: ../v2v/cmdline.ml:104
+#: ../v2v/cmdline.ml:120
msgid "Rename guest when converting"
msgstr ""
@@ -1655,7 +1671,7 @@ msgstr ""
msgid "Set format (default: auto)"
msgstr ""
-#: ../v2v/cmdline.ml:93
+#: ../v2v/cmdline.ml:108
msgid "Set input mode (default: libvirt)"
msgstr ""
@@ -1685,7 +1701,7 @@ msgstr ""
msgid "Set number of vCPUs"
msgstr ""
-#: ../v2v/cmdline.ml:101
+#: ../v2v/cmdline.ml:117
msgid "Set output allocation mode"
msgstr ""
@@ -1697,15 +1713,15 @@ msgstr ""
msgid "Set output filename"
msgstr ""
-#: ../v2v/cmdline.ml:103
+#: ../v2v/cmdline.ml:119
msgid "Set output format"
msgstr ""
-#: ../v2v/cmdline.ml:100
+#: ../v2v/cmdline.ml:116
msgid "Set output mode (default: libvirt)"
msgstr ""
-#: ../v2v/cmdline.ml:105
+#: ../v2v/cmdline.ml:121
msgid "Set output storage location"
msgstr ""
@@ -1753,7 +1769,7 @@ msgstr ""
msgid "Set user password"
msgstr ""
-#: ../v2v/cmdline.ml:119
+#: ../v2v/cmdline.ml:136
msgid "Set vmtype (for RHEV)"
msgstr ""
@@ -1797,6 +1813,10 @@ msgstr ""
msgid "Source URI: %s\n"
msgstr ""
+#: ../v2v/v2v.ml:47
+msgid "Source guest information (--print-source option):\n"
+msgstr ""
+
#: ../sparsify/in_place.ml:153
msgid "Sparsify in-place operation completed with no errors.\n"
msgstr ""
@@ -1855,7 +1875,7 @@ msgid ""
" IT IS POSSIBLE THAT SOMEONE IS DOING SOMETHING NASTY!"
msgstr ""
-#: ../v2v/convert_linux.ml:1042
+#: ../v2v/convert_linux.ml:1044
msgid ""
"The display driver was updated to '%s', but X11 does not seem to be "
"installed in the guest. X may not function correctly."
@@ -1919,7 +1939,7 @@ msgid ""
"virtual machine's disk, but it was stored on disk in older distros."
msgstr ""
-#: ../v2v/target_RHEV.ml:378
+#: ../v2v/output_RHEV.ml:692
msgid ""
"This guest required a password for connection to its display, but this is "
"not supported by RHEV. Therefore the converted guest's display will not "
@@ -1949,7 +1969,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:142
+#: ../v2v/v2v.ml:175
msgid "Trimming filesystems to reduce amount of data to copy"
msgstr ""
@@ -2063,7 +2083,7 @@ msgstr ""
msgid "cannot detect input disk format; use the --format parameter"
msgstr ""
-#: ../v2v/source_disk.ml:50
+#: ../v2v/input_disk.ml:60
msgid "cannot detect the input disk format; use the -if parameter"
msgstr ""
@@ -2077,11 +2097,11 @@ msgid ""
"\\Windows\\CurrentVersion\\Uninstall\\%s' does not contain an '%s' key"
msgstr ""
-#: ../v2v/v2v.ml:296
+#: ../v2v/v2v.ml:304
msgid "connection closed"
msgstr ""
-#: ../v2v/target_libvirt.ml:257
+#: ../v2v/output_libvirt.ml:269
msgid ""
"could not define libvirt domain. The libvirt XML is still available in "
"'%s'. Try running 'virsh define %s' yourself instead."
@@ -2093,14 +2113,18 @@ msgid ""
"\\CurrentVersion"
msgstr ""
-#: ../v2v/target_RHEV.ml:208
+#: ../v2v/input_libvirt.ml:289
+msgid "could not parse '-ic %s'. Original error message was: %s"
+msgstr ""
+
+#: ../v2v/output_RHEV.ml:154
msgid ""
"could not read the Export Storage Domain specified by the '-os %s' parameter "
"on the command line. Is it really an OVirt or RHEV-M Export Storage "
"Domain? The original error is: %s"
msgstr ""
-#: ../v2v/target_libvirt.ml:239
+#: ../v2v/output_libvirt.ml:251
msgid "could not refresh libvirt pool %s"
msgstr ""
@@ -2132,14 +2156,14 @@ msgstr ""
msgid "discard/trim is not supported: %s"
msgstr ""
-#: ../v2v/v2v.ml:234
+#: ../v2v/v2v.ml:254
msgid ""
"disk %s (%s) has no defined format, you have to either define the original "
"format in the source metadata, or use the '-of' option to force the output "
"format"
msgstr ""
-#: ../v2v/source_libvirt.ml:106
+#: ../v2v/input_libvirt.ml:99
msgid "display <graphics type='%s'> was ignored"
msgstr ""
@@ -2161,7 +2185,7 @@ msgstr ""
msgid "don't know how to remove packages using %s: packages: %s"
msgstr ""
-#: ../v2v/v2v.ml:280
+#: ../v2v/v2v.ml:288
msgid ""
"dual- or multi-boot operating system detected. Choose the root filesystem\n"
"that contains the main operating system from the list below:\n"
@@ -2175,19 +2199,19 @@ msgstr ""
msgid "error parsing URI '%s'. Look for error messages printed above."
msgstr ""
-#: ../v2v/source_libvirt.ml:63
+#: ../v2v/input_libvirt.ml:56
msgid "expecting XML expression to return an integer (expression: %s)"
msgstr ""
-#: ../v2v/cmdline.ml:194
+#: ../v2v/cmdline.ml:213
msgid "expecting a disk image (filename) on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:214
+#: ../v2v/cmdline.ml:233
msgid "expecting a libvirt XML file name on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:205
+#: ../v2v/cmdline.ml:224
msgid "expecting a libvirt guest name on the command line"
msgstr ""
@@ -2248,23 +2272,23 @@ msgstr ""
msgid "hostname could not be set for this type of guest"
msgstr ""
-#: ../v2v/v2v.ml:318
+#: ../v2v/cmdline.ml:65
+msgid "invalid --bridge or --network parameter"
+msgstr ""
+
+#: ../v2v/v2v.ml:326
msgid ""
"libguestfs thinks this is not an installed operating system (it might be, "
"for example, an installer disk or live CD). If this is wrong, it is "
"probably a bug in libguestfs. root=%s fmt=%s"
msgstr ""
-#: ../v2v/source_libvirt.ml:39
-msgid "libvirt returned a non-absolute path in the XML (%s)"
-msgstr ""
-
#. ../resize/resize.ml:194
#: ../resize/resize.ml:197 ../resize/resize.ml:196 ../resize/resize.ml:195
msgid "lv"
msgstr ""
-#: ../v2v/target_RHEV.ml:185
+#: ../v2v/output_RHEV.ml:131
msgid ""
"mount command failed, see earlier errors.\n"
"\n"
@@ -2272,7 +2296,7 @@ msgid ""
"[-os %s], or else you need to rerun virt-v2v as root."
msgstr ""
-#: ../v2v/v2v.ml:303
+#: ../v2v/v2v.ml:311
msgid ""
"multi-boot operating systems are not supported by virt-v2v. Use the --root "
"option to change how virt-v2v handles this."
@@ -2284,7 +2308,7 @@ msgid ""
"be a bug in virt-v2v."
msgstr ""
-#: ../v2v/source_libvirt.ml:170
+#: ../v2v/input_libvirt.ml:167
msgid "network <disk> with <source protocol='%s'> was ignored"
msgstr ""
@@ -2319,10 +2343,16 @@ msgid ""
"of this guest."
msgstr ""
-#: ../v2v/v2v.ml:273
+#: ../v2v/v2v.ml:281
msgid "no root device found in this operating system image."
msgstr ""
+#: ../v2v/input_libvirt.ml:304
+msgid ""
+"no support for remote libvirt connections to '-ic %s'. The conversion may "
+"fail when it tries to read the source disks."
+msgstr ""
+
#: ../resize/resize.ml:129
msgid "ntfsresize"
msgstr ""
@@ -2383,7 +2413,7 @@ msgstr ""
msgid "pwrite: short write restoring swap partition header"
msgstr ""
-#: ../v2v/v2v.ml:191 ../v2v/v2v.ml:75
+#: ../v2v/v2v.ml:224 ../v2v/v2v.ml:111
msgid "qemu-img command failed, see earlier errors"
msgstr ""
@@ -2395,7 +2425,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:311
+#: ../v2v/v2v.ml:319
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2411,14 +2441,14 @@ msgstr ""
msgid "sectors"
msgstr ""
-#: ../v2v/target_RHEV.ml:228
+#: ../v2v/output_RHEV.ml:174
msgid ""
"the Export Storage Domain (%s) has not been attached to any Data Center.\n"
"\n"
"You have to do this through the RHEV-M / OVirt user interface first."
msgstr ""
-#: ../v2v/target_RHEV.ml:233
+#: ../v2v/output_RHEV.ml:179
msgid ""
"the Export Storage Domain (%s) is not writable.\n"
"\n"
@@ -2427,7 +2457,7 @@ msgid ""
"Original error was: %s"
msgstr ""
-#: ../v2v/target_RHEV.ml:275
+#: ../v2v/output_RHEV.ml:223
msgid ""
"the number of '--rhev-vol-uuid' parameters passed on the command line has to "
"match the number of guest disk images (for this guest: %d)"
@@ -2437,7 +2467,7 @@ msgstr ""
msgid "the source disk has no partitions"
msgstr ""
-#: ../v2v/target_RHEV.ml:133
+#: ../v2v/output_RHEV.ml:285
msgid ""
"the virtual size of the input disk %s is not an exact multiple of 512 "
"bytes. The virtual size is: %Ld.\n"
@@ -2446,13 +2476,13 @@ msgid ""
"about this issue."
msgstr ""
-#: ../v2v/target_RHEV.ml:222
+#: ../v2v/output_RHEV.ml:168
msgid ""
"there are multiple UUIDs in the Export Storage Domain (%s). This is "
"unexpected, and may be a bug in virt-v2v or OVirt."
msgstr ""
-#: ../v2v/target_RHEV.ml:220
+#: ../v2v/output_RHEV.ml:166
msgid ""
"there are no UUIDs in the Export Storage Domain (%s). Is it really an OVirt "
"or RHEV-M Export Storage Domain?"
@@ -2482,7 +2512,7 @@ msgid ""
"The guest will be configured to use a slower emulated device."
msgstr ""
-#: ../v2v/source_libvirt.ml:127
+#: ../v2v/input_libvirt.ml:120
msgid "this guest has no non-removable disks"
msgstr ""
@@ -2500,33 +2530,27 @@ msgstr ""
msgid "unknown --align-first option: use never|always|auto"
msgstr ""
-#: ../v2v/cmdline.ml:84
+#: ../v2v/cmdline.ml:98
msgid "unknown --root option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:174
+#: ../v2v/cmdline.ml:193
msgid "unknown --vmtype option, must be \"server\" or \"desktop\""
msgstr ""
-#: ../v2v/cmdline.ml:57
+#: ../v2v/cmdline.ml:58
msgid "unknown -i option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:66
+#: ../v2v/cmdline.ml:80
msgid "unknown -o option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:74
+#: ../v2v/cmdline.ml:88
msgid "unknown -oa option: %s"
msgstr ""
-#: ../v2v/target_RHEV.ml:638
-msgid ""
-"unknown NIC model %s for ethernet device %s. This NIC will be imported as "
-"rtl8139 instead."
-msgstr ""
-
-#: ../v2v/target_RHEV.ml:494
+#: ../v2v/output_RHEV.ml:423
msgid "unknown guest operating system: %s %s %d.%d (%s)"
msgstr ""
@@ -2725,11 +2749,11 @@ msgstr ""
msgid "virt-sysprep: script: killed by signal (%d)\n"
msgstr ""
-#: ../v2v/v2v.ml:132
+#: ../v2v/v2v.ml:165
msgid "virt-v2v is unable to convert this guest type (linux/distro=%s)"
msgstr ""
-#: ../v2v/v2v.ml:138
+#: ../v2v/v2v.ml:171
msgid "virt-v2v is unable to convert this guest type (type=%s)"
msgstr ""
diff --git a/po/kn.po b/po/kn.po
index b3aa3d4..8d3c418 100644
--- a/po/kn.po
+++ b/po/kn.po
@@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-08-19 17:51+0100\n"
+"POT-Creation-Date: 2014-08-21 17:07+0100\n"
"PO-Revision-Date: 2014-07-22 18:03+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Kannada (http://www.transifex.com/projects/p/libguestfs/"
@@ -69,7 +69,7 @@ msgstr ""
msgid "%s (ignored)\n"
msgstr ""
-#: ../v2v/convert_linux.ml:1134
+#: ../v2v/convert_linux.ml:1136
msgid ""
"%s references unknown device \"%s\". You may have to fix this entry "
"manually after conversion."
@@ -79,7 +79,7 @@ msgstr ""
msgid "%s: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:147
+#: ../v2v/v2v.ml:180
msgid "%s: %s (ignored)"
msgstr ""
@@ -220,7 +220,7 @@ msgstr ""
msgid "%s: cannot output to a character device or /dev/null\n"
msgstr ""
-#: ../v2v/cmdline.ml:126
+#: ../v2v/cmdline.ml:143
msgid ""
"%s: convert a guest to use KVM\n"
"\n"
@@ -272,7 +272,7 @@ msgstr ""
msgid "%s: error: %s"
msgstr ""
-#: ../v2v/v2v.ml:369 ../sysprep/main.ml:297
+#: ../v2v/v2v.ml:377 ../sysprep/main.ml:297
msgid "%s: error: %s\n"
msgstr ""
@@ -282,13 +282,13 @@ msgstr ""
#. ../resize/resize.ml:1309
#. ../builder/builder.ml:743
-#: ../v2v/v2v.ml:362 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
+#: ../v2v/v2v.ml:370 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
msgid "%s: error: %s: %s\n"
msgstr ""
#. ../resize/resize.ml:1312
#. ../builder/builder.ml:746
-#: ../v2v/v2v.ml:365 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
+#: ../v2v/v2v.ml:373 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
msgid "%s: error: %s: %s: %s\n"
msgstr ""
@@ -309,7 +309,7 @@ msgstr ""
#. ../resize/resize.ml:1331
#. ../customize/customize_main.ml:262
#. ../builder/builder.ml:764
-#: ../v2v/v2v.ml:387 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
+#: ../v2v/v2v.ml:395 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
msgid "%s: exception: %s\n"
msgstr ""
@@ -319,7 +319,7 @@ msgstr ""
#. ../resize/resize.ml:1319
#. ../builder/builder.ml:752
-#: ../v2v/v2v.ml:375 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
+#: ../v2v/v2v.ml:383 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
msgid "%s: failure: %s\n"
msgstr ""
@@ -346,14 +346,14 @@ msgstr ""
#. ../resize/resize.ml:1328
#. ../customize/customize_main.ml:259
#. ../builder/builder.ml:761
-#: ../v2v/v2v.ml:384 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
+#: ../v2v/v2v.ml:392 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
msgid "%s: internal error: Not_found exception was thrown\n"
msgstr ""
#. ../resize/resize.ml:1325
#. ../customize/customize_main.ml:255
#. ../builder/builder.ml:758
-#: ../v2v/v2v.ml:381 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
+#: ../v2v/v2v.ml:389 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
msgid "%s: internal error: assertion failed at %s, line %d, char %d\n"
msgstr ""
@@ -361,7 +361,7 @@ msgstr ""
#. ../customize/customize_main.ml:252
#. ../builder/sources.ml:135
#. ../builder/builder.ml:755
-#: ../v2v/v2v.ml:378 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
+#: ../v2v/v2v.ml:386 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
msgid "%s: internal error: invalid argument: %s\n"
msgstr ""
@@ -379,7 +379,7 @@ msgstr ""
#. ../resize/resize.ml:1316
#. ../builder/builder.ml:749
-#: ../v2v/v2v.ml:372 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
+#: ../v2v/v2v.ml:380 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
msgid "%s: libguestfs error: %s\n"
msgstr ""
@@ -628,7 +628,7 @@ msgstr ""
msgid "--expand option given twice"
msgstr ""
-#: ../v2v/cmdline.ml:226
+#: ../v2v/cmdline.ml:245
msgid "--no-copy and '-o libvirt' cannot be used at the same time"
msgstr ""
@@ -653,40 +653,40 @@ msgstr ""
msgid "--tmp prebuilt:file: %s: file format is not qcow2"
msgstr ""
-#: ../v2v/cmdline.ml:236 ../v2v/cmdline.ml:224
+#: ../v2v/cmdline.ml:255 ../v2v/cmdline.ml:243
msgid "--vmtype option can only be used with '-o rhev'"
msgstr ""
-#: ../v2v/source_disk.ml:34
+#: ../v2v/input_disk.ml:44
msgid "-i disk: invalid input filename (%s)"
msgstr ""
-#: ../v2v/target_libvirt.ml:219
+#: ../v2v/output_libvirt.ml:231
msgid ""
"-o libvirt: output pool '%s' has type='dir' but the /pool/target/path "
"element either does not exist or is not a local directory. See virt-v2v(1) "
"section \"OUTPUT TO LIBVIRT\""
msgstr ""
-#: ../v2v/target_libvirt.ml:216
+#: ../v2v/output_libvirt.ml:228
msgid ""
"-o libvirt: output pool '%s' is not a directory (type='dir'). See virt-"
"v2v(1) section \"OUTPUT TO LIBVIRT\""
msgstr ""
-#: ../v2v/cmdline.ml:231
+#: ../v2v/cmdline.ml:250
msgid "-o local: output directory was not specified, use '-os /dir'"
msgstr ""
-#: ../v2v/cmdline.ml:241
+#: ../v2v/cmdline.ml:260
msgid "-o rhev: output storage was not specified, use '-os'"
msgstr ""
-#: ../v2v/cmdline.ml:233
+#: ../v2v/cmdline.ml:252
msgid "-os %s: output directory does not exist or is not a directory"
msgstr ""
-#: ../v2v/source_libvirt.ml:174
+#: ../v2v/input_libvirt.ml:171
msgid "<disk type='%s'> was ignored"
msgstr ""
@@ -754,7 +754,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:151
+#: ../v2v/v2v.ml:184
msgid "Closing the overlay"
msgstr ""
@@ -766,11 +766,11 @@ msgstr ""
msgid "Converting %s to %s"
msgstr ""
-#: ../v2v/v2v.ml:112
+#: ../v2v/v2v.ml:148
msgid "Converting %s to run on KVM"
msgstr ""
-#: ../v2v/v2v.ml:110
+#: ../v2v/v2v.ml:146
msgid "Converting the guest to run on KVM"
msgstr ""
@@ -790,7 +790,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:170
+#: ../v2v/v2v.ml:203
msgid "Copying disk %d/%d to %s (%s)"
msgstr ""
@@ -814,11 +814,11 @@ msgstr ""
msgid "Create symbolic links"
msgstr ""
-#: ../v2v/v2v.ml:59
+#: ../v2v/v2v.ml:95
msgid "Creating an overlay to protect the source from being modified"
msgstr ""
-#: ../v2v/v2v.ml:196
+#: ../v2v/v2v.ml:229
msgid "Creating output metadata"
msgstr ""
@@ -857,7 +857,7 @@ msgstr ""
msgid "DIR"
msgstr ""
-#: ../v2v/cmdline.ml:92 ../sparsify/cmdline.ml:73 ../resize/resize.ml:186
+#: ../v2v/cmdline.ml:107 ../sparsify/cmdline.ml:73 ../resize/resize.ml:186
msgid "Debug GC and memory allocations"
msgstr ""
@@ -909,7 +909,7 @@ msgstr ""
#. ../customize/customize_main.ml:99
#. ../builder/cmdline.ml:158
#. ../builder/cmdline.ml:157
-#: ../v2v/cmdline.ml:117 ../sysprep/main.ml:155 ../sysprep/main.ml:154
+#: ../v2v/cmdline.ml:134 ../sysprep/main.ml:155 ../sysprep/main.ml:154
msgid "Display version and exit"
msgstr ""
@@ -986,7 +986,7 @@ msgstr ""
#. ../customize/customize_main.ml:97
#. ../builder/cmdline.ml:156
#. ../builder/cmdline.ml:155
-#: ../v2v/cmdline.ml:115 ../sysprep/main.ml:153 ../sysprep/main.ml:152
+#: ../v2v/cmdline.ml:132 ../sysprep/main.ml:153 ../sysprep/main.ml:152
msgid "Enable debugging messages"
msgstr ""
@@ -997,7 +997,7 @@ msgstr ""
#. ../resize/resize.ml:214
#. ../customize/customize_main.ml:101
#. ../builder/cmdline.ml:159
-#: ../v2v/cmdline.ml:120 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
+#: ../v2v/cmdline.ml:137 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
msgid "Enable tracing of libguestfs calls"
msgstr ""
@@ -1005,7 +1005,7 @@ msgstr ""
msgid "Enable/disable specific operations"
msgstr ""
-#: ../v2v/v2v.ml:293
+#: ../v2v/v2v.ml:301
msgid "Enter number between 1 and %d: "
msgstr ""
@@ -1093,7 +1093,7 @@ msgstr ""
msgid "Fingerprint: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:212 ../customize/customize_main.ml:237
+#: ../v2v/v2v.ml:232 ../customize/customize_main.ml:237
#: ../builder/builder.ml:711
msgid "Finishing off"
msgstr ""
@@ -1151,7 +1151,7 @@ msgstr ""
msgid "HOSTNAME"
msgstr ""
-#: ../v2v/cmdline.ml:114
+#: ../v2v/cmdline.ml:131
msgid "How to choose root filesystem"
msgstr ""
@@ -1163,7 +1163,7 @@ msgstr ""
msgid "Ignore partition"
msgstr ""
-#: ../v2v/v2v.ml:97
+#: ../v2v/v2v.ml:133
msgid "Initializing the target %s"
msgstr ""
@@ -1173,11 +1173,11 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/cmdline.ml:96
+#: ../v2v/cmdline.ml:111
msgid "Input format (for -i disk)"
msgstr ""
-#: ../v2v/v2v.ml:103
+#: ../v2v/v2v.ml:139
msgid "Inspecting the overlay"
msgstr ""
@@ -1197,7 +1197,7 @@ msgstr ""
msgid "Installing packages: %s"
msgstr ""
-#: ../v2v/cmdline.ml:99
+#: ../v2v/cmdline.ml:115
msgid "Just write the metadata"
msgstr ""
@@ -1205,7 +1205,7 @@ msgstr ""
msgid "Key: %s\n"
msgstr ""
-#: ../v2v/cmdline.ml:102 ../v2v/cmdline.ml:94
+#: ../v2v/cmdline.ml:118 ../v2v/cmdline.ml:109
msgid "Libvirt URI"
msgstr ""
@@ -1220,7 +1220,7 @@ msgstr ""
#. ../resize/resize.ml:193
#. ../customize/customize_main.ml:89
#. ../builder/cmdline.ml:139
-#: ../v2v/cmdline.ml:97 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
+#: ../v2v/cmdline.ml:112 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
msgid "List long options"
msgstr ""
@@ -1229,7 +1229,7 @@ msgid "List supported operations"
msgstr ""
#. ../builder/cmdline.ml:140
-#: ../v2v/cmdline.ml:98 ../sparsify/cmdline.ml:79 ../resize/resize.ml:198
+#: ../v2v/cmdline.ml:113 ../sparsify/cmdline.ml:79 ../resize/resize.ml:198
msgid "Make output machine readable"
msgstr ""
@@ -1237,6 +1237,14 @@ msgstr ""
msgid "Making directory: %s"
msgstr ""
+#: ../v2v/cmdline.ml:106
+msgid "Map bridge 'in' to 'out'"
+msgstr ""
+
+#: ../v2v/cmdline.ml:114
+msgid "Map network 'in' to 'out'"
+msgstr ""
+
#: ../builder/list_entries.ml:77
msgid "Minimum/default size:"
msgstr ""
@@ -1294,11 +1302,15 @@ msgstr ""
msgid "Opening the new disk"
msgstr ""
-#: ../v2v/v2v.ml:80
+#: ../v2v/v2v.ml:116
msgid "Opening the overlay"
msgstr ""
-#: ../v2v/cmdline.ml:113
+#: ../v2v/v2v.ml:42
+msgid "Opening the source %s"
+msgstr ""
+
+#: ../v2v/cmdline.ml:130
msgid "Output VM UUID"
msgstr ""
@@ -1314,7 +1326,7 @@ msgstr ""
msgid "Output format (default: raw)"
msgstr ""
-#: ../v2v/cmdline.ml:109
+#: ../v2v/cmdline.ml:126
msgid "Output image UUID"
msgstr ""
@@ -1322,7 +1334,7 @@ msgstr ""
msgid "Output size"
msgstr ""
-#: ../v2v/cmdline.ml:111
+#: ../v2v/cmdline.ml:128
msgid "Output vol UUID(s)"
msgstr ""
@@ -1353,11 +1365,15 @@ msgstr ""
msgid "Print info about template cache"
msgstr ""
-#: ../v2v/cmdline.ml:106 ../sparsify/cmdline.ml:81
+#: ../v2v/cmdline.ml:122
+msgid "Print source and stop"
+msgstr ""
+
+#: ../v2v/cmdline.ml:123 ../sparsify/cmdline.ml:81
msgid "Quiet output"
msgstr ""
-#: ../v2v/target_RHEV.ml:544 ../v2v/target_RHEV.ml:141
+#: ../v2v/output_RHEV.ml:475 ../v2v/output_RHEV.ml:293
msgid "RHEV does not support the output format '%s', only raw or qcow2"
msgstr ""
@@ -1550,7 +1566,7 @@ msgstr ""
msgid "Remove user at-jobs and cron-jobs"
msgstr ""
-#: ../v2v/cmdline.ml:104
+#: ../v2v/cmdline.ml:120
msgid "Rename guest when converting"
msgstr ""
@@ -1654,7 +1670,7 @@ msgstr ""
msgid "Set format (default: auto)"
msgstr ""
-#: ../v2v/cmdline.ml:93
+#: ../v2v/cmdline.ml:108
msgid "Set input mode (default: libvirt)"
msgstr ""
@@ -1684,7 +1700,7 @@ msgstr ""
msgid "Set number of vCPUs"
msgstr ""
-#: ../v2v/cmdline.ml:101
+#: ../v2v/cmdline.ml:117
msgid "Set output allocation mode"
msgstr ""
@@ -1696,15 +1712,15 @@ msgstr ""
msgid "Set output filename"
msgstr ""
-#: ../v2v/cmdline.ml:103
+#: ../v2v/cmdline.ml:119
msgid "Set output format"
msgstr ""
-#: ../v2v/cmdline.ml:100
+#: ../v2v/cmdline.ml:116
msgid "Set output mode (default: libvirt)"
msgstr ""
-#: ../v2v/cmdline.ml:105
+#: ../v2v/cmdline.ml:121
msgid "Set output storage location"
msgstr ""
@@ -1752,7 +1768,7 @@ msgstr ""
msgid "Set user password"
msgstr ""
-#: ../v2v/cmdline.ml:119
+#: ../v2v/cmdline.ml:136
msgid "Set vmtype (for RHEV)"
msgstr ""
@@ -1796,6 +1812,10 @@ msgstr ""
msgid "Source URI: %s\n"
msgstr ""
+#: ../v2v/v2v.ml:47
+msgid "Source guest information (--print-source option):\n"
+msgstr ""
+
#: ../sparsify/in_place.ml:153
msgid "Sparsify in-place operation completed with no errors.\n"
msgstr ""
@@ -1854,7 +1874,7 @@ msgid ""
" IT IS POSSIBLE THAT SOMEONE IS DOING SOMETHING NASTY!"
msgstr ""
-#: ../v2v/convert_linux.ml:1042
+#: ../v2v/convert_linux.ml:1044
msgid ""
"The display driver was updated to '%s', but X11 does not seem to be "
"installed in the guest. X may not function correctly."
@@ -1918,7 +1938,7 @@ msgid ""
"virtual machine's disk, but it was stored on disk in older distros."
msgstr ""
-#: ../v2v/target_RHEV.ml:378
+#: ../v2v/output_RHEV.ml:692
msgid ""
"This guest required a password for connection to its display, but this is "
"not supported by RHEV. Therefore the converted guest's display will not "
@@ -1948,7 +1968,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:142
+#: ../v2v/v2v.ml:175
msgid "Trimming filesystems to reduce amount of data to copy"
msgstr ""
@@ -2062,7 +2082,7 @@ msgstr ""
msgid "cannot detect input disk format; use the --format parameter"
msgstr ""
-#: ../v2v/source_disk.ml:50
+#: ../v2v/input_disk.ml:60
msgid "cannot detect the input disk format; use the -if parameter"
msgstr ""
@@ -2076,11 +2096,11 @@ msgid ""
"\\Windows\\CurrentVersion\\Uninstall\\%s' does not contain an '%s' key"
msgstr ""
-#: ../v2v/v2v.ml:296
+#: ../v2v/v2v.ml:304
msgid "connection closed"
msgstr ""
-#: ../v2v/target_libvirt.ml:257
+#: ../v2v/output_libvirt.ml:269
msgid ""
"could not define libvirt domain. The libvirt XML is still available in "
"'%s'. Try running 'virsh define %s' yourself instead."
@@ -2092,14 +2112,18 @@ msgid ""
"\\CurrentVersion"
msgstr ""
-#: ../v2v/target_RHEV.ml:208
+#: ../v2v/input_libvirt.ml:289
+msgid "could not parse '-ic %s'. Original error message was: %s"
+msgstr ""
+
+#: ../v2v/output_RHEV.ml:154
msgid ""
"could not read the Export Storage Domain specified by the '-os %s' parameter "
"on the command line. Is it really an OVirt or RHEV-M Export Storage "
"Domain? The original error is: %s"
msgstr ""
-#: ../v2v/target_libvirt.ml:239
+#: ../v2v/output_libvirt.ml:251
msgid "could not refresh libvirt pool %s"
msgstr ""
@@ -2131,14 +2155,14 @@ msgstr ""
msgid "discard/trim is not supported: %s"
msgstr ""
-#: ../v2v/v2v.ml:234
+#: ../v2v/v2v.ml:254
msgid ""
"disk %s (%s) has no defined format, you have to either define the original "
"format in the source metadata, or use the '-of' option to force the output "
"format"
msgstr ""
-#: ../v2v/source_libvirt.ml:106
+#: ../v2v/input_libvirt.ml:99
msgid "display <graphics type='%s'> was ignored"
msgstr ""
@@ -2160,7 +2184,7 @@ msgstr ""
msgid "don't know how to remove packages using %s: packages: %s"
msgstr ""
-#: ../v2v/v2v.ml:280
+#: ../v2v/v2v.ml:288
msgid ""
"dual- or multi-boot operating system detected. Choose the root filesystem\n"
"that contains the main operating system from the list below:\n"
@@ -2174,19 +2198,19 @@ msgstr ""
msgid "error parsing URI '%s'. Look for error messages printed above."
msgstr ""
-#: ../v2v/source_libvirt.ml:63
+#: ../v2v/input_libvirt.ml:56
msgid "expecting XML expression to return an integer (expression: %s)"
msgstr ""
-#: ../v2v/cmdline.ml:194
+#: ../v2v/cmdline.ml:213
msgid "expecting a disk image (filename) on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:214
+#: ../v2v/cmdline.ml:233
msgid "expecting a libvirt XML file name on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:205
+#: ../v2v/cmdline.ml:224
msgid "expecting a libvirt guest name on the command line"
msgstr ""
@@ -2247,23 +2271,23 @@ msgstr ""
msgid "hostname could not be set for this type of guest"
msgstr ""
-#: ../v2v/v2v.ml:318
+#: ../v2v/cmdline.ml:65
+msgid "invalid --bridge or --network parameter"
+msgstr ""
+
+#: ../v2v/v2v.ml:326
msgid ""
"libguestfs thinks this is not an installed operating system (it might be, "
"for example, an installer disk or live CD). If this is wrong, it is "
"probably a bug in libguestfs. root=%s fmt=%s"
msgstr ""
-#: ../v2v/source_libvirt.ml:39
-msgid "libvirt returned a non-absolute path in the XML (%s)"
-msgstr ""
-
#. ../resize/resize.ml:194
#: ../resize/resize.ml:197 ../resize/resize.ml:196 ../resize/resize.ml:195
msgid "lv"
msgstr ""
-#: ../v2v/target_RHEV.ml:185
+#: ../v2v/output_RHEV.ml:131
msgid ""
"mount command failed, see earlier errors.\n"
"\n"
@@ -2271,7 +2295,7 @@ msgid ""
"[-os %s], or else you need to rerun virt-v2v as root."
msgstr ""
-#: ../v2v/v2v.ml:303
+#: ../v2v/v2v.ml:311
msgid ""
"multi-boot operating systems are not supported by virt-v2v. Use the --root "
"option to change how virt-v2v handles this."
@@ -2283,7 +2307,7 @@ msgid ""
"be a bug in virt-v2v."
msgstr ""
-#: ../v2v/source_libvirt.ml:170
+#: ../v2v/input_libvirt.ml:167
msgid "network <disk> with <source protocol='%s'> was ignored"
msgstr ""
@@ -2318,10 +2342,16 @@ msgid ""
"of this guest."
msgstr ""
-#: ../v2v/v2v.ml:273
+#: ../v2v/v2v.ml:281
msgid "no root device found in this operating system image."
msgstr ""
+#: ../v2v/input_libvirt.ml:304
+msgid ""
+"no support for remote libvirt connections to '-ic %s'. The conversion may "
+"fail when it tries to read the source disks."
+msgstr ""
+
#: ../resize/resize.ml:129
msgid "ntfsresize"
msgstr ""
@@ -2382,7 +2412,7 @@ msgstr ""
msgid "pwrite: short write restoring swap partition header"
msgstr ""
-#: ../v2v/v2v.ml:191 ../v2v/v2v.ml:75
+#: ../v2v/v2v.ml:224 ../v2v/v2v.ml:111
msgid "qemu-img command failed, see earlier errors"
msgstr ""
@@ -2394,7 +2424,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:311
+#: ../v2v/v2v.ml:319
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2410,14 +2440,14 @@ msgstr ""
msgid "sectors"
msgstr ""
-#: ../v2v/target_RHEV.ml:228
+#: ../v2v/output_RHEV.ml:174
msgid ""
"the Export Storage Domain (%s) has not been attached to any Data Center.\n"
"\n"
"You have to do this through the RHEV-M / OVirt user interface first."
msgstr ""
-#: ../v2v/target_RHEV.ml:233
+#: ../v2v/output_RHEV.ml:179
msgid ""
"the Export Storage Domain (%s) is not writable.\n"
"\n"
@@ -2426,7 +2456,7 @@ msgid ""
"Original error was: %s"
msgstr ""
-#: ../v2v/target_RHEV.ml:275
+#: ../v2v/output_RHEV.ml:223
msgid ""
"the number of '--rhev-vol-uuid' parameters passed on the command line has to "
"match the number of guest disk images (for this guest: %d)"
@@ -2436,7 +2466,7 @@ msgstr ""
msgid "the source disk has no partitions"
msgstr ""
-#: ../v2v/target_RHEV.ml:133
+#: ../v2v/output_RHEV.ml:285
msgid ""
"the virtual size of the input disk %s is not an exact multiple of 512 "
"bytes. The virtual size is: %Ld.\n"
@@ -2445,13 +2475,13 @@ msgid ""
"about this issue."
msgstr ""
-#: ../v2v/target_RHEV.ml:222
+#: ../v2v/output_RHEV.ml:168
msgid ""
"there are multiple UUIDs in the Export Storage Domain (%s). This is "
"unexpected, and may be a bug in virt-v2v or OVirt."
msgstr ""
-#: ../v2v/target_RHEV.ml:220
+#: ../v2v/output_RHEV.ml:166
msgid ""
"there are no UUIDs in the Export Storage Domain (%s). Is it really an OVirt "
"or RHEV-M Export Storage Domain?"
@@ -2481,7 +2511,7 @@ msgid ""
"The guest will be configured to use a slower emulated device."
msgstr ""
-#: ../v2v/source_libvirt.ml:127
+#: ../v2v/input_libvirt.ml:120
msgid "this guest has no non-removable disks"
msgstr ""
@@ -2499,33 +2529,27 @@ msgstr ""
msgid "unknown --align-first option: use never|always|auto"
msgstr ""
-#: ../v2v/cmdline.ml:84
+#: ../v2v/cmdline.ml:98
msgid "unknown --root option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:174
+#: ../v2v/cmdline.ml:193
msgid "unknown --vmtype option, must be \"server\" or \"desktop\""
msgstr ""
-#: ../v2v/cmdline.ml:57
+#: ../v2v/cmdline.ml:58
msgid "unknown -i option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:66
+#: ../v2v/cmdline.ml:80
msgid "unknown -o option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:74
+#: ../v2v/cmdline.ml:88
msgid "unknown -oa option: %s"
msgstr ""
-#: ../v2v/target_RHEV.ml:638
-msgid ""
-"unknown NIC model %s for ethernet device %s. This NIC will be imported as "
-"rtl8139 instead."
-msgstr ""
-
-#: ../v2v/target_RHEV.ml:494
+#: ../v2v/output_RHEV.ml:423
msgid "unknown guest operating system: %s %s %d.%d (%s)"
msgstr ""
@@ -2724,11 +2748,11 @@ msgstr ""
msgid "virt-sysprep: script: killed by signal (%d)\n"
msgstr ""
-#: ../v2v/v2v.ml:132
+#: ../v2v/v2v.ml:165
msgid "virt-v2v is unable to convert this guest type (linux/distro=%s)"
msgstr ""
-#: ../v2v/v2v.ml:138
+#: ../v2v/v2v.ml:171
msgid "virt-v2v is unable to convert this guest type (type=%s)"
msgstr ""
diff --git a/po/libguestfs.pot b/po/libguestfs.pot
index 2741bad..c3ccec0 100644
--- a/po/libguestfs.pot
+++ b/po/libguestfs.pot
@@ -6,10 +6,10 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: libguestfs 1.27.28\n"
+"Project-Id-Version: libguestfs 1.27.29\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-08-19 17:51+0100\n"
+"POT-Creation-Date: 2014-08-21 17:07+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -68,7 +68,7 @@ msgstr ""
msgid "%s (ignored)\n"
msgstr ""
-#: ../v2v/convert_linux.ml:1134
+#: ../v2v/convert_linux.ml:1136
msgid ""
"%s references unknown device \"%s\". You may have to fix this entry "
"manually after conversion."
@@ -78,7 +78,7 @@ msgstr ""
msgid "%s: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:147
+#: ../v2v/v2v.ml:180
msgid "%s: %s (ignored)"
msgstr ""
@@ -219,7 +219,7 @@ msgstr ""
msgid "%s: cannot output to a character device or /dev/null\n"
msgstr ""
-#: ../v2v/cmdline.ml:126
+#: ../v2v/cmdline.ml:143
msgid ""
"%s: convert a guest to use KVM\n"
"\n"
@@ -271,7 +271,7 @@ msgstr ""
msgid "%s: error: %s"
msgstr ""
-#: ../v2v/v2v.ml:369 ../sysprep/main.ml:297
+#: ../v2v/v2v.ml:377 ../sysprep/main.ml:297
msgid "%s: error: %s\n"
msgstr ""
@@ -281,13 +281,13 @@ msgstr ""
#. ../resize/resize.ml:1309
#. ../builder/builder.ml:743
-#: ../v2v/v2v.ml:362 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
+#: ../v2v/v2v.ml:370 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
msgid "%s: error: %s: %s\n"
msgstr ""
#. ../resize/resize.ml:1312
#. ../builder/builder.ml:746
-#: ../v2v/v2v.ml:365 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
+#: ../v2v/v2v.ml:373 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
msgid "%s: error: %s: %s: %s\n"
msgstr ""
@@ -308,7 +308,7 @@ msgstr ""
#. ../resize/resize.ml:1331
#. ../customize/customize_main.ml:262
#. ../builder/builder.ml:764
-#: ../v2v/v2v.ml:387 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
+#: ../v2v/v2v.ml:395 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
msgid "%s: exception: %s\n"
msgstr ""
@@ -318,7 +318,7 @@ msgstr ""
#. ../resize/resize.ml:1319
#. ../builder/builder.ml:752
-#: ../v2v/v2v.ml:375 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
+#: ../v2v/v2v.ml:383 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
msgid "%s: failure: %s\n"
msgstr ""
@@ -345,14 +345,14 @@ msgstr ""
#. ../resize/resize.ml:1328
#. ../customize/customize_main.ml:259
#. ../builder/builder.ml:761
-#: ../v2v/v2v.ml:384 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
+#: ../v2v/v2v.ml:392 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
msgid "%s: internal error: Not_found exception was thrown\n"
msgstr ""
#. ../resize/resize.ml:1325
#. ../customize/customize_main.ml:255
#. ../builder/builder.ml:758
-#: ../v2v/v2v.ml:381 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
+#: ../v2v/v2v.ml:389 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
msgid "%s: internal error: assertion failed at %s, line %d, char %d\n"
msgstr ""
@@ -360,7 +360,7 @@ msgstr ""
#. ../customize/customize_main.ml:252
#. ../builder/sources.ml:135
#. ../builder/builder.ml:755
-#: ../v2v/v2v.ml:378 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
+#: ../v2v/v2v.ml:386 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
msgid "%s: internal error: invalid argument: %s\n"
msgstr ""
@@ -378,7 +378,7 @@ msgstr ""
#. ../resize/resize.ml:1316
#. ../builder/builder.ml:749
-#: ../v2v/v2v.ml:372 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
+#: ../v2v/v2v.ml:380 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
msgid "%s: libguestfs error: %s\n"
msgstr ""
@@ -627,7 +627,7 @@ msgstr ""
msgid "--expand option given twice"
msgstr ""
-#: ../v2v/cmdline.ml:226
+#: ../v2v/cmdline.ml:245
msgid "--no-copy and '-o libvirt' cannot be used at the same time"
msgstr ""
@@ -652,40 +652,40 @@ msgstr ""
msgid "--tmp prebuilt:file: %s: file format is not qcow2"
msgstr ""
-#: ../v2v/cmdline.ml:236 ../v2v/cmdline.ml:224
+#: ../v2v/cmdline.ml:255 ../v2v/cmdline.ml:243
msgid "--vmtype option can only be used with '-o rhev'"
msgstr ""
-#: ../v2v/source_disk.ml:34
+#: ../v2v/input_disk.ml:44
msgid "-i disk: invalid input filename (%s)"
msgstr ""
-#: ../v2v/target_libvirt.ml:219
+#: ../v2v/output_libvirt.ml:231
msgid ""
"-o libvirt: output pool '%s' has type='dir' but the /pool/target/path "
"element either does not exist or is not a local directory. See virt-v2v(1) "
"section \"OUTPUT TO LIBVIRT\""
msgstr ""
-#: ../v2v/target_libvirt.ml:216
+#: ../v2v/output_libvirt.ml:228
msgid ""
"-o libvirt: output pool '%s' is not a directory (type='dir'). See virt-"
"v2v(1) section \"OUTPUT TO LIBVIRT\""
msgstr ""
-#: ../v2v/cmdline.ml:231
+#: ../v2v/cmdline.ml:250
msgid "-o local: output directory was not specified, use '-os /dir'"
msgstr ""
-#: ../v2v/cmdline.ml:241
+#: ../v2v/cmdline.ml:260
msgid "-o rhev: output storage was not specified, use '-os'"
msgstr ""
-#: ../v2v/cmdline.ml:233
+#: ../v2v/cmdline.ml:252
msgid "-os %s: output directory does not exist or is not a directory"
msgstr ""
-#: ../v2v/source_libvirt.ml:174
+#: ../v2v/input_libvirt.ml:171
msgid "<disk type='%s'> was ignored"
msgstr ""
@@ -753,7 +753,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:151
+#: ../v2v/v2v.ml:184
msgid "Closing the overlay"
msgstr ""
@@ -765,11 +765,11 @@ msgstr ""
msgid "Converting %s to %s"
msgstr ""
-#: ../v2v/v2v.ml:112
+#: ../v2v/v2v.ml:148
msgid "Converting %s to run on KVM"
msgstr ""
-#: ../v2v/v2v.ml:110
+#: ../v2v/v2v.ml:146
msgid "Converting the guest to run on KVM"
msgstr ""
@@ -789,7 +789,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:170
+#: ../v2v/v2v.ml:203
msgid "Copying disk %d/%d to %s (%s)"
msgstr ""
@@ -813,11 +813,11 @@ msgstr ""
msgid "Create symbolic links"
msgstr ""
-#: ../v2v/v2v.ml:59
+#: ../v2v/v2v.ml:95
msgid "Creating an overlay to protect the source from being modified"
msgstr ""
-#: ../v2v/v2v.ml:196
+#: ../v2v/v2v.ml:229
msgid "Creating output metadata"
msgstr ""
@@ -856,7 +856,7 @@ msgstr ""
msgid "DIR"
msgstr ""
-#: ../v2v/cmdline.ml:92 ../sparsify/cmdline.ml:73 ../resize/resize.ml:186
+#: ../v2v/cmdline.ml:107 ../sparsify/cmdline.ml:73 ../resize/resize.ml:186
msgid "Debug GC and memory allocations"
msgstr ""
@@ -908,7 +908,7 @@ msgstr ""
#. ../customize/customize_main.ml:99
#. ../builder/cmdline.ml:158
#. ../builder/cmdline.ml:157
-#: ../v2v/cmdline.ml:117 ../sysprep/main.ml:155 ../sysprep/main.ml:154
+#: ../v2v/cmdline.ml:134 ../sysprep/main.ml:155 ../sysprep/main.ml:154
msgid "Display version and exit"
msgstr ""
@@ -985,7 +985,7 @@ msgstr ""
#. ../customize/customize_main.ml:97
#. ../builder/cmdline.ml:156
#. ../builder/cmdline.ml:155
-#: ../v2v/cmdline.ml:115 ../sysprep/main.ml:153 ../sysprep/main.ml:152
+#: ../v2v/cmdline.ml:132 ../sysprep/main.ml:153 ../sysprep/main.ml:152
msgid "Enable debugging messages"
msgstr ""
@@ -996,7 +996,7 @@ msgstr ""
#. ../resize/resize.ml:214
#. ../customize/customize_main.ml:101
#. ../builder/cmdline.ml:159
-#: ../v2v/cmdline.ml:120 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
+#: ../v2v/cmdline.ml:137 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
msgid "Enable tracing of libguestfs calls"
msgstr ""
@@ -1004,7 +1004,7 @@ msgstr ""
msgid "Enable/disable specific operations"
msgstr ""
-#: ../v2v/v2v.ml:293
+#: ../v2v/v2v.ml:301
msgid "Enter number between 1 and %d: "
msgstr ""
@@ -1092,7 +1092,7 @@ msgstr ""
msgid "Fingerprint: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:212 ../customize/customize_main.ml:237
+#: ../v2v/v2v.ml:232 ../customize/customize_main.ml:237
#: ../builder/builder.ml:711
msgid "Finishing off"
msgstr ""
@@ -1150,7 +1150,7 @@ msgstr ""
msgid "HOSTNAME"
msgstr ""
-#: ../v2v/cmdline.ml:114
+#: ../v2v/cmdline.ml:131
msgid "How to choose root filesystem"
msgstr ""
@@ -1162,7 +1162,7 @@ msgstr ""
msgid "Ignore partition"
msgstr ""
-#: ../v2v/v2v.ml:97
+#: ../v2v/v2v.ml:133
msgid "Initializing the target %s"
msgstr ""
@@ -1172,11 +1172,11 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/cmdline.ml:96
+#: ../v2v/cmdline.ml:111
msgid "Input format (for -i disk)"
msgstr ""
-#: ../v2v/v2v.ml:103
+#: ../v2v/v2v.ml:139
msgid "Inspecting the overlay"
msgstr ""
@@ -1196,7 +1196,7 @@ msgstr ""
msgid "Installing packages: %s"
msgstr ""
-#: ../v2v/cmdline.ml:99
+#: ../v2v/cmdline.ml:115
msgid "Just write the metadata"
msgstr ""
@@ -1204,7 +1204,7 @@ msgstr ""
msgid "Key: %s\n"
msgstr ""
-#: ../v2v/cmdline.ml:102 ../v2v/cmdline.ml:94
+#: ../v2v/cmdline.ml:118 ../v2v/cmdline.ml:109
msgid "Libvirt URI"
msgstr ""
@@ -1219,7 +1219,7 @@ msgstr ""
#. ../resize/resize.ml:193
#. ../customize/customize_main.ml:89
#. ../builder/cmdline.ml:139
-#: ../v2v/cmdline.ml:97 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
+#: ../v2v/cmdline.ml:112 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
msgid "List long options"
msgstr ""
@@ -1228,7 +1228,7 @@ msgid "List supported operations"
msgstr ""
#. ../builder/cmdline.ml:140
-#: ../v2v/cmdline.ml:98 ../sparsify/cmdline.ml:79 ../resize/resize.ml:198
+#: ../v2v/cmdline.ml:113 ../sparsify/cmdline.ml:79 ../resize/resize.ml:198
msgid "Make output machine readable"
msgstr ""
@@ -1236,6 +1236,14 @@ msgstr ""
msgid "Making directory: %s"
msgstr ""
+#: ../v2v/cmdline.ml:106
+msgid "Map bridge 'in' to 'out'"
+msgstr ""
+
+#: ../v2v/cmdline.ml:114
+msgid "Map network 'in' to 'out'"
+msgstr ""
+
#: ../builder/list_entries.ml:77
msgid "Minimum/default size:"
msgstr ""
@@ -1293,11 +1301,15 @@ msgstr ""
msgid "Opening the new disk"
msgstr ""
-#: ../v2v/v2v.ml:80
+#: ../v2v/v2v.ml:116
msgid "Opening the overlay"
msgstr ""
-#: ../v2v/cmdline.ml:113
+#: ../v2v/v2v.ml:42
+msgid "Opening the source %s"
+msgstr ""
+
+#: ../v2v/cmdline.ml:130
msgid "Output VM UUID"
msgstr ""
@@ -1313,7 +1325,7 @@ msgstr ""
msgid "Output format (default: raw)"
msgstr ""
-#: ../v2v/cmdline.ml:109
+#: ../v2v/cmdline.ml:126
msgid "Output image UUID"
msgstr ""
@@ -1321,7 +1333,7 @@ msgstr ""
msgid "Output size"
msgstr ""
-#: ../v2v/cmdline.ml:111
+#: ../v2v/cmdline.ml:128
msgid "Output vol UUID(s)"
msgstr ""
@@ -1352,11 +1364,15 @@ msgstr ""
msgid "Print info about template cache"
msgstr ""
-#: ../v2v/cmdline.ml:106 ../sparsify/cmdline.ml:81
+#: ../v2v/cmdline.ml:122
+msgid "Print source and stop"
+msgstr ""
+
+#: ../v2v/cmdline.ml:123 ../sparsify/cmdline.ml:81
msgid "Quiet output"
msgstr ""
-#: ../v2v/target_RHEV.ml:544 ../v2v/target_RHEV.ml:141
+#: ../v2v/output_RHEV.ml:475 ../v2v/output_RHEV.ml:293
msgid "RHEV does not support the output format '%s', only raw or qcow2"
msgstr ""
@@ -1549,7 +1565,7 @@ msgstr ""
msgid "Remove user at-jobs and cron-jobs"
msgstr ""
-#: ../v2v/cmdline.ml:104
+#: ../v2v/cmdline.ml:120
msgid "Rename guest when converting"
msgstr ""
@@ -1653,7 +1669,7 @@ msgstr ""
msgid "Set format (default: auto)"
msgstr ""
-#: ../v2v/cmdline.ml:93
+#: ../v2v/cmdline.ml:108
msgid "Set input mode (default: libvirt)"
msgstr ""
@@ -1683,7 +1699,7 @@ msgstr ""
msgid "Set number of vCPUs"
msgstr ""
-#: ../v2v/cmdline.ml:101
+#: ../v2v/cmdline.ml:117
msgid "Set output allocation mode"
msgstr ""
@@ -1695,15 +1711,15 @@ msgstr ""
msgid "Set output filename"
msgstr ""
-#: ../v2v/cmdline.ml:103
+#: ../v2v/cmdline.ml:119
msgid "Set output format"
msgstr ""
-#: ../v2v/cmdline.ml:100
+#: ../v2v/cmdline.ml:116
msgid "Set output mode (default: libvirt)"
msgstr ""
-#: ../v2v/cmdline.ml:105
+#: ../v2v/cmdline.ml:121
msgid "Set output storage location"
msgstr ""
@@ -1751,7 +1767,7 @@ msgstr ""
msgid "Set user password"
msgstr ""
-#: ../v2v/cmdline.ml:119
+#: ../v2v/cmdline.ml:136
msgid "Set vmtype (for RHEV)"
msgstr ""
@@ -1795,6 +1811,10 @@ msgstr ""
msgid "Source URI: %s\n"
msgstr ""
+#: ../v2v/v2v.ml:47
+msgid "Source guest information (--print-source option):\n"
+msgstr ""
+
#: ../sparsify/in_place.ml:153
msgid "Sparsify in-place operation completed with no errors.\n"
msgstr ""
@@ -1853,7 +1873,7 @@ msgid ""
" IT IS POSSIBLE THAT SOMEONE IS DOING SOMETHING NASTY!"
msgstr ""
-#: ../v2v/convert_linux.ml:1042
+#: ../v2v/convert_linux.ml:1044
msgid ""
"The display driver was updated to '%s', but X11 does not seem to be "
"installed in the guest. X may not function correctly."
@@ -1917,7 +1937,7 @@ msgid ""
"virtual machine's disk, but it was stored on disk in older distros."
msgstr ""
-#: ../v2v/target_RHEV.ml:378
+#: ../v2v/output_RHEV.ml:692
msgid ""
"This guest required a password for connection to its display, but this is "
"not supported by RHEV. Therefore the converted guest's display will not "
@@ -1947,7 +1967,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:142
+#: ../v2v/v2v.ml:175
msgid "Trimming filesystems to reduce amount of data to copy"
msgstr ""
@@ -2061,7 +2081,7 @@ msgstr ""
msgid "cannot detect input disk format; use the --format parameter"
msgstr ""
-#: ../v2v/source_disk.ml:50
+#: ../v2v/input_disk.ml:60
msgid "cannot detect the input disk format; use the -if parameter"
msgstr ""
@@ -2075,11 +2095,11 @@ msgid ""
"\\Windows\\CurrentVersion\\Uninstall\\%s' does not contain an '%s' key"
msgstr ""
-#: ../v2v/v2v.ml:296
+#: ../v2v/v2v.ml:304
msgid "connection closed"
msgstr ""
-#: ../v2v/target_libvirt.ml:257
+#: ../v2v/output_libvirt.ml:269
msgid ""
"could not define libvirt domain. The libvirt XML is still available in "
"'%s'. Try running 'virsh define %s' yourself instead."
@@ -2091,14 +2111,18 @@ msgid ""
"\\CurrentVersion"
msgstr ""
-#: ../v2v/target_RHEV.ml:208
+#: ../v2v/input_libvirt.ml:289
+msgid "could not parse '-ic %s'. Original error message was: %s"
+msgstr ""
+
+#: ../v2v/output_RHEV.ml:154
msgid ""
"could not read the Export Storage Domain specified by the '-os %s' parameter "
"on the command line. Is it really an OVirt or RHEV-M Export Storage "
"Domain? The original error is: %s"
msgstr ""
-#: ../v2v/target_libvirt.ml:239
+#: ../v2v/output_libvirt.ml:251
msgid "could not refresh libvirt pool %s"
msgstr ""
@@ -2130,14 +2154,14 @@ msgstr ""
msgid "discard/trim is not supported: %s"
msgstr ""
-#: ../v2v/v2v.ml:234
+#: ../v2v/v2v.ml:254
msgid ""
"disk %s (%s) has no defined format, you have to either define the original "
"format in the source metadata, or use the '-of' option to force the output "
"format"
msgstr ""
-#: ../v2v/source_libvirt.ml:106
+#: ../v2v/input_libvirt.ml:99
msgid "display <graphics type='%s'> was ignored"
msgstr ""
@@ -2159,7 +2183,7 @@ msgstr ""
msgid "don't know how to remove packages using %s: packages: %s"
msgstr ""
-#: ../v2v/v2v.ml:280
+#: ../v2v/v2v.ml:288
msgid ""
"dual- or multi-boot operating system detected. Choose the root filesystem\n"
"that contains the main operating system from the list below:\n"
@@ -2173,19 +2197,19 @@ msgstr ""
msgid "error parsing URI '%s'. Look for error messages printed above."
msgstr ""
-#: ../v2v/source_libvirt.ml:63
+#: ../v2v/input_libvirt.ml:56
msgid "expecting XML expression to return an integer (expression: %s)"
msgstr ""
-#: ../v2v/cmdline.ml:194
+#: ../v2v/cmdline.ml:213
msgid "expecting a disk image (filename) on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:214
+#: ../v2v/cmdline.ml:233
msgid "expecting a libvirt XML file name on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:205
+#: ../v2v/cmdline.ml:224
msgid "expecting a libvirt guest name on the command line"
msgstr ""
@@ -2246,23 +2270,23 @@ msgstr ""
msgid "hostname could not be set for this type of guest"
msgstr ""
-#: ../v2v/v2v.ml:318
+#: ../v2v/cmdline.ml:65
+msgid "invalid --bridge or --network parameter"
+msgstr ""
+
+#: ../v2v/v2v.ml:326
msgid ""
"libguestfs thinks this is not an installed operating system (it might be, "
"for example, an installer disk or live CD). If this is wrong, it is "
"probably a bug in libguestfs. root=%s fmt=%s"
msgstr ""
-#: ../v2v/source_libvirt.ml:39
-msgid "libvirt returned a non-absolute path in the XML (%s)"
-msgstr ""
-
#. ../resize/resize.ml:194
#: ../resize/resize.ml:197 ../resize/resize.ml:196 ../resize/resize.ml:195
msgid "lv"
msgstr ""
-#: ../v2v/target_RHEV.ml:185
+#: ../v2v/output_RHEV.ml:131
msgid ""
"mount command failed, see earlier errors.\n"
"\n"
@@ -2270,7 +2294,7 @@ msgid ""
"[-os %s], or else you need to rerun virt-v2v as root."
msgstr ""
-#: ../v2v/v2v.ml:303
+#: ../v2v/v2v.ml:311
msgid ""
"multi-boot operating systems are not supported by virt-v2v. Use the --root "
"option to change how virt-v2v handles this."
@@ -2282,7 +2306,7 @@ msgid ""
"be a bug in virt-v2v."
msgstr ""
-#: ../v2v/source_libvirt.ml:170
+#: ../v2v/input_libvirt.ml:167
msgid "network <disk> with <source protocol='%s'> was ignored"
msgstr ""
@@ -2317,10 +2341,16 @@ msgid ""
"of this guest."
msgstr ""
-#: ../v2v/v2v.ml:273
+#: ../v2v/v2v.ml:281
msgid "no root device found in this operating system image."
msgstr ""
+#: ../v2v/input_libvirt.ml:304
+msgid ""
+"no support for remote libvirt connections to '-ic %s'. The conversion may "
+"fail when it tries to read the source disks."
+msgstr ""
+
#: ../resize/resize.ml:129
msgid "ntfsresize"
msgstr ""
@@ -2381,7 +2411,7 @@ msgstr ""
msgid "pwrite: short write restoring swap partition header"
msgstr ""
-#: ../v2v/v2v.ml:191 ../v2v/v2v.ml:75
+#: ../v2v/v2v.ml:224 ../v2v/v2v.ml:111
msgid "qemu-img command failed, see earlier errors"
msgstr ""
@@ -2393,7 +2423,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:311
+#: ../v2v/v2v.ml:319
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2409,14 +2439,14 @@ msgstr ""
msgid "sectors"
msgstr ""
-#: ../v2v/target_RHEV.ml:228
+#: ../v2v/output_RHEV.ml:174
msgid ""
"the Export Storage Domain (%s) has not been attached to any Data Center.\n"
"\n"
"You have to do this through the RHEV-M / OVirt user interface first."
msgstr ""
-#: ../v2v/target_RHEV.ml:233
+#: ../v2v/output_RHEV.ml:179
msgid ""
"the Export Storage Domain (%s) is not writable.\n"
"\n"
@@ -2425,7 +2455,7 @@ msgid ""
"Original error was: %s"
msgstr ""
-#: ../v2v/target_RHEV.ml:275
+#: ../v2v/output_RHEV.ml:223
msgid ""
"the number of '--rhev-vol-uuid' parameters passed on the command line has to "
"match the number of guest disk images (for this guest: %d)"
@@ -2435,7 +2465,7 @@ msgstr ""
msgid "the source disk has no partitions"
msgstr ""
-#: ../v2v/target_RHEV.ml:133
+#: ../v2v/output_RHEV.ml:285
msgid ""
"the virtual size of the input disk %s is not an exact multiple of 512 "
"bytes. The virtual size is: %Ld.\n"
@@ -2444,13 +2474,13 @@ msgid ""
"about this issue."
msgstr ""
-#: ../v2v/target_RHEV.ml:222
+#: ../v2v/output_RHEV.ml:168
msgid ""
"there are multiple UUIDs in the Export Storage Domain (%s). This is "
"unexpected, and may be a bug in virt-v2v or OVirt."
msgstr ""
-#: ../v2v/target_RHEV.ml:220
+#: ../v2v/output_RHEV.ml:166
msgid ""
"there are no UUIDs in the Export Storage Domain (%s). Is it really an OVirt "
"or RHEV-M Export Storage Domain?"
@@ -2480,7 +2510,7 @@ msgid ""
"The guest will be configured to use a slower emulated device."
msgstr ""
-#: ../v2v/source_libvirt.ml:127
+#: ../v2v/input_libvirt.ml:120
msgid "this guest has no non-removable disks"
msgstr ""
@@ -2498,33 +2528,27 @@ msgstr ""
msgid "unknown --align-first option: use never|always|auto"
msgstr ""
-#: ../v2v/cmdline.ml:84
+#: ../v2v/cmdline.ml:98
msgid "unknown --root option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:174
+#: ../v2v/cmdline.ml:193
msgid "unknown --vmtype option, must be \"server\" or \"desktop\""
msgstr ""
-#: ../v2v/cmdline.ml:57
+#: ../v2v/cmdline.ml:58
msgid "unknown -i option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:66
+#: ../v2v/cmdline.ml:80
msgid "unknown -o option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:74
+#: ../v2v/cmdline.ml:88
msgid "unknown -oa option: %s"
msgstr ""
-#: ../v2v/target_RHEV.ml:638
-msgid ""
-"unknown NIC model %s for ethernet device %s. This NIC will be imported as "
-"rtl8139 instead."
-msgstr ""
-
-#: ../v2v/target_RHEV.ml:494
+#: ../v2v/output_RHEV.ml:423
msgid "unknown guest operating system: %s %s %d.%d (%s)"
msgstr ""
@@ -2723,11 +2747,11 @@ msgstr ""
msgid "virt-sysprep: script: killed by signal (%d)\n"
msgstr ""
-#: ../v2v/v2v.ml:132
+#: ../v2v/v2v.ml:165
msgid "virt-v2v is unable to convert this guest type (linux/distro=%s)"
msgstr ""
-#: ../v2v/v2v.ml:138
+#: ../v2v/v2v.ml:171
msgid "virt-v2v is unable to convert this guest type (type=%s)"
msgstr ""
diff --git a/po/ml.po b/po/ml.po
index e135ab2..ec65221 100644
--- a/po/ml.po
+++ b/po/ml.po
@@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-08-19 17:51+0100\n"
+"POT-Creation-Date: 2014-08-21 17:07+0100\n"
"PO-Revision-Date: 2014-07-22 18:03+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Malayalam (http://www.transifex.com/projects/p/libguestfs/"
@@ -69,7 +69,7 @@ msgstr ""
msgid "%s (ignored)\n"
msgstr ""
-#: ../v2v/convert_linux.ml:1134
+#: ../v2v/convert_linux.ml:1136
msgid ""
"%s references unknown device \"%s\". You may have to fix this entry "
"manually after conversion."
@@ -79,7 +79,7 @@ msgstr ""
msgid "%s: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:147
+#: ../v2v/v2v.ml:180
msgid "%s: %s (ignored)"
msgstr ""
@@ -220,7 +220,7 @@ msgstr ""
msgid "%s: cannot output to a character device or /dev/null\n"
msgstr ""
-#: ../v2v/cmdline.ml:126
+#: ../v2v/cmdline.ml:143
msgid ""
"%s: convert a guest to use KVM\n"
"\n"
@@ -272,7 +272,7 @@ msgstr ""
msgid "%s: error: %s"
msgstr ""
-#: ../v2v/v2v.ml:369 ../sysprep/main.ml:297
+#: ../v2v/v2v.ml:377 ../sysprep/main.ml:297
msgid "%s: error: %s\n"
msgstr ""
@@ -282,13 +282,13 @@ msgstr ""
#. ../resize/resize.ml:1309
#. ../builder/builder.ml:743
-#: ../v2v/v2v.ml:362 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
+#: ../v2v/v2v.ml:370 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
msgid "%s: error: %s: %s\n"
msgstr ""
#. ../resize/resize.ml:1312
#. ../builder/builder.ml:746
-#: ../v2v/v2v.ml:365 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
+#: ../v2v/v2v.ml:373 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
msgid "%s: error: %s: %s: %s\n"
msgstr ""
@@ -309,7 +309,7 @@ msgstr ""
#. ../resize/resize.ml:1331
#. ../customize/customize_main.ml:262
#. ../builder/builder.ml:764
-#: ../v2v/v2v.ml:387 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
+#: ../v2v/v2v.ml:395 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
msgid "%s: exception: %s\n"
msgstr ""
@@ -319,7 +319,7 @@ msgstr ""
#. ../resize/resize.ml:1319
#. ../builder/builder.ml:752
-#: ../v2v/v2v.ml:375 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
+#: ../v2v/v2v.ml:383 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
msgid "%s: failure: %s\n"
msgstr ""
@@ -346,14 +346,14 @@ msgstr ""
#. ../resize/resize.ml:1328
#. ../customize/customize_main.ml:259
#. ../builder/builder.ml:761
-#: ../v2v/v2v.ml:384 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
+#: ../v2v/v2v.ml:392 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
msgid "%s: internal error: Not_found exception was thrown\n"
msgstr ""
#. ../resize/resize.ml:1325
#. ../customize/customize_main.ml:255
#. ../builder/builder.ml:758
-#: ../v2v/v2v.ml:381 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
+#: ../v2v/v2v.ml:389 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
msgid "%s: internal error: assertion failed at %s, line %d, char %d\n"
msgstr ""
@@ -361,7 +361,7 @@ msgstr ""
#. ../customize/customize_main.ml:252
#. ../builder/sources.ml:135
#. ../builder/builder.ml:755
-#: ../v2v/v2v.ml:378 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
+#: ../v2v/v2v.ml:386 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
msgid "%s: internal error: invalid argument: %s\n"
msgstr ""
@@ -379,7 +379,7 @@ msgstr ""
#. ../resize/resize.ml:1316
#. ../builder/builder.ml:749
-#: ../v2v/v2v.ml:372 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
+#: ../v2v/v2v.ml:380 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
msgid "%s: libguestfs error: %s\n"
msgstr ""
@@ -628,7 +628,7 @@ msgstr ""
msgid "--expand option given twice"
msgstr ""
-#: ../v2v/cmdline.ml:226
+#: ../v2v/cmdline.ml:245
msgid "--no-copy and '-o libvirt' cannot be used at the same time"
msgstr ""
@@ -653,40 +653,40 @@ msgstr ""
msgid "--tmp prebuilt:file: %s: file format is not qcow2"
msgstr ""
-#: ../v2v/cmdline.ml:236 ../v2v/cmdline.ml:224
+#: ../v2v/cmdline.ml:255 ../v2v/cmdline.ml:243
msgid "--vmtype option can only be used with '-o rhev'"
msgstr ""
-#: ../v2v/source_disk.ml:34
+#: ../v2v/input_disk.ml:44
msgid "-i disk: invalid input filename (%s)"
msgstr ""
-#: ../v2v/target_libvirt.ml:219
+#: ../v2v/output_libvirt.ml:231
msgid ""
"-o libvirt: output pool '%s' has type='dir' but the /pool/target/path "
"element either does not exist or is not a local directory. See virt-v2v(1) "
"section \"OUTPUT TO LIBVIRT\""
msgstr ""
-#: ../v2v/target_libvirt.ml:216
+#: ../v2v/output_libvirt.ml:228
msgid ""
"-o libvirt: output pool '%s' is not a directory (type='dir'). See virt-"
"v2v(1) section \"OUTPUT TO LIBVIRT\""
msgstr ""
-#: ../v2v/cmdline.ml:231
+#: ../v2v/cmdline.ml:250
msgid "-o local: output directory was not specified, use '-os /dir'"
msgstr ""
-#: ../v2v/cmdline.ml:241
+#: ../v2v/cmdline.ml:260
msgid "-o rhev: output storage was not specified, use '-os'"
msgstr ""
-#: ../v2v/cmdline.ml:233
+#: ../v2v/cmdline.ml:252
msgid "-os %s: output directory does not exist or is not a directory"
msgstr ""
-#: ../v2v/source_libvirt.ml:174
+#: ../v2v/input_libvirt.ml:171
msgid "<disk type='%s'> was ignored"
msgstr ""
@@ -754,7 +754,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:151
+#: ../v2v/v2v.ml:184
msgid "Closing the overlay"
msgstr ""
@@ -766,11 +766,11 @@ msgstr ""
msgid "Converting %s to %s"
msgstr ""
-#: ../v2v/v2v.ml:112
+#: ../v2v/v2v.ml:148
msgid "Converting %s to run on KVM"
msgstr ""
-#: ../v2v/v2v.ml:110
+#: ../v2v/v2v.ml:146
msgid "Converting the guest to run on KVM"
msgstr ""
@@ -790,7 +790,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:170
+#: ../v2v/v2v.ml:203
msgid "Copying disk %d/%d to %s (%s)"
msgstr ""
@@ -814,11 +814,11 @@ msgstr ""
msgid "Create symbolic links"
msgstr ""
-#: ../v2v/v2v.ml:59
+#: ../v2v/v2v.ml:95
msgid "Creating an overlay to protect the source from being modified"
msgstr ""
-#: ../v2v/v2v.ml:196
+#: ../v2v/v2v.ml:229
msgid "Creating output metadata"
msgstr ""
@@ -857,7 +857,7 @@ msgstr ""
msgid "DIR"
msgstr ""
-#: ../v2v/cmdline.ml:92 ../sparsify/cmdline.ml:73 ../resize/resize.ml:186
+#: ../v2v/cmdline.ml:107 ../sparsify/cmdline.ml:73 ../resize/resize.ml:186
msgid "Debug GC and memory allocations"
msgstr ""
@@ -909,7 +909,7 @@ msgstr ""
#. ../customize/customize_main.ml:99
#. ../builder/cmdline.ml:158
#. ../builder/cmdline.ml:157
-#: ../v2v/cmdline.ml:117 ../sysprep/main.ml:155 ../sysprep/main.ml:154
+#: ../v2v/cmdline.ml:134 ../sysprep/main.ml:155 ../sysprep/main.ml:154
msgid "Display version and exit"
msgstr ""
@@ -986,7 +986,7 @@ msgstr ""
#. ../customize/customize_main.ml:97
#. ../builder/cmdline.ml:156
#. ../builder/cmdline.ml:155
-#: ../v2v/cmdline.ml:115 ../sysprep/main.ml:153 ../sysprep/main.ml:152
+#: ../v2v/cmdline.ml:132 ../sysprep/main.ml:153 ../sysprep/main.ml:152
msgid "Enable debugging messages"
msgstr ""
@@ -997,7 +997,7 @@ msgstr ""
#. ../resize/resize.ml:214
#. ../customize/customize_main.ml:101
#. ../builder/cmdline.ml:159
-#: ../v2v/cmdline.ml:120 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
+#: ../v2v/cmdline.ml:137 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
msgid "Enable tracing of libguestfs calls"
msgstr ""
@@ -1005,7 +1005,7 @@ msgstr ""
msgid "Enable/disable specific operations"
msgstr ""
-#: ../v2v/v2v.ml:293
+#: ../v2v/v2v.ml:301
msgid "Enter number between 1 and %d: "
msgstr ""
@@ -1093,7 +1093,7 @@ msgstr ""
msgid "Fingerprint: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:212 ../customize/customize_main.ml:237
+#: ../v2v/v2v.ml:232 ../customize/customize_main.ml:237
#: ../builder/builder.ml:711
msgid "Finishing off"
msgstr ""
@@ -1151,7 +1151,7 @@ msgstr ""
msgid "HOSTNAME"
msgstr ""
-#: ../v2v/cmdline.ml:114
+#: ../v2v/cmdline.ml:131
msgid "How to choose root filesystem"
msgstr ""
@@ -1163,7 +1163,7 @@ msgstr ""
msgid "Ignore partition"
msgstr ""
-#: ../v2v/v2v.ml:97
+#: ../v2v/v2v.ml:133
msgid "Initializing the target %s"
msgstr ""
@@ -1173,11 +1173,11 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/cmdline.ml:96
+#: ../v2v/cmdline.ml:111
msgid "Input format (for -i disk)"
msgstr ""
-#: ../v2v/v2v.ml:103
+#: ../v2v/v2v.ml:139
msgid "Inspecting the overlay"
msgstr ""
@@ -1197,7 +1197,7 @@ msgstr ""
msgid "Installing packages: %s"
msgstr ""
-#: ../v2v/cmdline.ml:99
+#: ../v2v/cmdline.ml:115
msgid "Just write the metadata"
msgstr ""
@@ -1205,7 +1205,7 @@ msgstr ""
msgid "Key: %s\n"
msgstr ""
-#: ../v2v/cmdline.ml:102 ../v2v/cmdline.ml:94
+#: ../v2v/cmdline.ml:118 ../v2v/cmdline.ml:109
msgid "Libvirt URI"
msgstr ""
@@ -1220,7 +1220,7 @@ msgstr ""
#. ../resize/resize.ml:193
#. ../customize/customize_main.ml:89
#. ../builder/cmdline.ml:139
-#: ../v2v/cmdline.ml:97 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
+#: ../v2v/cmdline.ml:112 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
msgid "List long options"
msgstr ""
@@ -1229,7 +1229,7 @@ msgid "List supported operations"
msgstr ""
#. ../builder/cmdline.ml:140
-#: ../v2v/cmdline.ml:98 ../sparsify/cmdline.ml:79 ../resize/resize.ml:198
+#: ../v2v/cmdline.ml:113 ../sparsify/cmdline.ml:79 ../resize/resize.ml:198
msgid "Make output machine readable"
msgstr ""
@@ -1237,6 +1237,14 @@ msgstr ""
msgid "Making directory: %s"
msgstr ""
+#: ../v2v/cmdline.ml:106
+msgid "Map bridge 'in' to 'out'"
+msgstr ""
+
+#: ../v2v/cmdline.ml:114
+msgid "Map network 'in' to 'out'"
+msgstr ""
+
#: ../builder/list_entries.ml:77
msgid "Minimum/default size:"
msgstr ""
@@ -1294,11 +1302,15 @@ msgstr ""
msgid "Opening the new disk"
msgstr ""
-#: ../v2v/v2v.ml:80
+#: ../v2v/v2v.ml:116
msgid "Opening the overlay"
msgstr ""
-#: ../v2v/cmdline.ml:113
+#: ../v2v/v2v.ml:42
+msgid "Opening the source %s"
+msgstr ""
+
+#: ../v2v/cmdline.ml:130
msgid "Output VM UUID"
msgstr ""
@@ -1314,7 +1326,7 @@ msgstr ""
msgid "Output format (default: raw)"
msgstr ""
-#: ../v2v/cmdline.ml:109
+#: ../v2v/cmdline.ml:126
msgid "Output image UUID"
msgstr ""
@@ -1322,7 +1334,7 @@ msgstr ""
msgid "Output size"
msgstr ""
-#: ../v2v/cmdline.ml:111
+#: ../v2v/cmdline.ml:128
msgid "Output vol UUID(s)"
msgstr ""
@@ -1353,11 +1365,15 @@ msgstr ""
msgid "Print info about template cache"
msgstr ""
-#: ../v2v/cmdline.ml:106 ../sparsify/cmdline.ml:81
+#: ../v2v/cmdline.ml:122
+msgid "Print source and stop"
+msgstr ""
+
+#: ../v2v/cmdline.ml:123 ../sparsify/cmdline.ml:81
msgid "Quiet output"
msgstr ""
-#: ../v2v/target_RHEV.ml:544 ../v2v/target_RHEV.ml:141
+#: ../v2v/output_RHEV.ml:475 ../v2v/output_RHEV.ml:293
msgid "RHEV does not support the output format '%s', only raw or qcow2"
msgstr ""
@@ -1550,7 +1566,7 @@ msgstr ""
msgid "Remove user at-jobs and cron-jobs"
msgstr ""
-#: ../v2v/cmdline.ml:104
+#: ../v2v/cmdline.ml:120
msgid "Rename guest when converting"
msgstr ""
@@ -1654,7 +1670,7 @@ msgstr ""
msgid "Set format (default: auto)"
msgstr ""
-#: ../v2v/cmdline.ml:93
+#: ../v2v/cmdline.ml:108
msgid "Set input mode (default: libvirt)"
msgstr ""
@@ -1684,7 +1700,7 @@ msgstr ""
msgid "Set number of vCPUs"
msgstr ""
-#: ../v2v/cmdline.ml:101
+#: ../v2v/cmdline.ml:117
msgid "Set output allocation mode"
msgstr ""
@@ -1696,15 +1712,15 @@ msgstr ""
msgid "Set output filename"
msgstr ""
-#: ../v2v/cmdline.ml:103
+#: ../v2v/cmdline.ml:119
msgid "Set output format"
msgstr ""
-#: ../v2v/cmdline.ml:100
+#: ../v2v/cmdline.ml:116
msgid "Set output mode (default: libvirt)"
msgstr ""
-#: ../v2v/cmdline.ml:105
+#: ../v2v/cmdline.ml:121
msgid "Set output storage location"
msgstr ""
@@ -1752,7 +1768,7 @@ msgstr ""
msgid "Set user password"
msgstr ""
-#: ../v2v/cmdline.ml:119
+#: ../v2v/cmdline.ml:136
msgid "Set vmtype (for RHEV)"
msgstr ""
@@ -1796,6 +1812,10 @@ msgstr ""
msgid "Source URI: %s\n"
msgstr ""
+#: ../v2v/v2v.ml:47
+msgid "Source guest information (--print-source option):\n"
+msgstr ""
+
#: ../sparsify/in_place.ml:153
msgid "Sparsify in-place operation completed with no errors.\n"
msgstr ""
@@ -1854,7 +1874,7 @@ msgid ""
" IT IS POSSIBLE THAT SOMEONE IS DOING SOMETHING NASTY!"
msgstr ""
-#: ../v2v/convert_linux.ml:1042
+#: ../v2v/convert_linux.ml:1044
msgid ""
"The display driver was updated to '%s', but X11 does not seem to be "
"installed in the guest. X may not function correctly."
@@ -1918,7 +1938,7 @@ msgid ""
"virtual machine's disk, but it was stored on disk in older distros."
msgstr ""
-#: ../v2v/target_RHEV.ml:378
+#: ../v2v/output_RHEV.ml:692
msgid ""
"This guest required a password for connection to its display, but this is "
"not supported by RHEV. Therefore the converted guest's display will not "
@@ -1948,7 +1968,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:142
+#: ../v2v/v2v.ml:175
msgid "Trimming filesystems to reduce amount of data to copy"
msgstr ""
@@ -2062,7 +2082,7 @@ msgstr ""
msgid "cannot detect input disk format; use the --format parameter"
msgstr ""
-#: ../v2v/source_disk.ml:50
+#: ../v2v/input_disk.ml:60
msgid "cannot detect the input disk format; use the -if parameter"
msgstr ""
@@ -2076,11 +2096,11 @@ msgid ""
"\\Windows\\CurrentVersion\\Uninstall\\%s' does not contain an '%s' key"
msgstr ""
-#: ../v2v/v2v.ml:296
+#: ../v2v/v2v.ml:304
msgid "connection closed"
msgstr ""
-#: ../v2v/target_libvirt.ml:257
+#: ../v2v/output_libvirt.ml:269
msgid ""
"could not define libvirt domain. The libvirt XML is still available in "
"'%s'. Try running 'virsh define %s' yourself instead."
@@ -2092,14 +2112,18 @@ msgid ""
"\\CurrentVersion"
msgstr ""
-#: ../v2v/target_RHEV.ml:208
+#: ../v2v/input_libvirt.ml:289
+msgid "could not parse '-ic %s'. Original error message was: %s"
+msgstr ""
+
+#: ../v2v/output_RHEV.ml:154
msgid ""
"could not read the Export Storage Domain specified by the '-os %s' parameter "
"on the command line. Is it really an OVirt or RHEV-M Export Storage "
"Domain? The original error is: %s"
msgstr ""
-#: ../v2v/target_libvirt.ml:239
+#: ../v2v/output_libvirt.ml:251
msgid "could not refresh libvirt pool %s"
msgstr ""
@@ -2131,14 +2155,14 @@ msgstr ""
msgid "discard/trim is not supported: %s"
msgstr ""
-#: ../v2v/v2v.ml:234
+#: ../v2v/v2v.ml:254
msgid ""
"disk %s (%s) has no defined format, you have to either define the original "
"format in the source metadata, or use the '-of' option to force the output "
"format"
msgstr ""
-#: ../v2v/source_libvirt.ml:106
+#: ../v2v/input_libvirt.ml:99
msgid "display <graphics type='%s'> was ignored"
msgstr ""
@@ -2160,7 +2184,7 @@ msgstr ""
msgid "don't know how to remove packages using %s: packages: %s"
msgstr ""
-#: ../v2v/v2v.ml:280
+#: ../v2v/v2v.ml:288
msgid ""
"dual- or multi-boot operating system detected. Choose the root filesystem\n"
"that contains the main operating system from the list below:\n"
@@ -2174,19 +2198,19 @@ msgstr ""
msgid "error parsing URI '%s'. Look for error messages printed above."
msgstr ""
-#: ../v2v/source_libvirt.ml:63
+#: ../v2v/input_libvirt.ml:56
msgid "expecting XML expression to return an integer (expression: %s)"
msgstr ""
-#: ../v2v/cmdline.ml:194
+#: ../v2v/cmdline.ml:213
msgid "expecting a disk image (filename) on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:214
+#: ../v2v/cmdline.ml:233
msgid "expecting a libvirt XML file name on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:205
+#: ../v2v/cmdline.ml:224
msgid "expecting a libvirt guest name on the command line"
msgstr ""
@@ -2247,23 +2271,23 @@ msgstr ""
msgid "hostname could not be set for this type of guest"
msgstr ""
-#: ../v2v/v2v.ml:318
+#: ../v2v/cmdline.ml:65
+msgid "invalid --bridge or --network parameter"
+msgstr ""
+
+#: ../v2v/v2v.ml:326
msgid ""
"libguestfs thinks this is not an installed operating system (it might be, "
"for example, an installer disk or live CD). If this is wrong, it is "
"probably a bug in libguestfs. root=%s fmt=%s"
msgstr ""
-#: ../v2v/source_libvirt.ml:39
-msgid "libvirt returned a non-absolute path in the XML (%s)"
-msgstr ""
-
#. ../resize/resize.ml:194
#: ../resize/resize.ml:197 ../resize/resize.ml:196 ../resize/resize.ml:195
msgid "lv"
msgstr ""
-#: ../v2v/target_RHEV.ml:185
+#: ../v2v/output_RHEV.ml:131
msgid ""
"mount command failed, see earlier errors.\n"
"\n"
@@ -2271,7 +2295,7 @@ msgid ""
"[-os %s], or else you need to rerun virt-v2v as root."
msgstr ""
-#: ../v2v/v2v.ml:303
+#: ../v2v/v2v.ml:311
msgid ""
"multi-boot operating systems are not supported by virt-v2v. Use the --root "
"option to change how virt-v2v handles this."
@@ -2283,7 +2307,7 @@ msgid ""
"be a bug in virt-v2v."
msgstr ""
-#: ../v2v/source_libvirt.ml:170
+#: ../v2v/input_libvirt.ml:167
msgid "network <disk> with <source protocol='%s'> was ignored"
msgstr ""
@@ -2318,10 +2342,16 @@ msgid ""
"of this guest."
msgstr ""
-#: ../v2v/v2v.ml:273
+#: ../v2v/v2v.ml:281
msgid "no root device found in this operating system image."
msgstr ""
+#: ../v2v/input_libvirt.ml:304
+msgid ""
+"no support for remote libvirt connections to '-ic %s'. The conversion may "
+"fail when it tries to read the source disks."
+msgstr ""
+
#: ../resize/resize.ml:129
msgid "ntfsresize"
msgstr ""
@@ -2382,7 +2412,7 @@ msgstr ""
msgid "pwrite: short write restoring swap partition header"
msgstr ""
-#: ../v2v/v2v.ml:191 ../v2v/v2v.ml:75
+#: ../v2v/v2v.ml:224 ../v2v/v2v.ml:111
msgid "qemu-img command failed, see earlier errors"
msgstr ""
@@ -2394,7 +2424,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:311
+#: ../v2v/v2v.ml:319
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2410,14 +2440,14 @@ msgstr ""
msgid "sectors"
msgstr ""
-#: ../v2v/target_RHEV.ml:228
+#: ../v2v/output_RHEV.ml:174
msgid ""
"the Export Storage Domain (%s) has not been attached to any Data Center.\n"
"\n"
"You have to do this through the RHEV-M / OVirt user interface first."
msgstr ""
-#: ../v2v/target_RHEV.ml:233
+#: ../v2v/output_RHEV.ml:179
msgid ""
"the Export Storage Domain (%s) is not writable.\n"
"\n"
@@ -2426,7 +2456,7 @@ msgid ""
"Original error was: %s"
msgstr ""
-#: ../v2v/target_RHEV.ml:275
+#: ../v2v/output_RHEV.ml:223
msgid ""
"the number of '--rhev-vol-uuid' parameters passed on the command line has to "
"match the number of guest disk images (for this guest: %d)"
@@ -2436,7 +2466,7 @@ msgstr ""
msgid "the source disk has no partitions"
msgstr ""
-#: ../v2v/target_RHEV.ml:133
+#: ../v2v/output_RHEV.ml:285
msgid ""
"the virtual size of the input disk %s is not an exact multiple of 512 "
"bytes. The virtual size is: %Ld.\n"
@@ -2445,13 +2475,13 @@ msgid ""
"about this issue."
msgstr ""
-#: ../v2v/target_RHEV.ml:222
+#: ../v2v/output_RHEV.ml:168
msgid ""
"there are multiple UUIDs in the Export Storage Domain (%s). This is "
"unexpected, and may be a bug in virt-v2v or OVirt."
msgstr ""
-#: ../v2v/target_RHEV.ml:220
+#: ../v2v/output_RHEV.ml:166
msgid ""
"there are no UUIDs in the Export Storage Domain (%s). Is it really an OVirt "
"or RHEV-M Export Storage Domain?"
@@ -2481,7 +2511,7 @@ msgid ""
"The guest will be configured to use a slower emulated device."
msgstr ""
-#: ../v2v/source_libvirt.ml:127
+#: ../v2v/input_libvirt.ml:120
msgid "this guest has no non-removable disks"
msgstr ""
@@ -2499,33 +2529,27 @@ msgstr ""
msgid "unknown --align-first option: use never|always|auto"
msgstr ""
-#: ../v2v/cmdline.ml:84
+#: ../v2v/cmdline.ml:98
msgid "unknown --root option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:174
+#: ../v2v/cmdline.ml:193
msgid "unknown --vmtype option, must be \"server\" or \"desktop\""
msgstr ""
-#: ../v2v/cmdline.ml:57
+#: ../v2v/cmdline.ml:58
msgid "unknown -i option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:66
+#: ../v2v/cmdline.ml:80
msgid "unknown -o option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:74
+#: ../v2v/cmdline.ml:88
msgid "unknown -oa option: %s"
msgstr ""
-#: ../v2v/target_RHEV.ml:638
-msgid ""
-"unknown NIC model %s for ethernet device %s. This NIC will be imported as "
-"rtl8139 instead."
-msgstr ""
-
-#: ../v2v/target_RHEV.ml:494
+#: ../v2v/output_RHEV.ml:423
msgid "unknown guest operating system: %s %s %d.%d (%s)"
msgstr ""
@@ -2724,11 +2748,11 @@ msgstr ""
msgid "virt-sysprep: script: killed by signal (%d)\n"
msgstr ""
-#: ../v2v/v2v.ml:132
+#: ../v2v/v2v.ml:165
msgid "virt-v2v is unable to convert this guest type (linux/distro=%s)"
msgstr ""
-#: ../v2v/v2v.ml:138
+#: ../v2v/v2v.ml:171
msgid "virt-v2v is unable to convert this guest type (type=%s)"
msgstr ""
diff --git a/po/mr.po b/po/mr.po
index 8c32d6c..e8c9c37 100644
--- a/po/mr.po
+++ b/po/mr.po
@@ -10,7 +10,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-08-19 17:51+0100\n"
+"POT-Creation-Date: 2014-08-21 17:07+0100\n"
"PO-Revision-Date: 2014-07-22 18:03+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Marathi (http://www.transifex.com/projects/p/libguestfs/"
@@ -70,7 +70,7 @@ msgstr ""
msgid "%s (ignored)\n"
msgstr ""
-#: ../v2v/convert_linux.ml:1134
+#: ../v2v/convert_linux.ml:1136
msgid ""
"%s references unknown device \"%s\". You may have to fix this entry "
"manually after conversion."
@@ -80,7 +80,7 @@ msgstr ""
msgid "%s: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:147
+#: ../v2v/v2v.ml:180
msgid "%s: %s (ignored)"
msgstr ""
@@ -221,7 +221,7 @@ msgstr ""
msgid "%s: cannot output to a character device or /dev/null\n"
msgstr ""
-#: ../v2v/cmdline.ml:126
+#: ../v2v/cmdline.ml:143
msgid ""
"%s: convert a guest to use KVM\n"
"\n"
@@ -273,7 +273,7 @@ msgstr ""
msgid "%s: error: %s"
msgstr ""
-#: ../v2v/v2v.ml:369 ../sysprep/main.ml:297
+#: ../v2v/v2v.ml:377 ../sysprep/main.ml:297
msgid "%s: error: %s\n"
msgstr ""
@@ -283,13 +283,13 @@ msgstr ""
#. ../resize/resize.ml:1309
#. ../builder/builder.ml:743
-#: ../v2v/v2v.ml:362 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
+#: ../v2v/v2v.ml:370 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
msgid "%s: error: %s: %s\n"
msgstr ""
#. ../resize/resize.ml:1312
#. ../builder/builder.ml:746
-#: ../v2v/v2v.ml:365 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
+#: ../v2v/v2v.ml:373 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
msgid "%s: error: %s: %s: %s\n"
msgstr ""
@@ -310,7 +310,7 @@ msgstr ""
#. ../resize/resize.ml:1331
#. ../customize/customize_main.ml:262
#. ../builder/builder.ml:764
-#: ../v2v/v2v.ml:387 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
+#: ../v2v/v2v.ml:395 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
msgid "%s: exception: %s\n"
msgstr ""
@@ -320,7 +320,7 @@ msgstr ""
#. ../resize/resize.ml:1319
#. ../builder/builder.ml:752
-#: ../v2v/v2v.ml:375 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
+#: ../v2v/v2v.ml:383 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
msgid "%s: failure: %s\n"
msgstr ""
@@ -347,14 +347,14 @@ msgstr ""
#. ../resize/resize.ml:1328
#. ../customize/customize_main.ml:259
#. ../builder/builder.ml:761
-#: ../v2v/v2v.ml:384 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
+#: ../v2v/v2v.ml:392 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
msgid "%s: internal error: Not_found exception was thrown\n"
msgstr ""
#. ../resize/resize.ml:1325
#. ../customize/customize_main.ml:255
#. ../builder/builder.ml:758
-#: ../v2v/v2v.ml:381 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
+#: ../v2v/v2v.ml:389 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
msgid "%s: internal error: assertion failed at %s, line %d, char %d\n"
msgstr ""
@@ -362,7 +362,7 @@ msgstr ""
#. ../customize/customize_main.ml:252
#. ../builder/sources.ml:135
#. ../builder/builder.ml:755
-#: ../v2v/v2v.ml:378 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
+#: ../v2v/v2v.ml:386 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
msgid "%s: internal error: invalid argument: %s\n"
msgstr ""
@@ -380,7 +380,7 @@ msgstr ""
#. ../resize/resize.ml:1316
#. ../builder/builder.ml:749
-#: ../v2v/v2v.ml:372 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
+#: ../v2v/v2v.ml:380 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
msgid "%s: libguestfs error: %s\n"
msgstr ""
@@ -629,7 +629,7 @@ msgstr ""
msgid "--expand option given twice"
msgstr ""
-#: ../v2v/cmdline.ml:226
+#: ../v2v/cmdline.ml:245
msgid "--no-copy and '-o libvirt' cannot be used at the same time"
msgstr ""
@@ -654,40 +654,40 @@ msgstr ""
msgid "--tmp prebuilt:file: %s: file format is not qcow2"
msgstr ""
-#: ../v2v/cmdline.ml:236 ../v2v/cmdline.ml:224
+#: ../v2v/cmdline.ml:255 ../v2v/cmdline.ml:243
msgid "--vmtype option can only be used with '-o rhev'"
msgstr ""
-#: ../v2v/source_disk.ml:34
+#: ../v2v/input_disk.ml:44
msgid "-i disk: invalid input filename (%s)"
msgstr ""
-#: ../v2v/target_libvirt.ml:219
+#: ../v2v/output_libvirt.ml:231
msgid ""
"-o libvirt: output pool '%s' has type='dir' but the /pool/target/path "
"element either does not exist or is not a local directory. See virt-v2v(1) "
"section \"OUTPUT TO LIBVIRT\""
msgstr ""
-#: ../v2v/target_libvirt.ml:216
+#: ../v2v/output_libvirt.ml:228
msgid ""
"-o libvirt: output pool '%s' is not a directory (type='dir'). See virt-"
"v2v(1) section \"OUTPUT TO LIBVIRT\""
msgstr ""
-#: ../v2v/cmdline.ml:231
+#: ../v2v/cmdline.ml:250
msgid "-o local: output directory was not specified, use '-os /dir'"
msgstr ""
-#: ../v2v/cmdline.ml:241
+#: ../v2v/cmdline.ml:260
msgid "-o rhev: output storage was not specified, use '-os'"
msgstr ""
-#: ../v2v/cmdline.ml:233
+#: ../v2v/cmdline.ml:252
msgid "-os %s: output directory does not exist or is not a directory"
msgstr ""
-#: ../v2v/source_libvirt.ml:174
+#: ../v2v/input_libvirt.ml:171
msgid "<disk type='%s'> was ignored"
msgstr ""
@@ -755,7 +755,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:151
+#: ../v2v/v2v.ml:184
msgid "Closing the overlay"
msgstr ""
@@ -767,11 +767,11 @@ msgstr ""
msgid "Converting %s to %s"
msgstr ""
-#: ../v2v/v2v.ml:112
+#: ../v2v/v2v.ml:148
msgid "Converting %s to run on KVM"
msgstr ""
-#: ../v2v/v2v.ml:110
+#: ../v2v/v2v.ml:146
msgid "Converting the guest to run on KVM"
msgstr ""
@@ -791,7 +791,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:170
+#: ../v2v/v2v.ml:203
msgid "Copying disk %d/%d to %s (%s)"
msgstr ""
@@ -815,11 +815,11 @@ msgstr ""
msgid "Create symbolic links"
msgstr ""
-#: ../v2v/v2v.ml:59
+#: ../v2v/v2v.ml:95
msgid "Creating an overlay to protect the source from being modified"
msgstr ""
-#: ../v2v/v2v.ml:196
+#: ../v2v/v2v.ml:229
msgid "Creating output metadata"
msgstr ""
@@ -858,7 +858,7 @@ msgstr ""
msgid "DIR"
msgstr ""
-#: ../v2v/cmdline.ml:92 ../sparsify/cmdline.ml:73 ../resize/resize.ml:186
+#: ../v2v/cmdline.ml:107 ../sparsify/cmdline.ml:73 ../resize/resize.ml:186
msgid "Debug GC and memory allocations"
msgstr ""
@@ -910,7 +910,7 @@ msgstr ""
#. ../customize/customize_main.ml:99
#. ../builder/cmdline.ml:158
#. ../builder/cmdline.ml:157
-#: ../v2v/cmdline.ml:117 ../sysprep/main.ml:155 ../sysprep/main.ml:154
+#: ../v2v/cmdline.ml:134 ../sysprep/main.ml:155 ../sysprep/main.ml:154
msgid "Display version and exit"
msgstr ""
@@ -987,7 +987,7 @@ msgstr ""
#. ../customize/customize_main.ml:97
#. ../builder/cmdline.ml:156
#. ../builder/cmdline.ml:155
-#: ../v2v/cmdline.ml:115 ../sysprep/main.ml:153 ../sysprep/main.ml:152
+#: ../v2v/cmdline.ml:132 ../sysprep/main.ml:153 ../sysprep/main.ml:152
msgid "Enable debugging messages"
msgstr ""
@@ -998,7 +998,7 @@ msgstr ""
#. ../resize/resize.ml:214
#. ../customize/customize_main.ml:101
#. ../builder/cmdline.ml:159
-#: ../v2v/cmdline.ml:120 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
+#: ../v2v/cmdline.ml:137 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
msgid "Enable tracing of libguestfs calls"
msgstr ""
@@ -1006,7 +1006,7 @@ msgstr ""
msgid "Enable/disable specific operations"
msgstr ""
-#: ../v2v/v2v.ml:293
+#: ../v2v/v2v.ml:301
msgid "Enter number between 1 and %d: "
msgstr ""
@@ -1094,7 +1094,7 @@ msgstr ""
msgid "Fingerprint: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:212 ../customize/customize_main.ml:237
+#: ../v2v/v2v.ml:232 ../customize/customize_main.ml:237
#: ../builder/builder.ml:711
msgid "Finishing off"
msgstr ""
@@ -1152,7 +1152,7 @@ msgstr ""
msgid "HOSTNAME"
msgstr ""
-#: ../v2v/cmdline.ml:114
+#: ../v2v/cmdline.ml:131
msgid "How to choose root filesystem"
msgstr ""
@@ -1164,7 +1164,7 @@ msgstr ""
msgid "Ignore partition"
msgstr ""
-#: ../v2v/v2v.ml:97
+#: ../v2v/v2v.ml:133
msgid "Initializing the target %s"
msgstr ""
@@ -1174,11 +1174,11 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/cmdline.ml:96
+#: ../v2v/cmdline.ml:111
msgid "Input format (for -i disk)"
msgstr ""
-#: ../v2v/v2v.ml:103
+#: ../v2v/v2v.ml:139
msgid "Inspecting the overlay"
msgstr ""
@@ -1198,7 +1198,7 @@ msgstr ""
msgid "Installing packages: %s"
msgstr ""
-#: ../v2v/cmdline.ml:99
+#: ../v2v/cmdline.ml:115
msgid "Just write the metadata"
msgstr ""
@@ -1206,7 +1206,7 @@ msgstr ""
msgid "Key: %s\n"
msgstr ""
-#: ../v2v/cmdline.ml:102 ../v2v/cmdline.ml:94
+#: ../v2v/cmdline.ml:118 ../v2v/cmdline.ml:109
msgid "Libvirt URI"
msgstr ""
@@ -1221,7 +1221,7 @@ msgstr ""
#. ../resize/resize.ml:193
#. ../customize/customize_main.ml:89
#. ../builder/cmdline.ml:139
-#: ../v2v/cmdline.ml:97 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
+#: ../v2v/cmdline.ml:112 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
msgid "List long options"
msgstr ""
@@ -1230,7 +1230,7 @@ msgid "List supported operations"
msgstr ""
#. ../builder/cmdline.ml:140
-#: ../v2v/cmdline.ml:98 ../sparsify/cmdline.ml:79 ../resize/resize.ml:198
+#: ../v2v/cmdline.ml:113 ../sparsify/cmdline.ml:79 ../resize/resize.ml:198
msgid "Make output machine readable"
msgstr ""
@@ -1238,6 +1238,14 @@ msgstr ""
msgid "Making directory: %s"
msgstr ""
+#: ../v2v/cmdline.ml:106
+msgid "Map bridge 'in' to 'out'"
+msgstr ""
+
+#: ../v2v/cmdline.ml:114
+msgid "Map network 'in' to 'out'"
+msgstr ""
+
#: ../builder/list_entries.ml:77
msgid "Minimum/default size:"
msgstr ""
@@ -1295,11 +1303,15 @@ msgstr ""
msgid "Opening the new disk"
msgstr ""
-#: ../v2v/v2v.ml:80
+#: ../v2v/v2v.ml:116
msgid "Opening the overlay"
msgstr ""
-#: ../v2v/cmdline.ml:113
+#: ../v2v/v2v.ml:42
+msgid "Opening the source %s"
+msgstr ""
+
+#: ../v2v/cmdline.ml:130
msgid "Output VM UUID"
msgstr ""
@@ -1315,7 +1327,7 @@ msgstr ""
msgid "Output format (default: raw)"
msgstr ""
-#: ../v2v/cmdline.ml:109
+#: ../v2v/cmdline.ml:126
msgid "Output image UUID"
msgstr ""
@@ -1323,7 +1335,7 @@ msgstr ""
msgid "Output size"
msgstr ""
-#: ../v2v/cmdline.ml:111
+#: ../v2v/cmdline.ml:128
msgid "Output vol UUID(s)"
msgstr ""
@@ -1354,11 +1366,15 @@ msgstr ""
msgid "Print info about template cache"
msgstr ""
-#: ../v2v/cmdline.ml:106 ../sparsify/cmdline.ml:81
+#: ../v2v/cmdline.ml:122
+msgid "Print source and stop"
+msgstr ""
+
+#: ../v2v/cmdline.ml:123 ../sparsify/cmdline.ml:81
msgid "Quiet output"
msgstr ""
-#: ../v2v/target_RHEV.ml:544 ../v2v/target_RHEV.ml:141
+#: ../v2v/output_RHEV.ml:475 ../v2v/output_RHEV.ml:293
msgid "RHEV does not support the output format '%s', only raw or qcow2"
msgstr ""
@@ -1551,7 +1567,7 @@ msgstr ""
msgid "Remove user at-jobs and cron-jobs"
msgstr ""
-#: ../v2v/cmdline.ml:104
+#: ../v2v/cmdline.ml:120
msgid "Rename guest when converting"
msgstr ""
@@ -1655,7 +1671,7 @@ msgstr ""
msgid "Set format (default: auto)"
msgstr ""
-#: ../v2v/cmdline.ml:93
+#: ../v2v/cmdline.ml:108
msgid "Set input mode (default: libvirt)"
msgstr ""
@@ -1685,7 +1701,7 @@ msgstr ""
msgid "Set number of vCPUs"
msgstr ""
-#: ../v2v/cmdline.ml:101
+#: ../v2v/cmdline.ml:117
msgid "Set output allocation mode"
msgstr ""
@@ -1697,15 +1713,15 @@ msgstr ""
msgid "Set output filename"
msgstr ""
-#: ../v2v/cmdline.ml:103
+#: ../v2v/cmdline.ml:119
msgid "Set output format"
msgstr ""
-#: ../v2v/cmdline.ml:100
+#: ../v2v/cmdline.ml:116
msgid "Set output mode (default: libvirt)"
msgstr ""
-#: ../v2v/cmdline.ml:105
+#: ../v2v/cmdline.ml:121
msgid "Set output storage location"
msgstr ""
@@ -1753,7 +1769,7 @@ msgstr ""
msgid "Set user password"
msgstr ""
-#: ../v2v/cmdline.ml:119
+#: ../v2v/cmdline.ml:136
msgid "Set vmtype (for RHEV)"
msgstr ""
@@ -1797,6 +1813,10 @@ msgstr ""
msgid "Source URI: %s\n"
msgstr ""
+#: ../v2v/v2v.ml:47
+msgid "Source guest information (--print-source option):\n"
+msgstr ""
+
#: ../sparsify/in_place.ml:153
msgid "Sparsify in-place operation completed with no errors.\n"
msgstr ""
@@ -1855,7 +1875,7 @@ msgid ""
" IT IS POSSIBLE THAT SOMEONE IS DOING SOMETHING NASTY!"
msgstr ""
-#: ../v2v/convert_linux.ml:1042
+#: ../v2v/convert_linux.ml:1044
msgid ""
"The display driver was updated to '%s', but X11 does not seem to be "
"installed in the guest. X may not function correctly."
@@ -1919,7 +1939,7 @@ msgid ""
"virtual machine's disk, but it was stored on disk in older distros."
msgstr ""
-#: ../v2v/target_RHEV.ml:378
+#: ../v2v/output_RHEV.ml:692
msgid ""
"This guest required a password for connection to its display, but this is "
"not supported by RHEV. Therefore the converted guest's display will not "
@@ -1949,7 +1969,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:142
+#: ../v2v/v2v.ml:175
msgid "Trimming filesystems to reduce amount of data to copy"
msgstr ""
@@ -2063,7 +2083,7 @@ msgstr ""
msgid "cannot detect input disk format; use the --format parameter"
msgstr ""
-#: ../v2v/source_disk.ml:50
+#: ../v2v/input_disk.ml:60
msgid "cannot detect the input disk format; use the -if parameter"
msgstr ""
@@ -2077,11 +2097,11 @@ msgid ""
"\\Windows\\CurrentVersion\\Uninstall\\%s' does not contain an '%s' key"
msgstr ""
-#: ../v2v/v2v.ml:296
+#: ../v2v/v2v.ml:304
msgid "connection closed"
msgstr ""
-#: ../v2v/target_libvirt.ml:257
+#: ../v2v/output_libvirt.ml:269
msgid ""
"could not define libvirt domain. The libvirt XML is still available in "
"'%s'. Try running 'virsh define %s' yourself instead."
@@ -2093,14 +2113,18 @@ msgid ""
"\\CurrentVersion"
msgstr ""
-#: ../v2v/target_RHEV.ml:208
+#: ../v2v/input_libvirt.ml:289
+msgid "could not parse '-ic %s'. Original error message was: %s"
+msgstr ""
+
+#: ../v2v/output_RHEV.ml:154
msgid ""
"could not read the Export Storage Domain specified by the '-os %s' parameter "
"on the command line. Is it really an OVirt or RHEV-M Export Storage "
"Domain? The original error is: %s"
msgstr ""
-#: ../v2v/target_libvirt.ml:239
+#: ../v2v/output_libvirt.ml:251
msgid "could not refresh libvirt pool %s"
msgstr ""
@@ -2132,14 +2156,14 @@ msgstr ""
msgid "discard/trim is not supported: %s"
msgstr ""
-#: ../v2v/v2v.ml:234
+#: ../v2v/v2v.ml:254
msgid ""
"disk %s (%s) has no defined format, you have to either define the original "
"format in the source metadata, or use the '-of' option to force the output "
"format"
msgstr ""
-#: ../v2v/source_libvirt.ml:106
+#: ../v2v/input_libvirt.ml:99
msgid "display <graphics type='%s'> was ignored"
msgstr ""
@@ -2161,7 +2185,7 @@ msgstr ""
msgid "don't know how to remove packages using %s: packages: %s"
msgstr ""
-#: ../v2v/v2v.ml:280
+#: ../v2v/v2v.ml:288
msgid ""
"dual- or multi-boot operating system detected. Choose the root filesystem\n"
"that contains the main operating system from the list below:\n"
@@ -2175,19 +2199,19 @@ msgstr ""
msgid "error parsing URI '%s'. Look for error messages printed above."
msgstr ""
-#: ../v2v/source_libvirt.ml:63
+#: ../v2v/input_libvirt.ml:56
msgid "expecting XML expression to return an integer (expression: %s)"
msgstr ""
-#: ../v2v/cmdline.ml:194
+#: ../v2v/cmdline.ml:213
msgid "expecting a disk image (filename) on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:214
+#: ../v2v/cmdline.ml:233
msgid "expecting a libvirt XML file name on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:205
+#: ../v2v/cmdline.ml:224
msgid "expecting a libvirt guest name on the command line"
msgstr ""
@@ -2248,23 +2272,23 @@ msgstr ""
msgid "hostname could not be set for this type of guest"
msgstr ""
-#: ../v2v/v2v.ml:318
+#: ../v2v/cmdline.ml:65
+msgid "invalid --bridge or --network parameter"
+msgstr ""
+
+#: ../v2v/v2v.ml:326
msgid ""
"libguestfs thinks this is not an installed operating system (it might be, "
"for example, an installer disk or live CD). If this is wrong, it is "
"probably a bug in libguestfs. root=%s fmt=%s"
msgstr ""
-#: ../v2v/source_libvirt.ml:39
-msgid "libvirt returned a non-absolute path in the XML (%s)"
-msgstr ""
-
#. ../resize/resize.ml:194
#: ../resize/resize.ml:197 ../resize/resize.ml:196 ../resize/resize.ml:195
msgid "lv"
msgstr ""
-#: ../v2v/target_RHEV.ml:185
+#: ../v2v/output_RHEV.ml:131
msgid ""
"mount command failed, see earlier errors.\n"
"\n"
@@ -2272,7 +2296,7 @@ msgid ""
"[-os %s], or else you need to rerun virt-v2v as root."
msgstr ""
-#: ../v2v/v2v.ml:303
+#: ../v2v/v2v.ml:311
msgid ""
"multi-boot operating systems are not supported by virt-v2v. Use the --root "
"option to change how virt-v2v handles this."
@@ -2284,7 +2308,7 @@ msgid ""
"be a bug in virt-v2v."
msgstr ""
-#: ../v2v/source_libvirt.ml:170
+#: ../v2v/input_libvirt.ml:167
msgid "network <disk> with <source protocol='%s'> was ignored"
msgstr ""
@@ -2319,10 +2343,16 @@ msgid ""
"of this guest."
msgstr ""
-#: ../v2v/v2v.ml:273
+#: ../v2v/v2v.ml:281
msgid "no root device found in this operating system image."
msgstr ""
+#: ../v2v/input_libvirt.ml:304
+msgid ""
+"no support for remote libvirt connections to '-ic %s'. The conversion may "
+"fail when it tries to read the source disks."
+msgstr ""
+
#: ../resize/resize.ml:129
msgid "ntfsresize"
msgstr ""
@@ -2383,7 +2413,7 @@ msgstr ""
msgid "pwrite: short write restoring swap partition header"
msgstr ""
-#: ../v2v/v2v.ml:191 ../v2v/v2v.ml:75
+#: ../v2v/v2v.ml:224 ../v2v/v2v.ml:111
msgid "qemu-img command failed, see earlier errors"
msgstr ""
@@ -2395,7 +2425,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:311
+#: ../v2v/v2v.ml:319
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2411,14 +2441,14 @@ msgstr ""
msgid "sectors"
msgstr ""
-#: ../v2v/target_RHEV.ml:228
+#: ../v2v/output_RHEV.ml:174
msgid ""
"the Export Storage Domain (%s) has not been attached to any Data Center.\n"
"\n"
"You have to do this through the RHEV-M / OVirt user interface first."
msgstr ""
-#: ../v2v/target_RHEV.ml:233
+#: ../v2v/output_RHEV.ml:179
msgid ""
"the Export Storage Domain (%s) is not writable.\n"
"\n"
@@ -2427,7 +2457,7 @@ msgid ""
"Original error was: %s"
msgstr ""
-#: ../v2v/target_RHEV.ml:275
+#: ../v2v/output_RHEV.ml:223
msgid ""
"the number of '--rhev-vol-uuid' parameters passed on the command line has to "
"match the number of guest disk images (for this guest: %d)"
@@ -2437,7 +2467,7 @@ msgstr ""
msgid "the source disk has no partitions"
msgstr ""
-#: ../v2v/target_RHEV.ml:133
+#: ../v2v/output_RHEV.ml:285
msgid ""
"the virtual size of the input disk %s is not an exact multiple of 512 "
"bytes. The virtual size is: %Ld.\n"
@@ -2446,13 +2476,13 @@ msgid ""
"about this issue."
msgstr ""
-#: ../v2v/target_RHEV.ml:222
+#: ../v2v/output_RHEV.ml:168
msgid ""
"there are multiple UUIDs in the Export Storage Domain (%s). This is "
"unexpected, and may be a bug in virt-v2v or OVirt."
msgstr ""
-#: ../v2v/target_RHEV.ml:220
+#: ../v2v/output_RHEV.ml:166
msgid ""
"there are no UUIDs in the Export Storage Domain (%s). Is it really an OVirt "
"or RHEV-M Export Storage Domain?"
@@ -2482,7 +2512,7 @@ msgid ""
"The guest will be configured to use a slower emulated device."
msgstr ""
-#: ../v2v/source_libvirt.ml:127
+#: ../v2v/input_libvirt.ml:120
msgid "this guest has no non-removable disks"
msgstr ""
@@ -2500,33 +2530,27 @@ msgstr ""
msgid "unknown --align-first option: use never|always|auto"
msgstr ""
-#: ../v2v/cmdline.ml:84
+#: ../v2v/cmdline.ml:98
msgid "unknown --root option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:174
+#: ../v2v/cmdline.ml:193
msgid "unknown --vmtype option, must be \"server\" or \"desktop\""
msgstr ""
-#: ../v2v/cmdline.ml:57
+#: ../v2v/cmdline.ml:58
msgid "unknown -i option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:66
+#: ../v2v/cmdline.ml:80
msgid "unknown -o option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:74
+#: ../v2v/cmdline.ml:88
msgid "unknown -oa option: %s"
msgstr ""
-#: ../v2v/target_RHEV.ml:638
-msgid ""
-"unknown NIC model %s for ethernet device %s. This NIC will be imported as "
-"rtl8139 instead."
-msgstr ""
-
-#: ../v2v/target_RHEV.ml:494
+#: ../v2v/output_RHEV.ml:423
msgid "unknown guest operating system: %s %s %d.%d (%s)"
msgstr ""
@@ -2725,11 +2749,11 @@ msgstr ""
msgid "virt-sysprep: script: killed by signal (%d)\n"
msgstr ""
-#: ../v2v/v2v.ml:132
+#: ../v2v/v2v.ml:165
msgid "virt-v2v is unable to convert this guest type (linux/distro=%s)"
msgstr ""
-#: ../v2v/v2v.ml:138
+#: ../v2v/v2v.ml:171
msgid "virt-v2v is unable to convert this guest type (type=%s)"
msgstr ""
diff --git a/po/nl.po b/po/nl.po
index 79909ab..09155ec 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -11,7 +11,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-08-19 17:51+0100\n"
+"POT-Creation-Date: 2014-08-21 17:07+0100\n"
"PO-Revision-Date: 2014-07-22 18:03+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Dutch (http://www.transifex.com/projects/p/libguestfs/"
@@ -71,7 +71,7 @@ msgstr ""
msgid "%s (ignored)\n"
msgstr ""
-#: ../v2v/convert_linux.ml:1134
+#: ../v2v/convert_linux.ml:1136
msgid ""
"%s references unknown device \"%s\". You may have to fix this entry "
"manually after conversion."
@@ -81,7 +81,7 @@ msgstr ""
msgid "%s: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:147
+#: ../v2v/v2v.ml:180
msgid "%s: %s (ignored)"
msgstr ""
@@ -222,7 +222,7 @@ msgstr ""
msgid "%s: cannot output to a character device or /dev/null\n"
msgstr ""
-#: ../v2v/cmdline.ml:126
+#: ../v2v/cmdline.ml:143
msgid ""
"%s: convert a guest to use KVM\n"
"\n"
@@ -274,7 +274,7 @@ msgstr ""
msgid "%s: error: %s"
msgstr ""
-#: ../v2v/v2v.ml:369 ../sysprep/main.ml:297
+#: ../v2v/v2v.ml:377 ../sysprep/main.ml:297
msgid "%s: error: %s\n"
msgstr ""
@@ -284,13 +284,13 @@ msgstr ""
#. ../resize/resize.ml:1309
#. ../builder/builder.ml:743
-#: ../v2v/v2v.ml:362 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
+#: ../v2v/v2v.ml:370 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
msgid "%s: error: %s: %s\n"
msgstr ""
#. ../resize/resize.ml:1312
#. ../builder/builder.ml:746
-#: ../v2v/v2v.ml:365 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
+#: ../v2v/v2v.ml:373 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
msgid "%s: error: %s: %s: %s\n"
msgstr ""
@@ -311,7 +311,7 @@ msgstr ""
#. ../resize/resize.ml:1331
#. ../customize/customize_main.ml:262
#. ../builder/builder.ml:764
-#: ../v2v/v2v.ml:387 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
+#: ../v2v/v2v.ml:395 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
msgid "%s: exception: %s\n"
msgstr ""
@@ -321,7 +321,7 @@ msgstr ""
#. ../resize/resize.ml:1319
#. ../builder/builder.ml:752
-#: ../v2v/v2v.ml:375 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
+#: ../v2v/v2v.ml:383 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
msgid "%s: failure: %s\n"
msgstr ""
@@ -348,14 +348,14 @@ msgstr ""
#. ../resize/resize.ml:1328
#. ../customize/customize_main.ml:259
#. ../builder/builder.ml:761
-#: ../v2v/v2v.ml:384 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
+#: ../v2v/v2v.ml:392 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
msgid "%s: internal error: Not_found exception was thrown\n"
msgstr ""
#. ../resize/resize.ml:1325
#. ../customize/customize_main.ml:255
#. ../builder/builder.ml:758
-#: ../v2v/v2v.ml:381 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
+#: ../v2v/v2v.ml:389 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
msgid "%s: internal error: assertion failed at %s, line %d, char %d\n"
msgstr ""
@@ -363,7 +363,7 @@ msgstr ""
#. ../customize/customize_main.ml:252
#. ../builder/sources.ml:135
#. ../builder/builder.ml:755
-#: ../v2v/v2v.ml:378 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
+#: ../v2v/v2v.ml:386 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
msgid "%s: internal error: invalid argument: %s\n"
msgstr ""
@@ -381,7 +381,7 @@ msgstr ""
#. ../resize/resize.ml:1316
#. ../builder/builder.ml:749
-#: ../v2v/v2v.ml:372 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
+#: ../v2v/v2v.ml:380 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
msgid "%s: libguestfs error: %s\n"
msgstr ""
@@ -630,7 +630,7 @@ msgstr ""
msgid "--expand option given twice"
msgstr ""
-#: ../v2v/cmdline.ml:226
+#: ../v2v/cmdline.ml:245
msgid "--no-copy and '-o libvirt' cannot be used at the same time"
msgstr ""
@@ -655,40 +655,40 @@ msgstr ""
msgid "--tmp prebuilt:file: %s: file format is not qcow2"
msgstr ""
-#: ../v2v/cmdline.ml:236 ../v2v/cmdline.ml:224
+#: ../v2v/cmdline.ml:255 ../v2v/cmdline.ml:243
msgid "--vmtype option can only be used with '-o rhev'"
msgstr ""
-#: ../v2v/source_disk.ml:34
+#: ../v2v/input_disk.ml:44
msgid "-i disk: invalid input filename (%s)"
msgstr ""
-#: ../v2v/target_libvirt.ml:219
+#: ../v2v/output_libvirt.ml:231
msgid ""
"-o libvirt: output pool '%s' has type='dir' but the /pool/target/path "
"element either does not exist or is not a local directory. See virt-v2v(1) "
"section \"OUTPUT TO LIBVIRT\""
msgstr ""
-#: ../v2v/target_libvirt.ml:216
+#: ../v2v/output_libvirt.ml:228
msgid ""
"-o libvirt: output pool '%s' is not a directory (type='dir'). See virt-"
"v2v(1) section \"OUTPUT TO LIBVIRT\""
msgstr ""
-#: ../v2v/cmdline.ml:231
+#: ../v2v/cmdline.ml:250
msgid "-o local: output directory was not specified, use '-os /dir'"
msgstr ""
-#: ../v2v/cmdline.ml:241
+#: ../v2v/cmdline.ml:260
msgid "-o rhev: output storage was not specified, use '-os'"
msgstr ""
-#: ../v2v/cmdline.ml:233
+#: ../v2v/cmdline.ml:252
msgid "-os %s: output directory does not exist or is not a directory"
msgstr ""
-#: ../v2v/source_libvirt.ml:174
+#: ../v2v/input_libvirt.ml:171
msgid "<disk type='%s'> was ignored"
msgstr ""
@@ -756,7 +756,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:151
+#: ../v2v/v2v.ml:184
msgid "Closing the overlay"
msgstr ""
@@ -768,11 +768,11 @@ msgstr ""
msgid "Converting %s to %s"
msgstr ""
-#: ../v2v/v2v.ml:112
+#: ../v2v/v2v.ml:148
msgid "Converting %s to run on KVM"
msgstr ""
-#: ../v2v/v2v.ml:110
+#: ../v2v/v2v.ml:146
msgid "Converting the guest to run on KVM"
msgstr ""
@@ -792,7 +792,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:170
+#: ../v2v/v2v.ml:203
msgid "Copying disk %d/%d to %s (%s)"
msgstr ""
@@ -816,11 +816,11 @@ msgstr ""
msgid "Create symbolic links"
msgstr ""
-#: ../v2v/v2v.ml:59
+#: ../v2v/v2v.ml:95
msgid "Creating an overlay to protect the source from being modified"
msgstr ""
-#: ../v2v/v2v.ml:196
+#: ../v2v/v2v.ml:229
msgid "Creating output metadata"
msgstr ""
@@ -859,7 +859,7 @@ msgstr ""
msgid "DIR"
msgstr ""
-#: ../v2v/cmdline.ml:92 ../sparsify/cmdline.ml:73 ../resize/resize.ml:186
+#: ../v2v/cmdline.ml:107 ../sparsify/cmdline.ml:73 ../resize/resize.ml:186
msgid "Debug GC and memory allocations"
msgstr ""
@@ -911,7 +911,7 @@ msgstr ""
#. ../customize/customize_main.ml:99
#. ../builder/cmdline.ml:158
#. ../builder/cmdline.ml:157
-#: ../v2v/cmdline.ml:117 ../sysprep/main.ml:155 ../sysprep/main.ml:154
+#: ../v2v/cmdline.ml:134 ../sysprep/main.ml:155 ../sysprep/main.ml:154
msgid "Display version and exit"
msgstr ""
@@ -988,7 +988,7 @@ msgstr ""
#. ../customize/customize_main.ml:97
#. ../builder/cmdline.ml:156
#. ../builder/cmdline.ml:155
-#: ../v2v/cmdline.ml:115 ../sysprep/main.ml:153 ../sysprep/main.ml:152
+#: ../v2v/cmdline.ml:132 ../sysprep/main.ml:153 ../sysprep/main.ml:152
msgid "Enable debugging messages"
msgstr ""
@@ -999,7 +999,7 @@ msgstr ""
#. ../resize/resize.ml:214
#. ../customize/customize_main.ml:101
#. ../builder/cmdline.ml:159
-#: ../v2v/cmdline.ml:120 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
+#: ../v2v/cmdline.ml:137 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
msgid "Enable tracing of libguestfs calls"
msgstr ""
@@ -1007,7 +1007,7 @@ msgstr ""
msgid "Enable/disable specific operations"
msgstr ""
-#: ../v2v/v2v.ml:293
+#: ../v2v/v2v.ml:301
msgid "Enter number between 1 and %d: "
msgstr ""
@@ -1095,7 +1095,7 @@ msgstr ""
msgid "Fingerprint: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:212 ../customize/customize_main.ml:237
+#: ../v2v/v2v.ml:232 ../customize/customize_main.ml:237
#: ../builder/builder.ml:711
msgid "Finishing off"
msgstr ""
@@ -1153,7 +1153,7 @@ msgstr ""
msgid "HOSTNAME"
msgstr ""
-#: ../v2v/cmdline.ml:114
+#: ../v2v/cmdline.ml:131
msgid "How to choose root filesystem"
msgstr ""
@@ -1165,7 +1165,7 @@ msgstr ""
msgid "Ignore partition"
msgstr ""
-#: ../v2v/v2v.ml:97
+#: ../v2v/v2v.ml:133
msgid "Initializing the target %s"
msgstr ""
@@ -1175,11 +1175,11 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/cmdline.ml:96
+#: ../v2v/cmdline.ml:111
msgid "Input format (for -i disk)"
msgstr ""
-#: ../v2v/v2v.ml:103
+#: ../v2v/v2v.ml:139
msgid "Inspecting the overlay"
msgstr ""
@@ -1199,7 +1199,7 @@ msgstr ""
msgid "Installing packages: %s"
msgstr ""
-#: ../v2v/cmdline.ml:99
+#: ../v2v/cmdline.ml:115
msgid "Just write the metadata"
msgstr ""
@@ -1207,7 +1207,7 @@ msgstr ""
msgid "Key: %s\n"
msgstr ""
-#: ../v2v/cmdline.ml:102 ../v2v/cmdline.ml:94
+#: ../v2v/cmdline.ml:118 ../v2v/cmdline.ml:109
msgid "Libvirt URI"
msgstr ""
@@ -1222,7 +1222,7 @@ msgstr ""
#. ../resize/resize.ml:193
#. ../customize/customize_main.ml:89
#. ../builder/cmdline.ml:139
-#: ../v2v/cmdline.ml:97 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
+#: ../v2v/cmdline.ml:112 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
msgid "List long options"
msgstr ""
@@ -1231,7 +1231,7 @@ msgid "List supported operations"
msgstr ""
#. ../builder/cmdline.ml:140
-#: ../v2v/cmdline.ml:98 ../sparsify/cmdline.ml:79 ../resize/resize.ml:198
+#: ../v2v/cmdline.ml:113 ../sparsify/cmdline.ml:79 ../resize/resize.ml:198
msgid "Make output machine readable"
msgstr ""
@@ -1239,6 +1239,14 @@ msgstr ""
msgid "Making directory: %s"
msgstr ""
+#: ../v2v/cmdline.ml:106
+msgid "Map bridge 'in' to 'out'"
+msgstr ""
+
+#: ../v2v/cmdline.ml:114
+msgid "Map network 'in' to 'out'"
+msgstr ""
+
#: ../builder/list_entries.ml:77
msgid "Minimum/default size:"
msgstr ""
@@ -1296,11 +1304,15 @@ msgstr ""
msgid "Opening the new disk"
msgstr ""
-#: ../v2v/v2v.ml:80
+#: ../v2v/v2v.ml:116
msgid "Opening the overlay"
msgstr ""
-#: ../v2v/cmdline.ml:113
+#: ../v2v/v2v.ml:42
+msgid "Opening the source %s"
+msgstr ""
+
+#: ../v2v/cmdline.ml:130
msgid "Output VM UUID"
msgstr ""
@@ -1316,7 +1328,7 @@ msgstr ""
msgid "Output format (default: raw)"
msgstr ""
-#: ../v2v/cmdline.ml:109
+#: ../v2v/cmdline.ml:126
msgid "Output image UUID"
msgstr ""
@@ -1324,7 +1336,7 @@ msgstr ""
msgid "Output size"
msgstr ""
-#: ../v2v/cmdline.ml:111
+#: ../v2v/cmdline.ml:128
msgid "Output vol UUID(s)"
msgstr ""
@@ -1355,11 +1367,15 @@ msgstr ""
msgid "Print info about template cache"
msgstr ""
-#: ../v2v/cmdline.ml:106 ../sparsify/cmdline.ml:81
+#: ../v2v/cmdline.ml:122
+msgid "Print source and stop"
+msgstr ""
+
+#: ../v2v/cmdline.ml:123 ../sparsify/cmdline.ml:81
msgid "Quiet output"
msgstr ""
-#: ../v2v/target_RHEV.ml:544 ../v2v/target_RHEV.ml:141
+#: ../v2v/output_RHEV.ml:475 ../v2v/output_RHEV.ml:293
msgid "RHEV does not support the output format '%s', only raw or qcow2"
msgstr ""
@@ -1552,7 +1568,7 @@ msgstr ""
msgid "Remove user at-jobs and cron-jobs"
msgstr ""
-#: ../v2v/cmdline.ml:104
+#: ../v2v/cmdline.ml:120
msgid "Rename guest when converting"
msgstr ""
@@ -1656,7 +1672,7 @@ msgstr ""
msgid "Set format (default: auto)"
msgstr ""
-#: ../v2v/cmdline.ml:93
+#: ../v2v/cmdline.ml:108
msgid "Set input mode (default: libvirt)"
msgstr ""
@@ -1686,7 +1702,7 @@ msgstr ""
msgid "Set number of vCPUs"
msgstr ""
-#: ../v2v/cmdline.ml:101
+#: ../v2v/cmdline.ml:117
msgid "Set output allocation mode"
msgstr ""
@@ -1698,15 +1714,15 @@ msgstr ""
msgid "Set output filename"
msgstr ""
-#: ../v2v/cmdline.ml:103
+#: ../v2v/cmdline.ml:119
msgid "Set output format"
msgstr ""
-#: ../v2v/cmdline.ml:100
+#: ../v2v/cmdline.ml:116
msgid "Set output mode (default: libvirt)"
msgstr ""
-#: ../v2v/cmdline.ml:105
+#: ../v2v/cmdline.ml:121
msgid "Set output storage location"
msgstr ""
@@ -1754,7 +1770,7 @@ msgstr ""
msgid "Set user password"
msgstr ""
-#: ../v2v/cmdline.ml:119
+#: ../v2v/cmdline.ml:136
msgid "Set vmtype (for RHEV)"
msgstr ""
@@ -1798,6 +1814,10 @@ msgstr ""
msgid "Source URI: %s\n"
msgstr ""
+#: ../v2v/v2v.ml:47
+msgid "Source guest information (--print-source option):\n"
+msgstr ""
+
#: ../sparsify/in_place.ml:153
msgid "Sparsify in-place operation completed with no errors.\n"
msgstr ""
@@ -1856,7 +1876,7 @@ msgid ""
" IT IS POSSIBLE THAT SOMEONE IS DOING SOMETHING NASTY!"
msgstr ""
-#: ../v2v/convert_linux.ml:1042
+#: ../v2v/convert_linux.ml:1044
msgid ""
"The display driver was updated to '%s', but X11 does not seem to be "
"installed in the guest. X may not function correctly."
@@ -1920,7 +1940,7 @@ msgid ""
"virtual machine's disk, but it was stored on disk in older distros."
msgstr ""
-#: ../v2v/target_RHEV.ml:378
+#: ../v2v/output_RHEV.ml:692
msgid ""
"This guest required a password for connection to its display, but this is "
"not supported by RHEV. Therefore the converted guest's display will not "
@@ -1950,7 +1970,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:142
+#: ../v2v/v2v.ml:175
msgid "Trimming filesystems to reduce amount of data to copy"
msgstr ""
@@ -2064,7 +2084,7 @@ msgstr ""
msgid "cannot detect input disk format; use the --format parameter"
msgstr ""
-#: ../v2v/source_disk.ml:50
+#: ../v2v/input_disk.ml:60
msgid "cannot detect the input disk format; use the -if parameter"
msgstr ""
@@ -2078,11 +2098,11 @@ msgid ""
"\\Windows\\CurrentVersion\\Uninstall\\%s' does not contain an '%s' key"
msgstr ""
-#: ../v2v/v2v.ml:296
+#: ../v2v/v2v.ml:304
msgid "connection closed"
msgstr ""
-#: ../v2v/target_libvirt.ml:257
+#: ../v2v/output_libvirt.ml:269
msgid ""
"could not define libvirt domain. The libvirt XML is still available in "
"'%s'. Try running 'virsh define %s' yourself instead."
@@ -2094,14 +2114,18 @@ msgid ""
"\\CurrentVersion"
msgstr ""
-#: ../v2v/target_RHEV.ml:208
+#: ../v2v/input_libvirt.ml:289
+msgid "could not parse '-ic %s'. Original error message was: %s"
+msgstr ""
+
+#: ../v2v/output_RHEV.ml:154
msgid ""
"could not read the Export Storage Domain specified by the '-os %s' parameter "
"on the command line. Is it really an OVirt or RHEV-M Export Storage "
"Domain? The original error is: %s"
msgstr ""
-#: ../v2v/target_libvirt.ml:239
+#: ../v2v/output_libvirt.ml:251
msgid "could not refresh libvirt pool %s"
msgstr ""
@@ -2133,14 +2157,14 @@ msgstr ""
msgid "discard/trim is not supported: %s"
msgstr ""
-#: ../v2v/v2v.ml:234
+#: ../v2v/v2v.ml:254
msgid ""
"disk %s (%s) has no defined format, you have to either define the original "
"format in the source metadata, or use the '-of' option to force the output "
"format"
msgstr ""
-#: ../v2v/source_libvirt.ml:106
+#: ../v2v/input_libvirt.ml:99
msgid "display <graphics type='%s'> was ignored"
msgstr ""
@@ -2162,7 +2186,7 @@ msgstr ""
msgid "don't know how to remove packages using %s: packages: %s"
msgstr ""
-#: ../v2v/v2v.ml:280
+#: ../v2v/v2v.ml:288
msgid ""
"dual- or multi-boot operating system detected. Choose the root filesystem\n"
"that contains the main operating system from the list below:\n"
@@ -2176,19 +2200,19 @@ msgstr ""
msgid "error parsing URI '%s'. Look for error messages printed above."
msgstr ""
-#: ../v2v/source_libvirt.ml:63
+#: ../v2v/input_libvirt.ml:56
msgid "expecting XML expression to return an integer (expression: %s)"
msgstr ""
-#: ../v2v/cmdline.ml:194
+#: ../v2v/cmdline.ml:213
msgid "expecting a disk image (filename) on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:214
+#: ../v2v/cmdline.ml:233
msgid "expecting a libvirt XML file name on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:205
+#: ../v2v/cmdline.ml:224
msgid "expecting a libvirt guest name on the command line"
msgstr ""
@@ -2249,23 +2273,23 @@ msgstr ""
msgid "hostname could not be set for this type of guest"
msgstr ""
-#: ../v2v/v2v.ml:318
+#: ../v2v/cmdline.ml:65
+msgid "invalid --bridge or --network parameter"
+msgstr ""
+
+#: ../v2v/v2v.ml:326
msgid ""
"libguestfs thinks this is not an installed operating system (it might be, "
"for example, an installer disk or live CD). If this is wrong, it is "
"probably a bug in libguestfs. root=%s fmt=%s"
msgstr ""
-#: ../v2v/source_libvirt.ml:39
-msgid "libvirt returned a non-absolute path in the XML (%s)"
-msgstr ""
-
#. ../resize/resize.ml:194
#: ../resize/resize.ml:197 ../resize/resize.ml:196 ../resize/resize.ml:195
msgid "lv"
msgstr ""
-#: ../v2v/target_RHEV.ml:185
+#: ../v2v/output_RHEV.ml:131
msgid ""
"mount command failed, see earlier errors.\n"
"\n"
@@ -2273,7 +2297,7 @@ msgid ""
"[-os %s], or else you need to rerun virt-v2v as root."
msgstr ""
-#: ../v2v/v2v.ml:303
+#: ../v2v/v2v.ml:311
msgid ""
"multi-boot operating systems are not supported by virt-v2v. Use the --root "
"option to change how virt-v2v handles this."
@@ -2285,7 +2309,7 @@ msgid ""
"be a bug in virt-v2v."
msgstr ""
-#: ../v2v/source_libvirt.ml:170
+#: ../v2v/input_libvirt.ml:167
msgid "network <disk> with <source protocol='%s'> was ignored"
msgstr ""
@@ -2320,10 +2344,16 @@ msgid ""
"of this guest."
msgstr ""
-#: ../v2v/v2v.ml:273
+#: ../v2v/v2v.ml:281
msgid "no root device found in this operating system image."
msgstr ""
+#: ../v2v/input_libvirt.ml:304
+msgid ""
+"no support for remote libvirt connections to '-ic %s'. The conversion may "
+"fail when it tries to read the source disks."
+msgstr ""
+
#: ../resize/resize.ml:129
msgid "ntfsresize"
msgstr ""
@@ -2384,7 +2414,7 @@ msgstr ""
msgid "pwrite: short write restoring swap partition header"
msgstr ""
-#: ../v2v/v2v.ml:191 ../v2v/v2v.ml:75
+#: ../v2v/v2v.ml:224 ../v2v/v2v.ml:111
msgid "qemu-img command failed, see earlier errors"
msgstr ""
@@ -2396,7 +2426,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:311
+#: ../v2v/v2v.ml:319
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2412,14 +2442,14 @@ msgstr ""
msgid "sectors"
msgstr ""
-#: ../v2v/target_RHEV.ml:228
+#: ../v2v/output_RHEV.ml:174
msgid ""
"the Export Storage Domain (%s) has not been attached to any Data Center.\n"
"\n"
"You have to do this through the RHEV-M / OVirt user interface first."
msgstr ""
-#: ../v2v/target_RHEV.ml:233
+#: ../v2v/output_RHEV.ml:179
msgid ""
"the Export Storage Domain (%s) is not writable.\n"
"\n"
@@ -2428,7 +2458,7 @@ msgid ""
"Original error was: %s"
msgstr ""
-#: ../v2v/target_RHEV.ml:275
+#: ../v2v/output_RHEV.ml:223
msgid ""
"the number of '--rhev-vol-uuid' parameters passed on the command line has to "
"match the number of guest disk images (for this guest: %d)"
@@ -2438,7 +2468,7 @@ msgstr ""
msgid "the source disk has no partitions"
msgstr ""
-#: ../v2v/target_RHEV.ml:133
+#: ../v2v/output_RHEV.ml:285
msgid ""
"the virtual size of the input disk %s is not an exact multiple of 512 "
"bytes. The virtual size is: %Ld.\n"
@@ -2447,13 +2477,13 @@ msgid ""
"about this issue."
msgstr ""
-#: ../v2v/target_RHEV.ml:222
+#: ../v2v/output_RHEV.ml:168
msgid ""
"there are multiple UUIDs in the Export Storage Domain (%s). This is "
"unexpected, and may be a bug in virt-v2v or OVirt."
msgstr ""
-#: ../v2v/target_RHEV.ml:220
+#: ../v2v/output_RHEV.ml:166
msgid ""
"there are no UUIDs in the Export Storage Domain (%s). Is it really an OVirt "
"or RHEV-M Export Storage Domain?"
@@ -2483,7 +2513,7 @@ msgid ""
"The guest will be configured to use a slower emulated device."
msgstr ""
-#: ../v2v/source_libvirt.ml:127
+#: ../v2v/input_libvirt.ml:120
msgid "this guest has no non-removable disks"
msgstr ""
@@ -2501,33 +2531,27 @@ msgstr ""
msgid "unknown --align-first option: use never|always|auto"
msgstr ""
-#: ../v2v/cmdline.ml:84
+#: ../v2v/cmdline.ml:98
msgid "unknown --root option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:174
+#: ../v2v/cmdline.ml:193
msgid "unknown --vmtype option, must be \"server\" or \"desktop\""
msgstr ""
-#: ../v2v/cmdline.ml:57
+#: ../v2v/cmdline.ml:58
msgid "unknown -i option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:66
+#: ../v2v/cmdline.ml:80
msgid "unknown -o option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:74
+#: ../v2v/cmdline.ml:88
msgid "unknown -oa option: %s"
msgstr ""
-#: ../v2v/target_RHEV.ml:638
-msgid ""
-"unknown NIC model %s for ethernet device %s. This NIC will be imported as "
-"rtl8139 instead."
-msgstr ""
-
-#: ../v2v/target_RHEV.ml:494
+#: ../v2v/output_RHEV.ml:423
msgid "unknown guest operating system: %s %s %d.%d (%s)"
msgstr ""
@@ -2726,11 +2750,11 @@ msgstr ""
msgid "virt-sysprep: script: killed by signal (%d)\n"
msgstr ""
-#: ../v2v/v2v.ml:132
+#: ../v2v/v2v.ml:165
msgid "virt-v2v is unable to convert this guest type (linux/distro=%s)"
msgstr ""
-#: ../v2v/v2v.ml:138
+#: ../v2v/v2v.ml:171
msgid "virt-v2v is unable to convert this guest type (type=%s)"
msgstr ""
diff --git a/po/or.po b/po/or.po
index aae7427..6499946 100644
--- a/po/or.po
+++ b/po/or.po
@@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-08-19 17:51+0100\n"
+"POT-Creation-Date: 2014-08-21 17:07+0100\n"
"PO-Revision-Date: 2014-07-22 18:03+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Oriya (http://www.transifex.com/projects/p/libguestfs/"
@@ -69,7 +69,7 @@ msgstr ""
msgid "%s (ignored)\n"
msgstr ""
-#: ../v2v/convert_linux.ml:1134
+#: ../v2v/convert_linux.ml:1136
msgid ""
"%s references unknown device \"%s\". You may have to fix this entry "
"manually after conversion."
@@ -79,7 +79,7 @@ msgstr ""
msgid "%s: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:147
+#: ../v2v/v2v.ml:180
msgid "%s: %s (ignored)"
msgstr ""
@@ -220,7 +220,7 @@ msgstr ""
msgid "%s: cannot output to a character device or /dev/null\n"
msgstr ""
-#: ../v2v/cmdline.ml:126
+#: ../v2v/cmdline.ml:143
msgid ""
"%s: convert a guest to use KVM\n"
"\n"
@@ -272,7 +272,7 @@ msgstr ""
msgid "%s: error: %s"
msgstr ""
-#: ../v2v/v2v.ml:369 ../sysprep/main.ml:297
+#: ../v2v/v2v.ml:377 ../sysprep/main.ml:297
msgid "%s: error: %s\n"
msgstr ""
@@ -282,13 +282,13 @@ msgstr ""
#. ../resize/resize.ml:1309
#. ../builder/builder.ml:743
-#: ../v2v/v2v.ml:362 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
+#: ../v2v/v2v.ml:370 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
msgid "%s: error: %s: %s\n"
msgstr ""
#. ../resize/resize.ml:1312
#. ../builder/builder.ml:746
-#: ../v2v/v2v.ml:365 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
+#: ../v2v/v2v.ml:373 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
msgid "%s: error: %s: %s: %s\n"
msgstr ""
@@ -309,7 +309,7 @@ msgstr ""
#. ../resize/resize.ml:1331
#. ../customize/customize_main.ml:262
#. ../builder/builder.ml:764
-#: ../v2v/v2v.ml:387 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
+#: ../v2v/v2v.ml:395 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
msgid "%s: exception: %s\n"
msgstr ""
@@ -319,7 +319,7 @@ msgstr ""
#. ../resize/resize.ml:1319
#. ../builder/builder.ml:752
-#: ../v2v/v2v.ml:375 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
+#: ../v2v/v2v.ml:383 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
msgid "%s: failure: %s\n"
msgstr ""
@@ -346,14 +346,14 @@ msgstr ""
#. ../resize/resize.ml:1328
#. ../customize/customize_main.ml:259
#. ../builder/builder.ml:761
-#: ../v2v/v2v.ml:384 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
+#: ../v2v/v2v.ml:392 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
msgid "%s: internal error: Not_found exception was thrown\n"
msgstr ""
#. ../resize/resize.ml:1325
#. ../customize/customize_main.ml:255
#. ../builder/builder.ml:758
-#: ../v2v/v2v.ml:381 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
+#: ../v2v/v2v.ml:389 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
msgid "%s: internal error: assertion failed at %s, line %d, char %d\n"
msgstr ""
@@ -361,7 +361,7 @@ msgstr ""
#. ../customize/customize_main.ml:252
#. ../builder/sources.ml:135
#. ../builder/builder.ml:755
-#: ../v2v/v2v.ml:378 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
+#: ../v2v/v2v.ml:386 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
msgid "%s: internal error: invalid argument: %s\n"
msgstr ""
@@ -379,7 +379,7 @@ msgstr ""
#. ../resize/resize.ml:1316
#. ../builder/builder.ml:749
-#: ../v2v/v2v.ml:372 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
+#: ../v2v/v2v.ml:380 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
msgid "%s: libguestfs error: %s\n"
msgstr ""
@@ -628,7 +628,7 @@ msgstr ""
msgid "--expand option given twice"
msgstr ""
-#: ../v2v/cmdline.ml:226
+#: ../v2v/cmdline.ml:245
msgid "--no-copy and '-o libvirt' cannot be used at the same time"
msgstr ""
@@ -653,40 +653,40 @@ msgstr ""
msgid "--tmp prebuilt:file: %s: file format is not qcow2"
msgstr ""
-#: ../v2v/cmdline.ml:236 ../v2v/cmdline.ml:224
+#: ../v2v/cmdline.ml:255 ../v2v/cmdline.ml:243
msgid "--vmtype option can only be used with '-o rhev'"
msgstr ""
-#: ../v2v/source_disk.ml:34
+#: ../v2v/input_disk.ml:44
msgid "-i disk: invalid input filename (%s)"
msgstr ""
-#: ../v2v/target_libvirt.ml:219
+#: ../v2v/output_libvirt.ml:231
msgid ""
"-o libvirt: output pool '%s' has type='dir' but the /pool/target/path "
"element either does not exist or is not a local directory. See virt-v2v(1) "
"section \"OUTPUT TO LIBVIRT\""
msgstr ""
-#: ../v2v/target_libvirt.ml:216
+#: ../v2v/output_libvirt.ml:228
msgid ""
"-o libvirt: output pool '%s' is not a directory (type='dir'). See virt-"
"v2v(1) section \"OUTPUT TO LIBVIRT\""
msgstr ""
-#: ../v2v/cmdline.ml:231
+#: ../v2v/cmdline.ml:250
msgid "-o local: output directory was not specified, use '-os /dir'"
msgstr ""
-#: ../v2v/cmdline.ml:241
+#: ../v2v/cmdline.ml:260
msgid "-o rhev: output storage was not specified, use '-os'"
msgstr ""
-#: ../v2v/cmdline.ml:233
+#: ../v2v/cmdline.ml:252
msgid "-os %s: output directory does not exist or is not a directory"
msgstr ""
-#: ../v2v/source_libvirt.ml:174
+#: ../v2v/input_libvirt.ml:171
msgid "<disk type='%s'> was ignored"
msgstr ""
@@ -754,7 +754,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:151
+#: ../v2v/v2v.ml:184
msgid "Closing the overlay"
msgstr ""
@@ -766,11 +766,11 @@ msgstr ""
msgid "Converting %s to %s"
msgstr ""
-#: ../v2v/v2v.ml:112
+#: ../v2v/v2v.ml:148
msgid "Converting %s to run on KVM"
msgstr ""
-#: ../v2v/v2v.ml:110
+#: ../v2v/v2v.ml:146
msgid "Converting the guest to run on KVM"
msgstr ""
@@ -790,7 +790,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:170
+#: ../v2v/v2v.ml:203
msgid "Copying disk %d/%d to %s (%s)"
msgstr ""
@@ -814,11 +814,11 @@ msgstr ""
msgid "Create symbolic links"
msgstr ""
-#: ../v2v/v2v.ml:59
+#: ../v2v/v2v.ml:95
msgid "Creating an overlay to protect the source from being modified"
msgstr ""
-#: ../v2v/v2v.ml:196
+#: ../v2v/v2v.ml:229
msgid "Creating output metadata"
msgstr ""
@@ -857,7 +857,7 @@ msgstr ""
msgid "DIR"
msgstr ""
-#: ../v2v/cmdline.ml:92 ../sparsify/cmdline.ml:73 ../resize/resize.ml:186
+#: ../v2v/cmdline.ml:107 ../sparsify/cmdline.ml:73 ../resize/resize.ml:186
msgid "Debug GC and memory allocations"
msgstr ""
@@ -909,7 +909,7 @@ msgstr ""
#. ../customize/customize_main.ml:99
#. ../builder/cmdline.ml:158
#. ../builder/cmdline.ml:157
-#: ../v2v/cmdline.ml:117 ../sysprep/main.ml:155 ../sysprep/main.ml:154
+#: ../v2v/cmdline.ml:134 ../sysprep/main.ml:155 ../sysprep/main.ml:154
msgid "Display version and exit"
msgstr ""
@@ -986,7 +986,7 @@ msgstr ""
#. ../customize/customize_main.ml:97
#. ../builder/cmdline.ml:156
#. ../builder/cmdline.ml:155
-#: ../v2v/cmdline.ml:115 ../sysprep/main.ml:153 ../sysprep/main.ml:152
+#: ../v2v/cmdline.ml:132 ../sysprep/main.ml:153 ../sysprep/main.ml:152
msgid "Enable debugging messages"
msgstr ""
@@ -997,7 +997,7 @@ msgstr ""
#. ../resize/resize.ml:214
#. ../customize/customize_main.ml:101
#. ../builder/cmdline.ml:159
-#: ../v2v/cmdline.ml:120 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
+#: ../v2v/cmdline.ml:137 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
msgid "Enable tracing of libguestfs calls"
msgstr ""
@@ -1005,7 +1005,7 @@ msgstr ""
msgid "Enable/disable specific operations"
msgstr ""
-#: ../v2v/v2v.ml:293
+#: ../v2v/v2v.ml:301
msgid "Enter number between 1 and %d: "
msgstr ""
@@ -1093,7 +1093,7 @@ msgstr ""
msgid "Fingerprint: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:212 ../customize/customize_main.ml:237
+#: ../v2v/v2v.ml:232 ../customize/customize_main.ml:237
#: ../builder/builder.ml:711
msgid "Finishing off"
msgstr ""
@@ -1151,7 +1151,7 @@ msgstr ""
msgid "HOSTNAME"
msgstr ""
-#: ../v2v/cmdline.ml:114
+#: ../v2v/cmdline.ml:131
msgid "How to choose root filesystem"
msgstr ""
@@ -1163,7 +1163,7 @@ msgstr ""
msgid "Ignore partition"
msgstr ""
-#: ../v2v/v2v.ml:97
+#: ../v2v/v2v.ml:133
msgid "Initializing the target %s"
msgstr ""
@@ -1173,11 +1173,11 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/cmdline.ml:96
+#: ../v2v/cmdline.ml:111
msgid "Input format (for -i disk)"
msgstr ""
-#: ../v2v/v2v.ml:103
+#: ../v2v/v2v.ml:139
msgid "Inspecting the overlay"
msgstr ""
@@ -1197,7 +1197,7 @@ msgstr ""
msgid "Installing packages: %s"
msgstr ""
-#: ../v2v/cmdline.ml:99
+#: ../v2v/cmdline.ml:115
msgid "Just write the metadata"
msgstr ""
@@ -1205,7 +1205,7 @@ msgstr ""
msgid "Key: %s\n"
msgstr ""
-#: ../v2v/cmdline.ml:102 ../v2v/cmdline.ml:94
+#: ../v2v/cmdline.ml:118 ../v2v/cmdline.ml:109
msgid "Libvirt URI"
msgstr ""
@@ -1220,7 +1220,7 @@ msgstr ""
#. ../resize/resize.ml:193
#. ../customize/customize_main.ml:89
#. ../builder/cmdline.ml:139
-#: ../v2v/cmdline.ml:97 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
+#: ../v2v/cmdline.ml:112 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
msgid "List long options"
msgstr ""
@@ -1229,7 +1229,7 @@ msgid "List supported operations"
msgstr ""
#. ../builder/cmdline.ml:140
-#: ../v2v/cmdline.ml:98 ../sparsify/cmdline.ml:79 ../resize/resize.ml:198
+#: ../v2v/cmdline.ml:113 ../sparsify/cmdline.ml:79 ../resize/resize.ml:198
msgid "Make output machine readable"
msgstr ""
@@ -1237,6 +1237,14 @@ msgstr ""
msgid "Making directory: %s"
msgstr ""
+#: ../v2v/cmdline.ml:106
+msgid "Map bridge 'in' to 'out'"
+msgstr ""
+
+#: ../v2v/cmdline.ml:114
+msgid "Map network 'in' to 'out'"
+msgstr ""
+
#: ../builder/list_entries.ml:77
msgid "Minimum/default size:"
msgstr ""
@@ -1294,11 +1302,15 @@ msgstr ""
msgid "Opening the new disk"
msgstr ""
-#: ../v2v/v2v.ml:80
+#: ../v2v/v2v.ml:116
msgid "Opening the overlay"
msgstr ""
-#: ../v2v/cmdline.ml:113
+#: ../v2v/v2v.ml:42
+msgid "Opening the source %s"
+msgstr ""
+
+#: ../v2v/cmdline.ml:130
msgid "Output VM UUID"
msgstr ""
@@ -1314,7 +1326,7 @@ msgstr ""
msgid "Output format (default: raw)"
msgstr ""
-#: ../v2v/cmdline.ml:109
+#: ../v2v/cmdline.ml:126
msgid "Output image UUID"
msgstr ""
@@ -1322,7 +1334,7 @@ msgstr ""
msgid "Output size"
msgstr ""
-#: ../v2v/cmdline.ml:111
+#: ../v2v/cmdline.ml:128
msgid "Output vol UUID(s)"
msgstr ""
@@ -1353,11 +1365,15 @@ msgstr ""
msgid "Print info about template cache"
msgstr ""
-#: ../v2v/cmdline.ml:106 ../sparsify/cmdline.ml:81
+#: ../v2v/cmdline.ml:122
+msgid "Print source and stop"
+msgstr ""
+
+#: ../v2v/cmdline.ml:123 ../sparsify/cmdline.ml:81
msgid "Quiet output"
msgstr ""
-#: ../v2v/target_RHEV.ml:544 ../v2v/target_RHEV.ml:141
+#: ../v2v/output_RHEV.ml:475 ../v2v/output_RHEV.ml:293
msgid "RHEV does not support the output format '%s', only raw or qcow2"
msgstr ""
@@ -1550,7 +1566,7 @@ msgstr ""
msgid "Remove user at-jobs and cron-jobs"
msgstr ""
-#: ../v2v/cmdline.ml:104
+#: ../v2v/cmdline.ml:120
msgid "Rename guest when converting"
msgstr ""
@@ -1654,7 +1670,7 @@ msgstr ""
msgid "Set format (default: auto)"
msgstr ""
-#: ../v2v/cmdline.ml:93
+#: ../v2v/cmdline.ml:108
msgid "Set input mode (default: libvirt)"
msgstr ""
@@ -1684,7 +1700,7 @@ msgstr ""
msgid "Set number of vCPUs"
msgstr ""
-#: ../v2v/cmdline.ml:101
+#: ../v2v/cmdline.ml:117
msgid "Set output allocation mode"
msgstr ""
@@ -1696,15 +1712,15 @@ msgstr ""
msgid "Set output filename"
msgstr ""
-#: ../v2v/cmdline.ml:103
+#: ../v2v/cmdline.ml:119
msgid "Set output format"
msgstr ""
-#: ../v2v/cmdline.ml:100
+#: ../v2v/cmdline.ml:116
msgid "Set output mode (default: libvirt)"
msgstr ""
-#: ../v2v/cmdline.ml:105
+#: ../v2v/cmdline.ml:121
msgid "Set output storage location"
msgstr ""
@@ -1752,7 +1768,7 @@ msgstr ""
msgid "Set user password"
msgstr ""
-#: ../v2v/cmdline.ml:119
+#: ../v2v/cmdline.ml:136
msgid "Set vmtype (for RHEV)"
msgstr ""
@@ -1796,6 +1812,10 @@ msgstr ""
msgid "Source URI: %s\n"
msgstr ""
+#: ../v2v/v2v.ml:47
+msgid "Source guest information (--print-source option):\n"
+msgstr ""
+
#: ../sparsify/in_place.ml:153
msgid "Sparsify in-place operation completed with no errors.\n"
msgstr ""
@@ -1854,7 +1874,7 @@ msgid ""
" IT IS POSSIBLE THAT SOMEONE IS DOING SOMETHING NASTY!"
msgstr ""
-#: ../v2v/convert_linux.ml:1042
+#: ../v2v/convert_linux.ml:1044
msgid ""
"The display driver was updated to '%s', but X11 does not seem to be "
"installed in the guest. X may not function correctly."
@@ -1918,7 +1938,7 @@ msgid ""
"virtual machine's disk, but it was stored on disk in older distros."
msgstr ""
-#: ../v2v/target_RHEV.ml:378
+#: ../v2v/output_RHEV.ml:692
msgid ""
"This guest required a password for connection to its display, but this is "
"not supported by RHEV. Therefore the converted guest's display will not "
@@ -1948,7 +1968,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:142
+#: ../v2v/v2v.ml:175
msgid "Trimming filesystems to reduce amount of data to copy"
msgstr ""
@@ -2062,7 +2082,7 @@ msgstr ""
msgid "cannot detect input disk format; use the --format parameter"
msgstr ""
-#: ../v2v/source_disk.ml:50
+#: ../v2v/input_disk.ml:60
msgid "cannot detect the input disk format; use the -if parameter"
msgstr ""
@@ -2076,11 +2096,11 @@ msgid ""
"\\Windows\\CurrentVersion\\Uninstall\\%s' does not contain an '%s' key"
msgstr ""
-#: ../v2v/v2v.ml:296
+#: ../v2v/v2v.ml:304
msgid "connection closed"
msgstr ""
-#: ../v2v/target_libvirt.ml:257
+#: ../v2v/output_libvirt.ml:269
msgid ""
"could not define libvirt domain. The libvirt XML is still available in "
"'%s'. Try running 'virsh define %s' yourself instead."
@@ -2092,14 +2112,18 @@ msgid ""
"\\CurrentVersion"
msgstr ""
-#: ../v2v/target_RHEV.ml:208
+#: ../v2v/input_libvirt.ml:289
+msgid "could not parse '-ic %s'. Original error message was: %s"
+msgstr ""
+
+#: ../v2v/output_RHEV.ml:154
msgid ""
"could not read the Export Storage Domain specified by the '-os %s' parameter "
"on the command line. Is it really an OVirt or RHEV-M Export Storage "
"Domain? The original error is: %s"
msgstr ""
-#: ../v2v/target_libvirt.ml:239
+#: ../v2v/output_libvirt.ml:251
msgid "could not refresh libvirt pool %s"
msgstr ""
@@ -2131,14 +2155,14 @@ msgstr ""
msgid "discard/trim is not supported: %s"
msgstr ""
-#: ../v2v/v2v.ml:234
+#: ../v2v/v2v.ml:254
msgid ""
"disk %s (%s) has no defined format, you have to either define the original "
"format in the source metadata, or use the '-of' option to force the output "
"format"
msgstr ""
-#: ../v2v/source_libvirt.ml:106
+#: ../v2v/input_libvirt.ml:99
msgid "display <graphics type='%s'> was ignored"
msgstr ""
@@ -2160,7 +2184,7 @@ msgstr ""
msgid "don't know how to remove packages using %s: packages: %s"
msgstr ""
-#: ../v2v/v2v.ml:280
+#: ../v2v/v2v.ml:288
msgid ""
"dual- or multi-boot operating system detected. Choose the root filesystem\n"
"that contains the main operating system from the list below:\n"
@@ -2174,19 +2198,19 @@ msgstr ""
msgid "error parsing URI '%s'. Look for error messages printed above."
msgstr ""
-#: ../v2v/source_libvirt.ml:63
+#: ../v2v/input_libvirt.ml:56
msgid "expecting XML expression to return an integer (expression: %s)"
msgstr ""
-#: ../v2v/cmdline.ml:194
+#: ../v2v/cmdline.ml:213
msgid "expecting a disk image (filename) on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:214
+#: ../v2v/cmdline.ml:233
msgid "expecting a libvirt XML file name on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:205
+#: ../v2v/cmdline.ml:224
msgid "expecting a libvirt guest name on the command line"
msgstr ""
@@ -2247,23 +2271,23 @@ msgstr ""
msgid "hostname could not be set for this type of guest"
msgstr ""
-#: ../v2v/v2v.ml:318
+#: ../v2v/cmdline.ml:65
+msgid "invalid --bridge or --network parameter"
+msgstr ""
+
+#: ../v2v/v2v.ml:326
msgid ""
"libguestfs thinks this is not an installed operating system (it might be, "
"for example, an installer disk or live CD). If this is wrong, it is "
"probably a bug in libguestfs. root=%s fmt=%s"
msgstr ""
-#: ../v2v/source_libvirt.ml:39
-msgid "libvirt returned a non-absolute path in the XML (%s)"
-msgstr ""
-
#. ../resize/resize.ml:194
#: ../resize/resize.ml:197 ../resize/resize.ml:196 ../resize/resize.ml:195
msgid "lv"
msgstr ""
-#: ../v2v/target_RHEV.ml:185
+#: ../v2v/output_RHEV.ml:131
msgid ""
"mount command failed, see earlier errors.\n"
"\n"
@@ -2271,7 +2295,7 @@ msgid ""
"[-os %s], or else you need to rerun virt-v2v as root."
msgstr ""
-#: ../v2v/v2v.ml:303
+#: ../v2v/v2v.ml:311
msgid ""
"multi-boot operating systems are not supported by virt-v2v. Use the --root "
"option to change how virt-v2v handles this."
@@ -2283,7 +2307,7 @@ msgid ""
"be a bug in virt-v2v."
msgstr ""
-#: ../v2v/source_libvirt.ml:170
+#: ../v2v/input_libvirt.ml:167
msgid "network <disk> with <source protocol='%s'> was ignored"
msgstr ""
@@ -2318,10 +2342,16 @@ msgid ""
"of this guest."
msgstr ""
-#: ../v2v/v2v.ml:273
+#: ../v2v/v2v.ml:281
msgid "no root device found in this operating system image."
msgstr ""
+#: ../v2v/input_libvirt.ml:304
+msgid ""
+"no support for remote libvirt connections to '-ic %s'. The conversion may "
+"fail when it tries to read the source disks."
+msgstr ""
+
#: ../resize/resize.ml:129
msgid "ntfsresize"
msgstr ""
@@ -2382,7 +2412,7 @@ msgstr ""
msgid "pwrite: short write restoring swap partition header"
msgstr ""
-#: ../v2v/v2v.ml:191 ../v2v/v2v.ml:75
+#: ../v2v/v2v.ml:224 ../v2v/v2v.ml:111
msgid "qemu-img command failed, see earlier errors"
msgstr ""
@@ -2394,7 +2424,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:311
+#: ../v2v/v2v.ml:319
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2410,14 +2440,14 @@ msgstr ""
msgid "sectors"
msgstr ""
-#: ../v2v/target_RHEV.ml:228
+#: ../v2v/output_RHEV.ml:174
msgid ""
"the Export Storage Domain (%s) has not been attached to any Data Center.\n"
"\n"
"You have to do this through the RHEV-M / OVirt user interface first."
msgstr ""
-#: ../v2v/target_RHEV.ml:233
+#: ../v2v/output_RHEV.ml:179
msgid ""
"the Export Storage Domain (%s) is not writable.\n"
"\n"
@@ -2426,7 +2456,7 @@ msgid ""
"Original error was: %s"
msgstr ""
-#: ../v2v/target_RHEV.ml:275
+#: ../v2v/output_RHEV.ml:223
msgid ""
"the number of '--rhev-vol-uuid' parameters passed on the command line has to "
"match the number of guest disk images (for this guest: %d)"
@@ -2436,7 +2466,7 @@ msgstr ""
msgid "the source disk has no partitions"
msgstr ""
-#: ../v2v/target_RHEV.ml:133
+#: ../v2v/output_RHEV.ml:285
msgid ""
"the virtual size of the input disk %s is not an exact multiple of 512 "
"bytes. The virtual size is: %Ld.\n"
@@ -2445,13 +2475,13 @@ msgid ""
"about this issue."
msgstr ""
-#: ../v2v/target_RHEV.ml:222
+#: ../v2v/output_RHEV.ml:168
msgid ""
"there are multiple UUIDs in the Export Storage Domain (%s). This is "
"unexpected, and may be a bug in virt-v2v or OVirt."
msgstr ""
-#: ../v2v/target_RHEV.ml:220
+#: ../v2v/output_RHEV.ml:166
msgid ""
"there are no UUIDs in the Export Storage Domain (%s). Is it really an OVirt "
"or RHEV-M Export Storage Domain?"
@@ -2481,7 +2511,7 @@ msgid ""
"The guest will be configured to use a slower emulated device."
msgstr ""
-#: ../v2v/source_libvirt.ml:127
+#: ../v2v/input_libvirt.ml:120
msgid "this guest has no non-removable disks"
msgstr ""
@@ -2499,33 +2529,27 @@ msgstr ""
msgid "unknown --align-first option: use never|always|auto"
msgstr ""
-#: ../v2v/cmdline.ml:84
+#: ../v2v/cmdline.ml:98
msgid "unknown --root option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:174
+#: ../v2v/cmdline.ml:193
msgid "unknown --vmtype option, must be \"server\" or \"desktop\""
msgstr ""
-#: ../v2v/cmdline.ml:57
+#: ../v2v/cmdline.ml:58
msgid "unknown -i option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:66
+#: ../v2v/cmdline.ml:80
msgid "unknown -o option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:74
+#: ../v2v/cmdline.ml:88
msgid "unknown -oa option: %s"
msgstr ""
-#: ../v2v/target_RHEV.ml:638
-msgid ""
-"unknown NIC model %s for ethernet device %s. This NIC will be imported as "
-"rtl8139 instead."
-msgstr ""
-
-#: ../v2v/target_RHEV.ml:494
+#: ../v2v/output_RHEV.ml:423
msgid "unknown guest operating system: %s %s %d.%d (%s)"
msgstr ""
@@ -2724,11 +2748,11 @@ msgstr ""
msgid "virt-sysprep: script: killed by signal (%d)\n"
msgstr ""
-#: ../v2v/v2v.ml:132
+#: ../v2v/v2v.ml:165
msgid "virt-v2v is unable to convert this guest type (linux/distro=%s)"
msgstr ""
-#: ../v2v/v2v.ml:138
+#: ../v2v/v2v.ml:171
msgid "virt-v2v is unable to convert this guest type (type=%s)"
msgstr ""
diff --git a/po/pa.po b/po/pa.po
index a375a5c..5a27467 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -10,7 +10,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-08-19 17:51+0100\n"
+"POT-Creation-Date: 2014-08-21 17:07+0100\n"
"PO-Revision-Date: 2014-07-22 18:03+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Panjabi (Punjabi) (http://www.transifex.com/projects/p/"
@@ -70,7 +70,7 @@ msgstr ""
msgid "%s (ignored)\n"
msgstr ""
-#: ../v2v/convert_linux.ml:1134
+#: ../v2v/convert_linux.ml:1136
msgid ""
"%s references unknown device \"%s\". You may have to fix this entry "
"manually after conversion."
@@ -80,7 +80,7 @@ msgstr ""
msgid "%s: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:147
+#: ../v2v/v2v.ml:180
msgid "%s: %s (ignored)"
msgstr ""
@@ -221,7 +221,7 @@ msgstr ""
msgid "%s: cannot output to a character device or /dev/null\n"
msgstr ""
-#: ../v2v/cmdline.ml:126
+#: ../v2v/cmdline.ml:143
msgid ""
"%s: convert a guest to use KVM\n"
"\n"
@@ -273,7 +273,7 @@ msgstr ""
msgid "%s: error: %s"
msgstr ""
-#: ../v2v/v2v.ml:369 ../sysprep/main.ml:297
+#: ../v2v/v2v.ml:377 ../sysprep/main.ml:297
msgid "%s: error: %s\n"
msgstr ""
@@ -283,13 +283,13 @@ msgstr ""
#. ../resize/resize.ml:1309
#. ../builder/builder.ml:743
-#: ../v2v/v2v.ml:362 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
+#: ../v2v/v2v.ml:370 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
msgid "%s: error: %s: %s\n"
msgstr ""
#. ../resize/resize.ml:1312
#. ../builder/builder.ml:746
-#: ../v2v/v2v.ml:365 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
+#: ../v2v/v2v.ml:373 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
msgid "%s: error: %s: %s: %s\n"
msgstr ""
@@ -310,7 +310,7 @@ msgstr ""
#. ../resize/resize.ml:1331
#. ../customize/customize_main.ml:262
#. ../builder/builder.ml:764
-#: ../v2v/v2v.ml:387 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
+#: ../v2v/v2v.ml:395 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
msgid "%s: exception: %s\n"
msgstr ""
@@ -320,7 +320,7 @@ msgstr ""
#. ../resize/resize.ml:1319
#. ../builder/builder.ml:752
-#: ../v2v/v2v.ml:375 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
+#: ../v2v/v2v.ml:383 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
msgid "%s: failure: %s\n"
msgstr ""
@@ -347,14 +347,14 @@ msgstr ""
#. ../resize/resize.ml:1328
#. ../customize/customize_main.ml:259
#. ../builder/builder.ml:761
-#: ../v2v/v2v.ml:384 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
+#: ../v2v/v2v.ml:392 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
msgid "%s: internal error: Not_found exception was thrown\n"
msgstr ""
#. ../resize/resize.ml:1325
#. ../customize/customize_main.ml:255
#. ../builder/builder.ml:758
-#: ../v2v/v2v.ml:381 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
+#: ../v2v/v2v.ml:389 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
msgid "%s: internal error: assertion failed at %s, line %d, char %d\n"
msgstr ""
@@ -362,7 +362,7 @@ msgstr ""
#. ../customize/customize_main.ml:252
#. ../builder/sources.ml:135
#. ../builder/builder.ml:755
-#: ../v2v/v2v.ml:378 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
+#: ../v2v/v2v.ml:386 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
msgid "%s: internal error: invalid argument: %s\n"
msgstr ""
@@ -380,7 +380,7 @@ msgstr ""
#. ../resize/resize.ml:1316
#. ../builder/builder.ml:749
-#: ../v2v/v2v.ml:372 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
+#: ../v2v/v2v.ml:380 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
msgid "%s: libguestfs error: %s\n"
msgstr ""
@@ -629,7 +629,7 @@ msgstr ""
msgid "--expand option given twice"
msgstr ""
-#: ../v2v/cmdline.ml:226
+#: ../v2v/cmdline.ml:245
msgid "--no-copy and '-o libvirt' cannot be used at the same time"
msgstr ""
@@ -654,40 +654,40 @@ msgstr ""
msgid "--tmp prebuilt:file: %s: file format is not qcow2"
msgstr ""
-#: ../v2v/cmdline.ml:236 ../v2v/cmdline.ml:224
+#: ../v2v/cmdline.ml:255 ../v2v/cmdline.ml:243
msgid "--vmtype option can only be used with '-o rhev'"
msgstr ""
-#: ../v2v/source_disk.ml:34
+#: ../v2v/input_disk.ml:44
msgid "-i disk: invalid input filename (%s)"
msgstr ""
-#: ../v2v/target_libvirt.ml:219
+#: ../v2v/output_libvirt.ml:231
msgid ""
"-o libvirt: output pool '%s' has type='dir' but the /pool/target/path "
"element either does not exist or is not a local directory. See virt-v2v(1) "
"section \"OUTPUT TO LIBVIRT\""
msgstr ""
-#: ../v2v/target_libvirt.ml:216
+#: ../v2v/output_libvirt.ml:228
msgid ""
"-o libvirt: output pool '%s' is not a directory (type='dir'). See virt-"
"v2v(1) section \"OUTPUT TO LIBVIRT\""
msgstr ""
-#: ../v2v/cmdline.ml:231
+#: ../v2v/cmdline.ml:250
msgid "-o local: output directory was not specified, use '-os /dir'"
msgstr ""
-#: ../v2v/cmdline.ml:241
+#: ../v2v/cmdline.ml:260
msgid "-o rhev: output storage was not specified, use '-os'"
msgstr ""
-#: ../v2v/cmdline.ml:233
+#: ../v2v/cmdline.ml:252
msgid "-os %s: output directory does not exist or is not a directory"
msgstr ""
-#: ../v2v/source_libvirt.ml:174
+#: ../v2v/input_libvirt.ml:171
msgid "<disk type='%s'> was ignored"
msgstr ""
@@ -755,7 +755,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:151
+#: ../v2v/v2v.ml:184
msgid "Closing the overlay"
msgstr ""
@@ -767,11 +767,11 @@ msgstr ""
msgid "Converting %s to %s"
msgstr ""
-#: ../v2v/v2v.ml:112
+#: ../v2v/v2v.ml:148
msgid "Converting %s to run on KVM"
msgstr ""
-#: ../v2v/v2v.ml:110
+#: ../v2v/v2v.ml:146
msgid "Converting the guest to run on KVM"
msgstr ""
@@ -791,7 +791,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:170
+#: ../v2v/v2v.ml:203
msgid "Copying disk %d/%d to %s (%s)"
msgstr ""
@@ -815,11 +815,11 @@ msgstr ""
msgid "Create symbolic links"
msgstr ""
-#: ../v2v/v2v.ml:59
+#: ../v2v/v2v.ml:95
msgid "Creating an overlay to protect the source from being modified"
msgstr ""
-#: ../v2v/v2v.ml:196
+#: ../v2v/v2v.ml:229
msgid "Creating output metadata"
msgstr ""
@@ -858,7 +858,7 @@ msgstr ""
msgid "DIR"
msgstr ""
-#: ../v2v/cmdline.ml:92 ../sparsify/cmdline.ml:73 ../resize/resize.ml:186
+#: ../v2v/cmdline.ml:107 ../sparsify/cmdline.ml:73 ../resize/resize.ml:186
msgid "Debug GC and memory allocations"
msgstr ""
@@ -910,7 +910,7 @@ msgstr ""
#. ../customize/customize_main.ml:99
#. ../builder/cmdline.ml:158
#. ../builder/cmdline.ml:157
-#: ../v2v/cmdline.ml:117 ../sysprep/main.ml:155 ../sysprep/main.ml:154
+#: ../v2v/cmdline.ml:134 ../sysprep/main.ml:155 ../sysprep/main.ml:154
msgid "Display version and exit"
msgstr ""
@@ -987,7 +987,7 @@ msgstr ""
#. ../customize/customize_main.ml:97
#. ../builder/cmdline.ml:156
#. ../builder/cmdline.ml:155
-#: ../v2v/cmdline.ml:115 ../sysprep/main.ml:153 ../sysprep/main.ml:152
+#: ../v2v/cmdline.ml:132 ../sysprep/main.ml:153 ../sysprep/main.ml:152
msgid "Enable debugging messages"
msgstr ""
@@ -998,7 +998,7 @@ msgstr ""
#. ../resize/resize.ml:214
#. ../customize/customize_main.ml:101
#. ../builder/cmdline.ml:159
-#: ../v2v/cmdline.ml:120 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
+#: ../v2v/cmdline.ml:137 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
msgid "Enable tracing of libguestfs calls"
msgstr ""
@@ -1006,7 +1006,7 @@ msgstr ""
msgid "Enable/disable specific operations"
msgstr ""
-#: ../v2v/v2v.ml:293
+#: ../v2v/v2v.ml:301
msgid "Enter number between 1 and %d: "
msgstr ""
@@ -1094,7 +1094,7 @@ msgstr ""
msgid "Fingerprint: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:212 ../customize/customize_main.ml:237
+#: ../v2v/v2v.ml:232 ../customize/customize_main.ml:237
#: ../builder/builder.ml:711
msgid "Finishing off"
msgstr ""
@@ -1152,7 +1152,7 @@ msgstr ""
msgid "HOSTNAME"
msgstr ""
-#: ../v2v/cmdline.ml:114
+#: ../v2v/cmdline.ml:131
msgid "How to choose root filesystem"
msgstr ""
@@ -1164,7 +1164,7 @@ msgstr ""
msgid "Ignore partition"
msgstr ""
-#: ../v2v/v2v.ml:97
+#: ../v2v/v2v.ml:133
msgid "Initializing the target %s"
msgstr ""
@@ -1174,11 +1174,11 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/cmdline.ml:96
+#: ../v2v/cmdline.ml:111
msgid "Input format (for -i disk)"
msgstr ""
-#: ../v2v/v2v.ml:103
+#: ../v2v/v2v.ml:139
msgid "Inspecting the overlay"
msgstr ""
@@ -1198,7 +1198,7 @@ msgstr ""
msgid "Installing packages: %s"
msgstr ""
-#: ../v2v/cmdline.ml:99
+#: ../v2v/cmdline.ml:115
msgid "Just write the metadata"
msgstr ""
@@ -1206,7 +1206,7 @@ msgstr ""
msgid "Key: %s\n"
msgstr ""
-#: ../v2v/cmdline.ml:102 ../v2v/cmdline.ml:94
+#: ../v2v/cmdline.ml:118 ../v2v/cmdline.ml:109
msgid "Libvirt URI"
msgstr ""
@@ -1221,7 +1221,7 @@ msgstr ""
#. ../resize/resize.ml:193
#. ../customize/customize_main.ml:89
#. ../builder/cmdline.ml:139
-#: ../v2v/cmdline.ml:97 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
+#: ../v2v/cmdline.ml:112 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
msgid "List long options"
msgstr ""
@@ -1230,7 +1230,7 @@ msgid "List supported operations"
msgstr ""
#. ../builder/cmdline.ml:140
-#: ../v2v/cmdline.ml:98 ../sparsify/cmdline.ml:79 ../resize/resize.ml:198
+#: ../v2v/cmdline.ml:113 ../sparsify/cmdline.ml:79 ../resize/resize.ml:198
msgid "Make output machine readable"
msgstr ""
@@ -1238,6 +1238,14 @@ msgstr ""
msgid "Making directory: %s"
msgstr ""
+#: ../v2v/cmdline.ml:106
+msgid "Map bridge 'in' to 'out'"
+msgstr ""
+
+#: ../v2v/cmdline.ml:114
+msgid "Map network 'in' to 'out'"
+msgstr ""
+
#: ../builder/list_entries.ml:77
msgid "Minimum/default size:"
msgstr ""
@@ -1295,11 +1303,15 @@ msgstr ""
msgid "Opening the new disk"
msgstr ""
-#: ../v2v/v2v.ml:80
+#: ../v2v/v2v.ml:116
msgid "Opening the overlay"
msgstr ""
-#: ../v2v/cmdline.ml:113
+#: ../v2v/v2v.ml:42
+msgid "Opening the source %s"
+msgstr ""
+
+#: ../v2v/cmdline.ml:130
msgid "Output VM UUID"
msgstr ""
@@ -1315,7 +1327,7 @@ msgstr ""
msgid "Output format (default: raw)"
msgstr ""
-#: ../v2v/cmdline.ml:109
+#: ../v2v/cmdline.ml:126
msgid "Output image UUID"
msgstr ""
@@ -1323,7 +1335,7 @@ msgstr ""
msgid "Output size"
msgstr ""
-#: ../v2v/cmdline.ml:111
+#: ../v2v/cmdline.ml:128
msgid "Output vol UUID(s)"
msgstr ""
@@ -1354,11 +1366,15 @@ msgstr ""
msgid "Print info about template cache"
msgstr ""
-#: ../v2v/cmdline.ml:106 ../sparsify/cmdline.ml:81
+#: ../v2v/cmdline.ml:122
+msgid "Print source and stop"
+msgstr ""
+
+#: ../v2v/cmdline.ml:123 ../sparsify/cmdline.ml:81
msgid "Quiet output"
msgstr ""
-#: ../v2v/target_RHEV.ml:544 ../v2v/target_RHEV.ml:141
+#: ../v2v/output_RHEV.ml:475 ../v2v/output_RHEV.ml:293
msgid "RHEV does not support the output format '%s', only raw or qcow2"
msgstr ""
@@ -1551,7 +1567,7 @@ msgstr ""
msgid "Remove user at-jobs and cron-jobs"
msgstr ""
-#: ../v2v/cmdline.ml:104
+#: ../v2v/cmdline.ml:120
msgid "Rename guest when converting"
msgstr ""
@@ -1655,7 +1671,7 @@ msgstr ""
msgid "Set format (default: auto)"
msgstr ""
-#: ../v2v/cmdline.ml:93
+#: ../v2v/cmdline.ml:108
msgid "Set input mode (default: libvirt)"
msgstr ""
@@ -1685,7 +1701,7 @@ msgstr ""
msgid "Set number of vCPUs"
msgstr ""
-#: ../v2v/cmdline.ml:101
+#: ../v2v/cmdline.ml:117
msgid "Set output allocation mode"
msgstr ""
@@ -1697,15 +1713,15 @@ msgstr ""
msgid "Set output filename"
msgstr ""
-#: ../v2v/cmdline.ml:103
+#: ../v2v/cmdline.ml:119
msgid "Set output format"
msgstr ""
-#: ../v2v/cmdline.ml:100
+#: ../v2v/cmdline.ml:116
msgid "Set output mode (default: libvirt)"
msgstr ""
-#: ../v2v/cmdline.ml:105
+#: ../v2v/cmdline.ml:121
msgid "Set output storage location"
msgstr ""
@@ -1753,7 +1769,7 @@ msgstr ""
msgid "Set user password"
msgstr ""
-#: ../v2v/cmdline.ml:119
+#: ../v2v/cmdline.ml:136
msgid "Set vmtype (for RHEV)"
msgstr ""
@@ -1797,6 +1813,10 @@ msgstr ""
msgid "Source URI: %s\n"
msgstr ""
+#: ../v2v/v2v.ml:47
+msgid "Source guest information (--print-source option):\n"
+msgstr ""
+
#: ../sparsify/in_place.ml:153
msgid "Sparsify in-place operation completed with no errors.\n"
msgstr ""
@@ -1855,7 +1875,7 @@ msgid ""
" IT IS POSSIBLE THAT SOMEONE IS DOING SOMETHING NASTY!"
msgstr ""
-#: ../v2v/convert_linux.ml:1042
+#: ../v2v/convert_linux.ml:1044
msgid ""
"The display driver was updated to '%s', but X11 does not seem to be "
"installed in the guest. X may not function correctly."
@@ -1919,7 +1939,7 @@ msgid ""
"virtual machine's disk, but it was stored on disk in older distros."
msgstr ""
-#: ../v2v/target_RHEV.ml:378
+#: ../v2v/output_RHEV.ml:692
msgid ""
"This guest required a password for connection to its display, but this is "
"not supported by RHEV. Therefore the converted guest's display will not "
@@ -1949,7 +1969,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:142
+#: ../v2v/v2v.ml:175
msgid "Trimming filesystems to reduce amount of data to copy"
msgstr ""
@@ -2063,7 +2083,7 @@ msgstr ""
msgid "cannot detect input disk format; use the --format parameter"
msgstr ""
-#: ../v2v/source_disk.ml:50
+#: ../v2v/input_disk.ml:60
msgid "cannot detect the input disk format; use the -if parameter"
msgstr ""
@@ -2077,11 +2097,11 @@ msgid ""
"\\Windows\\CurrentVersion\\Uninstall\\%s' does not contain an '%s' key"
msgstr ""
-#: ../v2v/v2v.ml:296
+#: ../v2v/v2v.ml:304
msgid "connection closed"
msgstr ""
-#: ../v2v/target_libvirt.ml:257
+#: ../v2v/output_libvirt.ml:269
msgid ""
"could not define libvirt domain. The libvirt XML is still available in "
"'%s'. Try running 'virsh define %s' yourself instead."
@@ -2093,14 +2113,18 @@ msgid ""
"\\CurrentVersion"
msgstr ""
-#: ../v2v/target_RHEV.ml:208
+#: ../v2v/input_libvirt.ml:289
+msgid "could not parse '-ic %s'. Original error message was: %s"
+msgstr ""
+
+#: ../v2v/output_RHEV.ml:154
msgid ""
"could not read the Export Storage Domain specified by the '-os %s' parameter "
"on the command line. Is it really an OVirt or RHEV-M Export Storage "
"Domain? The original error is: %s"
msgstr ""
-#: ../v2v/target_libvirt.ml:239
+#: ../v2v/output_libvirt.ml:251
msgid "could not refresh libvirt pool %s"
msgstr ""
@@ -2132,14 +2156,14 @@ msgstr ""
msgid "discard/trim is not supported: %s"
msgstr ""
-#: ../v2v/v2v.ml:234
+#: ../v2v/v2v.ml:254
msgid ""
"disk %s (%s) has no defined format, you have to either define the original "
"format in the source metadata, or use the '-of' option to force the output "
"format"
msgstr ""
-#: ../v2v/source_libvirt.ml:106
+#: ../v2v/input_libvirt.ml:99
msgid "display <graphics type='%s'> was ignored"
msgstr ""
@@ -2161,7 +2185,7 @@ msgstr ""
msgid "don't know how to remove packages using %s: packages: %s"
msgstr ""
-#: ../v2v/v2v.ml:280
+#: ../v2v/v2v.ml:288
msgid ""
"dual- or multi-boot operating system detected. Choose the root filesystem\n"
"that contains the main operating system from the list below:\n"
@@ -2175,19 +2199,19 @@ msgstr ""
msgid "error parsing URI '%s'. Look for error messages printed above."
msgstr ""
-#: ../v2v/source_libvirt.ml:63
+#: ../v2v/input_libvirt.ml:56
msgid "expecting XML expression to return an integer (expression: %s)"
msgstr ""
-#: ../v2v/cmdline.ml:194
+#: ../v2v/cmdline.ml:213
msgid "expecting a disk image (filename) on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:214
+#: ../v2v/cmdline.ml:233
msgid "expecting a libvirt XML file name on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:205
+#: ../v2v/cmdline.ml:224
msgid "expecting a libvirt guest name on the command line"
msgstr ""
@@ -2248,23 +2272,23 @@ msgstr ""
msgid "hostname could not be set for this type of guest"
msgstr ""
-#: ../v2v/v2v.ml:318
+#: ../v2v/cmdline.ml:65
+msgid "invalid --bridge or --network parameter"
+msgstr ""
+
+#: ../v2v/v2v.ml:326
msgid ""
"libguestfs thinks this is not an installed operating system (it might be, "
"for example, an installer disk or live CD). If this is wrong, it is "
"probably a bug in libguestfs. root=%s fmt=%s"
msgstr ""
-#: ../v2v/source_libvirt.ml:39
-msgid "libvirt returned a non-absolute path in the XML (%s)"
-msgstr ""
-
#. ../resize/resize.ml:194
#: ../resize/resize.ml:197 ../resize/resize.ml:196 ../resize/resize.ml:195
msgid "lv"
msgstr ""
-#: ../v2v/target_RHEV.ml:185
+#: ../v2v/output_RHEV.ml:131
msgid ""
"mount command failed, see earlier errors.\n"
"\n"
@@ -2272,7 +2296,7 @@ msgid ""
"[-os %s], or else you need to rerun virt-v2v as root."
msgstr ""
-#: ../v2v/v2v.ml:303
+#: ../v2v/v2v.ml:311
msgid ""
"multi-boot operating systems are not supported by virt-v2v. Use the --root "
"option to change how virt-v2v handles this."
@@ -2284,7 +2308,7 @@ msgid ""
"be a bug in virt-v2v."
msgstr ""
-#: ../v2v/source_libvirt.ml:170
+#: ../v2v/input_libvirt.ml:167
msgid "network <disk> with <source protocol='%s'> was ignored"
msgstr ""
@@ -2319,10 +2343,16 @@ msgid ""
"of this guest."
msgstr ""
-#: ../v2v/v2v.ml:273
+#: ../v2v/v2v.ml:281
msgid "no root device found in this operating system image."
msgstr ""
+#: ../v2v/input_libvirt.ml:304
+msgid ""
+"no support for remote libvirt connections to '-ic %s'. The conversion may "
+"fail when it tries to read the source disks."
+msgstr ""
+
#: ../resize/resize.ml:129
msgid "ntfsresize"
msgstr ""
@@ -2383,7 +2413,7 @@ msgstr ""
msgid "pwrite: short write restoring swap partition header"
msgstr ""
-#: ../v2v/v2v.ml:191 ../v2v/v2v.ml:75
+#: ../v2v/v2v.ml:224 ../v2v/v2v.ml:111
msgid "qemu-img command failed, see earlier errors"
msgstr ""
@@ -2395,7 +2425,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:311
+#: ../v2v/v2v.ml:319
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2411,14 +2441,14 @@ msgstr ""
msgid "sectors"
msgstr ""
-#: ../v2v/target_RHEV.ml:228
+#: ../v2v/output_RHEV.ml:174
msgid ""
"the Export Storage Domain (%s) has not been attached to any Data Center.\n"
"\n"
"You have to do this through the RHEV-M / OVirt user interface first."
msgstr ""
-#: ../v2v/target_RHEV.ml:233
+#: ../v2v/output_RHEV.ml:179
msgid ""
"the Export Storage Domain (%s) is not writable.\n"
"\n"
@@ -2427,7 +2457,7 @@ msgid ""
"Original error was: %s"
msgstr ""
-#: ../v2v/target_RHEV.ml:275
+#: ../v2v/output_RHEV.ml:223
msgid ""
"the number of '--rhev-vol-uuid' parameters passed on the command line has to "
"match the number of guest disk images (for this guest: %d)"
@@ -2437,7 +2467,7 @@ msgstr ""
msgid "the source disk has no partitions"
msgstr ""
-#: ../v2v/target_RHEV.ml:133
+#: ../v2v/output_RHEV.ml:285
msgid ""
"the virtual size of the input disk %s is not an exact multiple of 512 "
"bytes. The virtual size is: %Ld.\n"
@@ -2446,13 +2476,13 @@ msgid ""
"about this issue."
msgstr ""
-#: ../v2v/target_RHEV.ml:222
+#: ../v2v/output_RHEV.ml:168
msgid ""
"there are multiple UUIDs in the Export Storage Domain (%s). This is "
"unexpected, and may be a bug in virt-v2v or OVirt."
msgstr ""
-#: ../v2v/target_RHEV.ml:220
+#: ../v2v/output_RHEV.ml:166
msgid ""
"there are no UUIDs in the Export Storage Domain (%s). Is it really an OVirt "
"or RHEV-M Export Storage Domain?"
@@ -2482,7 +2512,7 @@ msgid ""
"The guest will be configured to use a slower emulated device."
msgstr ""
-#: ../v2v/source_libvirt.ml:127
+#: ../v2v/input_libvirt.ml:120
msgid "this guest has no non-removable disks"
msgstr ""
@@ -2500,33 +2530,27 @@ msgstr ""
msgid "unknown --align-first option: use never|always|auto"
msgstr ""
-#: ../v2v/cmdline.ml:84
+#: ../v2v/cmdline.ml:98
msgid "unknown --root option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:174
+#: ../v2v/cmdline.ml:193
msgid "unknown --vmtype option, must be \"server\" or \"desktop\""
msgstr ""
-#: ../v2v/cmdline.ml:57
+#: ../v2v/cmdline.ml:58
msgid "unknown -i option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:66
+#: ../v2v/cmdline.ml:80
msgid "unknown -o option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:74
+#: ../v2v/cmdline.ml:88
msgid "unknown -oa option: %s"
msgstr ""
-#: ../v2v/target_RHEV.ml:638
-msgid ""
-"unknown NIC model %s for ethernet device %s. This NIC will be imported as "
-"rtl8139 instead."
-msgstr ""
-
-#: ../v2v/target_RHEV.ml:494
+#: ../v2v/output_RHEV.ml:423
msgid "unknown guest operating system: %s %s %d.%d (%s)"
msgstr ""
@@ -2725,11 +2749,11 @@ msgstr ""
msgid "virt-sysprep: script: killed by signal (%d)\n"
msgstr ""
-#: ../v2v/v2v.ml:132
+#: ../v2v/v2v.ml:165
msgid "virt-v2v is unable to convert this guest type (linux/distro=%s)"
msgstr ""
-#: ../v2v/v2v.ml:138
+#: ../v2v/v2v.ml:171
msgid "virt-v2v is unable to convert this guest type (type=%s)"
msgstr ""
diff --git a/po/pl.po b/po/pl.po
index 0ff15e6..b4c8f9c 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -12,7 +12,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-08-19 17:51+0100\n"
+"POT-Creation-Date: 2014-08-21 17:07+0100\n"
"PO-Revision-Date: 2014-07-22 18:03+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Polish (http://www.transifex.com/projects/p/libguestfs/"
@@ -73,7 +73,7 @@ msgstr ""
msgid "%s (ignored)\n"
msgstr ""
-#: ../v2v/convert_linux.ml:1134
+#: ../v2v/convert_linux.ml:1136
msgid ""
"%s references unknown device \"%s\". You may have to fix this entry "
"manually after conversion."
@@ -83,7 +83,7 @@ msgstr ""
msgid "%s: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:147
+#: ../v2v/v2v.ml:180
msgid "%s: %s (ignored)"
msgstr ""
@@ -224,7 +224,7 @@ msgstr ""
msgid "%s: cannot output to a character device or /dev/null\n"
msgstr ""
-#: ../v2v/cmdline.ml:126
+#: ../v2v/cmdline.ml:143
msgid ""
"%s: convert a guest to use KVM\n"
"\n"
@@ -276,7 +276,7 @@ msgstr ""
msgid "%s: error: %s"
msgstr ""
-#: ../v2v/v2v.ml:369 ../sysprep/main.ml:297
+#: ../v2v/v2v.ml:377 ../sysprep/main.ml:297
msgid "%s: error: %s\n"
msgstr ""
@@ -286,13 +286,13 @@ msgstr ""
#. ../resize/resize.ml:1309
#. ../builder/builder.ml:743
-#: ../v2v/v2v.ml:362 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
+#: ../v2v/v2v.ml:370 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
msgid "%s: error: %s: %s\n"
msgstr ""
#. ../resize/resize.ml:1312
#. ../builder/builder.ml:746
-#: ../v2v/v2v.ml:365 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
+#: ../v2v/v2v.ml:373 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
msgid "%s: error: %s: %s: %s\n"
msgstr ""
@@ -313,7 +313,7 @@ msgstr ""
#. ../resize/resize.ml:1331
#. ../customize/customize_main.ml:262
#. ../builder/builder.ml:764
-#: ../v2v/v2v.ml:387 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
+#: ../v2v/v2v.ml:395 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
msgid "%s: exception: %s\n"
msgstr ""
@@ -323,7 +323,7 @@ msgstr ""
#. ../resize/resize.ml:1319
#. ../builder/builder.ml:752
-#: ../v2v/v2v.ml:375 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
+#: ../v2v/v2v.ml:383 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
msgid "%s: failure: %s\n"
msgstr ""
@@ -350,14 +350,14 @@ msgstr ""
#. ../resize/resize.ml:1328
#. ../customize/customize_main.ml:259
#. ../builder/builder.ml:761
-#: ../v2v/v2v.ml:384 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
+#: ../v2v/v2v.ml:392 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
msgid "%s: internal error: Not_found exception was thrown\n"
msgstr ""
#. ../resize/resize.ml:1325
#. ../customize/customize_main.ml:255
#. ../builder/builder.ml:758
-#: ../v2v/v2v.ml:381 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
+#: ../v2v/v2v.ml:389 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
msgid "%s: internal error: assertion failed at %s, line %d, char %d\n"
msgstr ""
@@ -365,7 +365,7 @@ msgstr ""
#. ../customize/customize_main.ml:252
#. ../builder/sources.ml:135
#. ../builder/builder.ml:755
-#: ../v2v/v2v.ml:378 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
+#: ../v2v/v2v.ml:386 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
msgid "%s: internal error: invalid argument: %s\n"
msgstr ""
@@ -383,7 +383,7 @@ msgstr ""
#. ../resize/resize.ml:1316
#. ../builder/builder.ml:749
-#: ../v2v/v2v.ml:372 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
+#: ../v2v/v2v.ml:380 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
msgid "%s: libguestfs error: %s\n"
msgstr ""
@@ -632,7 +632,7 @@ msgstr ""
msgid "--expand option given twice"
msgstr ""
-#: ../v2v/cmdline.ml:226
+#: ../v2v/cmdline.ml:245
msgid "--no-copy and '-o libvirt' cannot be used at the same time"
msgstr ""
@@ -657,40 +657,40 @@ msgstr ""
msgid "--tmp prebuilt:file: %s: file format is not qcow2"
msgstr ""
-#: ../v2v/cmdline.ml:236 ../v2v/cmdline.ml:224
+#: ../v2v/cmdline.ml:255 ../v2v/cmdline.ml:243
msgid "--vmtype option can only be used with '-o rhev'"
msgstr ""
-#: ../v2v/source_disk.ml:34
+#: ../v2v/input_disk.ml:44
msgid "-i disk: invalid input filename (%s)"
msgstr ""
-#: ../v2v/target_libvirt.ml:219
+#: ../v2v/output_libvirt.ml:231
msgid ""
"-o libvirt: output pool '%s' has type='dir' but the /pool/target/path "
"element either does not exist or is not a local directory. See virt-v2v(1) "
"section \"OUTPUT TO LIBVIRT\""
msgstr ""
-#: ../v2v/target_libvirt.ml:216
+#: ../v2v/output_libvirt.ml:228
msgid ""
"-o libvirt: output pool '%s' is not a directory (type='dir'). See virt-"
"v2v(1) section \"OUTPUT TO LIBVIRT\""
msgstr ""
-#: ../v2v/cmdline.ml:231
+#: ../v2v/cmdline.ml:250
msgid "-o local: output directory was not specified, use '-os /dir'"
msgstr ""
-#: ../v2v/cmdline.ml:241
+#: ../v2v/cmdline.ml:260
msgid "-o rhev: output storage was not specified, use '-os'"
msgstr ""
-#: ../v2v/cmdline.ml:233
+#: ../v2v/cmdline.ml:252
msgid "-os %s: output directory does not exist or is not a directory"
msgstr ""
-#: ../v2v/source_libvirt.ml:174
+#: ../v2v/input_libvirt.ml:171
msgid "<disk type='%s'> was ignored"
msgstr ""
@@ -758,7 +758,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:151
+#: ../v2v/v2v.ml:184
msgid "Closing the overlay"
msgstr ""
@@ -770,11 +770,11 @@ msgstr ""
msgid "Converting %s to %s"
msgstr ""
-#: ../v2v/v2v.ml:112
+#: ../v2v/v2v.ml:148
msgid "Converting %s to run on KVM"
msgstr ""
-#: ../v2v/v2v.ml:110
+#: ../v2v/v2v.ml:146
msgid "Converting the guest to run on KVM"
msgstr ""
@@ -794,7 +794,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:170
+#: ../v2v/v2v.ml:203
msgid "Copying disk %d/%d to %s (%s)"
msgstr ""
@@ -818,11 +818,11 @@ msgstr ""
msgid "Create symbolic links"
msgstr ""
-#: ../v2v/v2v.ml:59
+#: ../v2v/v2v.ml:95
msgid "Creating an overlay to protect the source from being modified"
msgstr ""
-#: ../v2v/v2v.ml:196
+#: ../v2v/v2v.ml:229
msgid "Creating output metadata"
msgstr ""
@@ -861,7 +861,7 @@ msgstr ""
msgid "DIR"
msgstr ""
-#: ../v2v/cmdline.ml:92 ../sparsify/cmdline.ml:73 ../resize/resize.ml:186
+#: ../v2v/cmdline.ml:107 ../sparsify/cmdline.ml:73 ../resize/resize.ml:186
msgid "Debug GC and memory allocations"
msgstr ""
@@ -913,7 +913,7 @@ msgstr ""
#. ../customize/customize_main.ml:99
#. ../builder/cmdline.ml:158
#. ../builder/cmdline.ml:157
-#: ../v2v/cmdline.ml:117 ../sysprep/main.ml:155 ../sysprep/main.ml:154
+#: ../v2v/cmdline.ml:134 ../sysprep/main.ml:155 ../sysprep/main.ml:154
msgid "Display version and exit"
msgstr ""
@@ -990,7 +990,7 @@ msgstr ""
#. ../customize/customize_main.ml:97
#. ../builder/cmdline.ml:156
#. ../builder/cmdline.ml:155
-#: ../v2v/cmdline.ml:115 ../sysprep/main.ml:153 ../sysprep/main.ml:152
+#: ../v2v/cmdline.ml:132 ../sysprep/main.ml:153 ../sysprep/main.ml:152
msgid "Enable debugging messages"
msgstr ""
@@ -1001,7 +1001,7 @@ msgstr ""
#. ../resize/resize.ml:214
#. ../customize/customize_main.ml:101
#. ../builder/cmdline.ml:159
-#: ../v2v/cmdline.ml:120 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
+#: ../v2v/cmdline.ml:137 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
msgid "Enable tracing of libguestfs calls"
msgstr ""
@@ -1009,7 +1009,7 @@ msgstr ""
msgid "Enable/disable specific operations"
msgstr ""
-#: ../v2v/v2v.ml:293
+#: ../v2v/v2v.ml:301
msgid "Enter number between 1 and %d: "
msgstr ""
@@ -1097,7 +1097,7 @@ msgstr ""
msgid "Fingerprint: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:212 ../customize/customize_main.ml:237
+#: ../v2v/v2v.ml:232 ../customize/customize_main.ml:237
#: ../builder/builder.ml:711
msgid "Finishing off"
msgstr ""
@@ -1155,7 +1155,7 @@ msgstr ""
msgid "HOSTNAME"
msgstr ""
-#: ../v2v/cmdline.ml:114
+#: ../v2v/cmdline.ml:131
msgid "How to choose root filesystem"
msgstr ""
@@ -1167,7 +1167,7 @@ msgstr ""
msgid "Ignore partition"
msgstr ""
-#: ../v2v/v2v.ml:97
+#: ../v2v/v2v.ml:133
msgid "Initializing the target %s"
msgstr ""
@@ -1177,11 +1177,11 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/cmdline.ml:96
+#: ../v2v/cmdline.ml:111
msgid "Input format (for -i disk)"
msgstr ""
-#: ../v2v/v2v.ml:103
+#: ../v2v/v2v.ml:139
msgid "Inspecting the overlay"
msgstr ""
@@ -1201,7 +1201,7 @@ msgstr ""
msgid "Installing packages: %s"
msgstr ""
-#: ../v2v/cmdline.ml:99
+#: ../v2v/cmdline.ml:115
msgid "Just write the metadata"
msgstr ""
@@ -1209,7 +1209,7 @@ msgstr ""
msgid "Key: %s\n"
msgstr ""
-#: ../v2v/cmdline.ml:102 ../v2v/cmdline.ml:94
+#: ../v2v/cmdline.ml:118 ../v2v/cmdline.ml:109
msgid "Libvirt URI"
msgstr ""
@@ -1224,7 +1224,7 @@ msgstr ""
#. ../resize/resize.ml:193
#. ../customize/customize_main.ml:89
#. ../builder/cmdline.ml:139
-#: ../v2v/cmdline.ml:97 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
+#: ../v2v/cmdline.ml:112 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
msgid "List long options"
msgstr ""
@@ -1233,7 +1233,7 @@ msgid "List supported operations"
msgstr ""
#. ../builder/cmdline.ml:140
-#: ../v2v/cmdline.ml:98 ../sparsify/cmdline.ml:79 ../resize/resize.ml:198
+#: ../v2v/cmdline.ml:113 ../sparsify/cmdline.ml:79 ../resize/resize.ml:198
msgid "Make output machine readable"
msgstr ""
@@ -1241,6 +1241,14 @@ msgstr ""
msgid "Making directory: %s"
msgstr ""
+#: ../v2v/cmdline.ml:106
+msgid "Map bridge 'in' to 'out'"
+msgstr ""
+
+#: ../v2v/cmdline.ml:114
+msgid "Map network 'in' to 'out'"
+msgstr ""
+
#: ../builder/list_entries.ml:77
msgid "Minimum/default size:"
msgstr ""
@@ -1298,11 +1306,15 @@ msgstr ""
msgid "Opening the new disk"
msgstr ""
-#: ../v2v/v2v.ml:80
+#: ../v2v/v2v.ml:116
msgid "Opening the overlay"
msgstr ""
-#: ../v2v/cmdline.ml:113
+#: ../v2v/v2v.ml:42
+msgid "Opening the source %s"
+msgstr ""
+
+#: ../v2v/cmdline.ml:130
msgid "Output VM UUID"
msgstr ""
@@ -1318,7 +1330,7 @@ msgstr ""
msgid "Output format (default: raw)"
msgstr ""
-#: ../v2v/cmdline.ml:109
+#: ../v2v/cmdline.ml:126
msgid "Output image UUID"
msgstr ""
@@ -1326,7 +1338,7 @@ msgstr ""
msgid "Output size"
msgstr ""
-#: ../v2v/cmdline.ml:111
+#: ../v2v/cmdline.ml:128
msgid "Output vol UUID(s)"
msgstr ""
@@ -1357,11 +1369,15 @@ msgstr ""
msgid "Print info about template cache"
msgstr ""
-#: ../v2v/cmdline.ml:106 ../sparsify/cmdline.ml:81
+#: ../v2v/cmdline.ml:122
+msgid "Print source and stop"
+msgstr ""
+
+#: ../v2v/cmdline.ml:123 ../sparsify/cmdline.ml:81
msgid "Quiet output"
msgstr ""
-#: ../v2v/target_RHEV.ml:544 ../v2v/target_RHEV.ml:141
+#: ../v2v/output_RHEV.ml:475 ../v2v/output_RHEV.ml:293
msgid "RHEV does not support the output format '%s', only raw or qcow2"
msgstr ""
@@ -1554,7 +1570,7 @@ msgstr ""
msgid "Remove user at-jobs and cron-jobs"
msgstr ""
-#: ../v2v/cmdline.ml:104
+#: ../v2v/cmdline.ml:120
msgid "Rename guest when converting"
msgstr ""
@@ -1658,7 +1674,7 @@ msgstr ""
msgid "Set format (default: auto)"
msgstr ""
-#: ../v2v/cmdline.ml:93
+#: ../v2v/cmdline.ml:108
msgid "Set input mode (default: libvirt)"
msgstr ""
@@ -1688,7 +1704,7 @@ msgstr ""
msgid "Set number of vCPUs"
msgstr ""
-#: ../v2v/cmdline.ml:101
+#: ../v2v/cmdline.ml:117
msgid "Set output allocation mode"
msgstr ""
@@ -1700,15 +1716,15 @@ msgstr ""
msgid "Set output filename"
msgstr ""
-#: ../v2v/cmdline.ml:103
+#: ../v2v/cmdline.ml:119
msgid "Set output format"
msgstr ""
-#: ../v2v/cmdline.ml:100
+#: ../v2v/cmdline.ml:116
msgid "Set output mode (default: libvirt)"
msgstr ""
-#: ../v2v/cmdline.ml:105
+#: ../v2v/cmdline.ml:121
msgid "Set output storage location"
msgstr ""
@@ -1756,7 +1772,7 @@ msgstr ""
msgid "Set user password"
msgstr ""
-#: ../v2v/cmdline.ml:119
+#: ../v2v/cmdline.ml:136
msgid "Set vmtype (for RHEV)"
msgstr ""
@@ -1800,6 +1816,10 @@ msgstr ""
msgid "Source URI: %s\n"
msgstr ""
+#: ../v2v/v2v.ml:47
+msgid "Source guest information (--print-source option):\n"
+msgstr ""
+
#: ../sparsify/in_place.ml:153
msgid "Sparsify in-place operation completed with no errors.\n"
msgstr ""
@@ -1858,7 +1878,7 @@ msgid ""
" IT IS POSSIBLE THAT SOMEONE IS DOING SOMETHING NASTY!"
msgstr ""
-#: ../v2v/convert_linux.ml:1042
+#: ../v2v/convert_linux.ml:1044
msgid ""
"The display driver was updated to '%s', but X11 does not seem to be "
"installed in the guest. X may not function correctly."
@@ -1922,7 +1942,7 @@ msgid ""
"virtual machine's disk, but it was stored on disk in older distros."
msgstr ""
-#: ../v2v/target_RHEV.ml:378
+#: ../v2v/output_RHEV.ml:692
msgid ""
"This guest required a password for connection to its display, but this is "
"not supported by RHEV. Therefore the converted guest's display will not "
@@ -1952,7 +1972,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:142
+#: ../v2v/v2v.ml:175
msgid "Trimming filesystems to reduce amount of data to copy"
msgstr ""
@@ -2066,7 +2086,7 @@ msgstr ""
msgid "cannot detect input disk format; use the --format parameter"
msgstr ""
-#: ../v2v/source_disk.ml:50
+#: ../v2v/input_disk.ml:60
msgid "cannot detect the input disk format; use the -if parameter"
msgstr ""
@@ -2080,11 +2100,11 @@ msgid ""
"\\Windows\\CurrentVersion\\Uninstall\\%s' does not contain an '%s' key"
msgstr ""
-#: ../v2v/v2v.ml:296
+#: ../v2v/v2v.ml:304
msgid "connection closed"
msgstr ""
-#: ../v2v/target_libvirt.ml:257
+#: ../v2v/output_libvirt.ml:269
msgid ""
"could not define libvirt domain. The libvirt XML is still available in "
"'%s'. Try running 'virsh define %s' yourself instead."
@@ -2096,14 +2116,18 @@ msgid ""
"\\CurrentVersion"
msgstr ""
-#: ../v2v/target_RHEV.ml:208
+#: ../v2v/input_libvirt.ml:289
+msgid "could not parse '-ic %s'. Original error message was: %s"
+msgstr ""
+
+#: ../v2v/output_RHEV.ml:154
msgid ""
"could not read the Export Storage Domain specified by the '-os %s' parameter "
"on the command line. Is it really an OVirt or RHEV-M Export Storage "
"Domain? The original error is: %s"
msgstr ""
-#: ../v2v/target_libvirt.ml:239
+#: ../v2v/output_libvirt.ml:251
msgid "could not refresh libvirt pool %s"
msgstr ""
@@ -2135,14 +2159,14 @@ msgstr ""
msgid "discard/trim is not supported: %s"
msgstr ""
-#: ../v2v/v2v.ml:234
+#: ../v2v/v2v.ml:254
msgid ""
"disk %s (%s) has no defined format, you have to either define the original "
"format in the source metadata, or use the '-of' option to force the output "
"format"
msgstr ""
-#: ../v2v/source_libvirt.ml:106
+#: ../v2v/input_libvirt.ml:99
msgid "display <graphics type='%s'> was ignored"
msgstr ""
@@ -2164,7 +2188,7 @@ msgstr ""
msgid "don't know how to remove packages using %s: packages: %s"
msgstr ""
-#: ../v2v/v2v.ml:280
+#: ../v2v/v2v.ml:288
msgid ""
"dual- or multi-boot operating system detected. Choose the root filesystem\n"
"that contains the main operating system from the list below:\n"
@@ -2178,19 +2202,19 @@ msgstr ""
msgid "error parsing URI '%s'. Look for error messages printed above."
msgstr ""
-#: ../v2v/source_libvirt.ml:63
+#: ../v2v/input_libvirt.ml:56
msgid "expecting XML expression to return an integer (expression: %s)"
msgstr ""
-#: ../v2v/cmdline.ml:194
+#: ../v2v/cmdline.ml:213
msgid "expecting a disk image (filename) on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:214
+#: ../v2v/cmdline.ml:233
msgid "expecting a libvirt XML file name on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:205
+#: ../v2v/cmdline.ml:224
msgid "expecting a libvirt guest name on the command line"
msgstr ""
@@ -2251,23 +2275,23 @@ msgstr ""
msgid "hostname could not be set for this type of guest"
msgstr ""
-#: ../v2v/v2v.ml:318
+#: ../v2v/cmdline.ml:65
+msgid "invalid --bridge or --network parameter"
+msgstr ""
+
+#: ../v2v/v2v.ml:326
msgid ""
"libguestfs thinks this is not an installed operating system (it might be, "
"for example, an installer disk or live CD). If this is wrong, it is "
"probably a bug in libguestfs. root=%s fmt=%s"
msgstr ""
-#: ../v2v/source_libvirt.ml:39
-msgid "libvirt returned a non-absolute path in the XML (%s)"
-msgstr ""
-
#. ../resize/resize.ml:194
#: ../resize/resize.ml:197 ../resize/resize.ml:196 ../resize/resize.ml:195
msgid "lv"
msgstr ""
-#: ../v2v/target_RHEV.ml:185
+#: ../v2v/output_RHEV.ml:131
msgid ""
"mount command failed, see earlier errors.\n"
"\n"
@@ -2275,7 +2299,7 @@ msgid ""
"[-os %s], or else you need to rerun virt-v2v as root."
msgstr ""
-#: ../v2v/v2v.ml:303
+#: ../v2v/v2v.ml:311
msgid ""
"multi-boot operating systems are not supported by virt-v2v. Use the --root "
"option to change how virt-v2v handles this."
@@ -2287,7 +2311,7 @@ msgid ""
"be a bug in virt-v2v."
msgstr ""
-#: ../v2v/source_libvirt.ml:170
+#: ../v2v/input_libvirt.ml:167
msgid "network <disk> with <source protocol='%s'> was ignored"
msgstr ""
@@ -2322,10 +2346,16 @@ msgid ""
"of this guest."
msgstr ""
-#: ../v2v/v2v.ml:273
+#: ../v2v/v2v.ml:281
msgid "no root device found in this operating system image."
msgstr ""
+#: ../v2v/input_libvirt.ml:304
+msgid ""
+"no support for remote libvirt connections to '-ic %s'. The conversion may "
+"fail when it tries to read the source disks."
+msgstr ""
+
#: ../resize/resize.ml:129
msgid "ntfsresize"
msgstr ""
@@ -2386,7 +2416,7 @@ msgstr ""
msgid "pwrite: short write restoring swap partition header"
msgstr ""
-#: ../v2v/v2v.ml:191 ../v2v/v2v.ml:75
+#: ../v2v/v2v.ml:224 ../v2v/v2v.ml:111
msgid "qemu-img command failed, see earlier errors"
msgstr ""
@@ -2398,7 +2428,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:311
+#: ../v2v/v2v.ml:319
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2414,14 +2444,14 @@ msgstr ""
msgid "sectors"
msgstr ""
-#: ../v2v/target_RHEV.ml:228
+#: ../v2v/output_RHEV.ml:174
msgid ""
"the Export Storage Domain (%s) has not been attached to any Data Center.\n"
"\n"
"You have to do this through the RHEV-M / OVirt user interface first."
msgstr ""
-#: ../v2v/target_RHEV.ml:233
+#: ../v2v/output_RHEV.ml:179
msgid ""
"the Export Storage Domain (%s) is not writable.\n"
"\n"
@@ -2430,7 +2460,7 @@ msgid ""
"Original error was: %s"
msgstr ""
-#: ../v2v/target_RHEV.ml:275
+#: ../v2v/output_RHEV.ml:223
msgid ""
"the number of '--rhev-vol-uuid' parameters passed on the command line has to "
"match the number of guest disk images (for this guest: %d)"
@@ -2440,7 +2470,7 @@ msgstr ""
msgid "the source disk has no partitions"
msgstr ""
-#: ../v2v/target_RHEV.ml:133
+#: ../v2v/output_RHEV.ml:285
msgid ""
"the virtual size of the input disk %s is not an exact multiple of 512 "
"bytes. The virtual size is: %Ld.\n"
@@ -2449,13 +2479,13 @@ msgid ""
"about this issue."
msgstr ""
-#: ../v2v/target_RHEV.ml:222
+#: ../v2v/output_RHEV.ml:168
msgid ""
"there are multiple UUIDs in the Export Storage Domain (%s). This is "
"unexpected, and may be a bug in virt-v2v or OVirt."
msgstr ""
-#: ../v2v/target_RHEV.ml:220
+#: ../v2v/output_RHEV.ml:166
msgid ""
"there are no UUIDs in the Export Storage Domain (%s). Is it really an OVirt "
"or RHEV-M Export Storage Domain?"
@@ -2485,7 +2515,7 @@ msgid ""
"The guest will be configured to use a slower emulated device."
msgstr ""
-#: ../v2v/source_libvirt.ml:127
+#: ../v2v/input_libvirt.ml:120
msgid "this guest has no non-removable disks"
msgstr ""
@@ -2503,33 +2533,27 @@ msgstr ""
msgid "unknown --align-first option: use never|always|auto"
msgstr ""
-#: ../v2v/cmdline.ml:84
+#: ../v2v/cmdline.ml:98
msgid "unknown --root option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:174
+#: ../v2v/cmdline.ml:193
msgid "unknown --vmtype option, must be \"server\" or \"desktop\""
msgstr ""
-#: ../v2v/cmdline.ml:57
+#: ../v2v/cmdline.ml:58
msgid "unknown -i option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:66
+#: ../v2v/cmdline.ml:80
msgid "unknown -o option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:74
+#: ../v2v/cmdline.ml:88
msgid "unknown -oa option: %s"
msgstr ""
-#: ../v2v/target_RHEV.ml:638
-msgid ""
-"unknown NIC model %s for ethernet device %s. This NIC will be imported as "
-"rtl8139 instead."
-msgstr ""
-
-#: ../v2v/target_RHEV.ml:494
+#: ../v2v/output_RHEV.ml:423
msgid "unknown guest operating system: %s %s %d.%d (%s)"
msgstr ""
@@ -2728,11 +2752,11 @@ msgstr ""
msgid "virt-sysprep: script: killed by signal (%d)\n"
msgstr ""
-#: ../v2v/v2v.ml:132
+#: ../v2v/v2v.ml:165
msgid "virt-v2v is unable to convert this guest type (linux/distro=%s)"
msgstr ""
-#: ../v2v/v2v.ml:138
+#: ../v2v/v2v.ml:171
msgid "virt-v2v is unable to convert this guest type (type=%s)"
msgstr ""
diff --git a/po/ta.po b/po/ta.po
index 8fc67a2..7e6c9e4 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-08-19 17:51+0100\n"
+"POT-Creation-Date: 2014-08-21 17:07+0100\n"
"PO-Revision-Date: 2014-07-22 18:03+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Tamil (http://www.transifex.com/projects/p/libguestfs/"
@@ -69,7 +69,7 @@ msgstr ""
msgid "%s (ignored)\n"
msgstr ""
-#: ../v2v/convert_linux.ml:1134
+#: ../v2v/convert_linux.ml:1136
msgid ""
"%s references unknown device \"%s\". You may have to fix this entry "
"manually after conversion."
@@ -79,7 +79,7 @@ msgstr ""
msgid "%s: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:147
+#: ../v2v/v2v.ml:180
msgid "%s: %s (ignored)"
msgstr ""
@@ -220,7 +220,7 @@ msgstr ""
msgid "%s: cannot output to a character device or /dev/null\n"
msgstr ""
-#: ../v2v/cmdline.ml:126
+#: ../v2v/cmdline.ml:143
msgid ""
"%s: convert a guest to use KVM\n"
"\n"
@@ -272,7 +272,7 @@ msgstr ""
msgid "%s: error: %s"
msgstr ""
-#: ../v2v/v2v.ml:369 ../sysprep/main.ml:297
+#: ../v2v/v2v.ml:377 ../sysprep/main.ml:297
msgid "%s: error: %s\n"
msgstr ""
@@ -282,13 +282,13 @@ msgstr ""
#. ../resize/resize.ml:1309
#. ../builder/builder.ml:743
-#: ../v2v/v2v.ml:362 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
+#: ../v2v/v2v.ml:370 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
msgid "%s: error: %s: %s\n"
msgstr ""
#. ../resize/resize.ml:1312
#. ../builder/builder.ml:746
-#: ../v2v/v2v.ml:365 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
+#: ../v2v/v2v.ml:373 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
msgid "%s: error: %s: %s: %s\n"
msgstr ""
@@ -309,7 +309,7 @@ msgstr ""
#. ../resize/resize.ml:1331
#. ../customize/customize_main.ml:262
#. ../builder/builder.ml:764
-#: ../v2v/v2v.ml:387 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
+#: ../v2v/v2v.ml:395 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
msgid "%s: exception: %s\n"
msgstr ""
@@ -319,7 +319,7 @@ msgstr ""
#. ../resize/resize.ml:1319
#. ../builder/builder.ml:752
-#: ../v2v/v2v.ml:375 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
+#: ../v2v/v2v.ml:383 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
msgid "%s: failure: %s\n"
msgstr ""
@@ -346,14 +346,14 @@ msgstr ""
#. ../resize/resize.ml:1328
#. ../customize/customize_main.ml:259
#. ../builder/builder.ml:761
-#: ../v2v/v2v.ml:384 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
+#: ../v2v/v2v.ml:392 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
msgid "%s: internal error: Not_found exception was thrown\n"
msgstr ""
#. ../resize/resize.ml:1325
#. ../customize/customize_main.ml:255
#. ../builder/builder.ml:758
-#: ../v2v/v2v.ml:381 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
+#: ../v2v/v2v.ml:389 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
msgid "%s: internal error: assertion failed at %s, line %d, char %d\n"
msgstr ""
@@ -361,7 +361,7 @@ msgstr ""
#. ../customize/customize_main.ml:252
#. ../builder/sources.ml:135
#. ../builder/builder.ml:755
-#: ../v2v/v2v.ml:378 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
+#: ../v2v/v2v.ml:386 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
msgid "%s: internal error: invalid argument: %s\n"
msgstr ""
@@ -379,7 +379,7 @@ msgstr ""
#. ../resize/resize.ml:1316
#. ../builder/builder.ml:749
-#: ../v2v/v2v.ml:372 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
+#: ../v2v/v2v.ml:380 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
msgid "%s: libguestfs error: %s\n"
msgstr ""
@@ -628,7 +628,7 @@ msgstr ""
msgid "--expand option given twice"
msgstr ""
-#: ../v2v/cmdline.ml:226
+#: ../v2v/cmdline.ml:245
msgid "--no-copy and '-o libvirt' cannot be used at the same time"
msgstr ""
@@ -653,40 +653,40 @@ msgstr ""
msgid "--tmp prebuilt:file: %s: file format is not qcow2"
msgstr ""
-#: ../v2v/cmdline.ml:236 ../v2v/cmdline.ml:224
+#: ../v2v/cmdline.ml:255 ../v2v/cmdline.ml:243
msgid "--vmtype option can only be used with '-o rhev'"
msgstr ""
-#: ../v2v/source_disk.ml:34
+#: ../v2v/input_disk.ml:44
msgid "-i disk: invalid input filename (%s)"
msgstr ""
-#: ../v2v/target_libvirt.ml:219
+#: ../v2v/output_libvirt.ml:231
msgid ""
"-o libvirt: output pool '%s' has type='dir' but the /pool/target/path "
"element either does not exist or is not a local directory. See virt-v2v(1) "
"section \"OUTPUT TO LIBVIRT\""
msgstr ""
-#: ../v2v/target_libvirt.ml:216
+#: ../v2v/output_libvirt.ml:228
msgid ""
"-o libvirt: output pool '%s' is not a directory (type='dir'). See virt-"
"v2v(1) section \"OUTPUT TO LIBVIRT\""
msgstr ""
-#: ../v2v/cmdline.ml:231
+#: ../v2v/cmdline.ml:250
msgid "-o local: output directory was not specified, use '-os /dir'"
msgstr ""
-#: ../v2v/cmdline.ml:241
+#: ../v2v/cmdline.ml:260
msgid "-o rhev: output storage was not specified, use '-os'"
msgstr ""
-#: ../v2v/cmdline.ml:233
+#: ../v2v/cmdline.ml:252
msgid "-os %s: output directory does not exist or is not a directory"
msgstr ""
-#: ../v2v/source_libvirt.ml:174
+#: ../v2v/input_libvirt.ml:171
msgid "<disk type='%s'> was ignored"
msgstr ""
@@ -754,7 +754,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:151
+#: ../v2v/v2v.ml:184
msgid "Closing the overlay"
msgstr ""
@@ -766,11 +766,11 @@ msgstr ""
msgid "Converting %s to %s"
msgstr ""
-#: ../v2v/v2v.ml:112
+#: ../v2v/v2v.ml:148
msgid "Converting %s to run on KVM"
msgstr ""
-#: ../v2v/v2v.ml:110
+#: ../v2v/v2v.ml:146
msgid "Converting the guest to run on KVM"
msgstr ""
@@ -790,7 +790,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:170
+#: ../v2v/v2v.ml:203
msgid "Copying disk %d/%d to %s (%s)"
msgstr ""
@@ -814,11 +814,11 @@ msgstr ""
msgid "Create symbolic links"
msgstr ""
-#: ../v2v/v2v.ml:59
+#: ../v2v/v2v.ml:95
msgid "Creating an overlay to protect the source from being modified"
msgstr ""
-#: ../v2v/v2v.ml:196
+#: ../v2v/v2v.ml:229
msgid "Creating output metadata"
msgstr ""
@@ -857,7 +857,7 @@ msgstr ""
msgid "DIR"
msgstr ""
-#: ../v2v/cmdline.ml:92 ../sparsify/cmdline.ml:73 ../resize/resize.ml:186
+#: ../v2v/cmdline.ml:107 ../sparsify/cmdline.ml:73 ../resize/resize.ml:186
msgid "Debug GC and memory allocations"
msgstr ""
@@ -909,7 +909,7 @@ msgstr ""
#. ../customize/customize_main.ml:99
#. ../builder/cmdline.ml:158
#. ../builder/cmdline.ml:157
-#: ../v2v/cmdline.ml:117 ../sysprep/main.ml:155 ../sysprep/main.ml:154
+#: ../v2v/cmdline.ml:134 ../sysprep/main.ml:155 ../sysprep/main.ml:154
msgid "Display version and exit"
msgstr ""
@@ -986,7 +986,7 @@ msgstr ""
#. ../customize/customize_main.ml:97
#. ../builder/cmdline.ml:156
#. ../builder/cmdline.ml:155
-#: ../v2v/cmdline.ml:115 ../sysprep/main.ml:153 ../sysprep/main.ml:152
+#: ../v2v/cmdline.ml:132 ../sysprep/main.ml:153 ../sysprep/main.ml:152
msgid "Enable debugging messages"
msgstr ""
@@ -997,7 +997,7 @@ msgstr ""
#. ../resize/resize.ml:214
#. ../customize/customize_main.ml:101
#. ../builder/cmdline.ml:159
-#: ../v2v/cmdline.ml:120 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
+#: ../v2v/cmdline.ml:137 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
msgid "Enable tracing of libguestfs calls"
msgstr ""
@@ -1005,7 +1005,7 @@ msgstr ""
msgid "Enable/disable specific operations"
msgstr ""
-#: ../v2v/v2v.ml:293
+#: ../v2v/v2v.ml:301
msgid "Enter number between 1 and %d: "
msgstr ""
@@ -1093,7 +1093,7 @@ msgstr ""
msgid "Fingerprint: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:212 ../customize/customize_main.ml:237
+#: ../v2v/v2v.ml:232 ../customize/customize_main.ml:237
#: ../builder/builder.ml:711
msgid "Finishing off"
msgstr ""
@@ -1151,7 +1151,7 @@ msgstr ""
msgid "HOSTNAME"
msgstr ""
-#: ../v2v/cmdline.ml:114
+#: ../v2v/cmdline.ml:131
msgid "How to choose root filesystem"
msgstr ""
@@ -1163,7 +1163,7 @@ msgstr ""
msgid "Ignore partition"
msgstr ""
-#: ../v2v/v2v.ml:97
+#: ../v2v/v2v.ml:133
msgid "Initializing the target %s"
msgstr ""
@@ -1173,11 +1173,11 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/cmdline.ml:96
+#: ../v2v/cmdline.ml:111
msgid "Input format (for -i disk)"
msgstr ""
-#: ../v2v/v2v.ml:103
+#: ../v2v/v2v.ml:139
msgid "Inspecting the overlay"
msgstr ""
@@ -1197,7 +1197,7 @@ msgstr ""
msgid "Installing packages: %s"
msgstr ""
-#: ../v2v/cmdline.ml:99
+#: ../v2v/cmdline.ml:115
msgid "Just write the metadata"
msgstr ""
@@ -1205,7 +1205,7 @@ msgstr ""
msgid "Key: %s\n"
msgstr ""
-#: ../v2v/cmdline.ml:102 ../v2v/cmdline.ml:94
+#: ../v2v/cmdline.ml:118 ../v2v/cmdline.ml:109
msgid "Libvirt URI"
msgstr ""
@@ -1220,7 +1220,7 @@ msgstr ""
#. ../resize/resize.ml:193
#. ../customize/customize_main.ml:89
#. ../builder/cmdline.ml:139
-#: ../v2v/cmdline.ml:97 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
+#: ../v2v/cmdline.ml:112 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
msgid "List long options"
msgstr ""
@@ -1229,7 +1229,7 @@ msgid "List supported operations"
msgstr ""
#. ../builder/cmdline.ml:140
-#: ../v2v/cmdline.ml:98 ../sparsify/cmdline.ml:79 ../resize/resize.ml:198
+#: ../v2v/cmdline.ml:113 ../sparsify/cmdline.ml:79 ../resize/resize.ml:198
msgid "Make output machine readable"
msgstr ""
@@ -1237,6 +1237,14 @@ msgstr ""
msgid "Making directory: %s"
msgstr ""
+#: ../v2v/cmdline.ml:106
+msgid "Map bridge 'in' to 'out'"
+msgstr ""
+
+#: ../v2v/cmdline.ml:114
+msgid "Map network 'in' to 'out'"
+msgstr ""
+
#: ../builder/list_entries.ml:77
msgid "Minimum/default size:"
msgstr ""
@@ -1294,11 +1302,15 @@ msgstr ""
msgid "Opening the new disk"
msgstr ""
-#: ../v2v/v2v.ml:80
+#: ../v2v/v2v.ml:116
msgid "Opening the overlay"
msgstr ""
-#: ../v2v/cmdline.ml:113
+#: ../v2v/v2v.ml:42
+msgid "Opening the source %s"
+msgstr ""
+
+#: ../v2v/cmdline.ml:130
msgid "Output VM UUID"
msgstr ""
@@ -1314,7 +1326,7 @@ msgstr ""
msgid "Output format (default: raw)"
msgstr ""
-#: ../v2v/cmdline.ml:109
+#: ../v2v/cmdline.ml:126
msgid "Output image UUID"
msgstr ""
@@ -1322,7 +1334,7 @@ msgstr ""
msgid "Output size"
msgstr ""
-#: ../v2v/cmdline.ml:111
+#: ../v2v/cmdline.ml:128
msgid "Output vol UUID(s)"
msgstr ""
@@ -1353,11 +1365,15 @@ msgstr ""
msgid "Print info about template cache"
msgstr ""
-#: ../v2v/cmdline.ml:106 ../sparsify/cmdline.ml:81
+#: ../v2v/cmdline.ml:122
+msgid "Print source and stop"
+msgstr ""
+
+#: ../v2v/cmdline.ml:123 ../sparsify/cmdline.ml:81
msgid "Quiet output"
msgstr ""
-#: ../v2v/target_RHEV.ml:544 ../v2v/target_RHEV.ml:141
+#: ../v2v/output_RHEV.ml:475 ../v2v/output_RHEV.ml:293
msgid "RHEV does not support the output format '%s', only raw or qcow2"
msgstr ""
@@ -1550,7 +1566,7 @@ msgstr ""
msgid "Remove user at-jobs and cron-jobs"
msgstr ""
-#: ../v2v/cmdline.ml:104
+#: ../v2v/cmdline.ml:120
msgid "Rename guest when converting"
msgstr ""
@@ -1654,7 +1670,7 @@ msgstr ""
msgid "Set format (default: auto)"
msgstr ""
-#: ../v2v/cmdline.ml:93
+#: ../v2v/cmdline.ml:108
msgid "Set input mode (default: libvirt)"
msgstr ""
@@ -1684,7 +1700,7 @@ msgstr ""
msgid "Set number of vCPUs"
msgstr ""
-#: ../v2v/cmdline.ml:101
+#: ../v2v/cmdline.ml:117
msgid "Set output allocation mode"
msgstr ""
@@ -1696,15 +1712,15 @@ msgstr ""
msgid "Set output filename"
msgstr ""
-#: ../v2v/cmdline.ml:103
+#: ../v2v/cmdline.ml:119
msgid "Set output format"
msgstr ""
-#: ../v2v/cmdline.ml:100
+#: ../v2v/cmdline.ml:116
msgid "Set output mode (default: libvirt)"
msgstr ""
-#: ../v2v/cmdline.ml:105
+#: ../v2v/cmdline.ml:121
msgid "Set output storage location"
msgstr ""
@@ -1752,7 +1768,7 @@ msgstr ""
msgid "Set user password"
msgstr ""
-#: ../v2v/cmdline.ml:119
+#: ../v2v/cmdline.ml:136
msgid "Set vmtype (for RHEV)"
msgstr ""
@@ -1796,6 +1812,10 @@ msgstr ""
msgid "Source URI: %s\n"
msgstr ""
+#: ../v2v/v2v.ml:47
+msgid "Source guest information (--print-source option):\n"
+msgstr ""
+
#: ../sparsify/in_place.ml:153
msgid "Sparsify in-place operation completed with no errors.\n"
msgstr ""
@@ -1854,7 +1874,7 @@ msgid ""
" IT IS POSSIBLE THAT SOMEONE IS DOING SOMETHING NASTY!"
msgstr ""
-#: ../v2v/convert_linux.ml:1042
+#: ../v2v/convert_linux.ml:1044
msgid ""
"The display driver was updated to '%s', but X11 does not seem to be "
"installed in the guest. X may not function correctly."
@@ -1918,7 +1938,7 @@ msgid ""
"virtual machine's disk, but it was stored on disk in older distros."
msgstr ""
-#: ../v2v/target_RHEV.ml:378
+#: ../v2v/output_RHEV.ml:692
msgid ""
"This guest required a password for connection to its display, but this is "
"not supported by RHEV. Therefore the converted guest's display will not "
@@ -1948,7 +1968,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:142
+#: ../v2v/v2v.ml:175
msgid "Trimming filesystems to reduce amount of data to copy"
msgstr ""
@@ -2062,7 +2082,7 @@ msgstr ""
msgid "cannot detect input disk format; use the --format parameter"
msgstr ""
-#: ../v2v/source_disk.ml:50
+#: ../v2v/input_disk.ml:60
msgid "cannot detect the input disk format; use the -if parameter"
msgstr ""
@@ -2076,11 +2096,11 @@ msgid ""
"\\Windows\\CurrentVersion\\Uninstall\\%s' does not contain an '%s' key"
msgstr ""
-#: ../v2v/v2v.ml:296
+#: ../v2v/v2v.ml:304
msgid "connection closed"
msgstr ""
-#: ../v2v/target_libvirt.ml:257
+#: ../v2v/output_libvirt.ml:269
msgid ""
"could not define libvirt domain. The libvirt XML is still available in "
"'%s'. Try running 'virsh define %s' yourself instead."
@@ -2092,14 +2112,18 @@ msgid ""
"\\CurrentVersion"
msgstr ""
-#: ../v2v/target_RHEV.ml:208
+#: ../v2v/input_libvirt.ml:289
+msgid "could not parse '-ic %s'. Original error message was: %s"
+msgstr ""
+
+#: ../v2v/output_RHEV.ml:154
msgid ""
"could not read the Export Storage Domain specified by the '-os %s' parameter "
"on the command line. Is it really an OVirt or RHEV-M Export Storage "
"Domain? The original error is: %s"
msgstr ""
-#: ../v2v/target_libvirt.ml:239
+#: ../v2v/output_libvirt.ml:251
msgid "could not refresh libvirt pool %s"
msgstr ""
@@ -2131,14 +2155,14 @@ msgstr ""
msgid "discard/trim is not supported: %s"
msgstr ""
-#: ../v2v/v2v.ml:234
+#: ../v2v/v2v.ml:254
msgid ""
"disk %s (%s) has no defined format, you have to either define the original "
"format in the source metadata, or use the '-of' option to force the output "
"format"
msgstr ""
-#: ../v2v/source_libvirt.ml:106
+#: ../v2v/input_libvirt.ml:99
msgid "display <graphics type='%s'> was ignored"
msgstr ""
@@ -2160,7 +2184,7 @@ msgstr ""
msgid "don't know how to remove packages using %s: packages: %s"
msgstr ""
-#: ../v2v/v2v.ml:280
+#: ../v2v/v2v.ml:288
msgid ""
"dual- or multi-boot operating system detected. Choose the root filesystem\n"
"that contains the main operating system from the list below:\n"
@@ -2174,19 +2198,19 @@ msgstr ""
msgid "error parsing URI '%s'. Look for error messages printed above."
msgstr ""
-#: ../v2v/source_libvirt.ml:63
+#: ../v2v/input_libvirt.ml:56
msgid "expecting XML expression to return an integer (expression: %s)"
msgstr ""
-#: ../v2v/cmdline.ml:194
+#: ../v2v/cmdline.ml:213
msgid "expecting a disk image (filename) on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:214
+#: ../v2v/cmdline.ml:233
msgid "expecting a libvirt XML file name on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:205
+#: ../v2v/cmdline.ml:224
msgid "expecting a libvirt guest name on the command line"
msgstr ""
@@ -2247,23 +2271,23 @@ msgstr ""
msgid "hostname could not be set for this type of guest"
msgstr ""
-#: ../v2v/v2v.ml:318
+#: ../v2v/cmdline.ml:65
+msgid "invalid --bridge or --network parameter"
+msgstr ""
+
+#: ../v2v/v2v.ml:326
msgid ""
"libguestfs thinks this is not an installed operating system (it might be, "
"for example, an installer disk or live CD). If this is wrong, it is "
"probably a bug in libguestfs. root=%s fmt=%s"
msgstr ""
-#: ../v2v/source_libvirt.ml:39
-msgid "libvirt returned a non-absolute path in the XML (%s)"
-msgstr ""
-
#. ../resize/resize.ml:194
#: ../resize/resize.ml:197 ../resize/resize.ml:196 ../resize/resize.ml:195
msgid "lv"
msgstr ""
-#: ../v2v/target_RHEV.ml:185
+#: ../v2v/output_RHEV.ml:131
msgid ""
"mount command failed, see earlier errors.\n"
"\n"
@@ -2271,7 +2295,7 @@ msgid ""
"[-os %s], or else you need to rerun virt-v2v as root."
msgstr ""
-#: ../v2v/v2v.ml:303
+#: ../v2v/v2v.ml:311
msgid ""
"multi-boot operating systems are not supported by virt-v2v. Use the --root "
"option to change how virt-v2v handles this."
@@ -2283,7 +2307,7 @@ msgid ""
"be a bug in virt-v2v."
msgstr ""
-#: ../v2v/source_libvirt.ml:170
+#: ../v2v/input_libvirt.ml:167
msgid "network <disk> with <source protocol='%s'> was ignored"
msgstr ""
@@ -2318,10 +2342,16 @@ msgid ""
"of this guest."
msgstr ""
-#: ../v2v/v2v.ml:273
+#: ../v2v/v2v.ml:281
msgid "no root device found in this operating system image."
msgstr ""
+#: ../v2v/input_libvirt.ml:304
+msgid ""
+"no support for remote libvirt connections to '-ic %s'. The conversion may "
+"fail when it tries to read the source disks."
+msgstr ""
+
#: ../resize/resize.ml:129
msgid "ntfsresize"
msgstr ""
@@ -2382,7 +2412,7 @@ msgstr ""
msgid "pwrite: short write restoring swap partition header"
msgstr ""
-#: ../v2v/v2v.ml:191 ../v2v/v2v.ml:75
+#: ../v2v/v2v.ml:224 ../v2v/v2v.ml:111
msgid "qemu-img command failed, see earlier errors"
msgstr ""
@@ -2394,7 +2424,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:311
+#: ../v2v/v2v.ml:319
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2410,14 +2440,14 @@ msgstr ""
msgid "sectors"
msgstr ""
-#: ../v2v/target_RHEV.ml:228
+#: ../v2v/output_RHEV.ml:174
msgid ""
"the Export Storage Domain (%s) has not been attached to any Data Center.\n"
"\n"
"You have to do this through the RHEV-M / OVirt user interface first."
msgstr ""
-#: ../v2v/target_RHEV.ml:233
+#: ../v2v/output_RHEV.ml:179
msgid ""
"the Export Storage Domain (%s) is not writable.\n"
"\n"
@@ -2426,7 +2456,7 @@ msgid ""
"Original error was: %s"
msgstr ""
-#: ../v2v/target_RHEV.ml:275
+#: ../v2v/output_RHEV.ml:223
msgid ""
"the number of '--rhev-vol-uuid' parameters passed on the command line has to "
"match the number of guest disk images (for this guest: %d)"
@@ -2436,7 +2466,7 @@ msgstr ""
msgid "the source disk has no partitions"
msgstr ""
-#: ../v2v/target_RHEV.ml:133
+#: ../v2v/output_RHEV.ml:285
msgid ""
"the virtual size of the input disk %s is not an exact multiple of 512 "
"bytes. The virtual size is: %Ld.\n"
@@ -2445,13 +2475,13 @@ msgid ""
"about this issue."
msgstr ""
-#: ../v2v/target_RHEV.ml:222
+#: ../v2v/output_RHEV.ml:168
msgid ""
"there are multiple UUIDs in the Export Storage Domain (%s). This is "
"unexpected, and may be a bug in virt-v2v or OVirt."
msgstr ""
-#: ../v2v/target_RHEV.ml:220
+#: ../v2v/output_RHEV.ml:166
msgid ""
"there are no UUIDs in the Export Storage Domain (%s). Is it really an OVirt "
"or RHEV-M Export Storage Domain?"
@@ -2481,7 +2511,7 @@ msgid ""
"The guest will be configured to use a slower emulated device."
msgstr ""
-#: ../v2v/source_libvirt.ml:127
+#: ../v2v/input_libvirt.ml:120
msgid "this guest has no non-removable disks"
msgstr ""
@@ -2499,33 +2529,27 @@ msgstr ""
msgid "unknown --align-first option: use never|always|auto"
msgstr ""
-#: ../v2v/cmdline.ml:84
+#: ../v2v/cmdline.ml:98
msgid "unknown --root option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:174
+#: ../v2v/cmdline.ml:193
msgid "unknown --vmtype option, must be \"server\" or \"desktop\""
msgstr ""
-#: ../v2v/cmdline.ml:57
+#: ../v2v/cmdline.ml:58
msgid "unknown -i option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:66
+#: ../v2v/cmdline.ml:80
msgid "unknown -o option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:74
+#: ../v2v/cmdline.ml:88
msgid "unknown -oa option: %s"
msgstr ""
-#: ../v2v/target_RHEV.ml:638
-msgid ""
-"unknown NIC model %s for ethernet device %s. This NIC will be imported as "
-"rtl8139 instead."
-msgstr ""
-
-#: ../v2v/target_RHEV.ml:494
+#: ../v2v/output_RHEV.ml:423
msgid "unknown guest operating system: %s %s %d.%d (%s)"
msgstr ""
@@ -2724,11 +2748,11 @@ msgstr ""
msgid "virt-sysprep: script: killed by signal (%d)\n"
msgstr ""
-#: ../v2v/v2v.ml:132
+#: ../v2v/v2v.ml:165
msgid "virt-v2v is unable to convert this guest type (linux/distro=%s)"
msgstr ""
-#: ../v2v/v2v.ml:138
+#: ../v2v/v2v.ml:171
msgid "virt-v2v is unable to convert this guest type (type=%s)"
msgstr ""
diff --git a/po/te.po b/po/te.po
index 75ec18a..2ae6123 100644
--- a/po/te.po
+++ b/po/te.po
@@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-08-19 17:51+0100\n"
+"POT-Creation-Date: 2014-08-21 17:07+0100\n"
"PO-Revision-Date: 2014-07-22 18:03+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Telugu (http://www.transifex.com/projects/p/libguestfs/"
@@ -69,7 +69,7 @@ msgstr ""
msgid "%s (ignored)\n"
msgstr ""
-#: ../v2v/convert_linux.ml:1134
+#: ../v2v/convert_linux.ml:1136
msgid ""
"%s references unknown device \"%s\". You may have to fix this entry "
"manually after conversion."
@@ -79,7 +79,7 @@ msgstr ""
msgid "%s: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:147
+#: ../v2v/v2v.ml:180
msgid "%s: %s (ignored)"
msgstr ""
@@ -220,7 +220,7 @@ msgstr ""
msgid "%s: cannot output to a character device or /dev/null\n"
msgstr ""
-#: ../v2v/cmdline.ml:126
+#: ../v2v/cmdline.ml:143
msgid ""
"%s: convert a guest to use KVM\n"
"\n"
@@ -272,7 +272,7 @@ msgstr ""
msgid "%s: error: %s"
msgstr ""
-#: ../v2v/v2v.ml:369 ../sysprep/main.ml:297
+#: ../v2v/v2v.ml:377 ../sysprep/main.ml:297
msgid "%s: error: %s\n"
msgstr ""
@@ -282,13 +282,13 @@ msgstr ""
#. ../resize/resize.ml:1309
#. ../builder/builder.ml:743
-#: ../v2v/v2v.ml:362 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
+#: ../v2v/v2v.ml:370 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
msgid "%s: error: %s: %s\n"
msgstr ""
#. ../resize/resize.ml:1312
#. ../builder/builder.ml:746
-#: ../v2v/v2v.ml:365 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
+#: ../v2v/v2v.ml:373 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
msgid "%s: error: %s: %s: %s\n"
msgstr ""
@@ -309,7 +309,7 @@ msgstr ""
#. ../resize/resize.ml:1331
#. ../customize/customize_main.ml:262
#. ../builder/builder.ml:764
-#: ../v2v/v2v.ml:387 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
+#: ../v2v/v2v.ml:395 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
msgid "%s: exception: %s\n"
msgstr ""
@@ -319,7 +319,7 @@ msgstr ""
#. ../resize/resize.ml:1319
#. ../builder/builder.ml:752
-#: ../v2v/v2v.ml:375 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
+#: ../v2v/v2v.ml:383 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
msgid "%s: failure: %s\n"
msgstr ""
@@ -346,14 +346,14 @@ msgstr ""
#. ../resize/resize.ml:1328
#. ../customize/customize_main.ml:259
#. ../builder/builder.ml:761
-#: ../v2v/v2v.ml:384 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
+#: ../v2v/v2v.ml:392 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
msgid "%s: internal error: Not_found exception was thrown\n"
msgstr ""
#. ../resize/resize.ml:1325
#. ../customize/customize_main.ml:255
#. ../builder/builder.ml:758
-#: ../v2v/v2v.ml:381 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
+#: ../v2v/v2v.ml:389 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
msgid "%s: internal error: assertion failed at %s, line %d, char %d\n"
msgstr ""
@@ -361,7 +361,7 @@ msgstr ""
#. ../customize/customize_main.ml:252
#. ../builder/sources.ml:135
#. ../builder/builder.ml:755
-#: ../v2v/v2v.ml:378 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
+#: ../v2v/v2v.ml:386 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
msgid "%s: internal error: invalid argument: %s\n"
msgstr ""
@@ -379,7 +379,7 @@ msgstr ""
#. ../resize/resize.ml:1316
#. ../builder/builder.ml:749
-#: ../v2v/v2v.ml:372 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
+#: ../v2v/v2v.ml:380 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
msgid "%s: libguestfs error: %s\n"
msgstr ""
@@ -628,7 +628,7 @@ msgstr ""
msgid "--expand option given twice"
msgstr ""
-#: ../v2v/cmdline.ml:226
+#: ../v2v/cmdline.ml:245
msgid "--no-copy and '-o libvirt' cannot be used at the same time"
msgstr ""
@@ -653,40 +653,40 @@ msgstr ""
msgid "--tmp prebuilt:file: %s: file format is not qcow2"
msgstr ""
-#: ../v2v/cmdline.ml:236 ../v2v/cmdline.ml:224
+#: ../v2v/cmdline.ml:255 ../v2v/cmdline.ml:243
msgid "--vmtype option can only be used with '-o rhev'"
msgstr ""
-#: ../v2v/source_disk.ml:34
+#: ../v2v/input_disk.ml:44
msgid "-i disk: invalid input filename (%s)"
msgstr ""
-#: ../v2v/target_libvirt.ml:219
+#: ../v2v/output_libvirt.ml:231
msgid ""
"-o libvirt: output pool '%s' has type='dir' but the /pool/target/path "
"element either does not exist or is not a local directory. See virt-v2v(1) "
"section \"OUTPUT TO LIBVIRT\""
msgstr ""
-#: ../v2v/target_libvirt.ml:216
+#: ../v2v/output_libvirt.ml:228
msgid ""
"-o libvirt: output pool '%s' is not a directory (type='dir'). See virt-"
"v2v(1) section \"OUTPUT TO LIBVIRT\""
msgstr ""
-#: ../v2v/cmdline.ml:231
+#: ../v2v/cmdline.ml:250
msgid "-o local: output directory was not specified, use '-os /dir'"
msgstr ""
-#: ../v2v/cmdline.ml:241
+#: ../v2v/cmdline.ml:260
msgid "-o rhev: output storage was not specified, use '-os'"
msgstr ""
-#: ../v2v/cmdline.ml:233
+#: ../v2v/cmdline.ml:252
msgid "-os %s: output directory does not exist or is not a directory"
msgstr ""
-#: ../v2v/source_libvirt.ml:174
+#: ../v2v/input_libvirt.ml:171
msgid "<disk type='%s'> was ignored"
msgstr ""
@@ -754,7 +754,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:151
+#: ../v2v/v2v.ml:184
msgid "Closing the overlay"
msgstr ""
@@ -766,11 +766,11 @@ msgstr ""
msgid "Converting %s to %s"
msgstr ""
-#: ../v2v/v2v.ml:112
+#: ../v2v/v2v.ml:148
msgid "Converting %s to run on KVM"
msgstr ""
-#: ../v2v/v2v.ml:110
+#: ../v2v/v2v.ml:146
msgid "Converting the guest to run on KVM"
msgstr ""
@@ -790,7 +790,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:170
+#: ../v2v/v2v.ml:203
msgid "Copying disk %d/%d to %s (%s)"
msgstr ""
@@ -814,11 +814,11 @@ msgstr ""
msgid "Create symbolic links"
msgstr ""
-#: ../v2v/v2v.ml:59
+#: ../v2v/v2v.ml:95
msgid "Creating an overlay to protect the source from being modified"
msgstr ""
-#: ../v2v/v2v.ml:196
+#: ../v2v/v2v.ml:229
msgid "Creating output metadata"
msgstr ""
@@ -857,7 +857,7 @@ msgstr ""
msgid "DIR"
msgstr ""
-#: ../v2v/cmdline.ml:92 ../sparsify/cmdline.ml:73 ../resize/resize.ml:186
+#: ../v2v/cmdline.ml:107 ../sparsify/cmdline.ml:73 ../resize/resize.ml:186
msgid "Debug GC and memory allocations"
msgstr ""
@@ -909,7 +909,7 @@ msgstr ""
#. ../customize/customize_main.ml:99
#. ../builder/cmdline.ml:158
#. ../builder/cmdline.ml:157
-#: ../v2v/cmdline.ml:117 ../sysprep/main.ml:155 ../sysprep/main.ml:154
+#: ../v2v/cmdline.ml:134 ../sysprep/main.ml:155 ../sysprep/main.ml:154
msgid "Display version and exit"
msgstr ""
@@ -986,7 +986,7 @@ msgstr ""
#. ../customize/customize_main.ml:97
#. ../builder/cmdline.ml:156
#. ../builder/cmdline.ml:155
-#: ../v2v/cmdline.ml:115 ../sysprep/main.ml:153 ../sysprep/main.ml:152
+#: ../v2v/cmdline.ml:132 ../sysprep/main.ml:153 ../sysprep/main.ml:152
msgid "Enable debugging messages"
msgstr ""
@@ -997,7 +997,7 @@ msgstr ""
#. ../resize/resize.ml:214
#. ../customize/customize_main.ml:101
#. ../builder/cmdline.ml:159
-#: ../v2v/cmdline.ml:120 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
+#: ../v2v/cmdline.ml:137 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
msgid "Enable tracing of libguestfs calls"
msgstr ""
@@ -1005,7 +1005,7 @@ msgstr ""
msgid "Enable/disable specific operations"
msgstr ""
-#: ../v2v/v2v.ml:293
+#: ../v2v/v2v.ml:301
msgid "Enter number between 1 and %d: "
msgstr ""
@@ -1093,7 +1093,7 @@ msgstr ""
msgid "Fingerprint: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:212 ../customize/customize_main.ml:237
+#: ../v2v/v2v.ml:232 ../customize/customize_main.ml:237
#: ../builder/builder.ml:711
msgid "Finishing off"
msgstr ""
@@ -1151,7 +1151,7 @@ msgstr ""
msgid "HOSTNAME"
msgstr ""
-#: ../v2v/cmdline.ml:114
+#: ../v2v/cmdline.ml:131
msgid "How to choose root filesystem"
msgstr ""
@@ -1163,7 +1163,7 @@ msgstr ""
msgid "Ignore partition"
msgstr ""
-#: ../v2v/v2v.ml:97
+#: ../v2v/v2v.ml:133
msgid "Initializing the target %s"
msgstr ""
@@ -1173,11 +1173,11 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/cmdline.ml:96
+#: ../v2v/cmdline.ml:111
msgid "Input format (for -i disk)"
msgstr ""
-#: ../v2v/v2v.ml:103
+#: ../v2v/v2v.ml:139
msgid "Inspecting the overlay"
msgstr ""
@@ -1197,7 +1197,7 @@ msgstr ""
msgid "Installing packages: %s"
msgstr ""
-#: ../v2v/cmdline.ml:99
+#: ../v2v/cmdline.ml:115
msgid "Just write the metadata"
msgstr ""
@@ -1205,7 +1205,7 @@ msgstr ""
msgid "Key: %s\n"
msgstr ""
-#: ../v2v/cmdline.ml:102 ../v2v/cmdline.ml:94
+#: ../v2v/cmdline.ml:118 ../v2v/cmdline.ml:109
msgid "Libvirt URI"
msgstr ""
@@ -1220,7 +1220,7 @@ msgstr ""
#. ../resize/resize.ml:193
#. ../customize/customize_main.ml:89
#. ../builder/cmdline.ml:139
-#: ../v2v/cmdline.ml:97 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
+#: ../v2v/cmdline.ml:112 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
msgid "List long options"
msgstr ""
@@ -1229,7 +1229,7 @@ msgid "List supported operations"
msgstr ""
#. ../builder/cmdline.ml:140
-#: ../v2v/cmdline.ml:98 ../sparsify/cmdline.ml:79 ../resize/resize.ml:198
+#: ../v2v/cmdline.ml:113 ../sparsify/cmdline.ml:79 ../resize/resize.ml:198
msgid "Make output machine readable"
msgstr ""
@@ -1237,6 +1237,14 @@ msgstr ""
msgid "Making directory: %s"
msgstr ""
+#: ../v2v/cmdline.ml:106
+msgid "Map bridge 'in' to 'out'"
+msgstr ""
+
+#: ../v2v/cmdline.ml:114
+msgid "Map network 'in' to 'out'"
+msgstr ""
+
#: ../builder/list_entries.ml:77
msgid "Minimum/default size:"
msgstr ""
@@ -1294,11 +1302,15 @@ msgstr ""
msgid "Opening the new disk"
msgstr ""
-#: ../v2v/v2v.ml:80
+#: ../v2v/v2v.ml:116
msgid "Opening the overlay"
msgstr ""
-#: ../v2v/cmdline.ml:113
+#: ../v2v/v2v.ml:42
+msgid "Opening the source %s"
+msgstr ""
+
+#: ../v2v/cmdline.ml:130
msgid "Output VM UUID"
msgstr ""
@@ -1314,7 +1326,7 @@ msgstr ""
msgid "Output format (default: raw)"
msgstr ""
-#: ../v2v/cmdline.ml:109
+#: ../v2v/cmdline.ml:126
msgid "Output image UUID"
msgstr ""
@@ -1322,7 +1334,7 @@ msgstr ""
msgid "Output size"
msgstr ""
-#: ../v2v/cmdline.ml:111
+#: ../v2v/cmdline.ml:128
msgid "Output vol UUID(s)"
msgstr ""
@@ -1353,11 +1365,15 @@ msgstr ""
msgid "Print info about template cache"
msgstr ""
-#: ../v2v/cmdline.ml:106 ../sparsify/cmdline.ml:81
+#: ../v2v/cmdline.ml:122
+msgid "Print source and stop"
+msgstr ""
+
+#: ../v2v/cmdline.ml:123 ../sparsify/cmdline.ml:81
msgid "Quiet output"
msgstr ""
-#: ../v2v/target_RHEV.ml:544 ../v2v/target_RHEV.ml:141
+#: ../v2v/output_RHEV.ml:475 ../v2v/output_RHEV.ml:293
msgid "RHEV does not support the output format '%s', only raw or qcow2"
msgstr ""
@@ -1550,7 +1566,7 @@ msgstr ""
msgid "Remove user at-jobs and cron-jobs"
msgstr ""
-#: ../v2v/cmdline.ml:104
+#: ../v2v/cmdline.ml:120
msgid "Rename guest when converting"
msgstr ""
@@ -1654,7 +1670,7 @@ msgstr ""
msgid "Set format (default: auto)"
msgstr ""
-#: ../v2v/cmdline.ml:93
+#: ../v2v/cmdline.ml:108
msgid "Set input mode (default: libvirt)"
msgstr ""
@@ -1684,7 +1700,7 @@ msgstr ""
msgid "Set number of vCPUs"
msgstr ""
-#: ../v2v/cmdline.ml:101
+#: ../v2v/cmdline.ml:117
msgid "Set output allocation mode"
msgstr ""
@@ -1696,15 +1712,15 @@ msgstr ""
msgid "Set output filename"
msgstr ""
-#: ../v2v/cmdline.ml:103
+#: ../v2v/cmdline.ml:119
msgid "Set output format"
msgstr ""
-#: ../v2v/cmdline.ml:100
+#: ../v2v/cmdline.ml:116
msgid "Set output mode (default: libvirt)"
msgstr ""
-#: ../v2v/cmdline.ml:105
+#: ../v2v/cmdline.ml:121
msgid "Set output storage location"
msgstr ""
@@ -1752,7 +1768,7 @@ msgstr ""
msgid "Set user password"
msgstr ""
-#: ../v2v/cmdline.ml:119
+#: ../v2v/cmdline.ml:136
msgid "Set vmtype (for RHEV)"
msgstr ""
@@ -1796,6 +1812,10 @@ msgstr ""
msgid "Source URI: %s\n"
msgstr ""
+#: ../v2v/v2v.ml:47
+msgid "Source guest information (--print-source option):\n"
+msgstr ""
+
#: ../sparsify/in_place.ml:153
msgid "Sparsify in-place operation completed with no errors.\n"
msgstr ""
@@ -1854,7 +1874,7 @@ msgid ""
" IT IS POSSIBLE THAT SOMEONE IS DOING SOMETHING NASTY!"
msgstr ""
-#: ../v2v/convert_linux.ml:1042
+#: ../v2v/convert_linux.ml:1044
msgid ""
"The display driver was updated to '%s', but X11 does not seem to be "
"installed in the guest. X may not function correctly."
@@ -1918,7 +1938,7 @@ msgid ""
"virtual machine's disk, but it was stored on disk in older distros."
msgstr ""
-#: ../v2v/target_RHEV.ml:378
+#: ../v2v/output_RHEV.ml:692
msgid ""
"This guest required a password for connection to its display, but this is "
"not supported by RHEV. Therefore the converted guest's display will not "
@@ -1948,7 +1968,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:142
+#: ../v2v/v2v.ml:175
msgid "Trimming filesystems to reduce amount of data to copy"
msgstr ""
@@ -2062,7 +2082,7 @@ msgstr ""
msgid "cannot detect input disk format; use the --format parameter"
msgstr ""
-#: ../v2v/source_disk.ml:50
+#: ../v2v/input_disk.ml:60
msgid "cannot detect the input disk format; use the -if parameter"
msgstr ""
@@ -2076,11 +2096,11 @@ msgid ""
"\\Windows\\CurrentVersion\\Uninstall\\%s' does not contain an '%s' key"
msgstr ""
-#: ../v2v/v2v.ml:296
+#: ../v2v/v2v.ml:304
msgid "connection closed"
msgstr ""
-#: ../v2v/target_libvirt.ml:257
+#: ../v2v/output_libvirt.ml:269
msgid ""
"could not define libvirt domain. The libvirt XML is still available in "
"'%s'. Try running 'virsh define %s' yourself instead."
@@ -2092,14 +2112,18 @@ msgid ""
"\\CurrentVersion"
msgstr ""
-#: ../v2v/target_RHEV.ml:208
+#: ../v2v/input_libvirt.ml:289
+msgid "could not parse '-ic %s'. Original error message was: %s"
+msgstr ""
+
+#: ../v2v/output_RHEV.ml:154
msgid ""
"could not read the Export Storage Domain specified by the '-os %s' parameter "
"on the command line. Is it really an OVirt or RHEV-M Export Storage "
"Domain? The original error is: %s"
msgstr ""
-#: ../v2v/target_libvirt.ml:239
+#: ../v2v/output_libvirt.ml:251
msgid "could not refresh libvirt pool %s"
msgstr ""
@@ -2131,14 +2155,14 @@ msgstr ""
msgid "discard/trim is not supported: %s"
msgstr ""
-#: ../v2v/v2v.ml:234
+#: ../v2v/v2v.ml:254
msgid ""
"disk %s (%s) has no defined format, you have to either define the original "
"format in the source metadata, or use the '-of' option to force the output "
"format"
msgstr ""
-#: ../v2v/source_libvirt.ml:106
+#: ../v2v/input_libvirt.ml:99
msgid "display <graphics type='%s'> was ignored"
msgstr ""
@@ -2160,7 +2184,7 @@ msgstr ""
msgid "don't know how to remove packages using %s: packages: %s"
msgstr ""
-#: ../v2v/v2v.ml:280
+#: ../v2v/v2v.ml:288
msgid ""
"dual- or multi-boot operating system detected. Choose the root filesystem\n"
"that contains the main operating system from the list below:\n"
@@ -2174,19 +2198,19 @@ msgstr ""
msgid "error parsing URI '%s'. Look for error messages printed above."
msgstr ""
-#: ../v2v/source_libvirt.ml:63
+#: ../v2v/input_libvirt.ml:56
msgid "expecting XML expression to return an integer (expression: %s)"
msgstr ""
-#: ../v2v/cmdline.ml:194
+#: ../v2v/cmdline.ml:213
msgid "expecting a disk image (filename) on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:214
+#: ../v2v/cmdline.ml:233
msgid "expecting a libvirt XML file name on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:205
+#: ../v2v/cmdline.ml:224
msgid "expecting a libvirt guest name on the command line"
msgstr ""
@@ -2247,23 +2271,23 @@ msgstr ""
msgid "hostname could not be set for this type of guest"
msgstr ""
-#: ../v2v/v2v.ml:318
+#: ../v2v/cmdline.ml:65
+msgid "invalid --bridge or --network parameter"
+msgstr ""
+
+#: ../v2v/v2v.ml:326
msgid ""
"libguestfs thinks this is not an installed operating system (it might be, "
"for example, an installer disk or live CD). If this is wrong, it is "
"probably a bug in libguestfs. root=%s fmt=%s"
msgstr ""
-#: ../v2v/source_libvirt.ml:39
-msgid "libvirt returned a non-absolute path in the XML (%s)"
-msgstr ""
-
#. ../resize/resize.ml:194
#: ../resize/resize.ml:197 ../resize/resize.ml:196 ../resize/resize.ml:195
msgid "lv"
msgstr ""
-#: ../v2v/target_RHEV.ml:185
+#: ../v2v/output_RHEV.ml:131
msgid ""
"mount command failed, see earlier errors.\n"
"\n"
@@ -2271,7 +2295,7 @@ msgid ""
"[-os %s], or else you need to rerun virt-v2v as root."
msgstr ""
-#: ../v2v/v2v.ml:303
+#: ../v2v/v2v.ml:311
msgid ""
"multi-boot operating systems are not supported by virt-v2v. Use the --root "
"option to change how virt-v2v handles this."
@@ -2283,7 +2307,7 @@ msgid ""
"be a bug in virt-v2v."
msgstr ""
-#: ../v2v/source_libvirt.ml:170
+#: ../v2v/input_libvirt.ml:167
msgid "network <disk> with <source protocol='%s'> was ignored"
msgstr ""
@@ -2318,10 +2342,16 @@ msgid ""
"of this guest."
msgstr ""
-#: ../v2v/v2v.ml:273
+#: ../v2v/v2v.ml:281
msgid "no root device found in this operating system image."
msgstr ""
+#: ../v2v/input_libvirt.ml:304
+msgid ""
+"no support for remote libvirt connections to '-ic %s'. The conversion may "
+"fail when it tries to read the source disks."
+msgstr ""
+
#: ../resize/resize.ml:129
msgid "ntfsresize"
msgstr ""
@@ -2382,7 +2412,7 @@ msgstr ""
msgid "pwrite: short write restoring swap partition header"
msgstr ""
-#: ../v2v/v2v.ml:191 ../v2v/v2v.ml:75
+#: ../v2v/v2v.ml:224 ../v2v/v2v.ml:111
msgid "qemu-img command failed, see earlier errors"
msgstr ""
@@ -2394,7 +2424,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:311
+#: ../v2v/v2v.ml:319
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2410,14 +2440,14 @@ msgstr ""
msgid "sectors"
msgstr ""
-#: ../v2v/target_RHEV.ml:228
+#: ../v2v/output_RHEV.ml:174
msgid ""
"the Export Storage Domain (%s) has not been attached to any Data Center.\n"
"\n"
"You have to do this through the RHEV-M / OVirt user interface first."
msgstr ""
-#: ../v2v/target_RHEV.ml:233
+#: ../v2v/output_RHEV.ml:179
msgid ""
"the Export Storage Domain (%s) is not writable.\n"
"\n"
@@ -2426,7 +2456,7 @@ msgid ""
"Original error was: %s"
msgstr ""
-#: ../v2v/target_RHEV.ml:275
+#: ../v2v/output_RHEV.ml:223
msgid ""
"the number of '--rhev-vol-uuid' parameters passed on the command line has to "
"match the number of guest disk images (for this guest: %d)"
@@ -2436,7 +2466,7 @@ msgstr ""
msgid "the source disk has no partitions"
msgstr ""
-#: ../v2v/target_RHEV.ml:133
+#: ../v2v/output_RHEV.ml:285
msgid ""
"the virtual size of the input disk %s is not an exact multiple of 512 "
"bytes. The virtual size is: %Ld.\n"
@@ -2445,13 +2475,13 @@ msgid ""
"about this issue."
msgstr ""
-#: ../v2v/target_RHEV.ml:222
+#: ../v2v/output_RHEV.ml:168
msgid ""
"there are multiple UUIDs in the Export Storage Domain (%s). This is "
"unexpected, and may be a bug in virt-v2v or OVirt."
msgstr ""
-#: ../v2v/target_RHEV.ml:220
+#: ../v2v/output_RHEV.ml:166
msgid ""
"there are no UUIDs in the Export Storage Domain (%s). Is it really an OVirt "
"or RHEV-M Export Storage Domain?"
@@ -2481,7 +2511,7 @@ msgid ""
"The guest will be configured to use a slower emulated device."
msgstr ""
-#: ../v2v/source_libvirt.ml:127
+#: ../v2v/input_libvirt.ml:120
msgid "this guest has no non-removable disks"
msgstr ""
@@ -2499,33 +2529,27 @@ msgstr ""
msgid "unknown --align-first option: use never|always|auto"
msgstr ""
-#: ../v2v/cmdline.ml:84
+#: ../v2v/cmdline.ml:98
msgid "unknown --root option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:174
+#: ../v2v/cmdline.ml:193
msgid "unknown --vmtype option, must be \"server\" or \"desktop\""
msgstr ""
-#: ../v2v/cmdline.ml:57
+#: ../v2v/cmdline.ml:58
msgid "unknown -i option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:66
+#: ../v2v/cmdline.ml:80
msgid "unknown -o option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:74
+#: ../v2v/cmdline.ml:88
msgid "unknown -oa option: %s"
msgstr ""
-#: ../v2v/target_RHEV.ml:638
-msgid ""
-"unknown NIC model %s for ethernet device %s. This NIC will be imported as "
-"rtl8139 instead."
-msgstr ""
-
-#: ../v2v/target_RHEV.ml:494
+#: ../v2v/output_RHEV.ml:423
msgid "unknown guest operating system: %s %s %d.%d (%s)"
msgstr ""
@@ -2724,11 +2748,11 @@ msgstr ""
msgid "virt-sysprep: script: killed by signal (%d)\n"
msgstr ""
-#: ../v2v/v2v.ml:132
+#: ../v2v/v2v.ml:165
msgid "virt-v2v is unable to convert this guest type (linux/distro=%s)"
msgstr ""
-#: ../v2v/v2v.ml:138
+#: ../v2v/v2v.ml:171
msgid "virt-v2v is unable to convert this guest type (type=%s)"
msgstr ""
diff --git a/po/uk.po b/po/uk.po
index 922e4f1..5cfab42 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -10,7 +10,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-08-19 17:51+0100\n"
+"POT-Creation-Date: 2014-08-21 17:07+0100\n"
"PO-Revision-Date: 2014-07-22 18:03+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Ukrainian (http://www.transifex.com/projects/p/libguestfs/"
@@ -71,7 +71,7 @@ msgstr ""
msgid "%s (ignored)\n"
msgstr ""
-#: ../v2v/convert_linux.ml:1134
+#: ../v2v/convert_linux.ml:1136
msgid ""
"%s references unknown device \"%s\". You may have to fix this entry "
"manually after conversion."
@@ -81,7 +81,7 @@ msgstr ""
msgid "%s: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:147
+#: ../v2v/v2v.ml:180
msgid "%s: %s (ignored)"
msgstr ""
@@ -222,7 +222,7 @@ msgstr ""
msgid "%s: cannot output to a character device or /dev/null\n"
msgstr ""
-#: ../v2v/cmdline.ml:126
+#: ../v2v/cmdline.ml:143
msgid ""
"%s: convert a guest to use KVM\n"
"\n"
@@ -274,7 +274,7 @@ msgstr ""
msgid "%s: error: %s"
msgstr ""
-#: ../v2v/v2v.ml:369 ../sysprep/main.ml:297
+#: ../v2v/v2v.ml:377 ../sysprep/main.ml:297
msgid "%s: error: %s\n"
msgstr ""
@@ -284,13 +284,13 @@ msgstr ""
#. ../resize/resize.ml:1309
#. ../builder/builder.ml:743
-#: ../v2v/v2v.ml:362 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
+#: ../v2v/v2v.ml:370 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
msgid "%s: error: %s: %s\n"
msgstr ""
#. ../resize/resize.ml:1312
#. ../builder/builder.ml:746
-#: ../v2v/v2v.ml:365 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
+#: ../v2v/v2v.ml:373 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
msgid "%s: error: %s: %s: %s\n"
msgstr ""
@@ -311,7 +311,7 @@ msgstr ""
#. ../resize/resize.ml:1331
#. ../customize/customize_main.ml:262
#. ../builder/builder.ml:764
-#: ../v2v/v2v.ml:387 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
+#: ../v2v/v2v.ml:395 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
msgid "%s: exception: %s\n"
msgstr ""
@@ -321,7 +321,7 @@ msgstr ""
#. ../resize/resize.ml:1319
#. ../builder/builder.ml:752
-#: ../v2v/v2v.ml:375 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
+#: ../v2v/v2v.ml:383 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
msgid "%s: failure: %s\n"
msgstr ""
@@ -348,14 +348,14 @@ msgstr ""
#. ../resize/resize.ml:1328
#. ../customize/customize_main.ml:259
#. ../builder/builder.ml:761
-#: ../v2v/v2v.ml:384 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
+#: ../v2v/v2v.ml:392 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
msgid "%s: internal error: Not_found exception was thrown\n"
msgstr ""
#. ../resize/resize.ml:1325
#. ../customize/customize_main.ml:255
#. ../builder/builder.ml:758
-#: ../v2v/v2v.ml:381 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
+#: ../v2v/v2v.ml:389 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
msgid "%s: internal error: assertion failed at %s, line %d, char %d\n"
msgstr ""
@@ -363,7 +363,7 @@ msgstr ""
#. ../customize/customize_main.ml:252
#. ../builder/sources.ml:135
#. ../builder/builder.ml:755
-#: ../v2v/v2v.ml:378 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
+#: ../v2v/v2v.ml:386 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
msgid "%s: internal error: invalid argument: %s\n"
msgstr ""
@@ -381,7 +381,7 @@ msgstr ""
#. ../resize/resize.ml:1316
#. ../builder/builder.ml:749
-#: ../v2v/v2v.ml:372 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
+#: ../v2v/v2v.ml:380 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
msgid "%s: libguestfs error: %s\n"
msgstr ""
@@ -630,7 +630,7 @@ msgstr ""
msgid "--expand option given twice"
msgstr ""
-#: ../v2v/cmdline.ml:226
+#: ../v2v/cmdline.ml:245
msgid "--no-copy and '-o libvirt' cannot be used at the same time"
msgstr ""
@@ -655,40 +655,40 @@ msgstr ""
msgid "--tmp prebuilt:file: %s: file format is not qcow2"
msgstr ""
-#: ../v2v/cmdline.ml:236 ../v2v/cmdline.ml:224
+#: ../v2v/cmdline.ml:255 ../v2v/cmdline.ml:243
msgid "--vmtype option can only be used with '-o rhev'"
msgstr ""
-#: ../v2v/source_disk.ml:34
+#: ../v2v/input_disk.ml:44
msgid "-i disk: invalid input filename (%s)"
msgstr ""
-#: ../v2v/target_libvirt.ml:219
+#: ../v2v/output_libvirt.ml:231
msgid ""
"-o libvirt: output pool '%s' has type='dir' but the /pool/target/path "
"element either does not exist or is not a local directory. See virt-v2v(1) "
"section \"OUTPUT TO LIBVIRT\""
msgstr ""
-#: ../v2v/target_libvirt.ml:216
+#: ../v2v/output_libvirt.ml:228
msgid ""
"-o libvirt: output pool '%s' is not a directory (type='dir'). See virt-"
"v2v(1) section \"OUTPUT TO LIBVIRT\""
msgstr ""
-#: ../v2v/cmdline.ml:231
+#: ../v2v/cmdline.ml:250
msgid "-o local: output directory was not specified, use '-os /dir'"
msgstr ""
-#: ../v2v/cmdline.ml:241
+#: ../v2v/cmdline.ml:260
msgid "-o rhev: output storage was not specified, use '-os'"
msgstr ""
-#: ../v2v/cmdline.ml:233
+#: ../v2v/cmdline.ml:252
msgid "-os %s: output directory does not exist or is not a directory"
msgstr ""
-#: ../v2v/source_libvirt.ml:174
+#: ../v2v/input_libvirt.ml:171
msgid "<disk type='%s'> was ignored"
msgstr ""
@@ -756,7 +756,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:151
+#: ../v2v/v2v.ml:184
msgid "Closing the overlay"
msgstr ""
@@ -768,11 +768,11 @@ msgstr ""
msgid "Converting %s to %s"
msgstr ""
-#: ../v2v/v2v.ml:112
+#: ../v2v/v2v.ml:148
msgid "Converting %s to run on KVM"
msgstr ""
-#: ../v2v/v2v.ml:110
+#: ../v2v/v2v.ml:146
msgid "Converting the guest to run on KVM"
msgstr ""
@@ -792,7 +792,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:170
+#: ../v2v/v2v.ml:203
msgid "Copying disk %d/%d to %s (%s)"
msgstr ""
@@ -816,11 +816,11 @@ msgstr ""
msgid "Create symbolic links"
msgstr ""
-#: ../v2v/v2v.ml:59
+#: ../v2v/v2v.ml:95
msgid "Creating an overlay to protect the source from being modified"
msgstr ""
-#: ../v2v/v2v.ml:196
+#: ../v2v/v2v.ml:229
msgid "Creating output metadata"
msgstr ""
@@ -859,7 +859,7 @@ msgstr ""
msgid "DIR"
msgstr ""
-#: ../v2v/cmdline.ml:92 ../sparsify/cmdline.ml:73 ../resize/resize.ml:186
+#: ../v2v/cmdline.ml:107 ../sparsify/cmdline.ml:73 ../resize/resize.ml:186
msgid "Debug GC and memory allocations"
msgstr ""
@@ -911,7 +911,7 @@ msgstr ""
#. ../customize/customize_main.ml:99
#. ../builder/cmdline.ml:158
#. ../builder/cmdline.ml:157
-#: ../v2v/cmdline.ml:117 ../sysprep/main.ml:155 ../sysprep/main.ml:154
+#: ../v2v/cmdline.ml:134 ../sysprep/main.ml:155 ../sysprep/main.ml:154
msgid "Display version and exit"
msgstr ""
@@ -988,7 +988,7 @@ msgstr ""
#. ../customize/customize_main.ml:97
#. ../builder/cmdline.ml:156
#. ../builder/cmdline.ml:155
-#: ../v2v/cmdline.ml:115 ../sysprep/main.ml:153 ../sysprep/main.ml:152
+#: ../v2v/cmdline.ml:132 ../sysprep/main.ml:153 ../sysprep/main.ml:152
msgid "Enable debugging messages"
msgstr ""
@@ -999,7 +999,7 @@ msgstr ""
#. ../resize/resize.ml:214
#. ../customize/customize_main.ml:101
#. ../builder/cmdline.ml:159
-#: ../v2v/cmdline.ml:120 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
+#: ../v2v/cmdline.ml:137 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
msgid "Enable tracing of libguestfs calls"
msgstr ""
@@ -1007,7 +1007,7 @@ msgstr ""
msgid "Enable/disable specific operations"
msgstr ""
-#: ../v2v/v2v.ml:293
+#: ../v2v/v2v.ml:301
msgid "Enter number between 1 and %d: "
msgstr ""
@@ -1095,7 +1095,7 @@ msgstr ""
msgid "Fingerprint: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:212 ../customize/customize_main.ml:237
+#: ../v2v/v2v.ml:232 ../customize/customize_main.ml:237
#: ../builder/builder.ml:711
msgid "Finishing off"
msgstr ""
@@ -1153,7 +1153,7 @@ msgstr ""
msgid "HOSTNAME"
msgstr ""
-#: ../v2v/cmdline.ml:114
+#: ../v2v/cmdline.ml:131
msgid "How to choose root filesystem"
msgstr ""
@@ -1165,7 +1165,7 @@ msgstr ""
msgid "Ignore partition"
msgstr ""
-#: ../v2v/v2v.ml:97
+#: ../v2v/v2v.ml:133
msgid "Initializing the target %s"
msgstr ""
@@ -1175,11 +1175,11 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/cmdline.ml:96
+#: ../v2v/cmdline.ml:111
msgid "Input format (for -i disk)"
msgstr ""
-#: ../v2v/v2v.ml:103
+#: ../v2v/v2v.ml:139
msgid "Inspecting the overlay"
msgstr ""
@@ -1199,7 +1199,7 @@ msgstr ""
msgid "Installing packages: %s"
msgstr ""
-#: ../v2v/cmdline.ml:99
+#: ../v2v/cmdline.ml:115
msgid "Just write the metadata"
msgstr ""
@@ -1207,7 +1207,7 @@ msgstr ""
msgid "Key: %s\n"
msgstr ""
-#: ../v2v/cmdline.ml:102 ../v2v/cmdline.ml:94
+#: ../v2v/cmdline.ml:118 ../v2v/cmdline.ml:109
msgid "Libvirt URI"
msgstr ""
@@ -1222,7 +1222,7 @@ msgstr ""
#. ../resize/resize.ml:193
#. ../customize/customize_main.ml:89
#. ../builder/cmdline.ml:139
-#: ../v2v/cmdline.ml:97 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
+#: ../v2v/cmdline.ml:112 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
msgid "List long options"
msgstr ""
@@ -1231,7 +1231,7 @@ msgid "List supported operations"
msgstr ""
#. ../builder/cmdline.ml:140
-#: ../v2v/cmdline.ml:98 ../sparsify/cmdline.ml:79 ../resize/resize.ml:198
+#: ../v2v/cmdline.ml:113 ../sparsify/cmdline.ml:79 ../resize/resize.ml:198
msgid "Make output machine readable"
msgstr ""
@@ -1239,6 +1239,14 @@ msgstr ""
msgid "Making directory: %s"
msgstr ""
+#: ../v2v/cmdline.ml:106
+msgid "Map bridge 'in' to 'out'"
+msgstr ""
+
+#: ../v2v/cmdline.ml:114
+msgid "Map network 'in' to 'out'"
+msgstr ""
+
#: ../builder/list_entries.ml:77
msgid "Minimum/default size:"
msgstr ""
@@ -1296,11 +1304,15 @@ msgstr ""
msgid "Opening the new disk"
msgstr ""
-#: ../v2v/v2v.ml:80
+#: ../v2v/v2v.ml:116
msgid "Opening the overlay"
msgstr ""
-#: ../v2v/cmdline.ml:113
+#: ../v2v/v2v.ml:42
+msgid "Opening the source %s"
+msgstr ""
+
+#: ../v2v/cmdline.ml:130
msgid "Output VM UUID"
msgstr ""
@@ -1316,7 +1328,7 @@ msgstr ""
msgid "Output format (default: raw)"
msgstr ""
-#: ../v2v/cmdline.ml:109
+#: ../v2v/cmdline.ml:126
msgid "Output image UUID"
msgstr ""
@@ -1324,7 +1336,7 @@ msgstr ""
msgid "Output size"
msgstr ""
-#: ../v2v/cmdline.ml:111
+#: ../v2v/cmdline.ml:128
msgid "Output vol UUID(s)"
msgstr ""
@@ -1355,11 +1367,15 @@ msgstr ""
msgid "Print info about template cache"
msgstr ""
-#: ../v2v/cmdline.ml:106 ../sparsify/cmdline.ml:81
+#: ../v2v/cmdline.ml:122
+msgid "Print source and stop"
+msgstr ""
+
+#: ../v2v/cmdline.ml:123 ../sparsify/cmdline.ml:81
msgid "Quiet output"
msgstr ""
-#: ../v2v/target_RHEV.ml:544 ../v2v/target_RHEV.ml:141
+#: ../v2v/output_RHEV.ml:475 ../v2v/output_RHEV.ml:293
msgid "RHEV does not support the output format '%s', only raw or qcow2"
msgstr ""
@@ -1552,7 +1568,7 @@ msgstr ""
msgid "Remove user at-jobs and cron-jobs"
msgstr ""
-#: ../v2v/cmdline.ml:104
+#: ../v2v/cmdline.ml:120
msgid "Rename guest when converting"
msgstr ""
@@ -1656,7 +1672,7 @@ msgstr ""
msgid "Set format (default: auto)"
msgstr ""
-#: ../v2v/cmdline.ml:93
+#: ../v2v/cmdline.ml:108
msgid "Set input mode (default: libvirt)"
msgstr ""
@@ -1686,7 +1702,7 @@ msgstr ""
msgid "Set number of vCPUs"
msgstr ""
-#: ../v2v/cmdline.ml:101
+#: ../v2v/cmdline.ml:117
msgid "Set output allocation mode"
msgstr ""
@@ -1698,15 +1714,15 @@ msgstr ""
msgid "Set output filename"
msgstr ""
-#: ../v2v/cmdline.ml:103
+#: ../v2v/cmdline.ml:119
msgid "Set output format"
msgstr ""
-#: ../v2v/cmdline.ml:100
+#: ../v2v/cmdline.ml:116
msgid "Set output mode (default: libvirt)"
msgstr ""
-#: ../v2v/cmdline.ml:105
+#: ../v2v/cmdline.ml:121
msgid "Set output storage location"
msgstr ""
@@ -1754,7 +1770,7 @@ msgstr ""
msgid "Set user password"
msgstr ""
-#: ../v2v/cmdline.ml:119
+#: ../v2v/cmdline.ml:136
msgid "Set vmtype (for RHEV)"
msgstr ""
@@ -1798,6 +1814,10 @@ msgstr ""
msgid "Source URI: %s\n"
msgstr ""
+#: ../v2v/v2v.ml:47
+msgid "Source guest information (--print-source option):\n"
+msgstr ""
+
#: ../sparsify/in_place.ml:153
msgid "Sparsify in-place operation completed with no errors.\n"
msgstr ""
@@ -1856,7 +1876,7 @@ msgid ""
" IT IS POSSIBLE THAT SOMEONE IS DOING SOMETHING NASTY!"
msgstr ""
-#: ../v2v/convert_linux.ml:1042
+#: ../v2v/convert_linux.ml:1044
msgid ""
"The display driver was updated to '%s', but X11 does not seem to be "
"installed in the guest. X may not function correctly."
@@ -1920,7 +1940,7 @@ msgid ""
"virtual machine's disk, but it was stored on disk in older distros."
msgstr ""
-#: ../v2v/target_RHEV.ml:378
+#: ../v2v/output_RHEV.ml:692
msgid ""
"This guest required a password for connection to its display, but this is "
"not supported by RHEV. Therefore the converted guest's display will not "
@@ -1950,7 +1970,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:142
+#: ../v2v/v2v.ml:175
msgid "Trimming filesystems to reduce amount of data to copy"
msgstr ""
@@ -2064,7 +2084,7 @@ msgstr ""
msgid "cannot detect input disk format; use the --format parameter"
msgstr ""
-#: ../v2v/source_disk.ml:50
+#: ../v2v/input_disk.ml:60
msgid "cannot detect the input disk format; use the -if parameter"
msgstr ""
@@ -2078,11 +2098,11 @@ msgid ""
"\\Windows\\CurrentVersion\\Uninstall\\%s' does not contain an '%s' key"
msgstr ""
-#: ../v2v/v2v.ml:296
+#: ../v2v/v2v.ml:304
msgid "connection closed"
msgstr ""
-#: ../v2v/target_libvirt.ml:257
+#: ../v2v/output_libvirt.ml:269
msgid ""
"could not define libvirt domain. The libvirt XML is still available in "
"'%s'. Try running 'virsh define %s' yourself instead."
@@ -2094,14 +2114,18 @@ msgid ""
"\\CurrentVersion"
msgstr ""
-#: ../v2v/target_RHEV.ml:208
+#: ../v2v/input_libvirt.ml:289
+msgid "could not parse '-ic %s'. Original error message was: %s"
+msgstr ""
+
+#: ../v2v/output_RHEV.ml:154
msgid ""
"could not read the Export Storage Domain specified by the '-os %s' parameter "
"on the command line. Is it really an OVirt or RHEV-M Export Storage "
"Domain? The original error is: %s"
msgstr ""
-#: ../v2v/target_libvirt.ml:239
+#: ../v2v/output_libvirt.ml:251
msgid "could not refresh libvirt pool %s"
msgstr ""
@@ -2133,14 +2157,14 @@ msgstr ""
msgid "discard/trim is not supported: %s"
msgstr ""
-#: ../v2v/v2v.ml:234
+#: ../v2v/v2v.ml:254
msgid ""
"disk %s (%s) has no defined format, you have to either define the original "
"format in the source metadata, or use the '-of' option to force the output "
"format"
msgstr ""
-#: ../v2v/source_libvirt.ml:106
+#: ../v2v/input_libvirt.ml:99
msgid "display <graphics type='%s'> was ignored"
msgstr ""
@@ -2162,7 +2186,7 @@ msgstr ""
msgid "don't know how to remove packages using %s: packages: %s"
msgstr ""
-#: ../v2v/v2v.ml:280
+#: ../v2v/v2v.ml:288
msgid ""
"dual- or multi-boot operating system detected. Choose the root filesystem\n"
"that contains the main operating system from the list below:\n"
@@ -2176,19 +2200,19 @@ msgstr ""
msgid "error parsing URI '%s'. Look for error messages printed above."
msgstr ""
-#: ../v2v/source_libvirt.ml:63
+#: ../v2v/input_libvirt.ml:56
msgid "expecting XML expression to return an integer (expression: %s)"
msgstr ""
-#: ../v2v/cmdline.ml:194
+#: ../v2v/cmdline.ml:213
msgid "expecting a disk image (filename) on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:214
+#: ../v2v/cmdline.ml:233
msgid "expecting a libvirt XML file name on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:205
+#: ../v2v/cmdline.ml:224
msgid "expecting a libvirt guest name on the command line"
msgstr ""
@@ -2249,23 +2273,23 @@ msgstr ""
msgid "hostname could not be set for this type of guest"
msgstr ""
-#: ../v2v/v2v.ml:318
+#: ../v2v/cmdline.ml:65
+msgid "invalid --bridge or --network parameter"
+msgstr ""
+
+#: ../v2v/v2v.ml:326
msgid ""
"libguestfs thinks this is not an installed operating system (it might be, "
"for example, an installer disk or live CD). If this is wrong, it is "
"probably a bug in libguestfs. root=%s fmt=%s"
msgstr ""
-#: ../v2v/source_libvirt.ml:39
-msgid "libvirt returned a non-absolute path in the XML (%s)"
-msgstr ""
-
#. ../resize/resize.ml:194
#: ../resize/resize.ml:197 ../resize/resize.ml:196 ../resize/resize.ml:195
msgid "lv"
msgstr ""
-#: ../v2v/target_RHEV.ml:185
+#: ../v2v/output_RHEV.ml:131
msgid ""
"mount command failed, see earlier errors.\n"
"\n"
@@ -2273,7 +2297,7 @@ msgid ""
"[-os %s], or else you need to rerun virt-v2v as root."
msgstr ""
-#: ../v2v/v2v.ml:303
+#: ../v2v/v2v.ml:311
msgid ""
"multi-boot operating systems are not supported by virt-v2v. Use the --root "
"option to change how virt-v2v handles this."
@@ -2285,7 +2309,7 @@ msgid ""
"be a bug in virt-v2v."
msgstr ""
-#: ../v2v/source_libvirt.ml:170
+#: ../v2v/input_libvirt.ml:167
msgid "network <disk> with <source protocol='%s'> was ignored"
msgstr ""
@@ -2320,10 +2344,16 @@ msgid ""
"of this guest."
msgstr ""
-#: ../v2v/v2v.ml:273
+#: ../v2v/v2v.ml:281
msgid "no root device found in this operating system image."
msgstr ""
+#: ../v2v/input_libvirt.ml:304
+msgid ""
+"no support for remote libvirt connections to '-ic %s'. The conversion may "
+"fail when it tries to read the source disks."
+msgstr ""
+
#: ../resize/resize.ml:129
msgid "ntfsresize"
msgstr ""
@@ -2384,7 +2414,7 @@ msgstr ""
msgid "pwrite: short write restoring swap partition header"
msgstr ""
-#: ../v2v/v2v.ml:191 ../v2v/v2v.ml:75
+#: ../v2v/v2v.ml:224 ../v2v/v2v.ml:111
msgid "qemu-img command failed, see earlier errors"
msgstr ""
@@ -2396,7 +2426,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:311
+#: ../v2v/v2v.ml:319
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2412,14 +2442,14 @@ msgstr ""
msgid "sectors"
msgstr ""
-#: ../v2v/target_RHEV.ml:228
+#: ../v2v/output_RHEV.ml:174
msgid ""
"the Export Storage Domain (%s) has not been attached to any Data Center.\n"
"\n"
"You have to do this through the RHEV-M / OVirt user interface first."
msgstr ""
-#: ../v2v/target_RHEV.ml:233
+#: ../v2v/output_RHEV.ml:179
msgid ""
"the Export Storage Domain (%s) is not writable.\n"
"\n"
@@ -2428,7 +2458,7 @@ msgid ""
"Original error was: %s"
msgstr ""
-#: ../v2v/target_RHEV.ml:275
+#: ../v2v/output_RHEV.ml:223
msgid ""
"the number of '--rhev-vol-uuid' parameters passed on the command line has to "
"match the number of guest disk images (for this guest: %d)"
@@ -2438,7 +2468,7 @@ msgstr ""
msgid "the source disk has no partitions"
msgstr ""
-#: ../v2v/target_RHEV.ml:133
+#: ../v2v/output_RHEV.ml:285
msgid ""
"the virtual size of the input disk %s is not an exact multiple of 512 "
"bytes. The virtual size is: %Ld.\n"
@@ -2447,13 +2477,13 @@ msgid ""
"about this issue."
msgstr ""
-#: ../v2v/target_RHEV.ml:222
+#: ../v2v/output_RHEV.ml:168
msgid ""
"there are multiple UUIDs in the Export Storage Domain (%s). This is "
"unexpected, and may be a bug in virt-v2v or OVirt."
msgstr ""
-#: ../v2v/target_RHEV.ml:220
+#: ../v2v/output_RHEV.ml:166
msgid ""
"there are no UUIDs in the Export Storage Domain (%s). Is it really an OVirt "
"or RHEV-M Export Storage Domain?"
@@ -2483,7 +2513,7 @@ msgid ""
"The guest will be configured to use a slower emulated device."
msgstr ""
-#: ../v2v/source_libvirt.ml:127
+#: ../v2v/input_libvirt.ml:120
msgid "this guest has no non-removable disks"
msgstr ""
@@ -2501,33 +2531,27 @@ msgstr ""
msgid "unknown --align-first option: use never|always|auto"
msgstr ""
-#: ../v2v/cmdline.ml:84
+#: ../v2v/cmdline.ml:98
msgid "unknown --root option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:174
+#: ../v2v/cmdline.ml:193
msgid "unknown --vmtype option, must be \"server\" or \"desktop\""
msgstr ""
-#: ../v2v/cmdline.ml:57
+#: ../v2v/cmdline.ml:58
msgid "unknown -i option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:66
+#: ../v2v/cmdline.ml:80
msgid "unknown -o option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:74
+#: ../v2v/cmdline.ml:88
msgid "unknown -oa option: %s"
msgstr ""
-#: ../v2v/target_RHEV.ml:638
-msgid ""
-"unknown NIC model %s for ethernet device %s. This NIC will be imported as "
-"rtl8139 instead."
-msgstr ""
-
-#: ../v2v/target_RHEV.ml:494
+#: ../v2v/output_RHEV.ml:423
msgid "unknown guest operating system: %s %s %d.%d (%s)"
msgstr ""
@@ -2726,11 +2750,11 @@ msgstr ""
msgid "virt-sysprep: script: killed by signal (%d)\n"
msgstr ""
-#: ../v2v/v2v.ml:132
+#: ../v2v/v2v.ml:165
msgid "virt-v2v is unable to convert this guest type (linux/distro=%s)"
msgstr ""
-#: ../v2v/v2v.ml:138
+#: ../v2v/v2v.ml:171
msgid "virt-v2v is unable to convert this guest type (type=%s)"
msgstr ""
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-libvirt/libguestfs.git
More information about the Pkg-libvirt-commits
mailing list