Fix the issues for oech.service status failed after stoped oech.service

(cherry picked from commit 05d1aae43a6dfc7b76edc418b3770fb7d95d6de5)
This commit is contained in:
ylzhangah 2022-09-05 17:25:01 +08:00 committed by openeuler-sync-bot
parent ae87f7ece6
commit dfeda5376c
2 changed files with 26 additions and 1 deletions

View File

@ -0,0 +1,20 @@
diff -Naur rpm/scripts/oech_logrotate.sh oech/scripts/oech_logrotate.sh
--- rpm/scripts/oech_logrotate.sh 2022-08-29 19:51:34.000000000 +0800
+++ oech/scripts/oech_logrotate.sh 2022-09-05 17:15:26.557831648 +0800
@@ -42,7 +42,8 @@
}
function stop_logrotate() {
- ps -ef | grep oech_logrotate.sh | grep -v grep | awk '{print $2}' | xargs kill -9 >/dev/null 2>&1
+ ps -ef | grep oech_logrotate.sh | grep -v grep | awk '{print $2}' | xargs killall >/dev/null 2>&1
+ return 0
}
function main() {
@@ -57,4 +58,4 @@
fi
}
-main "$@"
\ No newline at end of file
+main "$@"

View File

@ -4,13 +4,14 @@
Name: oec-hardware
Summary: openEuler Hardware Compatibility Test Suite
Version: 1.1.2
Release: 0
Release: 1
Group: Development/Tools
License: Mulan PSL v2
URL: https://gitee.com/openeuler/oec-hardware
Source0: https://gitee.com/openeuler/oec-hardware/repository/archive/v%{version}.tar.gz
# patch fix issue
Patch0001: oec-hardware-1.1.2-fix-oech.service_status_failed.patch
Buildroot: %{_tmppath}/%{name}-%{version}-root
BuildRequires: gcc
@ -33,6 +34,7 @@ openEuler Hardware Compatibility Test Server
%prep
%setup -q -c
%patch1 -p1
%build
@ -75,6 +77,9 @@ DESTDIR=$RPM_BUILD_ROOT make install
rm -rf /var/lock/oech.lock
%changelog
* Sat Sep 03 2022 ylzhangah <zhangyale3@h-partners.com> - 1.1.2-1
- Fix the status failed in checking oech.service status after stoped oech.service
* Tue Aug 30 2022 ylzhangah <zhangyale3@h-partners.com> - 1.1.2-0
- Upgrade command module
- Add VGPU testsuite