修复服务停止显示失败的问题,不再在安装和卸载软件包时enable/disable服务

This commit is contained in:
lixin 2024-03-15 15:47:09 +08:00
parent 111c220dad
commit 9ea69d6471
2 changed files with 31 additions and 3 deletions

View File

@ -0,0 +1,25 @@
From 55b9f6759bc69c66ac67e18edbad7c6e341b8935 Mon Sep 17 00:00:00 2001
From: lixin <lixinb@uniontech.com>
Date: Fri, 15 Mar 2024 15:36:24 +0800
Subject: [PATCH] use-kill-not-kill-INT-when-stop-service
---
ut-Migration-tools/server/migration-tools-server.service | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ut-Migration-tools/server/migration-tools-server.service b/ut-Migration-tools/server/migration-tools-server.service
index 6616c5b..b634fa4 100644
--- a/ut-Migration-tools/server/migration-tools-server.service
+++ b/ut-Migration-tools/server/migration-tools-server.service
@@ -5,7 +5,7 @@ After=network-online.target
[Service]
Type=simple
ExecStart=/usr/bin/python3 /usr/lib/migration-tools-server/index.py
-ExecStop=/bin/kill-INT $MAINPID
+ExecStop=/bin/kill -HUP $MAINPID
[Install]
WantedBy=multi-user.target
--
2.33.0

View File

@ -1,12 +1,13 @@
Name: migration-tools Name: migration-tools
Version: 1.0.0 Version: 1.0.0
Release: 7 Release: 8
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
License: MulanPSL-2.0 License: MulanPSL-2.0
Source0: ut-Migration-tools.tar.gz Source0: ut-Migration-tools.tar.gz
Patch0: 0001-fix-export-error-and-no-migration-details-issue.patch Patch0: 0001-fix-export-error-and-no-migration-details-issue.patch
Patch1: 0002-fix-uefi-boot-failed.patch Patch1: 0002-fix-uefi-boot-failed.patch
Patch2: 0003-modify-grub-rules-to-match-NIC-name.patch Patch2: 0003-modify-grub-rules-to-match-NIC-name.patch
Patch3: 0004-use-kill-not-kill-INT-when-stop-service.patch
# CVE patches: >= 100 # CVE patches: >= 100
Patch100: 0001-CVE-2024-24892.patch Patch100: 0001-CVE-2024-24892.patch
@ -34,6 +35,7 @@ Migration software server side
%patch0 -p1 %patch0 -p1
%patch1 -p1 %patch1 -p1
%patch2 -p1 %patch2 -p1
%patch3 -p1
# cve patches # cve patches
%patch100 -p1 %patch100 -p1
@ -57,7 +59,6 @@ cp -r ut-Migration-tools/* $RPM_BUILD_ROOT/usr/lib/migration-tools-server/
%post -n migration-tools-server %post -n migration-tools-server
chmod +x /usr/lib/migration-tools-server/server/start_webview.sh chmod +x /usr/lib/migration-tools-server/server/start_webview.sh
ln -sf /usr/lib/migration-tools-server/server/start_webview.sh /usr/bin/migration-tools ln -sf /usr/lib/migration-tools-server/server/start_webview.sh /usr/bin/migration-tools
systemctl enable migration-tools-server.service
%preun -n migration-tools-server %preun -n migration-tools-server
if [ $1 = 0 ];then if [ $1 = 0 ];then
@ -65,7 +66,6 @@ if [ $1 = 0 ];then
fi fi
%postun -n migration-tools-server %postun -n migration-tools-server
systemctl disable migration-tools-server.service
rm -rf /usr/bin/migration-tools rm -rf /usr/bin/migration-tools
%files -n migration-tools-server %files -n migration-tools-server
@ -74,6 +74,9 @@ rm -rf /usr/bin/migration-tools
%{_unitdir}/migration-tools-server.service %{_unitdir}/migration-tools-server.service
%changelog %changelog
* Thu Mar 14 2024 lixin <lixinb@uniontech.com> - 1.0.0-8
- fix stop service display failed
* Thu Mar 14 2024 lixin <lixinb@uniontech.com> - 1.0.0-7 * Thu Mar 14 2024 lixin <lixinb@uniontech.com> - 1.0.0-7
- Fix the error messages that occur during upgrades and downgrades. - Fix the error messages that occur during upgrades and downgrades.