diff --git a/0009-disable-button-for-system-type-and-space.patch b/0009-disable-button-for-system-type-and-space.patch new file mode 100644 index 0000000000000000000000000000000000000000..64e4042eeae7d12a6c17d651cbc01ce45f23252d --- /dev/null +++ b/0009-disable-button-for-system-type-and-space.patch @@ -0,0 +1,36 @@ +From 27b96502632535b0fcf70bc0bf80d3f876dc2b2f Mon Sep 17 00:00:00 2001 +From: lihaipeng +Date: Wed, 4 Sep 2024 15:25:41 +0800 +Subject: [PATCH] disable button for system type and space + +--- + templates/MT_check_evn.html | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/templates/MT_check_evn.html b/templates/MT_check_evn.html +index 47b2029..fc18af1 100755 +--- a/templates/MT_check_evn.html ++++ b/templates/MT_check_evn.html +@@ -52,8 +52,8 @@ +
+
+
+- +- ++ ++ + + + +@@ -122,6 +122,8 @@ + if (os_res == '1' && storage_res == '1') { + document.getElementById('check_id').style.opacity = "1" + document.getElementById('check_id').removeAttribute("disabled"); ++ document.getElementById('last_step').style.opacity = "1" ++ document.getElementById('last_step').removeAttribute("disabled"); + os_res.name = '0'; + storage_res.name = '0'; + } +-- +2.43.0 + diff --git a/0010-verify-user-password-disabled-by-button.patch b/0010-verify-user-password-disabled-by-button.patch new file mode 100644 index 0000000000000000000000000000000000000000..c439fe2af3ae2b1dd660abef1d290d876cd80b8c --- /dev/null +++ b/0010-verify-user-password-disabled-by-button.patch @@ -0,0 +1,43 @@ +From f8047aa03c724ac36d9e042f9f64608fd4ca4750 Mon Sep 17 00:00:00 2001 +From: lihaipeng +Date: Wed, 4 Sep 2024 16:26:02 +0800 +Subject: [PATCH] verify user password is disabled by button + +--- + templates/MT_check_root.html | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/templates/MT_check_root.html b/templates/MT_check_root.html +index b2a3955..9b70749 100755 +--- a/templates/MT_check_root.html ++++ b/templates/MT_check_root.html +@@ -72,7 +72,7 @@ +
+
+
+- ++ + + + +@@ -97,6 +97,9 @@ + check_user_data_json.ip = "tasks" + document.getElementById('check_id').style.opacity = 0.2 + document.getElementById('check_id').setAttribute("disabled", true); ++ ++ document.getElementById('last_step').style.opacity = 0.2 ++ document.getElementById('last_step').setAttribute("disabled", true); + info = document.getElementById("uname_id").value + "|" + document.getElementById("machine_password").value + $.ajax({ + async:true, +@@ -122,6 +125,7 @@ + } + + function close_tool() { ++ document.getElementById('last_step').setAttribute("disabled", true); + window.location.href="MT_check_env" + } + +-- +2.43.0 + diff --git a/migration-tools.spec b/migration-tools.spec index b39ae815513e725e177276e8ee9359d12337c049..10c6f6f05533707d63e042f575e6c5119c6cc15e 100644 --- a/migration-tools.spec +++ b/migration-tools.spec @@ -1,6 +1,6 @@ Name: migration-tools Version: 1.0.1 -Release: 11 +Release: 13 License: MulanPSL-2.0 Summary: A tool to help users migrate the Centos system to the UOS system and openEuler system Source0: migration-tools.tar.gz @@ -15,6 +15,8 @@ Patch4: 0005-system-check-page-before-migration-displayed.patch Patch5: 0006-return-button-after-successful-migration.patch Patch6: 0007-user-name-input-diversity.patch Patch7: 0008-software-source-input-box-diversity.patch +Patch8: 0009-disable-button-for-system-type-and-space.patch +Patch9: 0010-verify-user-password-disabled-by-button.patch # CVE patches: >= 100 Patch100: 100-CVE-2024-24892.patch @@ -68,6 +70,8 @@ Migration software server side %patch 5 -p1 %patch 6 -p1 %patch 7 -p1 +%patch 8 -p1 +%patch 9 -p1 %patch 100 -p1 %if 0%{?openEuler} @@ -123,6 +127,12 @@ rm -rf /usr/bin/migration-tools %endif %changelog +* Wed Sep 04 2024 lihaipeng - 1.0.1-13 +- verify user password is disabled by button + +* Wed Sep 04 2024 lihaipeng - 1.0.1-12 +- disable button for system type and space verification + * Wed Sep 04 2024 lihaipeng - 1.0.1-11 - software source repository input field diversity