rpms/virt-v2v
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Rebase to upstream development version 2.6.0

Browse Source 
resolves: RHEL-56813
This commit is contained in:
Richard W.M. Jones 2024-10-09 12:19:48 +01:00
parent ae89f3e094
commit 2555691d6f
22 changed files with 48 additions and 31521 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
0008-RHEL-v2v-Select-correct-qemu-binary-for-o-qemu-mode-.patch → 0001-RHEL-v2v-Select-correct-qemu-binary-for-o-qemu-mode-.patch
View File

@ -1,4 +1,4 @@
From 452464fc14731dd1f4f12f62d12ad82625f63aed Mon Sep 17 00:00:00 2001 From deadbd0e20075ebb7048c296ed4c1afe3a3c1468 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com> From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Sun, 28 Sep 2014 19:14:43 +0100 Date: Sun, 28 Sep 2014 19:14:43 +0100
Subject: [PATCH] RHEL: v2v: Select correct qemu binary for -o qemu mode Subject: [PATCH] RHEL: v2v: Select correct qemu binary for -o qemu mode

39
0001-convert-Display-osinfo-in-Converting-.-message.patch
View File

@ -1,39 +0,0 @@
From 4b39b7bd0f7f8cc3069df7e32f2dc35140a2b6d3 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Sat, 31 Aug 2024 09:25:50 +0100
Subject: [PATCH] convert: Display osinfo in "Converting ..." message
eg:
[ 9.3] Converting Windows Server 2022 Phony Edition (win2k22) to run on KVM
Reported-by: Ming Xie
Fixes: https://issues.redhat.com/browse/RHEL-56784
Signed-off-by: Richard W.M. Jones <rjones@redhat.com>
---
convert/convert.ml | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/convert/convert.ml b/convert/convert.ml
index 5d955599..64b36c97 100644
--- a/convert/convert.ml
+++ b/convert/convert.ml
@@ -220,11 +220,15 @@ and do_fstrim g inspect =
(* Conversion. *)
and do_convert g source inspect i_firmware
block_driver keep_serial_console interfaces =
- (match inspect.i_product_name with
- | "unknown" ->
+ (match inspect.i_product_name, inspect.i_osinfo with
+ | "unknown", "unknown" ->
message (f_"Converting the guest to run on KVM")
- | prod ->
+ | "unknown", osinfo ->
+ message (f_"Converting %s guest to run on KVM") osinfo
+ | prod, "unknown" ->
message (f_"Converting %s to run on KVM") prod
+ | prod, osinfo ->
+ message (f_"Converting %s (%s) to run on KVM") prod osinfo
);
let convert, conversion_name =

12
0009-RHEL-v2v-Disable-the-qemu-boot-oo-qemu-boot-option-R.patch → 0002-RHEL-v2v-Disable-the-qemu-boot-oo-qemu-boot-option-R.patch
View File

@ -1,4 +1,4 @@
From 6bc7af1eaeb3442329dd2d71ca422678b77d79aa Mon Sep 17 00:00:00 2001 From 77ea342ea0ddd3bebc782d0e901cccc61e99e4ac Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com> From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Tue, 30 Sep 2014 10:50:27 +0100 Date: Tue, 30 Sep 2014 10:50:27 +0100
Subject: [PATCH] RHEL: v2v: Disable the --qemu-boot / -oo qemu-boot option Subject: [PATCH] RHEL: v2v: Disable the --qemu-boot / -oo qemu-boot option
@ -44,10 +44,10 @@ index d2a1c270..0be37f5e 100644
=item B<-o null> =item B<-o null>
diff --git a/docs/virt-v2v.pod b/docs/virt-v2v.pod diff --git a/docs/virt-v2v.pod b/docs/virt-v2v.pod
index e6465fbf..76067e5a 100644 index 5345a6c9..a1e8fb30 100644
--- a/docs/virt-v2v.pod --- a/docs/virt-v2v.pod
+++ b/docs/virt-v2v.pod +++ b/docs/virt-v2v.pod
@@ -155,11 +155,6 @@ Since F<guest-domain.xml> contains the path(s) to the guest disk @@ -157,11 +157,6 @@ Since F<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 image(s) you do not need to specify the name of the disk image on the
command line. command line.
@ -59,7 +59,7 @@ index e6465fbf..76067e5a 100644
=head1 OPTIONS =head1 OPTIONS
=over 4 =over 4
@@ -531,9 +526,6 @@ This is similar to I<-o local>, except that a shell script is written @@ -533,9 +528,6 @@ This is similar to I<-o local>, except that a shell script is written
which you can use to boot the guest in qemu. The converted disks and which you can use to boot the guest in qemu. The converted disks and
shell script are written to the directory specified by I<-os>. shell script are written to the directory specified by I<-os>.
@ -69,7 +69,7 @@ index e6465fbf..76067e5a 100644
=item B<-o> B<rhev> =item B<-o> B<rhev>
This is the same as I<-o rhv>. This is the same as I<-o rhv>.
@@ -616,11 +608,6 @@ For I<-o openstack> (L<virt-v2v-output-openstack(1)>) only, set a guest ID @@ -618,11 +610,6 @@ For I<-o openstack> (L<virt-v2v-output-openstack(1)>) only, set a guest ID
which is saved on each Cinder volume in the C<virt_v2v_guest_id> which is saved on each Cinder volume in the C<virt_v2v_guest_id>
volume property. volume property.
@ -81,7 +81,7 @@ index e6465fbf..76067e5a 100644
=item B<-oo verify-server-certificate> =item B<-oo verify-server-certificate>
=item B<-oo verify-server-certificate=>C<true|false> =item B<-oo verify-server-certificate=>C<true|false>
@@ -791,10 +778,6 @@ Print information about the source guest and stop. This option is @@ -793,10 +780,6 @@ Print information about the source guest and stop. This option is
useful when you are setting up network and bridge maps. useful when you are setting up network and bridge maps.
See L</Networks and bridges>. See L</Networks and bridges>.

103
0002-Translated-using-Weblate-English-United-Kingdom.patch
View File

@ -1,103 +0,0 @@
From 00692c57b0adde6fb3a202ae307bdf55b6f6e5cf Mon Sep 17 00:00:00 2001
From: Andi Chandler <andi@gowling.com>
Date: Mon, 2 Sep 2024 15:38:35 +0200
Subject: [PATCH] Translated using Weblate (English (United Kingdom))
Currently translated at 4.9% (65 of 1305 strings)
Translation: libguestfs/virt-v2v-docs-master
Translate-URL: https://translate.fedoraproject.org/projects/libguestfs/virt-v2v-docs-master/en_GB/
---
po-docs/en_GB.po | 36 +++++++++++++++++++++++++++++-------
1 file changed, 29 insertions(+), 7 deletions(-)
diff --git a/po-docs/en_GB.po b/po-docs/en_GB.po
index 0aed20e0..0b181a34 100644
--- a/po-docs/en_GB.po
+++ b/po-docs/en_GB.po
@@ -8,16 +8,16 @@ msgstr ""
"Project-Id-Version: libguestfs 1.39.12\n"
"Report-Msgid-Bugs-To: guestfs@lists.libguestfs.org\n"
"POT-Creation-Date: 2020-08-13 13:17+0200\n"
-"PO-Revision-Date: 2015-02-21 10:15+0000\n"
-"Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
-"Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/"
-"libguestfs/language/en_GB/)\n"
+"PO-Revision-Date: 2024-09-02 13:38+0000\n"
+"Last-Translator: Andi Chandler <andi@gowling.com>\n"
+"Language-Team: English (United Kingdom) <https://translate.fedoraproject.org/"
+"projects/libguestfs/virt-v2v-docs-master/en_GB/>\n"
"Language: en_GB\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Zanata 4.6.2\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 5.7.1\n"
#. type: =end
#: common/mlcustomize/customize-options.pod:1
@@ -38,6 +38,12 @@ msgid ""
" ANY CHANGES YOU MAKE TO THIS FILE WILL BE LOST.\n"
"\n"
msgstr ""
+"libguestfs generated file\n"
+" WARNING: THIS FILE IS GENERATED FROM THE FOLLOWING FILES:\n"
+" generator/customize.ml\n"
+" and from the code in the generator/ subdirectory.\n"
+" ANY CHANGES YOU MAKE TO THIS FILE WILL BE LOST.\n"
+"\n"
#. type: verbatim
#: common/mlcustomize/customize-options.pod:9
@@ -46,6 +52,8 @@ msgid ""
" Copyright (C) 2009-2020 Red Hat Inc.\n"
"\n"
msgstr ""
+" Copyright (C) 2009-2020 Red Hat Inc.\n"
+"\n"
#. type: verbatim
#: common/mlcustomize/customize-options.pod:11
@@ -57,6 +65,11 @@ msgid ""
" (at your option) any later version.\n"
"\n"
msgstr ""
+" This program is free software; you can redistribute it and/or modify\n"
+" it under the terms of the GNU General Public Licence as published by\n"
+" the Free Software Foundation; either version 2 of the Licence, or\n"
+" (at your option) any later version.\n"
+"\n"
#. type: verbatim
#: common/mlcustomize/customize-options.pod:16
@@ -68,6 +81,11 @@ msgid ""
" GNU General Public License for more details.\n"
"\n"
msgstr ""
+" This program is distributed in the hope that it will be useful,\n"
+" but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n"
+" GNU General Public Licence for more details.\n"
+"\n"
#. type: verbatim
#: common/mlcustomize/customize-options.pod:21
@@ -78,11 +96,15 @@ msgid ""
" 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.\n"
"\n"
msgstr ""
+" You should have received a copy of the GNU General Public Licence along\n"
+" with this program; if not, write to the Free Software Foundation, Inc.,\n"
+" 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.\n"
+"\n"
#. type: =item
#: common/mlcustomize/customize-options.pod:29
msgid "B<--append-line> FILE:LINE"
-msgstr ""
+msgstr "B<--append-line> FILE:LINE"
#. type: textblock
#: common/mlcustomize/customize-options.pod:31

2
0010-RHEL-Fix-list-of-supported-sound-cards-to-match-RHEL.patch → 0003-RHEL-Fix-list-of-supported-sound-cards-to-match-RHEL.patch
View File

@ -1,4 +1,4 @@
From 145377b0aa47c2fbab0448ddd0e06d7a39b7f25d Mon Sep 17 00:00:00 2001 From e364d77b017dd10ec9e60d6cb0a75e92109dd321 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com> From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Fri, 24 Apr 2015 09:45:41 -0400 Date: Fri, 24 Apr 2015 09:45:41 -0400
Subject: [PATCH] RHEL: Fix list of supported sound cards to match RHEL qemu Subject: [PATCH] RHEL: Fix list of supported sound cards to match RHEL qemu

30447
0003-Update-translation-files.patch
View File

File diff suppressed because it is too large Load Diff

2
0011-RHEL-Fixes-for-libguestfs-winsupport.patch → 0004-RHEL-Fixes-for-libguestfs-winsupport.patch
View File

@ -1,4 +1,4 @@
From 628515f144017e3ac787a5daa3f76d0e3b0b47f6 Mon Sep 17 00:00:00 2001 From f20f654504d7d855b0fddf44dde6c8b5b229636f Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com> From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Sun, 30 Aug 2015 03:21:57 -0400 Date: Sun, 30 Aug 2015 03:21:57 -0400
Subject: [PATCH] RHEL: Fixes for libguestfs-winsupport. Subject: [PATCH] RHEL: Fixes for libguestfs-winsupport.

161
0004-Translated-using-Weblate-Ukrainian.patch
View File

@ -1,161 +0,0 @@
From e34f5c7e4430764d4402d1364072299c0e9395b8 Mon Sep 17 00:00:00 2001
From: Yuri Chornoivan <yurchor@ukr.net>
Date: Tue, 3 Sep 2024 16:41:33 +0200
Subject: [PATCH] Translated using Weblate (Ukrainian)
Currently translated at 95.4% (527 of 552 strings)
Translation: libguestfs/virt-v2v-master
Translate-URL: https://translate.fedoraproject.org/projects/libguestfs/virt-v2v-master/uk/
---
po/uk.po | 39 +++++++++++++++++++--------------------
1 file changed, 19 insertions(+), 20 deletions(-)
diff --git a/po/uk.po b/po/uk.po
index 047434a7..8a2891ec 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -12,10 +12,10 @@
msgid ""
msgstr ""
"Project-Id-Version: libguestfs 1.39.12\n"
-"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
-"component=libguestfs&product=Virtualization+Tools\n"
+"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug."
+"cgi?component=libguestfs&product=Virtualization+Tools\n"
"POT-Creation-Date: 2024-08-29 15:25+0100\n"
-"PO-Revision-Date: 2023-06-05 07:20+0000\n"
+"PO-Revision-Date: 2024-09-03 14:41+0000\n"
"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
"Language-Team: Ukrainian <https://translate.fedoraproject.org/projects/"
"libguestfs/virt-v2v-master/uk/>\n"
@@ -25,7 +25,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Generator: Weblate 4.17\n"
+"X-Generator: Weblate 5.7.1\n"
#: input/input_ova.ml:136 common/mltools/tools_utils.ml:235
msgid "%s"
@@ -77,7 +77,7 @@ msgstr ""
#: common/mlcustomize/customize_run.ml:121
msgid "%s ignored for non-Windows guest"
-msgstr ""
+msgstr "%s проігноровано для відмінної від Windows гостьової системи"
#: common/mlcustomize/customize_run.ml:194
#, fuzzy
@@ -243,24 +243,29 @@ msgstr ""
#: common/mlcustomize/customize_run.ml:160
msgid "--chown: could not parse numeric UID:GID from %s:%s"
-msgstr ""
+msgstr "--chown: не вдалося визначити числові значення UID:GID на основі %s:%s"
#: common/mlcustomize/customize_run.ml:224
msgid ""
"--inject-blnsvr: blnsvr.exe not found in virtio-win source that you specified"
msgstr ""
+"--inject-blnsvr: blnsvr.exe не знайдено у вказаному вами джерелі virtio-win"
#: common/mlcustomize/customize_run.ml:233
msgid ""
"--inject-qemu-ga: QEMU Guest Agent MSI not found in virtio-win source that "
"you specified"
msgstr ""
+"--inject-qemu-ga: не знайдено MSI гостьового агента QEMU у вказаному вами "
+"джерелі virtio-win"
#: common/mlcustomize/customize_run.ml:249
msgid ""
"--inject-virtio-win: virtio drivers were not found for this Windows version "
"in the virtio-win source that you specified"
msgstr ""
+"--inject-virtio-win: не знайдено драйверів virtio для цієї версії Windows у "
+"вказаному вами джерелі virtio-win"
#: v2v/v2v.ml:144 inspector/inspector.ml:131 in-place/in_place.ml:125
msgid "--mac ip prefix length field is out of range"
@@ -586,7 +591,7 @@ msgstr "Завантажитися у qemu (лише для -o qemu)"
#: common/mlcustomize/customize_cmdline.ml:209
msgid "Change the owner user and group ID of a file or directory"
-msgstr ""
+msgstr "Змінити ідентифікатор користувача і групи власника файла або каталогу"
#: common/mlcustomize/customize_cmdline.ml:198
msgid "Change the permissions of a file"
@@ -594,7 +599,7 @@ msgstr "Змінити права доступу до файла"
#: common/mlcustomize/customize_run.ml:163
msgid "Changing owner of %s to %d:%d"
-msgstr ""
+msgstr "Змінюємо власника %s на %d:%d"
#: common/mlcustomize/customize_run.ml:149
#, fuzzy
@@ -615,10 +620,8 @@ msgid "Copy files in disk image"
msgstr "Копіювати файли на образ диска"
#: common/mlcustomize/customize_cmdline.ml:438
-#, fuzzy
-#| msgid "Copy local files or directories into image"
msgid "Copy local files or directories from a tarball into image"
-msgstr "Копіювати локальні файли або каталоги до образу"
+msgstr "Копіювати локальні файли або каталоги з архіву tar до образу"
#: common/mlcustomize/customize_cmdline.ml:242
msgid "Copy local files or directories into image"
@@ -769,10 +772,8 @@ msgid "Inject a public key into the guest"
msgstr "Вставити відкритий ключ до гостьової системи"
#: common/mlcustomize/customize_cmdline.ml:294
-#, fuzzy
-#| msgid "Inject virtio-win drivers into a Windows guest"
msgid "Inject the Balloon Server into a Windows guest"
-msgstr "Вставити драйвери virtio-win до гостьової системи Windows"
+msgstr "Вставити Balloon Server до гостьової системи Windows"
#: common/mlcustomize/customize_cmdline.ml:300
msgid "Inject the QEMU Guest Agent into a Windows guest"
@@ -1167,7 +1168,7 @@ msgstr "ДЖЕРЕЛО:ПРИЗНАЧЕННЯ"
#: common/mlcustomize/customize_run.ml:332
msgid "SSH key could not be injected for this type of guest"
-msgstr ""
+msgstr "Ключ SSH не можна вставляти до цього типу гостьових систем"
#: common/mlcustomize/customize_run.ml:329
msgid "SSH key inject: %s"
@@ -1364,10 +1365,8 @@ msgid "Specify a LUKS key"
msgstr "Вказати ключ LUKS"
#: common/mlcustomize/customize_cmdline.ml:433
-#, fuzzy
-#| msgid "LOCALPATH:REMOTEDIR"
msgid "TARFILE:REMOTEDIR"
-msgstr "ЛОКАЛЬНИЙШЛЯХ:ВІДДАЛЕНИЙКАТАЛОГ"
+msgstr "ФАЙЛTAR:ВІДДАЛЕНИЙКАТАЛОГ"
#: common/mlcustomize/customize_cmdline.ml:323
msgid "TARGET:LINK[:LINK..]"
@@ -1435,7 +1434,7 @@ msgstr "%s: попередження: %s"
#: common/mlcustomize/customize_cmdline.ml:204
msgid "UID:GID:PATH"
-msgstr ""
+msgstr "UID:GID:ШЛЯХ"
#: common/mlcustomize/customize_cmdline.ml:351
msgid "USER:SELECTOR"
@@ -1457,7 +1456,7 @@ msgstr "Вилучити пакунки"
#: common/mlcustomize/customize_run.ml:335
msgid "Unpack tar file: %s to %s"
-msgstr ""
+msgstr "Розпаковування файла tar: %s до %s"
#: common/mlcustomize/customize_cmdline.ml:415
msgid "Unregister using subscription-manager"

2
0012-RHEL-v2v-i-disk-force-VNC-as-display-RHBZ-1372671.patch → 0005-RHEL-v2v-i-disk-force-VNC-as-display-RHBZ-1372671.patch
View File

@ -1,4 +1,4 @@
From f9fda69fae36c1b39bc150f79ffff70540b5d666 Mon Sep 17 00:00:00 2001 From 6c75da5b223fc205ac72ed2e01fe25e4f2b162d3 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com> From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Thu, 2 Mar 2017 14:21:37 +0100 Date: Thu, 2 Mar 2017 14:21:37 +0100
Subject: [PATCH] RHEL: v2v: -i disk: force VNC as display (RHBZ#1372671) Subject: [PATCH] RHEL: v2v: -i disk: force VNC as display (RHBZ#1372671)

427
0005-Translated-using-Weblate-Ukrainian.patch
View File

@ -1,427 +0,0 @@
From e618c18bf4c865e72f5ed4873abafccccaba24e1 Mon Sep 17 00:00:00 2001
From: Weblate Translation Memory
<noreply-mt-weblate-translation-memory@weblate.org>
Date: Tue, 3 Sep 2024 16:41:33 +0200
Subject: [PATCH] Translated using Weblate (Ukrainian)
Currently translated at 95.4% (527 of 552 strings)
Translation: libguestfs/virt-v2v-master
Translate-URL: https://translate.fedoraproject.org/projects/libguestfs/virt-v2v-master/uk/
---
po/uk.po | 138 +++++++++++++++++++------------------------------------
1 file changed, 46 insertions(+), 92 deletions(-)
diff --git a/po/uk.po b/po/uk.po
index 8a2891ec..8b616872 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -16,7 +16,8 @@ msgstr ""
"cgi?component=libguestfs&product=Virtualization+Tools\n"
"POT-Creation-Date: 2024-08-29 15:25+0100\n"
"PO-Revision-Date: 2024-09-03 14:41+0000\n"
-"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
+"Last-Translator: Weblate Translation Memory <noreply-mt-weblate-translation-"
+"memory@weblate.org>\n"
"Language-Team: Ukrainian <https://translate.fedoraproject.org/projects/"
"libguestfs/virt-v2v-master/uk/>\n"
"Language: uk\n"
@@ -49,7 +50,7 @@ msgstr "%s не повернуто жодних даних"
#: common/mlcustomize/customize_run.ml:191
msgid "%s does not exist in the guest"
-msgstr ""
+msgstr "%s не існує у гостьовій системі"
#: output/output_rhv.ml:273
msgid ""
@@ -80,10 +81,8 @@ msgid "%s ignored for non-Windows guest"
msgstr "%s проігноровано для відмінної від Windows гостьової системи"
#: common/mlcustomize/customize_run.ml:194
-#, fuzzy
-#| msgid "Inject a public key into the guest"
msgid "%s is not a regular file in the guest"
-msgstr "Вставити відкритий ключ до гостьової системи"
+msgstr "%s не є звичайним файлом у гостьовій системі"
#. inspector/inspector.ml:151
#. inspector/inspector.ml:40
@@ -114,10 +113,8 @@ msgid "%s: cannot open virtio-win ISO file: %s"
msgstr "%s: не вдалося відкрити файл ISO virtio-win: %s"
#: common/mlcustomize/customize_run.ml:72
-#, fuzzy
-#| msgid "external command ‘%s’ exited with error %d"
msgid "%s: command exited with an error"
-msgstr "виконання зовнішньої програми «%s» завершилося помилкою %d"
+msgstr "%s: виконання команди завершилося повідомленням про помилку"
#: v2v/v2v.ml:326
msgid ""
@@ -240,6 +237,9 @@ msgid ""
"--append-line: line must not contain newline characters. Use the --append-"
"line option multiple times to add several lines."
msgstr ""
+"--append-line: рядок не повинен містити символів розриву рядка. "
+"Скористайтеся параметром --append-line потрібну кількість разів, щоб додати "
+"декілька рядків."
#: common/mlcustomize/customize_run.ml:160
msgid "--chown: could not parse numeric UID:GID from %s:%s"
@@ -564,26 +564,20 @@ msgid "Append line(s) to the file"
msgstr "Дописати рядки до файла"
#: common/mlcustomize/customize_run.ml:145
-#, fuzzy
-#| msgid "Append line(s) to the file"
msgid "Appending line to %s"
-msgstr "Дописати рядки до файла"
+msgstr "Дописуємо рядок до %s"
#: common/mlcustomize/customize_cmdline.ml:397
msgid "Attach to a subscription-manager pool"
msgstr "Долучити до буфера subscription-manager"
#: common/mlcustomize/customize_run.ml:293
-#, fuzzy
-#| msgid "Attach to a subscription-manager pool"
msgid "Attaching to compatible subscriptions"
-msgstr "Долучити до буфера subscription-manager"
+msgstr "Долучаємо до сумісних підписок"
#: common/mlcustomize/customize_run.ml:297
-#, fuzzy
-#| msgid "Setting up the source: %s"
msgid "Attaching to the pool %s"
-msgstr "Налаштовуємо джерело: %s"
+msgstr "Долучаємо до буфера %s"
#: v2v/v2v.ml:281
msgid "Boot in qemu (-o qemu only)"
@@ -602,10 +596,8 @@ msgid "Changing owner of %s to %d:%d"
msgstr "Змінюємо власника %s на %d:%d"
#: common/mlcustomize/customize_run.ml:149
-#, fuzzy
-#| msgid "Change the permissions of a file"
msgid "Changing permissions of %s to %s"
-msgstr "Змінити права доступу до файла"
+msgstr "Зміна прав доступу до %s на %s"
#: common/mlcustomize/customize_cmdline.ml:529
msgid "Compatibility option doing nothing"
@@ -628,20 +620,16 @@ msgid "Copy local files or directories into image"
msgstr "Копіювати локальні файли або каталоги до образу"
#: common/mlcustomize/customize_run.ml:176
-#, fuzzy
-#| msgid "Copying remote disk %d/%d to %s"
msgid "Copying (in image): %s to %s"
-msgstr "Копіюємо віддалений диск %d з %d до %s"
+msgstr "Копіюємо (на образ): %s у %s"
#: v2v/v2v.ml:616
msgid "Copying disk %d/%d"
msgstr "Копіювання диска %d з %d"
#: common/mlcustomize/customize_run.ml:180
-#, fuzzy
-#| msgid "Copying disk %d/%d to %s (%s)"
msgid "Copying: %s to %s"
-msgstr "Копіювання диска %d з %d на %s (%s)"
+msgstr "Копіюємо %s до %s"
#: common/mlcustomize/customize_cmdline.ml:334
msgid "Create a directory"
@@ -668,10 +656,8 @@ msgid "Delete a file or directory"
msgstr "Вилучити файл або каталог"
#: common/mlcustomize/customize_run.ml:184
-#, fuzzy
-#| msgid "exception: %s"
msgid "Deleting: %s"
-msgstr "виключення: %s"
+msgstr "Вилучаємо: %s"
#: common/mltools/getopt.ml:229
msgid "Display brief help"
@@ -699,7 +685,7 @@ msgstr "Редагувати файл за допомогою виразу Perl"
#: common/mlcustomize/customize_run.ml:188
msgid "Editing: %s"
-msgstr ""
+msgstr "Редагування: %s"
#: common/mltools/tools_utils.ml:386
msgid "Enable libguestfs debugging messages"
@@ -837,21 +823,19 @@ msgstr "Вхідне передавання"
#: common/mlcustomize/customize_run.ml:199
msgid "Installing firstboot command: %s"
-msgstr ""
+msgstr "Встановлюємо програму firstboot: %s"
#: common/mlcustomize/customize_run.ml:203
msgid "Installing firstboot packages: %s"
-msgstr ""
+msgstr "Встановлюємо пакунки firstboot: %s"
#: common/mlcustomize/customize_run.ml:210
msgid "Installing firstboot script: %s"
-msgstr ""
+msgstr "Встановлюємо скрипт firstboot: %s"
#: common/mlcustomize/customize_run.ml:256
-#, fuzzy
-#| msgid "Uninstall package(s)"
msgid "Installing packages: %s"
-msgstr "Вилучити пакунки"
+msgstr "Встановлюємо пакунки: %s"
#: common/mlcustomize/customize_cmdline.ml:237
msgid "LOCALPATH:REMOTEDIR"
@@ -863,7 +847,7 @@ msgstr "Адреса libvirt"
#: common/mlcustomize/customize_run.ml:263
msgid "Linking: %s -> %s"
-msgstr ""
+msgstr "Компонування: %s -> %s"
#. common/mlcustomize/customize_cmdline.ml:299
#. common/mlcustomize/customize_cmdline.ml:293
@@ -877,7 +861,7 @@ msgstr "Зробити машину виведення придатною до
#: common/mlcustomize/customize_run.ml:268
msgid "Making directory: %s"
-msgstr ""
+msgstr "Створюємо каталог: %s"
#: v2v/v2v.ml:255 inspector/inspector.ml:178 in-place/in_place.ml:175
msgid "Map NIC to network or bridge or assign static IP"
@@ -898,7 +882,7 @@ msgstr "Пересунути файли на образ диска"
#: common/mlcustomize/customize_run.ml:272
msgid "Moving: %s -> %s"
-msgstr ""
+msgstr "Пересуваємо: %s -> %s"
#. input/input_vcenter_https.ml:45
#. input/input_ova.ml:36
@@ -1085,30 +1069,24 @@ msgid "Recursively truncate all files in directory"
msgstr "Рекурсивно обрізати усі файли у каталозі"
#: common/mlcustomize/customize_run.ml:343
-#, fuzzy
-#| msgid "Recursively truncate all files in directory"
msgid "Recursively truncating: %s"
-msgstr "Рекурсивно обрізати усі файли у каталозі"
+msgstr "Рекурсивно обрізаємо: %s"
#: common/mlcustomize/customize_cmdline.ml:403
msgid "Register using subscription-manager"
msgstr "Зареєструвати за допомогою subscription-manager"
#: common/mlcustomize/customize_run.ml:303
-#, fuzzy
-#| msgid "Register using subscription-manager"
msgid "Registering with subscription-manager"
-msgstr "Зареєструвати за допомогою subscription-manager"
+msgstr "Реєструємо за допомогою subscription-manager"
#: common/mlcustomize/customize_cmdline.ml:409
msgid "Remove all the subscriptions"
msgstr "Вилучити усі підписки"
#: common/mlcustomize/customize_run.ml:318
-#, fuzzy
-#| msgid "Remove all the subscriptions"
msgid "Removing all the subscriptions"
-msgstr "Вилучити усі підписки"
+msgstr "Вилучаємо усі підписки"
#: v2v/v2v.ml:269
msgid "Rename guest when converting"
@@ -1136,14 +1114,12 @@ msgstr "Обробити файл за допомогою touch"
#: common/mlcustomize/customize_run.ml:352
msgid "Running touch: %s"
-msgstr ""
+msgstr "Виконуємо touch: %s"
#. common/mlcustomize/customize_run.ml:167
#: common/mlcustomize/customize_run.ml:282
-#, fuzzy
-#| msgid "%s: warning: %s"
msgid "Running: %s"
-msgstr "%s: попередження: %s"
+msgstr "Виконуємо: %s"
#. common/mlcustomize/customize_cmdline.ml:264
#: common/mlcustomize/customize_cmdline.ml:373
@@ -1159,7 +1135,7 @@ msgstr "СЕЛЕКТОР"
#: common/mlcustomize/customize_run.ml:408
msgid "SELinux relabelling"
-msgstr ""
+msgstr "Зміна міток SELinux"
#. common/mlcustomize/customize_cmdline.ml:226
#: common/mlcustomize/customize_cmdline.ml:340
@@ -1172,7 +1148,7 @@ msgstr "Ключ SSH не можна вставляти до цього типу
#: common/mlcustomize/customize_run.ml:329
msgid "SSH key inject: %s"
-msgstr ""
+msgstr "Вставлення ключа SSH: %s"
#: v2v/v2v.ml:285
msgid "Same as ‘-io vddk-config=filename’"
@@ -1243,14 +1219,12 @@ msgid "Scrub build log file"
msgstr "Витерти файл журналу збирання"
#: common/mlcustomize/customize_run.ml:419
-#, fuzzy
-#| msgid "Scrub build log file"
msgid "Scrubbing the log file"
-msgstr "Витерти файл журналу збирання"
+msgstr "Витираємо файл журналу"
#: common/mlcustomize/customize_run.ml:287
msgid "Scrubbing: %s"
-msgstr ""
+msgstr "Витираємо: %s"
#: v2v/v2v.ml:233
msgid "Set bandwidth dynamically from file"
@@ -1318,35 +1292,27 @@ msgstr "Встановити пароль користувача"
#: common/mlcustomize/customize_run.ml:83
msgid "Setting a random seed"
-msgstr ""
+msgstr "Встановлюємо базу випадковості"
#: common/mlcustomize/customize_run.ml:399
-#, fuzzy
-#| msgid "Set root password"
msgid "Setting passwords"
-msgstr "Встановлення пароля root"
+msgstr "Встановлення паролів"
#: common/mlcustomize/password.ml:113
msgid "Setting random password of %s to %s"
-msgstr ""
+msgstr "Встановлюємо випадковий пароль %s у значення %s"
#: common/mlcustomize/customize_run.ml:215
-#, fuzzy
-#| msgid "Set the hostname"
msgid "Setting the hostname: %s"
-msgstr "Встановити назву вузла"
+msgstr "Встановлюємо назву вузла: %s"
#: common/mlcustomize/customize_run.ml:98
-#, fuzzy
-#| msgid "Setting up the destination: %s"
msgid "Setting the machine ID in %s"
-msgstr "Налаштовуємо призначення: %s"
+msgstr "Встановлюємо ідентифікатор комп'ютера у %s"
#: common/mlcustomize/customize_run.ml:347
-#, fuzzy
-#| msgid "Setting up the destination: %s"
msgid "Setting the timezone: %s"
-msgstr "Налаштовуємо призначення: %s"
+msgstr "Встановлюємо часовий пояс: %s"
#: v2v/v2v.ml:588
msgid "Setting up the destination: %s"
@@ -1427,10 +1393,8 @@ msgid "Truncate a file to zero size"
msgstr "Обрізати файл до нульового розміру"
#: common/mlcustomize/customize_run.ml:339
-#, fuzzy
-#| msgid "%s: warning: %s"
msgid "Truncating: %s"
-msgstr "%s: попередження: %s"
+msgstr "Обрізаємо: %s"
#: common/mlcustomize/customize_cmdline.ml:204
msgid "UID:GID:PATH"
@@ -1449,10 +1413,8 @@ msgid "Uninstall package(s)"
msgstr "Вилучити пакунки"
#: common/mlcustomize/customize_run.ml:356
-#, fuzzy
-#| msgid "Uninstall package(s)"
msgid "Uninstalling packages: %s"
-msgstr "Вилучити пакунки"
+msgstr "Вилучаємо пакунки: %s"
#: common/mlcustomize/customize_run.ml:335
msgid "Unpack tar file: %s to %s"
@@ -1463,20 +1425,16 @@ msgid "Unregister using subscription-manager"
msgstr "Скасувати реєстрацію за допомогою subscription-manager"
#: common/mlcustomize/customize_run.ml:323
-#, fuzzy
-#| msgid "Unregister using subscription-manager"
msgid "Unregistering with subscription-manager"
-msgstr "Скасувати реєстрацію за допомогою subscription-manager"
+msgstr "Скасовуємо реєстрацію за допомогою subscription-manager"
#: common/mlcustomize/customize_cmdline.ml:479
msgid "Update packages"
msgstr "Оновити пакунки"
#: common/mlcustomize/customize_run.ml:361
-#, fuzzy
-#| msgid "Update packages"
msgid "Updating packages"
-msgstr "Оновити пакунки"
+msgstr "Оновлюємо пакунки"
#: common/mlcustomize/customize_cmdline.ml:490
msgid "Upload local file to destination"
@@ -1484,7 +1442,7 @@ msgstr "Вивантажити локальний файл у систему п
#: common/mlcustomize/customize_run.ml:366
msgid "Uploading: %s to %s"
-msgstr ""
+msgstr "Вивантажуємо: %s до %s"
#: common/mltools/tools_utils.ml:391
msgid "Use ANSI colour sequences even if not tty"
@@ -1511,10 +1469,8 @@ msgid "Write file"
msgstr "Записати файл"
#: common/mlcustomize/customize_run.ml:391
-#, fuzzy
-#| msgid "%s: warning: %s"
msgid "Writing: %s"
-msgstr "%s: попередження: %s"
+msgstr "Записуємо: %s"
#: lib/YAML.ml:162
msgid ""
@@ -1556,10 +1512,8 @@ msgstr ""
"допомогою команди «virsh undefine»."
#: common/mlcustomize/append_line.ml:44
-#, fuzzy
-#| msgid "Append line(s) to the file"
msgid "append_line: %s is not a file"
-msgstr "Дописати рядки до файла"
+msgstr "append_line: %s не є файлом"
#: lib/utils.ml:83
msgid ""
@@ -1827,7 +1781,7 @@ msgstr ""
#: common/mltools/curl.ml:82
msgid "downloading %s"
-msgstr ""
+msgstr "Отримуємо: %s"
#: lib/networks.ml:84
msgid ""

2
0013-RHEL-v2v-do-not-mention-SUSE-Xen-hosts-RHBZ-1430203.patch → 0006-RHEL-v2v-do-not-mention-SUSE-Xen-hosts-RHBZ-1430203.patch
View File

@ -1,4 +1,4 @@
From edb28ecefc3f2ee2a5135dd5becfebfc9e408a2c Mon Sep 17 00:00:00 2001 From 4cf6260b7ba2f59897efd35d5b31a5c3fa280839 Mon Sep 17 00:00:00 2001
From: Pino Toscano <ptoscano@redhat.com> From: Pino Toscano <ptoscano@redhat.com>
Date: Wed, 8 Mar 2017 11:03:40 +0100 Date: Wed, 8 Mar 2017 11:03:40 +0100
Subject: [PATCH] RHEL: v2v: do not mention SUSE Xen hosts (RHBZ#1430203) Subject: [PATCH] RHEL: v2v: do not mention SUSE Xen hosts (RHBZ#1430203)

110
0006-Translated-using-Weblate-Ukrainian.patch
View File

@ -1,110 +0,0 @@
From 5b6fd116685d605207df014d693da5b5607274a8 Mon Sep 17 00:00:00 2001
From: Yuri Chornoivan <yurchor@ukr.net>
Date: Wed, 4 Sep 2024 17:38:40 +0200
Subject: [PATCH] Translated using Weblate (Ukrainian)
Currently translated at 100.0% (552 of 552 strings)
Translation: libguestfs/virt-v2v-master
Translate-URL: https://translate.fedoraproject.org/projects/libguestfs/virt-v2v-master/uk/
---
po/uk.po | 27 ++++++++++++---------------
1 file changed, 12 insertions(+), 15 deletions(-)
diff --git a/po/uk.po b/po/uk.po
index 8b616872..7c688b5b 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -15,9 +15,8 @@ msgstr ""
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug."
"cgi?component=libguestfs&product=Virtualization+Tools\n"
"POT-Creation-Date: 2024-08-29 15:25+0100\n"
-"PO-Revision-Date: 2024-09-03 14:41+0000\n"
-"Last-Translator: Weblate Translation Memory <noreply-mt-weblate-translation-"
-"memory@weblate.org>\n"
+"PO-Revision-Date: 2024-09-04 15:38+0000\n"
+"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
"Language-Team: Ukrainian <https://translate.fedoraproject.org/projects/"
"libguestfs/virt-v2v-master/uk/>\n"
"Language: uk\n"
@@ -1272,7 +1271,7 @@ msgstr "Встановити назву програми"
#: common/mlcustomize/customize_cmdline.ml:368
msgid "Set root password"
-msgstr "Встановлення пароля root"
+msgstr "Встановити пароль root"
#: common/mlcustomize/customize_cmdline.ml:444
msgid "Set the default timezone"
@@ -1781,7 +1780,7 @@ msgstr ""
#: common/mltools/curl.ml:82
msgid "downloading %s"
-msgstr "Отримуємо: %s"
+msgstr "отримуємо %s"
#: lib/networks.ml:84
msgid ""
@@ -1829,10 +1828,8 @@ msgid "exception: %s"
msgstr "виключення: %s"
#: common/mltools/tools_utils.ml:455
-#, fuzzy
-#| msgid "%s exited with error status %d"
msgid "exited with error %d"
-msgstr "Роботу %s завершено зі станом виходу %d"
+msgstr "завершено роботу з помилкою %d"
#: input/input_disk.ml:143
msgid "expected >= 1 disk name on the command line"
@@ -1847,7 +1844,7 @@ msgstr ""
#: common/mltools/tools_utils.ml:440
msgid "external command"
-msgstr ""
+msgstr "зовнішня команда"
#: output/output_rhv_upload.ml:275
msgid "failed server prechecks, see earlier errors"
@@ -2124,10 +2121,8 @@ msgid "kernel %s is not under grub tree %s"
msgstr "ядро %s перебуває поза ієрархією grub %s"
#: common/mltools/tools_utils.ml:539 common/mltools/tools_utils.ml:458
-#, fuzzy
-#| msgid "%s killed by signal %d (%s)"
msgid "killed by signal %d"
-msgstr "Роботу %s припинено за допомогою сигналу %d (%s)"
+msgstr "припинено за допомогою сигналу %d"
#: common/mltools/tools_utils.ml:237
msgid "libguestfs error: %s"
@@ -2516,6 +2511,8 @@ msgid ""
"password-crypto: unknown algorithm %s, use \"md5\", \"sha256\", \"sha512\" "
"or \"yescrypt\""
msgstr ""
+"password-crypto: невідомий алгоритм %s, скористайтеся \"md5\", \"sha256\", "
+"\"sha512\" або \"yescrypt\""
#: common/mlcustomize/password.ml:196
msgid ""
@@ -2663,10 +2660,8 @@ msgid "ssh-inject: the user %s does not exist on the guest"
msgstr ""
#: common/mltools/tools_utils.ml:542 common/mltools/tools_utils.ml:461
-#, fuzzy
-#| msgid "%s stopped by signal %d (%s)"
msgid "stopped by signal %d"
-msgstr "Роботу %s завершено за допомогою сигналу %d (%s)"
+msgstr "завершено за допомогою сигналу %d"
#: output/changeuid.ml:58
msgid "subprocess exited with non-zero error code %d"
@@ -2873,6 +2868,8 @@ msgstr ""
#: common/mlcustomize/timezone.ml:35
msgid "timezone '%s' does not exist, use a location like 'Europe/London'"
msgstr ""
+"часового поясу «%s» не існує, скористайтеся зазначенням міста, наприклад '"
+"Europe/London'"
#: common/mlcustomize/customize_run.ml:349
msgid "timezone could not be set for this type of guest"

2
0014-RHEL-point-to-KB-for-supported-v2v-hypervisors-guest.patch → 0007-RHEL-point-to-KB-for-supported-v2v-hypervisors-guest.patch
View File

@ -1,4 +1,4 @@
From 7d62ecb6fb9376e1d4950a8f98b53c79a05d3a1a Mon Sep 17 00:00:00 2001 From e5b655eca178aedb56db32af4dddc013cc08d767 Mon Sep 17 00:00:00 2001
From: Pino Toscano <ptoscano@redhat.com> From: Pino Toscano <ptoscano@redhat.com>
Date: Tue, 26 Mar 2019 09:42:25 +0100 Date: Tue, 26 Mar 2019 09:42:25 +0100
Subject: [PATCH] RHEL: point to KB for supported v2v hypervisors/guests Subject: [PATCH] RHEL: point to KB for supported v2v hypervisors/guests

181
0007-Translated-using-Weblate-Ukrainian.patch
View File

@ -1,181 +0,0 @@
From 33717800c6612bc1676c670ac2f9e0c5bb06fb78 Mon Sep 17 00:00:00 2001
From: Weblate Translation Memory
<noreply-mt-weblate-translation-memory@weblate.org>
Date: Wed, 4 Sep 2024 17:38:40 +0200
Subject: [PATCH] Translated using Weblate (Ukrainian)
Currently translated at 100.0% (552 of 552 strings)
Translation: libguestfs/virt-v2v-master
Translate-URL: https://translate.fedoraproject.org/projects/libguestfs/virt-v2v-master/uk/
---
po/uk.po | 53 ++++++++++++++++++++++++++++++-----------------------
1 file changed, 30 insertions(+), 23 deletions(-)
diff --git a/po/uk.po b/po/uk.po
index 7c688b5b..1166c04f 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -16,7 +16,8 @@ msgstr ""
"cgi?component=libguestfs&product=Virtualization+Tools\n"
"POT-Creation-Date: 2024-08-29 15:25+0100\n"
"PO-Revision-Date: 2024-09-04 15:38+0000\n"
-"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
+"Last-Translator: Weblate Translation Memory <noreply-mt-weblate-translation-"
+"memory@weblate.org>\n"
"Language-Team: Ukrainian <https://translate.fedoraproject.org/projects/"
"libguestfs/virt-v2v-master/uk/>\n"
"Language: uk\n"
@@ -1940,10 +1941,14 @@ msgid ""
"command line options that involve running commands in the guest. Use --"
"firstboot scripts instead."
msgstr ""
+"процесор основної системи (%s) і архітектура гостьової системи (%s) є "
+"несумісними, отже ви не можете скористатися параметрами командного рядка, "
+"зокрема запускати програми у гостьовій системі. Замість цього слід "
+"користуватися скриптами --firstboot."
#: common/mlcustomize/customize_run.ml:217
msgid "hostname could not be set for this type of guest"
-msgstr ""
+msgstr "для цього типу гостьових систем не можна встановлювати назви вузла"
#: common/mldrivers/linux_kernels.ml:340
msgid "ignoring kernel %s in bootloader, as it does not exist."
@@ -2085,28 +2090,24 @@ msgid "invalid output stream for --machine-readable: %s"
msgstr "некоректне потік виведення для --machine-readable: %s"
#: common/mlcustomize/password.ml:73
-#, fuzzy
-#| msgid "invalid format for '--%s' parameter, see the man page"
msgid "invalid password selector ‘%s’; see the man page"
-msgstr "некоректний формат параметра «--%s», див. сторінку підручника"
+msgstr "некоректний варіант пароля «%s»; див. сторінку man"
#: input/OVA.ml:450
msgid "invalid size returned by tar: %S"
msgstr "tar повернуто некоректний розмір: %S"
#: common/mlcustomize/subscription_manager.ml:54
-#, fuzzy
-#| msgid "invalid format for '--%s' parameter, see the man page"
msgid "invalid sm-attach selector ‘%s’; see the man page"
-msgstr "некоректний формат параметра «--%s», див. сторінку підручника"
+msgstr "некоректний варіант sm-attach «%s»; див. сторінку man"
#: common/mlcustomize/subscription_manager.ml:41
msgid "invalid sm-credentials selector ‘%s’; see the man page"
-msgstr ""
+msgstr "некоректний варіант sm-credentials «%s»; див. сторінку man"
#: common/mlcustomize/ssh_key.ml:45
msgid "invalid ssh-inject selector ‘%s’; see the man page"
-msgstr ""
+msgstr "некоректний варіант ssh-inject «%s»; див. сторінку man"
#: input/OVF.ml:82
msgid "invalid vmw:CoresPerSocket (%d) ignored"
@@ -2137,10 +2138,8 @@ msgstr ""
"для виконання перетворення virt-v2v"
#: common/mlcustomize/customize_run.ml:47
-#, fuzzy
-#| msgid "%s (ignored)"
msgid "log file %s: %s (ignored)"
-msgstr "%s (проігноровано)"
+msgstr "файл журналу %s: %s (проігноровано)"
#: input/OVA.ml:147
msgid ""
@@ -2188,6 +2187,8 @@ msgid ""
"multiple --root-password/--password options set the password for user ‘%s’ "
"twice"
msgstr ""
+"параметрами --root-password/--password двічі встановлено пароль для "
+"користувача «%s»"
#: v2v/v2v.ml:704
msgid "nbdcopy command failed, see earlier error messages"
@@ -2520,10 +2521,14 @@ msgid ""
"version %d.%d.\n"
"If this is incorrect, use --password-crypto option and file a bug."
msgstr ""
+"пароль: використано незахищене шифрування пароля md5 для гостьової системи "
+"типу %s, версія %d.%d.\n"
+"Якщо це не так, скористайтеся параметром --password-crypto і створіть "
+"повідомлення щодо вади."
#: common/mlcustomize/customize_run.ml:404
msgid "passwords could not be set for this type of guest"
-msgstr ""
+msgstr "для цього типу гостьових систем не можна встановлювати паролі"
#: lib/qemuNBD.ml:125
msgid ""
@@ -2553,6 +2558,7 @@ msgstr "qemu-nbd: неочікувана версія у --version: %s"
#: common/mlcustomize/customize_run.ml:85
msgid "random seed could not be set for this type of guest"
msgstr ""
+"для цього типу гостьових систем не можна встановлювати базу випадковості"
#: input/parse_domain_from_vmx.ml:45
msgid "remote vmx ‘%s’ could not be parsed as a URI"
@@ -2639,25 +2645,23 @@ msgstr ""
#: common/mlcustomize/ssh_key.ml:57
msgid "ssh-inject: $HOME environment variable is not set"
-msgstr ""
+msgstr "ssh-inject: значення змінної середовища $HOME не встановлено"
#: common/mlcustomize/ssh_key.ml:93
msgid "ssh-inject: key is an empty string"
-msgstr ""
+msgstr "ssh-inject: ключ є порожнім рядком"
#: common/mlcustomize/ssh_key.ml:66
-#, fuzzy
-#| msgid "Inject a public key into the guest"
msgid "ssh-inject: no public key file found in %s"
-msgstr "Вставити відкритий ключ до гостьової системи"
+msgstr "ssh-inject: у %s не знайдено відкритого ключа"
#: common/mlcustomize/ssh_key.ml:83
msgid "ssh-inject: public key file (%s) is empty"
-msgstr ""
+msgstr "ssh-inject: файл відкритого ключа (%s) є порожнім"
#: common/mlcustomize/ssh_key.ml:112
msgid "ssh-inject: the user %s does not exist on the guest"
-msgstr ""
+msgstr "ssh-inject: запису користувача %s у гостьовій системі не існує"
#: common/mltools/tools_utils.ml:542 common/mltools/tools_utils.ml:461
msgid "stopped by signal %d"
@@ -2673,7 +2677,7 @@ msgstr "підпроцес надіслав сигнал або зупинив
#: common/mlcustomize/customize_run.ml:307
msgid "subscription-manager credentials required for --sm-register"
-msgstr ""
+msgstr "для --sm-register потрібні реєстраційні дані subscription-manager"
#: v2v/v2v.ml:217
msgid "the --no-trim option has been removed and now does nothing"
@@ -2701,6 +2705,9 @@ msgid ""
"the command may have failed because the network is disabled. Try either "
"removing ‘--no-network’ or adding ‘--network’ on the command line."
msgstr ""
+"спроба виконати команду могла зазнати невдачі через те, що мережу було "
+"вимкнено. Спробуйте або вилучити «--no-network» з рядка команди, або додати "
+"«--network» до нього."
#: common/mltools/JSON_parser.ml:81
msgid "the key ‘%s’ was not found in a list of objects"
@@ -2873,7 +2880,7 @@ msgstr ""
#: common/mlcustomize/customize_run.ml:349
msgid "timezone could not be set for this type of guest"
-msgstr ""
+msgstr "для цього типу гостьових систем не можна встановлювати часовий пояс"
#: input/OVA.ml:318
msgid "unable to parse line from manifest file: %S"

10
0015-RHEL-Disable-o-glance.patch → 0008-RHEL-Disable-o-glance.patch
View File

@ -1,4 +1,4 @@
From 09a597d694e6d90fe49d11ceb5faf41981af7d1f Mon Sep 17 00:00:00 2001 From a3809a71fc76ccc9e9bdd73253ab9f40485223e3 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com> From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Wed, 30 Jun 2021 11:15:52 +0100 Date: Wed, 30 Jun 2021 11:15:52 +0100
Subject: [PATCH] RHEL: Disable -o glance Subject: [PATCH] RHEL: Disable -o glance
@ -98,10 +98,10 @@ index cd4862b1..54cd276e 100644
=head1 AUTHOR =head1 AUTHOR
diff --git a/docs/virt-v2v.pod b/docs/virt-v2v.pod diff --git a/docs/virt-v2v.pod b/docs/virt-v2v.pod
index 76067e5a..25327366 100644 index a1e8fb30..b89a08a3 100644
--- a/docs/virt-v2v.pod --- a/docs/virt-v2v.pod
+++ b/docs/virt-v2v.pod +++ b/docs/virt-v2v.pod
@@ -444,14 +444,6 @@ See L</Networks and bridges> below. @@ -446,14 +446,6 @@ See L</Networks and bridges> below.
This is the same as I<-o local>. This is the same as I<-o local>.
@ -116,7 +116,7 @@ index 76067e5a..25327366 100644
=item B<-o> B<kubevirt> =item B<-o> B<kubevirt>
Set the output method to I<kubevirt>. B<Note the way this mode works Set the output method to I<kubevirt>. B<Note the way this mode works
@@ -1204,11 +1196,6 @@ and output methods may use disk space, as outlined in the table below. @@ -1206,11 +1198,6 @@ and output methods may use disk space, as outlined in the table below.
This temporarily places a full copy of the uncompressed source disks This temporarily places a full copy of the uncompressed source disks
in C<$VIRT_V2V_TMPDIR> (or F</var/tmp>). in C<$VIRT_V2V_TMPDIR> (or F</var/tmp>).
@ -128,7 +128,7 @@ index 76067e5a..25327366 100644
=item I<-o local> =item I<-o local>
=item I<-o qemu> =item I<-o qemu>
@@ -1411,13 +1398,6 @@ See also L</Starting the libvirt system instance>. @@ -1413,13 +1400,6 @@ See also L</Starting the libvirt system instance>.
Because of how Cinder volumes are presented as F</dev> block devices, Because of how Cinder volumes are presented as F</dev> block devices,
using I<-o openstack> normally requires that virt-v2v is run as root. using I<-o openstack> normally requires that virt-v2v is run as root.

6
0016-RHEL-Remove-the-in-place-option.patch → 0009-RHEL-Remove-the-in-place-option.patch
View File

@ -1,4 +1,4 @@
From f2d4730d75f513c9b30bbe57a2ab1c38975d8286 Mon Sep 17 00:00:00 2001 From f367702871f1f07277377f07cb28c8f51b9cfd10 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com> From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Thu, 2 Dec 2021 11:56:05 +0000 Date: Thu, 2 Dec 2021 11:56:05 +0000
Subject: [PATCH] RHEL: Remove the --in-place option Subject: [PATCH] RHEL: Remove the --in-place option
@ -12,7 +12,7 @@ wish to support in RHEL.
3 files changed, 17 deletions(-) 3 files changed, 17 deletions(-)
diff --git a/docs/virt-v2v.pod b/docs/virt-v2v.pod diff --git a/docs/virt-v2v.pod b/docs/virt-v2v.pod
index 25327366..6a0b55e1 100644 index b89a08a3..8f096d0c 100644
--- a/docs/virt-v2v.pod --- a/docs/virt-v2v.pod
+++ b/docs/virt-v2v.pod +++ b/docs/virt-v2v.pod
@@ -25,9 +25,6 @@ virtualize those machines (physical to virtual, or p2v). @@ -25,9 +25,6 @@ virtualize those machines (physical to virtual, or p2v).
@ -36,7 +36,7 @@ index 25327366..6a0b55e1 100644
=head2 Customization =head2 Customization
Virt-v2v can also customize the guest during conversion, using the Virt-v2v can also customize the guest during conversion, using the
@@ -1679,7 +1672,6 @@ L<https://rwmj.wordpress.com/2015/09/18/importing-kvm-guests-to-ovirt-or-rhev/#c @@ -1681,7 +1674,6 @@ L<https://rwmj.wordpress.com/2015/09/18/importing-kvm-guests-to-ovirt-or-rhev/#c
L<virt-p2v(1)>, L<virt-p2v(1)>,
L<virt-v2v-inspector(1)>, L<virt-v2v-inspector(1)>,

2
0017-RHEL-9-oo-compressed-Remove-nbdcopy-version-check-an.patch → 0010-RHEL-9-oo-compressed-Remove-nbdcopy-version-check-an.patch
View File

@ -1,4 +1,4 @@
From e07412b5de82dc27e99eae72da8b3d0b63d3d7aa Mon Sep 17 00:00:00 2001 From 0531138b197fe35a8867849ee9af1ce8a9e5976f Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com> From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Tue, 5 Jul 2022 11:56:54 +0100 Date: Tue, 5 Jul 2022 11:56:54 +0100
Subject: [PATCH] RHEL 9: -oo compressed: Remove nbdcopy version check and test Subject: [PATCH] RHEL 9: -oo compressed: Remove nbdcopy version check and test

2
0018-RHEL-9-tests-Remove-btrfs-test.patch → 0011-RHEL-9-tests-Remove-btrfs-test.patch
View File

@ -1,4 +1,4 @@
From fa908f4ba62015ffddbae48e0e4d8c8285027f4a Mon Sep 17 00:00:00 2001 From ea468389280864bd7519782018f5b66e6b2ca4bd Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com> From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Tue, 5 Jul 2022 11:58:09 +0100 Date: Tue, 5 Jul 2022 11:58:09 +0100
Subject: [PATCH] RHEL 9: tests: Remove btrfs test Subject: [PATCH] RHEL 9: tests: Remove btrfs test

6
0019-RHEL-9-Remove-block-driver-option.patch → 0012-RHEL-9-Remove-block-driver-option.patch
View File

@ -1,4 +1,4 @@
From 54e64cee82ad660b6cdc286b6b83e31311049d3e Mon Sep 17 00:00:00 2001 From de92c507f1b17bfbf9e6e302f392d0bac8e0785f Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com> From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Fri, 28 Apr 2023 12:28:19 +0100 Date: Fri, 28 Apr 2023 12:28:19 +0100
Subject: [PATCH] RHEL 9: Remove --block-driver option Subject: [PATCH] RHEL 9: Remove --block-driver option
@ -37,10 +37,10 @@ index 4304c0d6..b7384210 100644
=item B<--colours> =item B<--colours>
diff --git a/docs/virt-v2v.pod b/docs/virt-v2v.pod diff --git a/docs/virt-v2v.pod b/docs/virt-v2v.pod
index 6a0b55e1..b816256f 100644 index 8f096d0c..74581463 100644
--- a/docs/virt-v2v.pod --- a/docs/virt-v2v.pod
+++ b/docs/virt-v2v.pod +++ b/docs/virt-v2v.pod
@@ -206,16 +206,6 @@ The options are silently ignored for other input methods. @@ -208,16 +208,6 @@ The options are silently ignored for other input methods.
See I<--network> below. See I<--network> below.

2
0020-RHEL-Add-warning-about-virt-v2v-in-place-not-being-s.patch → 0013-RHEL-Add-warning-about-virt-v2v-in-place-not-being-s.patch
View File

@ -1,4 +1,4 @@
From ae82e49e7ae4780aae866a144859f54a8e339c18 Mon Sep 17 00:00:00 2001 From 0fd391a93010e85d60b34e21404234fc490f10af Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com> From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Tue, 9 Jul 2024 11:30:09 +0100 Date: Tue, 9 Jul 2024 11:30:09 +0100
Subject: [PATCH] RHEL: Add warning about virt-v2v-in-place not being supported Subject: [PATCH] RHEL: Add warning about virt-v2v-in-place not being supported

4
sources
View File

@ -1,2 +1,2 @@
SHA512 (virt-v2v-2.5.9.tar.gz) = 93c557439f69e1ab75ad7caf6bd42e3877aff9454f844dad99d9296bbc2caa45a319ae5688c8f184acd5702cd7e732627591db2ff39292af62a6f61bba76d597 SHA512 (virt-v2v-2.6.0.tar.gz) = bc7ecf99e66bae057eaf5d7c82ca38ded4aa6ef8732544bc7079f2894c9c79542a415fede02cf8c2cb7e83756683457c705f816b1da57e5ca9565350b9376a73
SHA512 (virt-v2v-2.5.9.tar.gz.sig) = 2d687146ad6d6c3ab9791ac5c064f4f6cfb97209e08a081c51104bf9c3aba5cb9e00689692fd70831caa5c6405b40e5e67b8f4f92ec95200ac3d97dd4c3ce298 SHA512 (virt-v2v-2.6.0.tar.gz.sig) = 630166caf41d48ac2efca646611248263e58a4e7e644a7606b647911164a39a449ae3916d05248d48e80925f3f9179b1cfb850001b0f3dd30a48c301d62b11a0

45
virt-v2v.spec
View File

@ -3,11 +3,11 @@
%global verify_tarball_signature 1 %global verify_tarball_signature 1
# The source directory. # The source directory.
%global source_directory 2.5-development %global source_directory 2.6-stable
Name: virt-v2v Name: virt-v2v
Epoch: 1 Epoch: 1
Version: 2.5.9 Version: 2.6.0
Release: 1%{?dist} Release: 1%{?dist}
Summary: Convert a virtual machine to run on KVM Summary: Convert a virtual machine to run on KVM
@ -28,26 +28,19 @@ Source3: copy-patches.sh
# https://github.com/libguestfs/virt-v2v/commits/rhel-9.6 # https://github.com/libguestfs/virt-v2v/commits/rhel-9.6
# Patches. # Patches.
Patch0001: 0001-convert-Display-osinfo-in-Converting-.-message.patch Patch0001: 0001-RHEL-v2v-Select-correct-qemu-binary-for-o-qemu-mode-.patch
Patch0002: 0002-Translated-using-Weblate-English-United-Kingdom.patch Patch0002: 0002-RHEL-v2v-Disable-the-qemu-boot-oo-qemu-boot-option-R.patch
Patch0003: 0003-Update-translation-files.patch Patch0003: 0003-RHEL-Fix-list-of-supported-sound-cards-to-match-RHEL.patch
Patch0004: 0004-Translated-using-Weblate-Ukrainian.patch Patch0004: 0004-RHEL-Fixes-for-libguestfs-winsupport.patch
Patch0005: 0005-Translated-using-Weblate-Ukrainian.patch Patch0005: 0005-RHEL-v2v-i-disk-force-VNC-as-display-RHBZ-1372671.patch
Patch0006: 0006-Translated-using-Weblate-Ukrainian.patch Patch0006: 0006-RHEL-v2v-do-not-mention-SUSE-Xen-hosts-RHBZ-1430203.patch
Patch0007: 0007-Translated-using-Weblate-Ukrainian.patch Patch0007: 0007-RHEL-point-to-KB-for-supported-v2v-hypervisors-guest.patch
Patch0008: 0008-RHEL-v2v-Select-correct-qemu-binary-for-o-qemu-mode-.patch Patch0008: 0008-RHEL-Disable-o-glance.patch
Patch0009: 0009-RHEL-v2v-Disable-the-qemu-boot-oo-qemu-boot-option-R.patch Patch0009: 0009-RHEL-Remove-the-in-place-option.patch
Patch0010: 0010-RHEL-Fix-list-of-supported-sound-cards-to-match-RHEL.patch Patch0010: 0010-RHEL-9-oo-compressed-Remove-nbdcopy-version-check-an.patch
Patch0011: 0011-RHEL-Fixes-for-libguestfs-winsupport.patch Patch0011: 0011-RHEL-9-tests-Remove-btrfs-test.patch
Patch0012: 0012-RHEL-v2v-i-disk-force-VNC-as-display-RHBZ-1372671.patch Patch0012: 0012-RHEL-9-Remove-block-driver-option.patch
Patch0013: 0013-RHEL-v2v-do-not-mention-SUSE-Xen-hosts-RHBZ-1430203.patch Patch0013: 0013-RHEL-Add-warning-about-virt-v2v-in-place-not-being-s.patch
Patch0014: 0014-RHEL-point-to-KB-for-supported-v2v-hypervisors-guest.patch
Patch0015: 0015-RHEL-Disable-o-glance.patch
Patch0016: 0016-RHEL-Remove-the-in-place-option.patch
Patch0017: 0017-RHEL-9-oo-compressed-Remove-nbdcopy-version-check-an.patch
Patch0018: 0018-RHEL-9-tests-Remove-btrfs-test.patch
Patch0019: 0019-RHEL-9-Remove-block-driver-option.patch
Patch0020: 0020-RHEL-Add-warning-about-virt-v2v-in-place-not-being-s.patch
%if !0%{?rhel} %if !0%{?rhel}
# libguestfs hasn't been built on i686 for a while since there is no # libguestfs hasn't been built on i686 for a while since there is no
@ -328,9 +321,7 @@ make -C tests TESTS=test-v2v-fedora-luks-on-lvm-conversion.sh check
%{_mandir}/man1/virt-v2v-output-openstack.1* %{_mandir}/man1/virt-v2v-output-openstack.1*
%{_mandir}/man1/virt-v2v-output-rhv.1* %{_mandir}/man1/virt-v2v-output-rhv.1*
%{_mandir}/man1/virt-v2v-release-notes-1.42.1* %{_mandir}/man1/virt-v2v-release-notes-1.42.1*
%{_mandir}/man1/virt-v2v-release-notes-2.0.1* %{_mandir}/man1/virt-v2v-release-notes-2.*.1*
%{_mandir}/man1/virt-v2v-release-notes-2.2.1*
%{_mandir}/man1/virt-v2v-release-notes-2.4.1*
%{_mandir}/man1/virt-v2v-support.1* %{_mandir}/man1/virt-v2v-support.1*
%{_datadir}/virt-tools %{_datadir}/virt-tools
@ -351,6 +342,10 @@ make -C tests TESTS=test-v2v-fedora-luks-on-lvm-conversion.sh check
%changelog %changelog
* Wed Oct 09 2024 Richard W.M. Jones <rjones@redhat.com> - 1:2.6.0-1
- Rebase to upstream development version 2.6.0
resolves: RHEL-56813
* Thu Sep 05 2024 Richard W.M. Jones <rjones@redhat.com> - 1:2.5.9-1 * Thu Sep 05 2024 Richard W.M. Jones <rjones@redhat.com> - 1:2.5.9-1
- Rebase to upstream development version 2.5.9 - Rebase to upstream development version 2.5.9
- Fix display of incorrect Windows 11 version - Fix display of incorrect Windows 11 version