diff --git a/0020-rebrand-for-openeuler.patch b/0020-rebrand-for-openeuler.patch new file mode 100644 index 0000000000000000000000000000000000000000..21b44e3668cf371221099324ce8d6bb37f86443a --- /dev/null +++ b/0020-rebrand-for-openeuler.patch @@ -0,0 +1,1375 @@ +From bdf551f40a674c6760aff21731c2a0a008d1db4b Mon Sep 17 00:00:00 2001 +From: lixin +Date: Mon, 24 Feb 2025 10:14:52 +0800 +Subject: [PATCH] rebrand for openeuler + +--- + README_zh.md | 2 +- + connect_sql.py | 2 +- + index.py | 12 +- + rpm/migration-tools.spec | 470 ++++++++++++++++-- + .../{uos-sysmig.conf => migration-tools.conf} | 4 + + settings.py | 21 +- + sysmig_agent/Abisystmcompchk.py | 8 +- + sysmig_agent/centos72uos.sh | 16 +- + sysmig_agent/centos82uos.py | 20 +- + sysmig_agent/check.py | 38 +- + sysmig_agent/kernel.sh | 2 +- + sysmig_agent/migration.py | 20 +- + sysmig_agent/share.py | 52 +- + sysmig_agent/utils.py | 4 +- + templates/MT_check_environment.html | 14 +- + views/migration.py | 3 +- + views/reports.py | 9 +- + views/server.py | 10 +- + 18 files changed, 553 insertions(+), 154 deletions(-) + rename server/{uos-sysmig.conf => migration-tools.conf} (64%) + +diff --git a/README_zh.md b/README_zh.md +index 7a18b8d..97cee5a 100644 +--- a/README_zh.md ++++ b/README_zh.md +@@ -195,7 +195,7 @@ repo源配置页面 + ![迁移中](./figures/迁移中.png) + + - 迁移完成后，页面会跳转至迁移完成页面，可在该页面导出迁移后检测报告及迁移日志。 +-- 导出后，可在server端/var/tmp/uos-migration/目录下找到报告和日志的压缩包，解压后即可查看 ++- 导出后，可在server端/var/tmp/migration-tools/目录下找到报告和日志的压缩包，解压后即可查看 + ![迁移完成](./figures/迁移完成.png) + + - 迁移完成后，需手动重启agent机器，并验证是否迁移完成 +diff --git a/connect_sql.py b/connect_sql.py +index b5d0570..f0485af 100644 +--- a/connect_sql.py ++++ b/connect_sql.py +@@ -2,7 +2,7 @@ import pymysql + + class DBHelper: + # 构造函数 +- def __init__(self, host=db_host, user=db_user, pwd=db_password, db=db_name): ++ def __init__(self, host, user, pwd, db): + self.host = host + self.user = user + self.pwd = pwd +diff --git a/index.py b/index.py +index 06a44c3..0d1b542 100644 +--- a/index.py ++++ b/index.py +@@ -8,7 +8,7 @@ import json + from sysmig_agent import share + from views import migration, server + +-from flask import Flask, render_template, url_for, request, redirect, make_response, session, Response ++from flask import Flask, render_template, request, Response + app = Flask(__name__) + + mods = { +@@ -48,7 +48,7 @@ def check_methods(): + if mod: + response_str = mod(data) + return response_str +- ++ + + @app.route('/import_host_info', methods=['GET', 'POST']) + def import_host_info(): +@@ -297,7 +297,7 @@ def MT_check_user(): + mod = check_methods() + if mod: + return Response(mod, content_type='application/json') +- ++ + return render_template('MT_check_root.html') + + +@@ -327,7 +327,7 @@ def MT_kernel(): + 跳转检测内核界面 + :return: + """ +- return render_template('MT_kernel.html') ++ return render_template('MT_kernel.html') + + + @app.route('/MT_check_os_kernel', methods=['GET', 'POST']) +@@ -382,7 +382,7 @@ def MT_export_migration_reports(): + if mod: + data = request.get_data() + json_data = json.loads(data) +- mkdir_log_pwd = "/var/uos-migration/" ++ mkdir_log_pwd = "/var/migration-tools/" + isExists=os.path.exists(mkdir_log_pwd) + if not isExists: + try: +@@ -393,7 +393,7 @@ def MT_export_migration_reports(): + + info = mod.split(',') + 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/" ++ + ":/var/tmp/migration-tools/UOS*.tar.gz /var/migration-tools/" + try: + os.system(scp_log) + print(scp_log) +diff --git a/rpm/migration-tools.spec b/rpm/migration-tools.spec +index 20292a0..3724f0b 100644 +--- a/rpm/migration-tools.spec ++++ b/rpm/migration-tools.spec +@@ -1,84 +1,482 @@ +-Name: migration-tools +-Version: 1.0.0 +-Release: 1 +-License: MulanPSL-2.0 +-Summary: A tool to help users migrate the Centos system to the UOS system and openEuler system ++Name: migration-tools ++Version: 1.0.3 ++Release: 21 ++License: MulanPSL-2.0 ++Summary: A tool to help users migrate the Centos system to the UOS system and openEuler system ++Source0: %{name}-%{version}.tar.gz ++Source1: requires.tar.gz ++Source2: xlwt-1.3.0-py2.py3-none-any.whl ++# patches ++Patch001: 0001-download-the-rpm-package-in-the-system.patch ++Patch002: 0002-get-information-before-migration.patch ++Patch003: 0003-export-migration-check-report.patch ++Patch004: 0004-complete-information-report-after-abi-detection.patch ++Patch005: 0005-abi-detection-through-multi-threads.patch ++Patch006: 0006-add-message-query-to-update-abi-process.patch ++Patch007: 0007-start-task-to-check-migration.patch ++Patch008: 0008-add-system-migration-task.patch ++Patch009: 0009-get-abi-detection-process.patch ++Patch010: 0010-update-abi-result-to-database.patch ++Patch011: 0011-initializate-the-migration-status.patch ++Patch012: 0012-get-agent-kernel-version.patch ++Patch013: 0013-set-agent-migration-task.patch ++Patch014: 0014-compare-with-request-agent-ip.patch ++Patch015: 0015-agent-sends-the-task-after-receving-the-request.patch ++Patch016: 0016-export-migration-log.patch ++Patch017: 0017-add-task-to-check-repo.patch ++Patch018: 0018-add-interface-in-agent.patch ++Patch019: 0019-update-the-initilization-repo-file.patch ++#Patch020: 0001-rebrand-for-openeuler.patch ++ + +-Source0: ut-Migration-tools.tar.gz +-BuildArch: noarch ++BuildArch: noarch ++BuildRequires: systemd + %description + UOS Migration Software + +- ++%if 0%{?rhel} >= 7 + %package -n migration-tools-agent +-Summary: migration-tools-agent +-License: GPL +-Requires:dnf +-Requires:libabigail +-Requires:python3 +-Requires:python3-xlrd +-Requires:python3-xlwt +-Requires:python3-paramiko +-Requires:python3-flask +-Requires:rsync +-Requires:yum-utils ++Summary: migration-tools-agent ++License: MulanPSL-2.0 ++Requires: dnf ++Requires: libabigail ++Requires: python3 ++Requires: python3-flask ++Requires: python3-paramiko ++Requires: python3-requests ++Requires: python3-xlrd ++Requires: python3-xlwt ++Requires: openssl ++Requires: rsync ++Requires: yum-utils + + %description -n migration-tools-agent + Migration software agent side +- ++%endif + + %package -n migration-tools-server + Summary: migration-tools-server + License: MulanPSL-2.0 + Requires: python3 + Requires: python3-pip +-Requires: sshpass + Requires: python3-paramiko + Requires: python3-flask + Requires: python3-requests ++Requires: python3-PyMySQL + + %description -n migration-tools-server + Migration software server side + + + %prep +-%setup -c ++%autosetup -p1 ++ ++%if 0%{?openEuler} ++mkdir -p agent-requires/ ++cp -f %SOURCE1 agent-requires/ ++cp -f %SOURCE2 agent-requires/ ++%endif + + %install + rm -rf %{buildroot} + mkdir -p $RPM_BUILD_ROOT/usr/lib/migration-tools-server +-mkdir -p $RPM_BUILD_ROOT/var/tmp/uos-migration ++mkdir -p $RPM_BUILD_ROOT/var/tmp/migration-tools + mkdir -p $RPM_BUILD_ROOT/etc/migration-tools ++mkdir -p $RPM_BUILD_ROOT%{_unitdir} ++%{__cp} -r * $RPM_BUILD_ROOT/usr/lib/migration-tools-server/ ++ ++%if 0%{?rhel} >= 7 ++mkdir -p $RPM_BUILD_ROOT/usr/lib/migration-tools-agent ++%{__cp} -r * $RPM_BUILD_ROOT/usr/lib/migration-tools-agent/ + +-cp -r ut-Migration-tools/* $RPM_BUILD_ROOT/usr/lib/migration-tools-server/ ++%{__cp} -r $RPM_BUILD_ROOT/usr/lib/migration-tools-server/server/migration-tools-agent.service $RPM_BUILD_ROOT%{_unitdir} ++%endif + + # Install server config + %{__cp} -r $RPM_BUILD_ROOT/usr/lib/migration-tools-server/server/migration-tools.conf $RPM_BUILD_ROOT/etc/migration-tools ++%{__cp} -r $RPM_BUILD_ROOT/usr/lib/migration-tools-server/server/migration-tools-server.service $RPM_BUILD_ROOT%{_unitdir} + ++%posttrans ++%{_bindir}/systemctl daemon-reload + + %post -n migration-tools-server +-mkdir -p /etc/migration-tools +-mkdir -p /var/tmp/uos-migration +-cp -r /usr/lib/migration-tools-server/server/migration-tools-server.service /usr/lib/systemd/system/ ++pip3 install /usr/lib/migration-tools-server/agent-requires/xlwt-1.3.0-py2.py3-none-any.whl --no-cache-dir + chmod +x /usr/lib/migration-tools-server/server/start_webview.sh +-ln -s /usr/lib/migration-tools-server/server/start_webview.sh /usr/bin/migration-tools +-systemctl daemon-reload +-systemctl restart migration-tools-server.service +-systemctl enable migration-tools-server.service ++ln -sf /usr/lib/migration-tools-server/server/start_webview.sh /usr/bin/migration-tools + ++%preun -n migration-tools-server ++if [ $1 = 0 ];then ++ systemctl stop migration-tools-server.service ++fi + + %postun -n migration-tools-server +-systemctl disable migration-tools-server.service +-rm -rf /usr/lib/migration-tools-server/ +-rm -rf /usr/lib/migration-tools + rm -rf /usr/bin/migration-tools + +- + %files -n migration-tools-server + /etc/migration-tools ++/var/tmp/migration-tools + /usr/lib/migration-tools-server ++%{_unitdir}/migration-tools-server.service + ++%if 0%{?rhel} >= 7 ++%files -n migration-tools-agent ++/etc/migration-tools ++/var/tmp/migration-tools ++/usr/lib/migration-tools-agent ++%{_unitdir}/migration-tools-agent.service ++%endif + + %changelog ++* Wed Feb 19 2025 lixin - 1.0.3-20 ++- update for openEuler-25.03 ++- remove redundant patch ++ ++* Mon Nov 11 2024 xuezhixin - 1.0.3-19 ++- 0019-update-the-initilization-repo-file.patch ++ ++* Mon Nov 11 2024 xuezhixin - 1.0.3-18 ++- 0018-add-interface-in-agent.patch ++ ++* Mon Nov 11 2024 xuezhixin - 1.0.3-17 ++- 0017-add-task-to-check-repo.patch ++ ++* Mon Nov 11 2024 xuezhixin - 1.0.3-16 ++- 0016-export-migration-log.patch ++ ++* Mon Nov 11 2024 xuezhixin - 1.0.3-15 ++- 0015-agent-sends-the-task-after-receving-the-request.patch ++ ++* Mon Nov 11 2024 xuezhixin - 1.0.3-14 ++- 0014-compare-with-request-agent-ip.patch ++ ++* Mon Nov 11 2024 xuezhixin - 1.0.3-13 ++- 0013-set-agent-migration-task.patch ++ ++* Mon Nov 11 2024 xuezhixin - 1.0.3-12 ++- 0012-get-agent-kernel-version.patch ++ ++* Mon Nov 11 2024 xuezhixin - 1.0.3-11 ++- 0011-initializate-the-migration-status.patch ++ ++* Mon Nov 11 2024 xuezhixin - 1.0.3-10 ++- 0010-update-abi-result-to-database.patch ++ ++* Mon Nov 11 2024 xuezhixin - 1.0.3-9 ++- 0009-get-abi-detection-process.patch ++ ++* Mon Nov 11 2024 xuezhixin - 1.0.3-8 ++- 0008-add-system-migration-task.patch ++ ++* Mon Nov 11 2024 xuezhixin - 1.0.3-7 ++- 0007-start-task-to-check-migration.patch ++ ++* Mon Nov 11 2024 xuezhixin - 1.0.3-6 ++- 0006-add-message-query-to-update-abi-process.patch ++ ++* Mon Nov 11 2024 xuezhixin - 1.0.3-5 ++- 0005-abi-detection-through-multi-threads.patch ++ ++* Mon Nov 11 2024 xuezhixin - 1.0.3-4 ++- 0004-complete-information-report-after-abi-detection.patch ++ ++* Mon Nov 11 2024 xuezhixin - 1.0.3-3 ++- 0003-export-migration-check-report.patch ++ ++* Mon Nov 11 2024 xuezhixin - 1.0.3-2 ++- 0002-get-information-before-migration.patch ++ ++* Mon Nov 11 2024 xuezhixin - 1.0.3-1 ++- 0001-download-the-rpm-package-in-the-system.patch ++ ++* Mon Nov 11 2024 xuezhixin - 1.0.3-0 ++- update to 1.0.3 ++ ++* Tue Nov 5 2024 xuezhixin - 1.0.2-84 ++- 0084-divide-detection-report-into-mutiple-sheet-pages.patch ++ ++* Tue Nov 5 2024 xuezhixin - 1.0.2-83 ++- 0083-add-basic-summary-information-to-the-report.patch ++ ++* Tue Nov 5 2024 xuezhixin - 1.0.2-82 ++- 0082-write-the-data-of-each-row-and-column-into-report.patch ++ ++* Tue Nov 5 2024 xuezhixin - 1.0.2-81 ++- 0081-add-interface-to-export-migration-check-report.patch ++ ++* Tue Nov 5 2024 xuezhixin - 1.0.2-80 ++- 0080-write-the-data-of-each-row-into-report.patch ++ ++* Tue Nov 5 2024 xuezhixin - 1.0.2-79 ++- 0079-get-agent-storage-information.patch ++ ++* Tue Nov 5 2024 xuezhixin - 1.0.2-78 ++- 0078-fill-in-the-data-in-the-checked-templace.patch ++ ++* Tue Nov 5 2024 xuezhixin - 1.0.2-77 ++- 0077-copy-from-unzip-rpm-diractory-and-system-file-to-compatility-diractory.patch ++ ++* Tue Nov 5 2024 xuezhixin - 1.0.2-76 ++- 0076-detection-storage-interface.patch ++ ++* Tue Nov 5 2024 xuezhixin - 1.0.2-75 ++- 0075-detection-basic-information-and-format-abi-compatibility-information-to-report.patch ++ ++* Tue Nov 5 2024 xuezhixin - 1.0.2-74 ++- 0074-detection-basic-system-information.patch ++ ++* Tue Nov 5 2024 xuezhixin - 1.0.2-73 ++- 0073-get-os-version-and-os-id.patch ++ ++* Tue Nov 5 2024 xuezhixin - 1.0.2-72 ++- 0072-count-the-total-number-of-abi-compatible-lists.patch ++ ++* Tue Nov 5 2024 xuezhixin - 1.0.2-71 ++- 0071-get-package-list-from-repository.patch ++ ++* Tue Nov 5 2024 xuezhixin - 1.0.2-70 ++- 0070-interface-for-obtaining-repo-interface.patch ++ ++* Tue Nov 5 2024 xuezhixin - 1.0.2-69 ++- 0069-get-package-list-downloaded-locally-from-the-software-repository.patch ++ ++* Tue Nov 5 2024 xuezhixin - 1.0.2-68 ++- 0068-get-file-list-and-provide-file-path-to-compare.patch ++ ++* Tue Nov 5 2024 xuezhixin - 1.0.2-67 ++- 0067-add-an-abi-comparation-function.patch ++ ++* Tue Nov 5 2024 xuezhixin - 1.0.2-66 ++- 0066-check-if-file-is-binary.patch ++ ++* Tue Nov 5 2024 xuezhixin - 1.0.2-65 ++- 0065-get-checking-envirnmnet-process.patch ++ ++* Tue Nov 5 2024 xuezhixin - 1.0.2-64 ++- 0064-get-system-package-information-in-rpm-database.patch ++ ++* Tue Nov 5 2024 xuezhixin - 1.0.2-63 ++- 0063-add-compare-with-package-result-in-abi-report.patch ++ ++* Tue Nov 5 2024 xuezhixin - 1.0.2-62 ++- 0062-add-detection-ELF-content-in-abi-file.patch ++ ++* Tue Nov 5 2024 xuezhixin - 1.0.2-61 ++- 0061-detection-abi-log.patch ++ ++* Tue Nov 5 2024 xuezhixin - 1.0.2-60 ++- 0060-add-four-detection-item-to-abi-report.patch ++ ++* Tue Nov 5 2024 xuezhixin - 1.0.2-59 ++- 0059-add-kernel-detection-result-to-abi-report.patch ++ ++* Tue Nov 5 2024 xuezhixin - 1.0.2-58 ++- 0058-get-detection-envirnment-process-interface.patch ++ ++* Tue Nov 5 2024 xuezhixin - 1.0.2-57 ++- 0057-abi-basic-data-for-report.patch ++ ++* Tue Nov 5 2024 xuezhixin - 1.0.2-56 ++- 0056-modify-detection-envirnment-interface.patch ++ ++* Tue Nov 5 2024 xuezhixin - 1.0.2-55 ++- 0055-add-envirnment-detection-interface-before-migration.patch ++ ++* Tue Nov 5 2024 xuezhixin - 1.0.2-54 ++- 0054-removed-detection-abi-script.patch ++ ++* Tue Nov 5 2024 xuezhixin - 1.0.2-53 ++- 0053-get-repository-detection-result.patch ++ ++* Tue Nov 5 2024 xuezhixin - 1.0.2-52 ++- 0052-increase-the-weight-of-abi-detection-result.patch ++ ++* Tue Nov 5 2024 xuezhixin - 1.0.2-51 ++- 0051-add-basic-system-detection-information-and-upload-the-database.patch ++ ++* Tue Nov 5 2024 xuezhixin - 1.0.2-50 ++- 0050-check-free-space-in-system-disk.patch ++ ++* Tue Nov 5 2024 xuezhixin - 1.0.2-49 ++- 0049-add-interface-to-check-repository-result.patch ++ ++* Tue Nov 5 2024 xuezhixin - 1.0.2-48 ++- 0048-server-send-kernel-detection-task.patch ++ ++* Tue Nov 5 2024 xuezhixin - 1.0.2-47 ++- 0047-check-kernel-version-in-repository.patch ++ ++* Tue Nov 5 2024 xuezhixin - 1.0.2-46 ++- 0046-agent-sends-task-update-requrst-to-the-server.patch ++ ++* Tue Nov 5 2024 xuezhixin - 1.0.2-45 ++- 0045-modify-repository-file.patch ++ ++* Tue Nov 5 2024 xuezhixin - 1.0.2-44 ++- 0044-migrate-in-myutiple-steps.patch ++ ++* Tue Nov 5 2024 xuezhixin - 1.0.2-43 ++- 0043-process-os-version-and-os-name.patch ++ ++* Tue Nov 5 2024 xuezhixin - 1.0.2-42 ++- 0042-get-initial-os-version-from-agent_info-interface.patch ++ ++* Tue Nov 5 2024 xuezhixin - 1.0.2-41 ++- 0041-get-migration-status-from-database.patch ++ ++* Tue Nov 5 2024 xuezhixin - 1.0.2-40 ++- 0040-intial-logfile-and-tmpfile.patch ++ ++* Tue Nov 5 2024 xuezhixin - 1.0.2-39 ++- 0039-repository-file-choose-kernel-version-to-migration.patch ++ ++* Tue Nov 5 2024 xuezhixin - 1.0.2-38 ++- 0038-obtain-kernel-data.patch ++ ++* Tue Nov 5 2024 xuezhixin - 1.0.2-37 ++- 0037-add-subprocess-function-and-loggin.patch ++ ++* Tue Nov 5 2024 xuezhixin - 1.0.2-36 ++- 0036-add-an-interface-to-obtain-kernel-information.patch ++ ++* Tue Nov 5 2024 xuezhixin - 1.0.2-35 ++- 0035-the-migration-process-can-choose-not-to-migrate-the-kernel.patch ++ ++* Tue Nov 5 2024 xuezhixin - 1.0.2-34 ++- 0034-add-centos7-and-centos8-migration-interface.patch ++ ++* Tue Nov 5 2024 xuezhixin - 1.0.2-33 ++- 0033-check-system-kernrel.patch ++ ++* Tue Nov 5 2024 xuezhixin - 1.0.2-32 ++- 0032-add-migration.py-to-migration-function.patch ++ ++* Tue Nov 5 2024 xuezhixin - 1.0.2-31 ++- 0031-migration-check-and-extract-macros.patch ++ ++* Tue Nov 5 2024 xuezhixin - 1.0.2-30 ++- 0030-system-information-import-info-the-database-after-migration.patch ++ ++* Tue Nov 5 2024 xuezhixin - 1.0.2-29 ++- 0029-json-and-list-format-interchange.patch ++ ++* Tue Nov 5 2024 xuezhixin - 1.0.2-28 ++- 0028-send-agent-task.patch ++ ++* Tue Nov 5 2024 xuezhixin - 1.0.2-27 ++- 0027-fix-grub-file-for-system-option.patch ++ ++* Tue Nov 5 2024 xuezhixin - 1.0.2-26 ++- 0026-create-repository-and-disable-local-repofile.patch ++ ++* Tue Nov 5 2024 xuezhixin - 1.0.2-25 ++- 0025-update-migration-status-to-database.patch ++ ++* Tue Nov 5 2024 xuezhixin - 1.0.2-24 ++- 0024-add-url-processing-function.patch ++ ++* Mon Nov 4 2024 xuezhixin - 1.0.2-23 ++- 0023-update-the-status-of-the-migration-phase.patch ++ ++* Mon Nov 4 2024 xuezhixin - 1.0.2-22 ++- 0022-udpate-agent-host-status-online.patch ++ ++* Mon Nov 4 2024 xuezhixin - 1.0.2-21 ++- 0021-get-agent-ip-interface.patch ++ ++* Mon Nov 4 2024 xuezhixin - 1.0.2-20 ++- 0020-get-task-process-and-migration-stage-information.patch ++ ++* Mon Nov 4 2024 xuezhixin - 1.0.2-19 ++- 0019-update-abi-result-to-database.patch ++ ++* Mon Nov 4 2024 xuezhixin - 1.0.2-18 ++- 0018-detection-of-imported-host-information-interface.patch ++ ++* Mon Nov 4 2024 xuezhixin - 1.0.2-17 ++- 0017-add-process-data-in-database.patch ++ ++* Mon Nov 4 2024 xuezhixin - 1.0.2-16 ++- 0016-get-local-ip-on-the-agent.patch ++ ++* Mon Nov 4 2024 xuezhixin - 1.0.2-15 ++- 0015-delete-host-information-interface.patch ++ ++* Mon Nov 4 2024 xuezhixin - 1.0.2-14 ++- 0014-modify-task-stream-interface.patch ++ ++* Mon Nov 4 2024 xuezhixin - 1.0.2-13 ++- 0013-display-agent-host-information.patch ++ ++* Mon Nov 4 2024 xuezhixin - 1.0.2-12 ++- 0012-add-agent_task-in-database.patch ++ ++* Mon Nov 4 2024 xuezhixin - 1.0.2-11 ++- 0011-replace-agent-with-func-diractory.patch ++ ++* Mon Nov 4 2024 xuezhixin - 1.0.2-10 ++- 0010-create-task-stream-interface.patch ++ ++* Mon Nov 4 2024 xuezhixin - 1.0.2-9 ++- 0009-add-task_stream-table-in-database.patch ++ ++* Mon Nov 4 2024 xuezhixin - 1.0.2-8 ++- 0008-add-agent_info-table-in-database.patch ++ ++* Mon Nov 4 2024 xuezhixin - 1.0.2-7 ++- 0007-add-function-to-import-machine.patch ++ ++* Mon Nov 4 2024 xuezhixin - 1.0.2-6 ++- 0006-add-loger-interface-function.patch ++ ++* Fri Nov 1 2024 xuezhixin - 1.0.2-5 ++- add 0005-execution-sql-function.patch ++ ++* Fri Nov 1 2024 xuezhixin - 1.0.2-4 ++- add 0004-connect-sql-function.patch ++ ++* Fri Nov 1 2024 xuezhixin - 1.0.2-3 ++- add 0003-delete-redundant-code.patch ++ ++* Fri Nov 1 2024 xuezhixin - 1.0.2-2 ++- add 0002-modify-excel-report-content.patch ++ ++* Thu Oct 31 2024 xuezhixin - 1.0.2-1 ++- add 0001-stander-code.patch ++ ++* Tue Aug 27 2024 lihaipeng - 1.0.1-7 ++- fix cancel button function in tool ++ ++* Tue Jul 09 2024 Wenhua Huang - 1.0.1-6 ++- add BuildRequires systemd ++ ++* Tue Apr 02 2024 lixin - 1.0.1-5 ++- adjust the display sequence ++ ++* Mon Apr 01 2024 lixin - 1.0.1-4 ++- modify description ++ ++* Mon Mar 18 2024 lixin - 1.0.1-3 ++- fix stop service display failed ++- update spec ++ ++* Mon Mar 11 2024 lixin - 1.0.1-2 ++- fix : CVE-2024-24892 ++- use paramiko instead of sshpass to export migration log ++- and data ++ ++* Tue Mar 05 2024 lixin - 1.0.1-1 ++- Supports migrations to OpenEuler system using the web-based interface. ++ ++* Wed Sep 06 2023 lixin - 1.0.0-4 ++- fix: fix uefi boot failed ++- fix: modify grub rules to match NIC name after migration ++ ++* Tue Aug 22 2023 lixin - 1.0.0-3 ++- feat: add aarch64 agent package ++ ++* Mon Aug 21 2023 lixin - 1.0.0-2 ++- fix export log and migration report error ++- fix no migration detail error ++ + * Wed Aug 16 2023 lixin - 1.0.0-1 +-- init ++ init +diff --git a/server/uos-sysmig.conf b/server/migration-tools.conf +similarity index 64% +rename from server/uos-sysmig.conf +rename to server/migration-tools.conf +index 98aaa1c..162c736 100644 +--- a/server/uos-sysmig.conf ++++ b/server/migration-tools.conf +@@ -1,6 +1,10 @@ + [Server] + IP = "0.0.0.0" + PORT = "9999" ++DB_NAME = "uossysmig" ++DB_PASSWORD = "Mig2025.." ++DB_USER = "root" ++ + + [Agent] + IP = "0.0.0.0" +diff --git a/settings.py b/settings.py +index c8e945f..c9f3a56 100644 +--- a/settings.py ++++ b/settings.py +@@ -2,19 +2,18 @@ + # SPDX-License-Identifier: MulanPubL-2.0-or-later + + # AGENT目录 +-AGENT_DIR = '/var/tmp/uos-migration/' ++AGENT_DIR = '/var/tmp/migration-tools/' + + #迁移数据目录 +-MIGRATION_DATA_RPMS_DIR = '/var/tmp/uos-migration/data/exp-rst' +-MIGRATION_DATA_RPMS_3_INFO = '/var/tmp/uos-migration/data/exp-rst/pkginfo_3.txt' +-MIGRATION_DIR = '/var/tmp/uos-migration/UOS_migration_log' +-MIGRATION_KERNEL = '/var/tmp/uos-migration/kernel' +-pstate = '/var/tmp/uos-migration/.state' ++MIGRATION_DATA_RPMS_DIR = '/var/tmp/migration-tools/data/exp-rst' ++MIGRATION_DATA_RPMS_3_INFO = '/var/tmp/migration-tools/data/exp-rst/pkginfo_3.txt' ++MIGRATION_DIR = '/var/tmp/migration-tools/UOS_migration_log' ++MIGRATION_KERNEL = '/var/tmp/migration-tools/kernel' ++pstate = '/var/tmp/migration-tools/.state' + progresslogdir = AGENT_DIR + '.progress' +-PROGRESS = '/var/tmp/uos-migration/.progress' ++PROGRESS = '/var/tmp/migration-tools/.progress' + + # 迁移前分析目录 +-PRE_MIG = '/var/tmp/uos-migration/UOS_analysis_report/rpmva-before.txt' +-PRE_MIG_DIR = '/var/tmp/uos-migration/UOS_analysis_report' +- +-RPMS = '/var/tmp/uos-migration/.rpms' ++PRE_MIG = '/var/tmp/migration-tools/UOS_analysis_report/rpmva-before.txt' ++PRE_MIG_DIR = '/var/tmp/migration-tools/UOS_analysis_report' ++RPMS = '/var/tmp/migration-tools/.rpms' +diff --git a/sysmig_agent/Abisystmcompchk.py b/sysmig_agent/Abisystmcompchk.py +index 79e6581..56af395 100644 +--- a/sysmig_agent/Abisystmcompchk.py ++++ b/sysmig_agent/Abisystmcompchk.py +@@ -23,7 +23,7 @@ queueLock = threading.Lock() + + #为便于测试将变量、接口从share.py中拷贝到当前文件，待联调通过后删除即可 + ######################## add for test start ######################## +-local_dir = '/var/tmp/uos-migration/data/' ++local_dir = '/var/tmp/migration-tools/data/' + exp_rst_dir = local_dir+'exp-rst/' + + current_system_unique = exp_rst_dir + 'current-system-unique.csv' +@@ -165,7 +165,7 @@ def agent_ABI_check_result(): + + def logger_init(): + log_file = 'Abisystmcompchk.log' + '.' + datetime.datetime.now().strftime('%Y%m%d%H%M') +- log_path = '/var/tmp/uos-migration/UOS_migration_log/' ++ log_path = '/var/tmp/migration-tools/UOS_migration_log/' + if not os.path.exists(log_path): + os.makedirs(log_path) + +@@ -646,8 +646,8 @@ def mycopyfile(srcfile, dstfile, logger): + #Generate report name + def create_migrate_report_name(flag, logg): + +- migrate_before_report_path = '/var/tmp/uos-migration/UOS_analysis_report/' +- migrate_behind_report_path = '/var/tmp/uos-migration/UOS_migration_completed_report/' ++ migrate_before_report_path = '/var/tmp/migration-tools/UOS_analysis_report/' ++ migrate_behind_report_path = '/var/tmp/migration-tools/UOS_migration_completed_report/' + + migrate_report_before_sample_name = 'UOS_migration_report_HOSTIP_HOSTNAME_YYYYMMDDHHMM-BEFORE.xls' + migrate_report_behind_sample_name = 'UOS_migration_report_HOSTIP_HOSTNAME_YYYYMMDDHHMM-BEHIND.xls' +diff --git a/sysmig_agent/centos72uos.sh b/sysmig_agent/centos72uos.sh +index 4423138..9796ec6 100755 +--- a/sysmig_agent/centos72uos.sh ++++ b/sysmig_agent/centos72uos.sh +@@ -44,7 +44,7 @@ fi + comd=$knl + + yum_url=file:///etc/yum.repos.d/ +-bad_packages=( subscription-manager gstreamer1-plugins-bad-free-gtk python-meh-gui clucene-contribs-lib centos-release centos-release-cr libreport-plugin-rhtsupport yum-rhn-plugin desktop-backgrounds-basic centos-logos libreport-centos libreport-plugin-mantisbt sl-logos python36-rpm) ++bad_packages=( subscription-manager gstreamer1-plugins-bad-free-gtk python-meh-gui clucene-contribs-lib centos-release centos-release-cr libreport-plugin-rhtsupport yum-rhn-plugin desktop-backgrounds-basic centos-logos libreport-centos libreport-plugin-mantisbt sl-logos python36-rpm) + + + usage() { +@@ -84,7 +84,7 @@ restore_repos() { + Your repositories have been restored to your previous configuration." + } + +-yum install -y uos-license-mini license-config ++yum install -y uos-license-mini license-config + ## Start of script + + while getopts "h" option; do +@@ -173,8 +173,8 @@ fi + + ################# 使用uos-release-server默认软件源## + #: ' +-yum -y downgrade python-urlgrabber +-yum -y install python-urlgrabber ++yum -y downgrade python-urlgrabber ++yum -y install python-urlgrabber + #' + ##################################################### + +@@ -273,11 +273,11 @@ then + `) + update=(`ls -1 $kernel_dir |sed -e s/-[[:digit:]]./@/| awk -F '@' '{print $1}' + `) +- ++ + t=0 + flag=0 + declare -a diff_list +- ++ + for i in ${local[@]} + do + for j in ${update[@]} +@@ -302,7 +302,7 @@ then + do + rpm -ef $x --nodeps + done +- ++ + else + echo "Error,The kernel-"$comd" packages was not found in the source" + exit +@@ -311,6 +311,6 @@ fi + + rpm -qa --qf \ + "%{NAME}|%{VERSION}|%{RELEASE}|%{INSTALLTIME}|%{VENDOR}|%{BUILDTIME}|%{BUILDHOST}|%{SOURCERPM}|%{LICENSE}|%{PACKAGER}\n" \ +- | sort > "/var/tmp/uos-migration/UOS_migration_log/rpms-list-after.txt ++ | sort > "/var/tmp/migration-tools/UOS_migration_log/rpms-list-after.txt + + echo "Switch complete. UOS Server Enterprise-C 20 recommends rebooting this system." +diff --git a/sysmig_agent/centos82uos.py b/sysmig_agent/centos82uos.py +index cc54eba..a306264 100755 +--- a/sysmig_agent/centos82uos.py ++++ b/sysmig_agent/centos82uos.py +@@ -84,12 +84,12 @@ def clean_and_exit(): + def process_special_pkgs(): + print("swap *-logos related packages with UniontechOS packages") + subprocess.run('rpm -q centos-logos-ipa && dnf swap -y centos-logos-ipa uos-logos-ipa', shell=True) +- subprocess.run('rpm -q centos-logos-httpd && dnf swap -y centos-logos-httpd uos-logos-httpd', shell=True) ++ subprocess.run('rpm -q centos-logos-httpd && dnf swap -y centos-logos-httpd uos-logos-httpd', shell=True) + print("redhat-lsb is replaced by system-lsb on UniontechOS") + subprocess.run('rpm -q redhat-lsb-core && dnf swap -y redhat-lsb-core system-lsb-core', shell=True) + subprocess.run('rpm -q redhat-lsb-submod-security && dnf swap -y redhat-lsb-submod-security system-lsb-submod-security',shell=True) + print("rhn related packages is not provided by UniontechOS") +- subprocess.run('rpm -q rhn-client-tools && dnf -y remove rhn-client-tools python3-rhn-client-tools python3-rhnlib', shell=True) ++ subprocess.run('rpm -q rhn-client-tools && dnf -y remove rhn-client-tools python3-rhn-client-tools python3-rhnlib', shell=True) + print("subscription-manager related packages is not provided by UniontechOS") + subprocess.run('rpm -q subscription-manager && dnf -y remove subscription-manager', shell=True) + print("python3-syspurpose is not provided by UniontechOS") +@@ -104,9 +104,9 @@ def pre_system_rpms_info(): + print("Verifying RPMs installed before the switch against RPM database") + out1 = subprocess.check_output('rpm -qa --qf \ + "%{NAME}|%{VERSION}|%{RELEASE}|%{INSTALLTIME}|%{VENDOR}|%{BUILDTIME}|%{BUILDHOST}|%{SOURCERPM}|%{LICENSE}|%{PACKAGER}\\n" \ +- | sort > "/var/tmp/uos-migration/UOS_migration_log/rpms-list-before.txt"', shell=True) +- out2 = subprocess.check_output('rpm -Va | sort -k3 > "/var/tmp/uos-migration/UOS_migration_log/rpms-verified-before.txt"',shell=True) +- files = os.listdir('/var/tmp/uos-migration/') ++ | sort > "/var/tmp/migration-tools/UOS_migration_log/rpms-list-before.txt"', shell=True) ++ out2 = subprocess.check_output('rpm -Va | sort -k3 > "/var/tmp/migration-tools/UOS_migration_log/rpms-verified-before.txt"',shell=True) ++ files = os.listdir('/var/tmp/migration-tools/') + hostname = socket.gethostname() + print("Review the output of following files:") + for f in files: +@@ -119,7 +119,7 @@ def centos8_main(osname): + logger = logging.getLogger() + logger.setLevel(logging.INFO) + #rq = time.strftime('%Y%m%d%H%M', time.localtime(time.time())) +- log_name = '/var/tmp/uos-migration/UOS_migration_log/log' ++ log_name = '/var/tmp/migration-tools/UOS_migration_log/log' + logfile = log_name + fh = logging.FileHandler(logfile, mode='w') + fh.setLevel(logging.DEBUG) +@@ -199,7 +199,7 @@ def centos8_main(osname): + logger.info("========= Checking: dnf =========") + logger.info("Identifying dnf modules that are enabled...") + enabled_modules = str( +- subprocess.check_output("dnf module list --enabled | grep rhel | awk '{print $1}'", shell=True), ++ subprocess.check_output("dnf module list --enabled | grep rhel | awk '{print $1}'", shell=True), + 'utf-8') + enabled_modules = enabled_modules.split('\n')[:-1] + unknown_mods=[] +@@ -262,7 +262,7 @@ install '+ ' '.join(base_packages) + '\n\ + run\n\ + EOF' + try: +- fdout = open("/var/tmp/uos-migration/UOS_migration_log/mig_log.txt",'a') ++ fdout = open("/var/tmp/migration-tools/UOS_migration_log/mig_log.txt",'a') + subprocess.run(cmd,stdout=fdout , shell=True) + fdout.close() + except: +@@ -273,7 +273,7 @@ EOF' + logger.info("Updating initrd...") + indexhtml ='rpm -e --nodeps ' + osname+'-indexhtml' + os.system(indexhtml) +- fdout = open("/var/tmp/uos-migration/UOS_migration_log/mig_log.txt",'a') ++ fdout = open("/var/tmp/migration-tools/UOS_migration_log/mig_log.txt",'a') + subprocess.run('/usr/libexec/plymouth/plymouth-update-initrd',stdout=fdout,shell=True) + #run_cmd2file('/usr/libexec/plymouth/plymouth-update-initrd') + fdout.close() +@@ -283,7 +283,7 @@ EOF' + if subver == '8.3': + subprocess.run('yum -y downgrade crypto-policies --allowerasing', shell=True) + try: +- fdout = open("/var/tmp/uos-migration/UOS_migration_log/mig_log.txt",'a') ++ fdout = open("/var/tmp/migration-tools/UOS_migration_log/mig_log.txt",'a') + subprocess.run('yum -y distro-sync', stdout=fdout ,shell=True) + fdout.close() + except: +diff --git a/sysmig_agent/check.py b/sysmig_agent/check.py +index 1a21c52..3538666 100644 +--- a/sysmig_agent/check.py ++++ b/sysmig_agent/check.py +@@ -22,21 +22,21 @@ os.chdir('/usr/lib/migration-tools-agent') + def init_dir(): + if not os.path.isdir(PRE_MIG_DIR): + os.makedirs(PRE_MIG_DIR) +- ++ + if not os.path.isdir(MIGRATION_DIR): + os.makedirs(MIGRATION_DIR) + + if not os.path.isdir(MIGRATION_KERNEL): + os.makedirs(MIGRATION_KERNEL) +- ++ + if not os.path.isdir(MIGRATION_DATA_RPMS_DIR): + os.makedirs(MIGRATION_DATA_RPMS_DIR) +- ++ + if not os.path.exists(PRE_MIG): + with open(PRE_MIG,'w+') as fp: + fp.write(' ') + fp.close() +- ++ + if not os.path.exists(PROGRESS): + with open(PROGRESS,'w+') as fp: + fp.write(' ') +@@ -240,8 +240,8 @@ def export_reports(data): + ip = json.loads(uos_sysmig_conf).get('agentip').strip() + now = datetime.datetime.now().strftime('%Y%m%d%H%M%S') + +- compression = "tar zcvf /var/tmp/uos-migration/%s" % json_data.get("name") + "_%s" % ip +\ +- "_%s" % hostname + "_%s" % now + ".tar.gz" + " /var/tmp/uos-migration/%s" % json_data.get("export") ++ compression = "tar zcvf /var/tmp/migration-tools/%s" % json_data.get("name") + "_%s" % ip +\ ++ "_%s" % hostname + "_%s" % now + ".tar.gz" + " /var/tmp/migration-tools/%s" % json_data.get("export") + print(compression) + try: + os.system(compression) +@@ -267,7 +267,7 @@ def systemCheckRequires(conflist): + + def fork_sh(cmd): + try: +- fderr = open("/var/tmp/uos-migration/UOS_migration_log/err_log",'a') ++ fderr = open("/var/tmp/migration-tools/UOS_migration_log/err_log",'a') + subprocess.run(cmd, stderr=fderr , shell=True) + messageState('2') + fderr.close() +@@ -317,7 +317,7 @@ def check_environment(data_j): + + # 检测进度 + def analysisProgress(): +- path = '/var/tmp/uos-migration/data/uos/rpms' ++ path = '/var/tmp/migration-tools/data/uos/rpms' + if os.path.exists(path): + file_list = os.listdir(path) + else: +@@ -388,7 +388,7 @@ def ifnot_mig_kernel(kernel_version): + + + def mig_kernel(kernel_version): +- cwd = '/var/tmp/uos-migration/kernel/' ++ cwd = '/var/tmp/migration-tools/kernel/' + ret = os.listdir(cwd) + for i in ret: + os.unlink(cwd+i) +@@ -404,15 +404,15 @@ def mig_kernel(kernel_version): + repo = 'UniontechOS-kernel-'+kernel_version.strip() + else: + return 1 +- down_cmd = 'yumdownloader --destdir "/var/tmp/uos-migration/kernel" --enablerepo '+repo ++ down_cmd = 'yumdownloader --destdir "/var/tmp/migration-tools/kernel" --enablerepo '+repo + ret = os.popen(cmd).readlines() + for i in ret: + downpackage = down_cmd+' '+i.strip()+'-'+kernel_version.strip() + os.system(downpackage) + +- cwd = '/var/tmp/uos-migration/kernel/' ++ cwd = '/var/tmp/migration-tools/kernel/' + if os.listdir(cwd): +- os.system('rpm -Uvh "/var/tmp/uos-migration/kernel/*" --nodeps --oldpackage') ++ os.system('rpm -Uvh "/var/tmp/migration-tools/kernel/*" --nodeps --oldpackage') + else: + ifnot_mig_kernel() + return 1 +@@ -421,7 +421,7 @@ def mig_kernel(kernel_version): + def migration_details(data_j): + uos_sysmig_conf = json.loads(getSysMigConf()) + AGENT_IP = json.loads(uos_sysmig_conf).get('agentip').strip()[1:-1] +- path = '/var/tmp/uos-migration/UOS_migration_log/mig_log.txt' ++ path = '/var/tmp/migration-tools/UOS_migration_log/mig_log.txt' + if os.path.exists(path): + with open(path,'r') as lf: + data = lf.read() +@@ -515,23 +515,23 @@ def system_migration(data_j): + oldos = stros[0] + fp.close() + oldos = oldos.split(':',1) +- main_conf(oldos[1]) +- if os.path.exists('/var/tmp/uos-migration/data/exp-rst/systeminfo.txt'): ++ main_conf(oldos[1]) ++ if os.path.exists('/var/tmp/migration-tools/data/exp-rst/systeminfo.txt'): + run_cmd2file('sh sysmig_agent/Abitranrept.sh') + abi_txt2xls_after_mig() + messageState('4') + elif re.fullmatch('4',state): + messageState('5') +- if os.path.exists('/var/tmp/uos-migration/UOS_migration_log/rpms-verified-after.txt'): ++ if os.path.exists('/var/tmp/migration-tools/UOS_migration_log/rpms-verified-after.txt'): + res = '0' + else: + res = '-1' + elif re.fullmatch('3',state): + messageState('5') +- if os.path.exists('/var/tmp/uos-migration/data/exp-rst/systeminfo.txt'): ++ if os.path.exists('/var/tmp/migration-tools/data/exp-rst/systeminfo.txt'): + run_cmd2file('sysmig_agent/Abitranrept.sh') + abi_txt2xls_after_mig() +- if os.path.exists('/var/tmp/uos-migration/UOS_migration_log/rpms-list-after.txt'): ++ if os.path.exists('/var/tmp/migration-tools/UOS_migration_log/rpms-list-after.txt'): + res = '0' + else: + res = '-1' +@@ -546,7 +546,7 @@ def system_migration(data_j): + keylist = ['ip','res','data'] + valuelist = [AGENT_IP,res,data] + return list_to_json(keylist,valuelist) +- ++ + res = '2' + data = '......' + keylist = ['ip','res','data'] +diff --git a/sysmig_agent/kernel.sh b/sysmig_agent/kernel.sh +index fd3178d..bcd5da9 100755 +--- a/sysmig_agent/kernel.sh ++++ b/sysmig_agent/kernel.sh +@@ -4,7 +4,7 @@ set -x + + set -e + unset CDPATH +-KERNEL=/var/tmp/uos-migration/kernel ++KERNEL=/var/tmp/migration-tools/kernel + + while getopts :d:k: opt + do +diff --git a/sysmig_agent/migration.py b/sysmig_agent/migration.py +index a3265e9..b4ca652 100644 +--- a/sysmig_agent/migration.py ++++ b/sysmig_agent/migration.py +@@ -6,7 +6,7 @@ from sysmig_agent.centos82uos import * + #sys.path.append("..") + from connect_sql import DBHelper + +-RPMS = '/var/tmp/uos-migration/.rpms' ++RPMS = '/var/tmp/migration-tools/.rpms' + + # migrations function + +@@ -32,7 +32,7 @@ def migprogress(): + + + def readline_log(): +- path = '/var/tmp/uos-migration/UOS_migration_log/mig_log.txt' ++ path = '/var/tmp/migration-tools/UOS_migration_log/mig_log.txt' + if not os.path.exists(path): + return None + else: +@@ -46,7 +46,7 @@ def readline_log(): + + def migInit_porgress(): + uelc_rpm = os.popen('rpm -qa|wc -l').readlines() +- with open('/var/tmp/uos-migration/.rpms', 'w+') as fp: ++ with open('/var/tmp/migration-tools/.rpms', 'w+') as fp: + fp.write(uelc_rpm[0]) + fp.close() + +@@ -136,7 +136,7 @@ def disable_exclude(): + # migration kernel + def mig_kernel(kernel_version): + disable_exclude() +- cwd = '/var/tmp/uos-migration/kernel/' ++ cwd = '/var/tmp/migration-tools/kernel/' + if not os.path.exists(cwd): + os.mkdir(cwd) + ret = os.listdir(cwd) +@@ -155,14 +155,14 @@ def mig_kernel(kernel_version): + repo = 'UniontechOS-kernel-' + kernel_version.strip() + else: + return 1 +- down_cmd = 'yumdownloader --destdir "/var/tmp/uos-migration/kernel" --enablerepo '+repo ++ down_cmd = 'yumdownloader --destdir "/var/tmp/migration-tools/kernel" --enablerepo '+repo + ret = os.popen(cmd).readlines() + for i in ret: + downpackage = down_cmd+' '+i.strip()+'-'+kernel_version.strip() + # os.system(downpackage) + run_subprocess(downpackage) + +- cwd = '/var/tmp/uos-migration/kernel/' ++ cwd = '/var/tmp/migration-tools/kernel/' + if os.listdir(cwd): + cmd = 'rpm -Uvh "{}*" --nodeps --oldpackage'.format(cwd) + # os.system(cmd) +@@ -256,22 +256,22 @@ def mig_system_migration(kernel_version): + fp.close() + oldos = oldos.split(':',1) + main_conf(oldos[1]) +- if os.path.exists('/var/tmp/uos-migration/data/exp-rst/systeminfo.txt'): ++ if os.path.exists('/var/tmp/migration-tools/data/exp-rst/systeminfo.txt'): + run_cmd2file('sh func/Abitranrept.sh') + # abi_txt2xls_trans() + sql_mig_statue('4') + elif '4' == state: + sql_mig_statue('5') +- if os.path.exists('/var/tmp/uos-migration/UOS_migration_log/rpms-verified-after.txt'): ++ if os.path.exists('/var/tmp/migration-tools/UOS_migration_log/rpms-verified-after.txt'): + res = '0' + else: + res = '-1' + elif '3' == state: + sql_mig_statue('5') +- if os.path.exists('/var/tmp/uos-migration/data/exp-rst/systeminfo.txt'): ++ if os.path.exists('/var/tmp/migration-tools/data/exp-rst/systeminfo.txt'): + run_cmd2file('func/Abitranrept.sh') + # abi_txt2xls_trans() +- if os.path.exists('/var/tmp/uos-migration/UOS_migration_log/rpms-list-after.txt'): ++ if os.path.exists('/var/tmp/migration-tools/UOS_migration_log/rpms-list-after.txt'): + res = '0' + else: + res = '-1' +diff --git a/sysmig_agent/share.py b/sysmig_agent/share.py +index 0bd73f6..f253e46 100644 +--- a/sysmig_agent/share.py ++++ b/sysmig_agent/share.py +@@ -17,24 +17,24 @@ from connect_sql import DBHelper + defaultencoding = 'utf-8' + # logdss = Logger('./logdss.log',logging.DEBUG,logging.DEBUG) + new_os = '统信服务器操作系统V20({})' +-AGENT_DIR = '/var/tmp/uos-migration/' +-PRE_MIG = '/var/tmp/uos-migration/UOS_analysis_report/rpmva-before.txt' +-PRE_MIG_DIR = '/var/tmp/uos-migration/UOS_analysis_report' +-MIGRATION_DIR = '/var/tmp/uos-migration/UOS_migration_log' +-MIGRATION_REPORT_DIR = '/var/tmp/uos-migration/UOS_migration_completed_report' +- +- +-PROGRESS = '/var/tmp/uos-migration/.progress' +-RPMS = '/var/tmp/uos-migration/.rpms' +-MIGRATION_KERNEL = '/var/tmp/uos-migration/kernel' +-MIGRATION_LOG = '/var/tmp/uos-migration/UOS_migration_log/log' +-MIGRATION_DATA_RPMS_DIR = '/var/tmp/uos-migration/data/exp-rst' +-MIGRATION_DATA_RPMS_3_INFO = '/var/tmp/uos-migration/data/exp-rst/pkginfo_3.txt' +-pstate = '/var/tmp/uos-migration/.state' +- +-abi_file = '/var/tmp/uos-migration/data/exp-rst/agent_ABI_check_result.csv' ++AGENT_DIR = '/var/tmp/migration-tools/' ++PRE_MIG = '/var/tmp/migration-tools/UOS_analysis_report/rpmva-before.txt' ++PRE_MIG_DIR = '/var/tmp/migration-tools/UOS_analysis_report' ++MIGRATION_DIR = '/var/tmp/migration-tools/UOS_migration_log' ++MIGRATION_REPORT_DIR = '/var/tmp/migration-tools/UOS_migration_completed_report' ++ ++ ++PROGRESS = '/var/tmp/migration-tools/.progress' ++RPMS = '/var/tmp/migration-tools/.rpms' ++MIGRATION_KERNEL = '/var/tmp/migration-tools/kernel' ++MIGRATION_LOG = '/var/tmp/migration-tools/UOS_migration_log/log' ++MIGRATION_DATA_RPMS_DIR = '/var/tmp/migration-tools/data/exp-rst' ++MIGRATION_DATA_RPMS_3_INFO = '/var/tmp/migration-tools/data/exp-rst/pkginfo_3.txt' ++pstate = '/var/tmp/migration-tools/.state' ++ ++abi_file = '/var/tmp/migration-tools/data/exp-rst/agent_ABI_check_result.csv' + #Abi +-local_dir = '/var/tmp/uos-migration/data/' ++local_dir = '/var/tmp/migration-tools/data/' + exp_rst_dir = local_dir+'exp-rst/' + + current_system_unique = exp_rst_dir + 'current-system-unique.csv' +@@ -206,8 +206,8 @@ def getSysMigConf(): + + + def run_cmd2file(cmd): +- fdout = open("/var/tmp/uos-migration/UOS_migration_log/mig_log.txt",'a') +- fderr = open("/var/tmp/uos-migration/UOS_migration_log/err_log",'a') ++ fdout = open("/var/tmp/migration-tools/UOS_migration_log/mig_log.txt",'a') ++ fderr = open("/var/tmp/migration-tools/UOS_migration_log/err_log",'a') + p = subprocess.Popen(cmd, stdout=fdout, stderr=fderr, shell=True) + if p.poll(): + return +@@ -353,7 +353,7 @@ def list_to_json(keylist, valuelist): + def main_conf(osname): + logger = logging.getLogger() + logger.setLevel(logging.INFO) +- log_name = '/var/tmp/uos-migration/UOS_migration_log/log' ++ log_name = '/var/tmp/migration-tools/UOS_migration_log/log' + logfile = log_name + fh = logging.FileHandler(logfile, mode='w') + fh.setLevel(logging.DEBUG) +@@ -381,7 +381,7 @@ def main_conf(osname): + subprocess.run('dnf module disable -y satellite-5-client', shell=True) + except: + pass +- process_special_pkgs() ++ process_special_pkgs() + logger.info("Removing yum cache") + if os.path.isfile('/var/cache/yum'): + os.remove('/var/cache/yum') +@@ -392,7 +392,7 @@ def main_conf(osname): + elif os.path.isdir('/var/cache/dnf'): + shutil.rmtree('/var/cache/dnf') + logger.info("------------- : "+osname) +- ++ + conf_grub() + title_conf(osname) + +@@ -400,8 +400,8 @@ def main_conf(osname): + logger.info("Verifying RPMs installed after the switch against RPM database") + out1 = subprocess.check_output('rpm -qa --qf \ + "%{NAME}|%{VERSION}|%{RELEASE}|%{INSTALLTIME}|%{VENDOR}|%{BUILDTIME}|%{BUILDHOST}|%{SOURCERPM}|%{LICENSE}|%{PACKAGER}\n" \ +- | sort > "/var/tmp/uos-migration/UOS_migration_log/rpms-list-after.txt"', shell=True) +- out2 = subprocess.check_output('rpm -Va | sort -k3 > "/var/tmp/uos-migration/UOS_migration_log/rpms-verified-after.txt"',shell=True) ++ | sort > "/var/tmp/migration-tools/UOS_migration_log/rpms-list-after.txt"', shell=True) ++ out2 = subprocess.check_output('rpm -Va | sort -k3 > "/var/tmp/migration-tools/UOS_migration_log/rpms-verified-after.txt"',shell=True) + + logger.info("Switch complete.UniontechOS recommends rebooting this system.") + return 0 +@@ -444,8 +444,8 @@ def run_subprocess(cmd="", print_cmd=True, print_output=True): + output (print_output=True). Switching off printing the command can be useful in case it contains + a password in plain text. + """ +- cwdo = '/var/tmp/uos-migration/UOS_migration_log/mig_log.txt' +- cwde = '/var/tmp/uos-migration/UOS_migration_log/mig_err.txt' ++ cwdo = '/var/tmp/migration-tools/UOS_migration_log/mig_log.txt' ++ cwde = '/var/tmp/migration-tools/UOS_migration_log/mig_err.txt' + # fderr = open(cwde, 'a') + # from logging import * + # if print_cmd: +diff --git a/sysmig_agent/utils.py b/sysmig_agent/utils.py +index 472879b..b690d62 100644 +--- a/sysmig_agent/utils.py ++++ b/sysmig_agent/utils.py +@@ -11,12 +11,12 @@ def list_to_json(keylist, valuelist): + + # 检测进度 + def messageProgress(message): +- with open('/var/tmp/uos-migration/.progress','w') as fp: ++ with open('/var/tmp/migration-tools/.progress','w') as fp: + fp.write(message) + fp.close() + + + def messageState(message): +- with open('/var/tmp/uos-migration/.state','w') as fp: ++ with open('/var/tmp/migration-tools/.state','w') as fp: + fp.write(message) + fp.close() +diff --git a/templates/MT_check_environment.html b/templates/MT_check_environment.html +index 3ca8b01..2724e06 100644 +--- a/templates/MT_check_environment.html ++++ b/templates/MT_check_environment.html +@@ -19,11 +19,11 @@ + +
+
+-

+- ++

++ + +

+-
++
+ +
+
+@@ -34,10 +34,10 @@ + + + + +