!16 Fix the problem of service error when uninstalling
From: @jxy_git Reviewed-by: @yangzhao_kl Signed-off-by: @yangzhao_kl
This commit is contained in:
commit
9f0b268662
@ -0,0 +1,39 @@
|
|||||||
|
From 5925e37bb7aa3fe787478a2bf1f0b4bbbc2b93fb Mon Sep 17 00:00:00 2001
|
||||||
|
From: jiangxinyu <jiangxinyu@kylinos.cn>
|
||||||
|
Date: Mon, 28 Mar 2022 14:43:59 +0800
|
||||||
|
Subject: [PATCH] Fix the problem of service error when uninstalling
|
||||||
|
|
||||||
|
---
|
||||||
|
src/sbd.service.in | 2 +-
|
||||||
|
src/sbd_remote.service.in | 2 +-
|
||||||
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/src/sbd.service.in b/src/sbd.service.in
|
||||||
|
index 94b0f99..b51f570 100644
|
||||||
|
--- a/src/sbd.service.in
|
||||||
|
+++ b/src/sbd.service.in
|
||||||
|
@@ -5,7 +5,7 @@ Before=pacemaker.service
|
||||||
|
Before=dlm.service
|
||||||
|
After=systemd-modules-load.service iscsi.service
|
||||||
|
PartOf=corosync.service
|
||||||
|
-RefuseManualStop=true
|
||||||
|
+RefuseManualStop=no
|
||||||
|
RefuseManualStart=true
|
||||||
|
|
||||||
|
[Service]
|
||||||
|
diff --git a/src/sbd_remote.service.in b/src/sbd_remote.service.in
|
||||||
|
index cfcafb5..7392446 100644
|
||||||
|
--- a/src/sbd_remote.service.in
|
||||||
|
+++ b/src/sbd_remote.service.in
|
||||||
|
@@ -3,7 +3,7 @@ Description=Shared-storage based fencing daemon on pacemaker remote node
|
||||||
|
Documentation=man:sbd(8)
|
||||||
|
After=systemd-modules-load.service iscsi.service
|
||||||
|
PartOf=pacemaker_remote.service
|
||||||
|
-RefuseManualStop=true
|
||||||
|
+RefuseManualStop=no
|
||||||
|
RefuseManualStart=true
|
||||||
|
|
||||||
|
[Service]
|
||||||
|
--
|
||||||
|
2.33.0
|
||||||
|
|
||||||
12
sbd.spec
12
sbd.spec
@ -18,7 +18,7 @@
|
|||||||
%global commit 7f33d1a409d0a4e2cd69946688c48eaa8f3c5d26
|
%global commit 7f33d1a409d0a4e2cd69946688c48eaa8f3c5d26
|
||||||
%global shortcommit %(c=%{commit}; echo ${c:0:7})
|
%global shortcommit %(c=%{commit}; echo ${c:0:7})
|
||||||
%global github_owner Clusterlabs
|
%global github_owner Clusterlabs
|
||||||
%global buildnum 16
|
%global buildnum 17
|
||||||
|
|
||||||
Name: sbd
|
Name: sbd
|
||||||
Summary: Storage-based death
|
Summary: Storage-based death
|
||||||
@ -28,6 +28,7 @@ Version: 1.4.0
|
|||||||
Release: %{buildnum}
|
Release: %{buildnum}
|
||||||
Url: https://github.com/%{github_owner}/%{name}
|
Url: https://github.com/%{github_owner}/%{name}
|
||||||
Source0: https://github.com/%{github_owner}/%{name}/archive/%{commit}/%{name}-%{commit}_all.tar.gz
|
Source0: https://github.com/%{github_owner}/%{name}/archive/%{commit}/%{name}-%{commit}_all.tar.gz
|
||||||
|
Patch0: 0001-Fix-the-problem-of-service-error-when-uninstalling.patch
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||||
BuildRequires: autoconf
|
BuildRequires: autoconf
|
||||||
BuildRequires: automake
|
BuildRequires: automake
|
||||||
@ -42,9 +43,7 @@ BuildRequires: libxml2-devel
|
|||||||
BuildRequires: pkgconfig
|
BuildRequires: pkgconfig
|
||||||
BuildRequires: systemd
|
BuildRequires: systemd
|
||||||
|
|
||||||
%if 0%{?rhel} > 0
|
ExclusiveArch: x86_64 aarch64
|
||||||
ExclusiveArch: i686 x86_64 s390x ppc64le aarch64
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%if %{defined systemd_requires}
|
%if %{defined systemd_requires}
|
||||||
%systemd_requires
|
%systemd_requires
|
||||||
@ -57,7 +56,7 @@ This package contains the storage-based death functionality.
|
|||||||
###########################################################
|
###########################################################
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%autosetup -n %{name}-%{commit}
|
%autosetup -p1 -n %{name}-%{commit}
|
||||||
|
|
||||||
###########################################################
|
###########################################################
|
||||||
|
|
||||||
@ -125,6 +124,9 @@ fi
|
|||||||
%doc COPYING
|
%doc COPYING
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Mar 28 2022 jiangxinyu <jiangxinyu@kylinos.cn> - 1.4.0-17
|
||||||
|
- Fix the problem of service error when uninstalling
|
||||||
|
|
||||||
* Thur Dec 16 2021 liqiuyu <liqiuyu@kylinos.cn> - 1.4.0-16
|
* Thur Dec 16 2021 liqiuyu <liqiuyu@kylinos.cn> - 1.4.0-16
|
||||||
- Remove the release suffix
|
- Remove the release suffix
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user