!78 Fixed the warning message during installation of pacemaker-cli
From: @xiangbudaomz Reviewed-by: @jxy_git Signed-off-by: @jxy_git
This commit is contained in:
commit
34cace3d14
@ -17,7 +17,7 @@
|
|||||||
## can be incremented to build packages reliably considered "newer"
|
## can be incremented to build packages reliably considered "newer"
|
||||||
## than previously built packages with the same pcmkversion)
|
## than previously built packages with the same pcmkversion)
|
||||||
%global pcmkversion 2.1.7
|
%global pcmkversion 2.1.7
|
||||||
%global specversion 7
|
%global specversion 8
|
||||||
|
|
||||||
## Upstream commit (full commit ID, abbreviated commit ID, or tag) to build
|
## Upstream commit (full commit ID, abbreviated commit ID, or tag) to build
|
||||||
%global commit 0f7f88312f7a1ccedee60bf768aba79ee13d41e0
|
%global commit 0f7f88312f7a1ccedee60bf768aba79ee13d41e0
|
||||||
@ -96,6 +96,7 @@
|
|||||||
%global pkgname_procps procps-ng
|
%global pkgname_procps procps-ng
|
||||||
%global pkgname_glue_libs cluster-glue-libs
|
%global pkgname_glue_libs cluster-glue-libs
|
||||||
%global pkgname_pcmk_libs %{name}-libs
|
%global pkgname_pcmk_libs %{name}-libs
|
||||||
|
%global hacluster_id 189
|
||||||
|
|
||||||
## Distro-specific configuration choices
|
## Distro-specific configuration choices
|
||||||
|
|
||||||
@ -148,7 +149,6 @@ Url: https://www.clusterlabs.org/
|
|||||||
# You can use "spectool -s 0 pacemaker.spec" (rpmdevtools) to show final URL.
|
# You can use "spectool -s 0 pacemaker.spec" (rpmdevtools) to show final URL.
|
||||||
Source0: https://codeload.github.com/%{github_owner}/%{name}/tar.gz/%{archive_github_url}
|
Source0: https://codeload.github.com/%{github_owner}/%{name}/tar.gz/%{archive_github_url}
|
||||||
Source1: https://codeload.github.com/%{github_owner}/%{nagios_name}/tar.gz/%{nagios_archive_github_url}
|
Source1: https://codeload.github.com/%{github_owner}/%{nagios_name}/tar.gz/%{nagios_archive_github_url}
|
||||||
Source2: pacemaker.sysusers
|
|
||||||
Patch0: Add_replace_for_PCMK__REMOTE_SCHEMA_DIR.patch
|
Patch0: Add_replace_for_PCMK__REMOTE_SCHEMA_DIR.patch
|
||||||
Patch1: 001-schema-glib.patch
|
Patch1: 001-schema-glib.patch
|
||||||
Patch2: Doc-HealthSMART-fix-the-description-of-temp_lower.patch
|
Patch2: Doc-HealthSMART-fix-the-description-of-temp_lower.patch
|
||||||
@ -493,8 +493,6 @@ find %{buildroot} -name '*.la' -type f -print0 | xargs -0 rm -f
|
|||||||
rm -f %{buildroot}/%{_sbindir}/fence_legacy
|
rm -f %{buildroot}/%{_sbindir}/fence_legacy
|
||||||
rm -f %{buildroot}/%{_mandir}/man8/fence_legacy.*
|
rm -f %{buildroot}/%{_mandir}/man8/fence_legacy.*
|
||||||
|
|
||||||
install -p -D -m 0644 %{SOURCE2} %{buildroot}%{_sysusersdir}/pacemaker.conf
|
|
||||||
|
|
||||||
%post
|
%post
|
||||||
%systemd_post pacemaker.service
|
%systemd_post pacemaker.service
|
||||||
|
|
||||||
@ -556,7 +554,10 @@ fi
|
|||||||
%systemd_postun_with_restart crm_mon.service
|
%systemd_postun_with_restart crm_mon.service
|
||||||
|
|
||||||
%pre -n %{pkgname_pcmk_libs}
|
%pre -n %{pkgname_pcmk_libs}
|
||||||
%sysusers_create_compat %{SOURCE2}
|
# @TODO Use sysusers.d:
|
||||||
|
# https://fedoraproject.org/wiki/Changes/Adopting_sysusers.d_format
|
||||||
|
getent group %{gname} >/dev/null || groupadd -r %{gname} -g %{hacluster_id}
|
||||||
|
getent passwd %{uname} >/dev/null || useradd -r -g %{gname} -u %{hacluster_id} -s /sbin/nologin -c "cluster user" %{uname}
|
||||||
exit 0
|
exit 0
|
||||||
|
|
||||||
%ldconfig_scriptlets -n %{pkgname_pcmk_libs}
|
%ldconfig_scriptlets -n %{pkgname_pcmk_libs}
|
||||||
@ -672,7 +673,6 @@ exit 0
|
|||||||
%dir %attr (770, %{uname}, %{gname}) %{_var}/log/pacemaker/bundles
|
%dir %attr (770, %{uname}, %{gname}) %{_var}/log/pacemaker/bundles
|
||||||
|
|
||||||
%files -n %{pkgname_pcmk_libs} %{?with_nls:-f %{name}.lang}
|
%files -n %{pkgname_pcmk_libs} %{?with_nls:-f %{name}.lang}
|
||||||
%{_sysusersdir}/pacemaker.conf
|
|
||||||
%{_libdir}/libcib.so.*
|
%{_libdir}/libcib.so.*
|
||||||
%{_libdir}/liblrmd.so.*
|
%{_libdir}/liblrmd.so.*
|
||||||
%{_libdir}/libcrmservice.so.*
|
%{_libdir}/libcrmservice.so.*
|
||||||
@ -761,6 +761,9 @@ exit 0
|
|||||||
%license %{nagios_name}-%{nagios_hash}/COPYING
|
%license %{nagios_name}-%{nagios_hash}/COPYING
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Apr 01 2024 zouzhimin <zouzhimin@kylinos.cn> - 2.1.7-8
|
||||||
|
- Fixed the warning message during installation of pacemaker-cli
|
||||||
|
|
||||||
* Tue Mar 26 2024 zouzhimin <zouzhimin@kylinos.cn> - 2.1.7-7
|
* Tue Mar 26 2024 zouzhimin <zouzhimin@kylinos.cn> - 2.1.7-7
|
||||||
- Improve pacemaker-attrd cache management and logging
|
- Improve pacemaker-attrd cache management and logging
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user