Skip to content

Commit

Permalink
changes from review
Browse files Browse the repository at this point in the history
  • Loading branch information
jreidinger committed Dec 13, 2017
1 parent 17d6606 commit b6ca8ea
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
2 changes: 1 addition & 1 deletion package/yast2-ntp-client.changes
Expand Up @@ -2,7 +2,7 @@
Wed Dec 13 14:40:48 UTC 2017 - jreidinger@suse.com

- Do minimal modification to default chrony.conf in autoyast
when chrony is not specified explicitelly in packages section of
when chrony is not specified explicitly in packages section of
profile (bsc#1072595)
- 4.0.6

Expand Down
7 changes: 6 additions & 1 deletion src/modules/NtpClient.rb
Expand Up @@ -412,7 +412,12 @@ def Import(settings)
# Merges config to existing system configuration. It is useful for delayed write.
# When it at first set values, then chrony is installed and then it writes. So
# before write it will merge to system. Result is that it keep majority of config
# untouched and modify and what is needed.
# untouched and modify what is needed.
# What it mean is that if it set values, it works on parsed configuration file,
# but if package is not yet installed, then it creates new configuration file
# which is missing many stuff like comments or values that yast2-ntp-client does not touch.
# So if package is installed later, then this method re-apply changes on top of newly parsed
# file.
def merge_to_system
config = Export()
Read()
Expand Down

0 comments on commit b6ca8ea

Please sign in to comment.