rpms/chrony
7
0
Fork 0
Code Issues Pull Requests Releases Activity

use correct vendor pool.ntp.org zone on RHEL (#845981)

Browse Source
This commit is contained in:
Miroslav Lichvar 2012-09-10 18:17:25 +02:00
parent 974feed2cc
commit 076f43b39b
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
chrony.conf
View File

@ -1,9 +1,9 @@
# Use public servers from the pool.ntp.org project. # Use public servers from the pool.ntp.org project.
# Please consider joining the pool (http://www.pool.ntp.org/join.html). # Please consider joining the pool (http://www.pool.ntp.org/join.html).
server 0.fedora.pool.ntp.org iburst server 0.VENDORZONE.pool.ntp.org iburst
server 1.fedora.pool.ntp.org iburst server 1.VENDORZONE.pool.ntp.org iburst
server 2.fedora.pool.ntp.org iburst server 2.VENDORZONE.pool.ntp.org iburst
server 3.fedora.pool.ntp.org iburst server 3.VENDORZONE.pool.ntp.org iburst
# Ignore stratum in source selection. # Ignore stratum in source selection.
stratumweight 0 stratumweight 0

10
chrony.spec
View File

@ -33,12 +33,20 @@ systems with intermittent internet connections, but it also works well
in permanently connected environments. It can use also hardware reference in permanently connected environments. It can use also hardware reference
clocks, system real-time clock or manual input as time references. clocks, system real-time clock or manual input as time references.
%if 0%{!?vendorzone:1}
%{?fedora: %global vendorzone fedora.}
%{?rhel: %global vendorzone rhel.}
%endif
%prep %prep
%setup -q -n %{name}-%{version}%{?prerelease} %setup -q -n %{name}-%{version}%{?prerelease}
%{?gitpatch:%patch0 -p1} %{?gitpatch:%patch0 -p1}
%{?gitpatch: echo %{version}-%{gitpatch} > version.txt} %{?gitpatch: echo %{version}-%{gitpatch} > version.txt}
sed -e 's|VENDORZONE\.|%{vendorzone}|' < %{SOURCE1} > chrony.conf
touch -r %{SOURCE1} chrony.conf
%build %build
CFLAGS="$RPM_OPT_FLAGS" CFLAGS="$RPM_OPT_FLAGS"
%ifarch %{sparc} %ifarch %{sparc}
@ -69,7 +77,7 @@ mkdir -p $RPM_BUILD_ROOT%{_libexecdir}
mkdir -p $RPM_BUILD_ROOT/lib/systemd/system/systemd-timedated-ntp.target.wants mkdir -p $RPM_BUILD_ROOT/lib/systemd/system/systemd-timedated-ntp.target.wants
install -m 644 -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/chrony.conf install -m 644 -p chrony.conf $RPM_BUILD_ROOT%{_sysconfdir}/chrony.conf
install -m 640 -p %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/chrony.keys install -m 640 -p %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/chrony.keys
install -m 644 -p %{SOURCE3} $RPM_BUILD_ROOT/lib/systemd/system/chronyd.service install -m 644 -p %{SOURCE3} $RPM_BUILD_ROOT/lib/systemd/system/chronyd.service
install -m 755 -p %{SOURCE4} $RPM_BUILD_ROOT%{_libexecdir}/chrony-helper install -m 755 -p %{SOURCE4} $RPM_BUILD_ROOT%{_libexecdir}/chrony-helper