add sysusers.d fragment for chrony user/group (#2095374)
This installs a configuration fragment for systemd-sysusers which covers chrony user and group. For more details, see https://fedoraproject.org/wiki/Changes/Adopting_sysusers.d_format Resolves: #2095374
This commit is contained in:
parent
bd69bcff3b
commit
bbed76d3b6
12
chrony.spec
12
chrony.spec
@ -18,6 +18,7 @@ Source0: https://download.tuxfamily.org/chrony/chrony-%{version}%{?prerel
|
|||||||
Source1: https://download.tuxfamily.org/chrony/chrony-%{version}%{?prerelease}-tar-gz-asc.txt
|
Source1: https://download.tuxfamily.org/chrony/chrony-%{version}%{?prerelease}-tar-gz-asc.txt
|
||||||
Source2: https://chrony.tuxfamily.org/gpgkey-8F375C7E8D0EE125A3D3BD51537E2B76F7680DAC.asc
|
Source2: https://chrony.tuxfamily.org/gpgkey-8F375C7E8D0EE125A3D3BD51537E2B76F7680DAC.asc
|
||||||
Source3: chrony.dhclient
|
Source3: chrony.dhclient
|
||||||
|
Source4: chrony.sysusers
|
||||||
# simulator for test suite
|
# simulator for test suite
|
||||||
Source10: https://github.com/mlichvar/clknetsim/archive/%{clknetsim_ver}/clknetsim-%{clknetsim_ver}.tar.gz
|
Source10: https://github.com/mlichvar/clknetsim/archive/%{clknetsim_ver}/clknetsim-%{clknetsim_ver}.tar.gz
|
||||||
%{?gitpatch:Patch0: chrony-%{version}%{?prerelease}-%{gitpatch}.patch.gz}
|
%{?gitpatch:Patch0: chrony-%{version}%{?prerelease}-%{gitpatch}.patch.gz}
|
||||||
@ -34,8 +35,8 @@ BuildRequires: gcc gcc-c++ make bison systemd gnupg2
|
|||||||
%{?with_nts:BuildRequires: gnutls-utils}
|
%{?with_nts:BuildRequires: gnutls-utils}
|
||||||
%{?with_seccomp:BuildRequires: libseccomp-devel}
|
%{?with_seccomp:BuildRequires: libseccomp-devel}
|
||||||
|
|
||||||
Requires(pre): shadow-utils
|
|
||||||
%{?systemd_requires}
|
%{?systemd_requires}
|
||||||
|
%{?sysusers_requires_compat}
|
||||||
|
|
||||||
# Old NetworkManager expects the dispatcher scripts in a different place
|
# Old NetworkManager expects the dispatcher scripts in a different place
|
||||||
Conflicts: NetworkManager < 1.20
|
Conflicts: NetworkManager < 1.20
|
||||||
@ -123,6 +124,7 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/{sysconfig,logrotate.d}
|
|||||||
mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/{lib,log}/chrony
|
mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/{lib,log}/chrony
|
||||||
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/dhcp/dhclient.d
|
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/dhcp/dhclient.d
|
||||||
mkdir -p $RPM_BUILD_ROOT%{_libexecdir}
|
mkdir -p $RPM_BUILD_ROOT%{_libexecdir}
|
||||||
|
mkdir -p $RPM_BUILD_ROOT%{_sysusersdir}
|
||||||
mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/NetworkManager/dispatcher.d
|
mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/NetworkManager/dispatcher.d
|
||||||
mkdir -p $RPM_BUILD_ROOT{%{_unitdir},%{_prefix}/lib/systemd/ntp-units.d}
|
mkdir -p $RPM_BUILD_ROOT{%{_unitdir},%{_prefix}/lib/systemd/ntp-units.d}
|
||||||
|
|
||||||
@ -143,6 +145,8 @@ install -m 755 -p examples/chrony.nm-dispatcher.dhcp \
|
|||||||
$RPM_BUILD_ROOT%{_prefix}/lib/NetworkManager/dispatcher.d/20-chrony-dhcp
|
$RPM_BUILD_ROOT%{_prefix}/lib/NetworkManager/dispatcher.d/20-chrony-dhcp
|
||||||
install -m 644 -p examples/chrony-wait.service \
|
install -m 644 -p examples/chrony-wait.service \
|
||||||
$RPM_BUILD_ROOT%{_unitdir}/chrony-wait.service
|
$RPM_BUILD_ROOT%{_unitdir}/chrony-wait.service
|
||||||
|
install -m 644 -p %{SOURCE4} \
|
||||||
|
$RPM_BUILD_ROOT%{_sysusersdir}/chrony.conf
|
||||||
|
|
||||||
cat > $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/chronyd <<EOF
|
cat > $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/chronyd <<EOF
|
||||||
# Command-line options for chronyd
|
# Command-line options for chronyd
|
||||||
@ -161,10 +165,7 @@ export CLKNETSIM_RANDOM_SEED=24505
|
|||||||
make quickcheck
|
make quickcheck
|
||||||
|
|
||||||
%pre
|
%pre
|
||||||
getent group chrony > /dev/null || /usr/sbin/groupadd -r chrony
|
%sysusers_create_compat %{SOURCE4}
|
||||||
getent passwd chrony > /dev/null || /usr/sbin/useradd -r -g chrony \
|
|
||||||
-d %{_localstatedir}/lib/chrony -s /sbin/nologin chrony
|
|
||||||
:
|
|
||||||
|
|
||||||
%post
|
%post
|
||||||
# migrate from chrony-helper to sourcedir directive
|
# migrate from chrony-helper to sourcedir directive
|
||||||
@ -199,6 +200,7 @@ fi
|
|||||||
%{_prefix}/lib/NetworkManager
|
%{_prefix}/lib/NetworkManager
|
||||||
%{_prefix}/lib/systemd/ntp-units.d/*.list
|
%{_prefix}/lib/systemd/ntp-units.d/*.list
|
||||||
%{_unitdir}/chrony*.service
|
%{_unitdir}/chrony*.service
|
||||||
|
%{_sysusersdir}/chrony.conf
|
||||||
%{_mandir}/man[158]/%{name}*.[158]*
|
%{_mandir}/man[158]/%{name}*.[158]*
|
||||||
%dir %attr(750,chrony,chrony) %{_localstatedir}/lib/chrony
|
%dir %attr(750,chrony,chrony) %{_localstatedir}/lib/chrony
|
||||||
%ghost %attr(-,chrony,chrony) %{_localstatedir}/lib/chrony/drift
|
%ghost %attr(-,chrony,chrony) %{_localstatedir}/lib/chrony/drift
|
||||||
|
2
chrony.sysusers
Normal file
2
chrony.sysusers
Normal file
@ -0,0 +1,2 @@
|
|||||||
|
#Type Name ID GECOS Home directory Shell
|
||||||
|
u chrony - "chrony system user" /var/lib/chrony /sbin/nologin
|
Loading…
Reference in New Issue
Block a user