From e97b6ae875bc5224972091c12fc7811e8ac656d8 Mon Sep 17 00:00:00 2001 From: lixin Date: Fri, 8 Mar 2024 09:48:52 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E8=87=B3migration-tools-?= =?UTF-8?q?1.0.1=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...error-and-no-migration-details-issue.patch | 72 ---------------- 0002-fix-uefi-boot-failed.patch | 32 ------- ...-modify-grub-rules-to-match-NIC-name.patch | 72 ---------------- migration-tools.spec | 78 ++++++++++++++---- migration-tools.tar.gz | Bin 0 -> 1518536 bytes ut-Migration-tools.tar.gz => requires.tar.gz | Bin 7224806 -> 14159138 bytes xlwt-1.3.0-py2.py3-none-any.whl | Bin 0 -> 99981 bytes 7 files changed, 64 insertions(+), 190 deletions(-) delete mode 100644 0001-fix-export-error-and-no-migration-details-issue.patch delete mode 100644 0002-fix-uefi-boot-failed.patch delete mode 100644 0003-modify-grub-rules-to-match-NIC-name.patch create mode 100644 migration-tools.tar.gz rename ut-Migration-tools.tar.gz => requires.tar.gz (40%) create mode 100644 xlwt-1.3.0-py2.py3-none-any.whl diff --git a/0001-fix-export-error-and-no-migration-details-issue.patch b/0001-fix-export-error-and-no-migration-details-issue.patch deleted file mode 100644 index 98f7b61..0000000 --- a/0001-fix-export-error-and-no-migration-details-issue.patch +++ /dev/null @@ -1,72 +0,0 @@ -From 854c1d018b9a5f1079f387101c62f86009c3baac Mon Sep 17 00:00:00 2001 -From: Super User -Date: Mon, 21 Aug 2023 16:19:47 +0800 -Subject: [PATCH] fix export error and no migration details issue - ---- - ut-Migration-tools/index.py | 4 ++-- - ut-Migration-tools/templates/MT_migration.html | 3 ++- - ut-Migration-tools/views/migration.py | 6 +++++- - 3 files changed, 9 insertions(+), 4 deletions(-) - -diff --git a/ut-Migration-tools/index.py b/ut-Migration-tools/index.py -index 59e6830..635c5ac 100644 ---- a/ut-Migration-tools/index.py -+++ b/ut-Migration-tools/index.py -@@ -218,7 +218,7 @@ def MT_export_migration_reports(): - :return: - """ - mod = check_methods() -- f = open("/usr/lib/migration-tools-agent/.passwd.txt","r") -+ f = open("/usr/lib/migration-tools-server/.passwd.txt","r") - password = f.read() - f.close() - if mod: -@@ -234,7 +234,7 @@ def MT_export_migration_reports(): - print("export report mkdir error:%s" % mkdir_log_pwd) - - info = mod.split(',') -- scp_log = "sshpass -p %s" % password + " scp -r %s" % json_data.get('info').split("|")[0] + "@%s" % info[1] \ -+ scp_log = "sshpass -p '%s'" % password + " scp -r %s" % json_data.get('info').split("|")[0] + "@%s" % info[1] \ - + ":/var/tmp/uos-migration/UOS*.tar.gz /var/uos-migration/" - try: - os.system(scp_log) -diff --git a/ut-Migration-tools/templates/MT_migration.html b/ut-Migration-tools/templates/MT_migration.html -index 39bed0b..77bf56a 100644 ---- a/ut-Migration-tools/templates/MT_migration.html -+++ b/ut-Migration-tools/templates/MT_migration.html -@@ -65,7 +65,8 @@ -