Skip to content

Remove chrony-wait as a boot service dependency #166

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
2 commits merged into from
Oct 1, 2020
Merged

Remove chrony-wait as a boot service dependency #166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d326482
Remove chrony-wait as a boot service dependency
oliviacrain Oct 1, 2020
e0fbd09
Add cgmanifest entry for chrony
oliviacrain Oct 1, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions SPECS/chrony/chrony.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

Name: chrony
Version: 3.5.1
Release: 1%{?dist}
Release: 2%{?dist}
Summary: An NTP client/server
Vendor: Microsoft Corporation
Distribution: Mariner
Expand Down Expand Up @@ -77,13 +77,17 @@ sed -e 's|^pool.*|server time.windows.com|' \
-e 's|#\(keyfile\)|\1|' \
< examples/chrony.conf.example2 > chrony.conf

# use the example chrony-wait service, but comment out the line adding
# chrony-wait as a boot dependency
sed -i '/WantedBy=multi-user.target/s/^/#/g' examples/chrony-wait.service

cat >> chrony.conf << EOF

# Setting larger 'maxdistance' to tolerate time.windows.com delay
maxdistance 16.0
EOF

touch -r examples/chrony.conf.example2 chrony.conf
touch -r examples/chrony.conf.example2 examples/chrony-wait.service chrony.conf

# regenerate the file from getdate.y
rm -f getdate.c
Expand Down Expand Up @@ -191,6 +195,9 @@ systemctl start chronyd.service
%dir %attr(-,chrony,chrony) %{_localstatedir}/log/chrony

%changelog
* Thu Oct 01 2020 Thomas Crain <thcrain@microsoft.com> - 3.5.1-2
- Remove chrony-wait service as a boot dependency

* Tue Sep 01 2020 Mateusz Malisz <mamalisz@microsoft.com> - 3.5.1-1
- Update version to 3.5.1
- Remove gpg signature check
Expand Down
10 changes: 10 additions & 0 deletions cgmanifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -440,6 +440,16 @@
}
}
},
{
"component": {
"type": "other",
"other": {
"name": "chrony",
"version": "3.5.1",
"downloadUrl": "https://download.tuxfamily.org/chrony/chrony-3.5.1.tar.gz"
}
}
},
{
"component": {
"type": "other",
Expand Down