diff --git a/0004-use-kill-not-kill-INT-when-stop-service.patch b/0004-use-kill-not-kill-INT-when-stop-service.patch new file mode 100644 index 0000000000000000000000000000000000000000..ea082ee44f44231aa672b07fb6d3d241a6aac684 --- /dev/null +++ b/0004-use-kill-not-kill-INT-when-stop-service.patch @@ -0,0 +1,25 @@ +From 55b9f6759bc69c66ac67e18edbad7c6e341b8935 Mon Sep 17 00:00:00 2001 +From: lixin +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 + diff --git a/migration-tools.spec b/migration-tools.spec index 40e5223f9bdd1c2f8dab4e3cdf9d18bd759ef4a5..31ae652976f3738182249f993b53338e117e7417 100644 --- a/migration-tools.spec +++ b/migration-tools.spec @@ -1,12 +1,13 @@ Name: migration-tools Version: 1.0.0 -Release: 6 +Release: 8 Summary: A tool to help users migrate the Centos system to the UOS system and openEuler system License: MulanPSL-2.0 Source0: ut-Migration-tools.tar.gz Patch0: 0001-fix-export-error-and-no-migration-details-issue.patch Patch1: 0002-fix-uefi-boot-failed.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 Patch100: 0001-CVE-2024-24892.patch @@ -34,6 +35,7 @@ Migration software server side %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 # cve patches %patch100 -p1 @@ -43,35 +45,41 @@ 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/etc/migration-tools +%{__mkdir_p} $RPM_BUILD_ROOT%{_unitdir} cp -r ut-Migration-tools/* $RPM_BUILD_ROOT/usr/lib/migration-tools-server/ # 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/ 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 -rm -rf /usr/lib/systemd/system/migration-tools-server.service %files -n migration-tools-server /etc/migration-tools /usr/lib/migration-tools-server +%{_unitdir}/migration-tools-server.service %changelog +* Thu Mar 14 2024 lixin - 1.0.0-8 +- fix stop service display failed + +* Thu Mar 14 2024 lixin - 1.0.0-7 +- Fix the error messages that occur during upgrades and downgrades. + * Mon Mar 11 2024 lixin - 1.0.0-6 - fix : CVE-2024-24892 - use paramiko instead of sshpass to export migration log