From f5df2ac9bea96c83390bd86048876731d0a44d21 Mon Sep 17 00:00:00 2001 From: lihaipeng Date: Wed, 4 Sep 2024 13:15:53 +0800 Subject: [PATCH] user name input diversity (cherry picked from commit 8f2c34dd784540b3d32dad7fe9c8947a3087f748) --- 0007-user-name-input-diversity.patch | 35 ++++++++++++++++++++++++++++ migration-tools.spec | 7 +++++- 2 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 0007-user-name-input-diversity.patch diff --git a/0007-user-name-input-diversity.patch b/0007-user-name-input-diversity.patch new file mode 100644 index 0000000..2ad2d08 --- /dev/null +++ b/0007-user-name-input-diversity.patch @@ -0,0 +1,35 @@ +From f97cab793cc5b18c836a8ca4bdf82390c4fc3110 Mon Sep 17 00:00:00 2001 +From: lihaipeng +Date: Wed, 4 Sep 2024 13:12:51 +0800 +Subject: [PATCH] user name input diversity + +--- + templates/MT_check_root.html | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +diff --git a/templates/MT_check_root.html b/templates/MT_check_root.html +index 5e4ce52..b2a3955 100755 +--- a/templates/MT_check_root.html ++++ b/templates/MT_check_root.html +@@ -149,6 +149,18 @@ + }); + }); + ++ let uname_id=document.querySelector('#uname_id') ++ uname_id.onfocus=function(){ ++ if(uname_id.value=="请输入具有root权限的用户"){ ++ uname_id.value="" ++ } ++ } ++ uname_id.onblur=function(){ ++ if(uname_id.value==''){ ++ uname_id.value="请输入具有root权限的用户" ++ } ++ } ++ + + + +-- +2.43.0 + diff --git a/migration-tools.spec b/migration-tools.spec index a8a82d7..3a52b57 100644 --- a/migration-tools.spec +++ b/migration-tools.spec @@ -1,6 +1,6 @@ Name: migration-tools Version: 1.0.1 -Release: 9 +Release: 10 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 @@ -13,6 +13,7 @@ Patch2: 0003-adjust-the-display-sequence.patch Patch3: 0004-fix-cancel-button-function-in-tool.patch Patch4: 0005-system-check-page-before-migration-displayed.patch Patch5: 0006-return-button-after-successful-migration.patch +Patch6: 0007-user-name-input-diversity.patch # CVE patches: >= 100 Patch100: 100-CVE-2024-24892.patch @@ -64,6 +65,7 @@ Migration software server side %patch 3 -p1 %patch 4 -p1 %patch 5 -p1 +%patch 6 -p1 %patch 100 -p1 %if 0%{?openEuler} @@ -119,6 +121,9 @@ rm -rf /usr/bin/migration-tools %endif %changelog +* Wed Sep 04 2024 lihaipeng - 1.0.1-10 +- user name input diversity + * Wed Sep 04 2024 lihaipeng - 1.0.1-9 - return button after successful migration -- Gitee