Merge pull request #87 from teclator/merge_SLE-12-SP2

Merge fix from SLE-12-P2 (bsc#983486)
yast · Jul 3, 2017 · 34908e0 · 34908e0
2 parents 0fb736d + 910c0d6
commit 34908e0
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 2 deletions.
diff --git a/.yardopts b/.yardopts
@@ -0,0 +1,7 @@
+--no-private
+--markup markdown
+--protected
+--readme README.md
+--output-dir ./doc/autodocs
+--files *.md
+src/**/*.rb
diff --git a/package/yast2-ntp-client.changes b/package/yast2-ntp-client.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Fri Jun 30 16:58:16 UTC 2017 - knut.anderssen@suse.com
+
+- Resrict records are written at the end but the default file and
+  most profiles use them at the beginning, which mangles the file
+  completely (bsc#983486).
+  To fix it we have just changed the order of writing.
+- 3.2.12
+
 -------------------------------------------------------------------
 Fri Jun 30 09:36:48 UTC 2017 - jlopez@suse.com
 

diff --git a/package/yast2-ntp-client.spec b/package/yast2-ntp-client.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-ntp-client
-Version:        3.2.11
+Version:        3.2.12
 Release:        0
 Summary:        YaST2 - NTP Client Configuration
 License:        GPL-2.0+

diff --git a/src/modules/NtpClient.rb b/src/modules/NtpClient.rb
@@ -617,7 +617,9 @@ def Write
       # write settings
       return false if !go_next
 
-      @ntp_records += restrict_map_records
+      # Restrict map records are written first to not mangle the config file
+      # (bsc#983486)
+      @ntp_records = restrict_map_records + @ntp_records
 
       log.info "Writing settings #{@ntp_records}"