!24 修改部分描述
From: @f16lx Reviewed-by: @weidongkl Signed-off-by: @weidongkl
This commit is contained in:
commit
6231db4e1d
70
0001-modify-description.patch
Normal file
70
0001-modify-description.patch
Normal file
@ -0,0 +1,70 @@
|
|||||||
|
From 52c434875d1cda64d0abd96e115001ffef0d2cc5 Mon Sep 17 00:00:00 2001
|
||||||
|
From: lixin <lixinb@uniontech.com>
|
||||||
|
Date: Mon, 1 Apr 2024 11:04:00 +0800
|
||||||
|
Subject: [PATCH] modify-description
|
||||||
|
|
||||||
|
---
|
||||||
|
templates/MT_agreement.html | 2 +-
|
||||||
|
templates/MT_migration_results.html | 2 +-
|
||||||
|
templates/MT_note.html | 12 +++++++-----
|
||||||
|
3 files changed, 9 insertions(+), 7 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/templates/MT_agreement.html b/templates/MT_agreement.html
|
||||||
|
index be70ca8..d15a399 100755
|
||||||
|
--- a/templates/MT_agreement.html
|
||||||
|
+++ b/templates/MT_agreement.html
|
||||||
|
@@ -26,7 +26,7 @@
|
||||||
|
<div class="header">
|
||||||
|
<i class="rocket icon"></i> 欢迎使用统信服务器系统迁移软件。
|
||||||
|
</div>
|
||||||
|
- 此迁移工具用于将【当前操作系统】替换为【统信服务器操作系统 V20】,并将 RPM 软件包替换为统信的 RPM 软件包。
|
||||||
|
+ 此迁移工具用于将【当前操作系统】替换为【openEuler-20.03-LTS-SP1或统信服务器操作系统】,并将 RPM 软件包替换为统信的 RPM 软件包。
|
||||||
|
</div>
|
||||||
|
<b>协议许可:</b>
|
||||||
|
<div class="pr-agreement">
|
||||||
|
diff --git a/templates/MT_migration_results.html b/templates/MT_migration_results.html
|
||||||
|
index 3ff802b..fef5292 100755
|
||||||
|
--- a/templates/MT_migration_results.html
|
||||||
|
+++ b/templates/MT_migration_results.html
|
||||||
|
@@ -35,6 +35,7 @@
|
||||||
|
<br/>
|
||||||
|
<div align="center" >
|
||||||
|
<label style="font-size:15px;font-family:”思源黑体”;font-weight:bold;">系统迁移已完成,请您导出迁移分析报告后手动重启服务器。</label>
|
||||||
|
+ <p>注意:(openEuler系统迁移暂不支持导出日志/报告功能)</p>
|
||||||
|
</div>
|
||||||
|
<br/>
|
||||||
|
<br/>
|
||||||
|
@@ -88,7 +89,6 @@
|
||||||
|
<hr style="opacity: 0.1;border: 1px solid #4C4D4E;width:99%;" />
|
||||||
|
</br>
|
||||||
|
</br>
|
||||||
|
- <button onclick="close_tool();" data-toggle="modal" data-target="#exampleModal" type="submit" class="menter_btn_a_a_lf" data-locale="Exit" style="text-align: center; line-height: 37px; color:black; font-size:18px;"><style>a{TEXT-DECORATION:none}</style>完成</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
diff --git a/templates/MT_note.html b/templates/MT_note.html
|
||||||
|
index 099523b..1a79009 100755
|
||||||
|
--- a/templates/MT_note.html
|
||||||
|
+++ b/templates/MT_note.html
|
||||||
|
@@ -33,11 +33,13 @@
|
||||||
|
</br>
|
||||||
|
<p>1. 迁移一旦开始,过程不可逆。请确保您已将系统的数据与设置进行【完整备份】。</p>
|
||||||
|
<p>2. 迁移前请获得管理员许可,再进行迁移工作。</p>
|
||||||
|
- <p>3. 请提前获取【统信服务器操作系统 V20 】的软件仓库地址。</p>
|
||||||
|
- <p>4. 迁移过程中请保证稳定的网络连接。</p>
|
||||||
|
- <p>5. 迁移过程中请不要进行任何操作。</p>
|
||||||
|
- <p>6. 该迁移工具目前仅支持 CentOS 7 / CentOS 8 操作系统。</p>
|
||||||
|
- <p>7. 请确保在 '/var/cache' 中至少有 10GB 的可用空间。</p>
|
||||||
|
+ <p>3. openEuler系统迁移目前仅支持centos7.4-7.6 cui迁移至openEuler-20.03-LTS-SP1</p>
|
||||||
|
+ <p>3. openEuler系统迁移无需填写软件源</p>
|
||||||
|
+ <p>4. 如需迁移UOS系统,请提前准备【统信服务器操作系统 V20 】的软件仓库地址。</p>
|
||||||
|
+ <p>5. 迁移过程中请保证稳定的网络连接。</p>
|
||||||
|
+ <p>6. 迁移过程中请不要进行任何操作。</p>
|
||||||
|
+ <p>7. 该迁移工具目前仅支持 CentOS 7 / CentOS 8 操作系统。</p>
|
||||||
|
+ <p>8. 请确保在 '/var/cache' 中至少有 10GB 的可用空间。</p>
|
||||||
|
</br>
|
||||||
|
</br>
|
||||||
|
</br>
|
||||||
|
--
|
||||||
|
2.43.0
|
||||||
|
|
||||||
@ -1,6 +1,6 @@
|
|||||||
Name: migration-tools
|
Name: migration-tools
|
||||||
Version: 1.0.1
|
Version: 1.0.1
|
||||||
Release: 3
|
Release: 4
|
||||||
License: MulanPSL-2.0
|
License: MulanPSL-2.0
|
||||||
Summary: A tool to help users migrate the Centos system to the UOS system and openEuler system
|
Summary: A tool to help users migrate the Centos system to the UOS system and openEuler system
|
||||||
Source0: migration-tools.tar.gz
|
Source0: migration-tools.tar.gz
|
||||||
@ -8,6 +8,7 @@ Source1: requires.tar.gz
|
|||||||
Source2: xlwt-1.3.0-py2.py3-none-any.whl
|
Source2: xlwt-1.3.0-py2.py3-none-any.whl
|
||||||
# patches
|
# patches
|
||||||
Patch0: 0001-use-kill-not-kill-INT-when-stop-service.patch
|
Patch0: 0001-use-kill-not-kill-INT-when-stop-service.patch
|
||||||
|
Patch1: 0001-modify-description.patch
|
||||||
|
|
||||||
# CVE patches: >= 100
|
# CVE patches: >= 100
|
||||||
Patch100: 100-CVE-2024-24892.patch
|
Patch100: 100-CVE-2024-24892.patch
|
||||||
@ -53,6 +54,7 @@ Migration software server side
|
|||||||
%setup -c
|
%setup -c
|
||||||
|
|
||||||
%patch 0 -p1
|
%patch 0 -p1
|
||||||
|
%patch 1 -p1
|
||||||
%patch 100 -p1
|
%patch 100 -p1
|
||||||
|
|
||||||
%if 0%{?openEuler}
|
%if 0%{?openEuler}
|
||||||
@ -108,6 +110,9 @@ rm -rf /usr/bin/migration-tools
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Apr 01 2024 lixin <lixinb@uniontech.com> - 1.0.1-4
|
||||||
|
- modify description
|
||||||
|
|
||||||
* Mon Mar 18 2024 lixin <lixinb@uniontech.com> - 1.0.1-3
|
* Mon Mar 18 2024 lixin <lixinb@uniontech.com> - 1.0.1-3
|
||||||
- fix stop service display failed
|
- fix stop service display failed
|
||||||
- update spec
|
- update spec
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user