Skip to content
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

Jump to bottom

Conf name #108

Merged
merged 8 commits into from
Mar 7, 2018
Merged

Conf name #108

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
1eb8b71
use new name
jreidinger Mar 7, 2018
20eee1d
handle upgrade and add ghost file
jreidinger Mar 7, 2018
a01d09c
changes from review
jreidinger Mar 7, 2018
e2ba26b
fix tests
jreidinger Mar 7, 2018
8facdb8
make rubocop happy
jreidinger Mar 7, 2018
ee5ca9e
changes
jreidinger Mar 7, 2018
0d9c4b6
fix from review
jreidinger Mar 7, 2018
b0b7c23
changes from review
jreidinger Mar 7, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 10 additions & 0 deletions package/yast2-ntp-client.changes
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
-------------------------------------------------------------------
Wed Mar 7 10:57:36 UTC 2018 - jreidinger@suse.com

- change cron config file name to suse-ntp_synchronize
(bsc#1079122)
- convert old file to new one during upgrade, ensure that ntpd is
replaced by chrony (FATE#323432)
- ghost that config file, so it is easy to find who own it
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"who own it" or "which package owns it" ?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

or "which package belongs to" ?

- 4.0.9

-------------------------------------------------------------------
Thu Feb 22 15:21:04 UTC 2018 - gsouza@suse.com

Expand Down
2 changes: 1 addition & 1 deletion package/yast2-ntp-client.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@


Name: yast2-ntp-client
Version: 4.0.8
Version: 4.0.9
Release: 0
Summary: YaST2 - NTP Client Configuration
License: GPL-2.0+
Expand Down
3 changes: 1 addition & 2 deletions src/modules/NtpClient.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ class NtpClientClass < Module
NTP_FILE = "/etc/chrony.conf".freeze

# The cron file name for the synchronization.
CRON_FILE = "/etc/cron.d/suse-ntp_synchronize"
CRON_FILE = "/etc/cron.d/suse-ntp_synchronize".freeze

UNSUPPORTED_AUTOYAST_OPTIONS = [
"configure_dhcp",
Expand Down Expand Up @@ -88,7 +88,6 @@ def main
# The interval of synchronization in minutes.
@sync_interval = DEFAULT_SYNC_INTERVAL


# Service name of the NTP daemon
@service_name = "chronyd"

Expand Down
2 changes: 1 addition & 1 deletion test/ntp_client_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -388,7 +388,7 @@
end

describe "#ReadSynchronization" do
let(:cron_job_file) { "/etc/cron.d/novell.ntp-synchronize" }
let(:cron_job_file) { "/etc/cron.d/suse-ntp_synchronize" }
let(:cron_entry) { [] }

before do
Expand Down