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

update to 1.25-pre1

Browse Source
This commit is contained in:
Miroslav Lichvar 2011-01-31 18:01:14 +01:00
parent 1b2efd7b34
commit a657955c15
4 changed files with 10 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.gitignore vendored
View File

@ -1,3 +1,2 @@
chrony-1.24.tar.gz /timepps.h
timepps.h /chrony-1.25-pre1.tar.gz
chrony-1.24-20100428git73d775.patch.gz

10
chrony.spec
View File

@ -1,7 +1,7 @@
%define gitpatch 20100428git73d775 %define prerelease -pre1
Name: chrony Name: chrony
Version: 1.24 Version: 1.25
Release: 4.%{?gitpatch}%{?dist} Release: 0.1.pre1%{?gitpatch}%{?dist}
Summary: An NTP client/server Summary: An NTP client/server
Group: System Environment/Daemons Group: System Environment/Daemons
@ -17,7 +17,7 @@ Source5: chrony.logrotate
Source6: timepps.h Source6: timepps.h
Source7: chrony.nm-dispatcher Source7: chrony.nm-dispatcher
Source8: chrony.dhclient Source8: chrony.dhclient
Patch0: chrony-%{version}-%{gitpatch}.patch.gz %{?gitpatch:Patch0: chrony-%{version}-%{gitpatch}.patch.gz}
Patch1: chrony-retryres.patch Patch1: chrony-retryres.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@ -37,7 +37,7 @@ in permanently connected environments.
%prep %prep
%setup -q -n %{name}-%{version}%{?prerelease} %setup -q -n %{name}-%{version}%{?prerelease}
mkdir pps; cp -p %{SOURCE6} pps mkdir pps; cp -p %{SOURCE6} pps
%patch0 -p1 %{?gitpatch:%patch0 -p1}
%patch1 -p1 -b .retryres %patch1 -p1 -b .retryres
%{?gitpatch: echo %{version}-%{gitpatch} > version.txt} %{?gitpatch: echo %{version}-%{gitpatch} > version.txt}

14
chronyd.init
View File

@ -48,20 +48,10 @@ chrony_command() {
commandkey=$(get_key $commandkeyid) commandkey=$(get_key $commandkeyid)
[ -z "$commandkey" ] && return 2 [ -z "$commandkey" ] && return 2
! ( $chronyc <<EOF | grep -v '200 OK'
$chronyc <<EOF &
password $commandkey password $commandkey
$1 $1
EOF EOF
chronycpid=$!
# chronyc will hang if the daemon doesn't respond, kill it after 4 s
(sleep 4; kill $chronycpid) < /dev/null &> /dev/null &
killerpid=$!
wait $chronycpid &> /dev/null
kill $killerpid &> /dev/null || echo "chronyd not responding"
) | grep -v '200 OK'
} }
generate_commandkey() { generate_commandkey() {
@ -85,7 +75,7 @@ add_dhclient_servers() {
if [ -n "$command" ]; then if [ -n "$command" ]; then
echo -n $"Adding dhclient NTP servers to chrony: " echo -n $"Adding dhclient NTP servers to chrony: "
chrony_command "$command" &> /dev/null && success || failure chrony_command "$command" &> /dev/null && success || failure
echo echo
fi fi
} }

3
sources
View File

@ -1,3 +1,2 @@
8849e95428f43c5ab2692a2812653e65 chrony-1.24.tar.gz
b494eddf72f3455c333eed80642dc20d timepps.h b494eddf72f3455c333eed80642dc20d timepps.h
fd084bd4bf10c8fb4208d2a582177dc1 chrony-1.24-20100428git73d775.patch.gz 78c43bd309cc7660ac793e0ea5ed9368 chrony-1.25-pre1.tar.gz