Merge pull request #629 from yast/merge_SLE-15-SP1

merge SLE-15-SP1 into SLE-15-SP2
yast · Jun 15, 2020 · 44a79e8 · 44a79e8
2 parents 5b66ec8 + a38410c
commit 44a79e8
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/package/autoyast2.changes b/package/autoyast2.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Jun 12 13:15:42 UTC 2020 - Knut Anderssen <kanderssen@suse.com>
+
+- Export ntp_policy as CDATA so that empty strings are preserved
+  for the second_stage (bsc#1172026)
+- 4.2.38
+
 -------------------------------------------------------------------
 Wed May 27 08:26:35 UTC 2020 - Imobach Gonzalez Sosa <igonzalezsosa@suse.com>
 

diff --git a/package/autoyast2.spec b/package/autoyast2.spec
@@ -22,7 +22,7 @@
 %endif
 
 Name:           autoyast2
-Version:        4.2.37
+Version:        4.2.38
 Release:        0
 Summary:        YaST2 - Automated Installation
 License:        GPL-2.0-only

diff --git a/src/include/autoinstall/xml.rb b/src/include/autoinstall/xml.rb
@@ -120,7 +120,8 @@ def profileSetup
           "location",
           "script_source",
           "media_url",
-          "subvolumes_prefix"
+          "subvolumes_prefix",
+          "ntp_policy"
         ]
       )
       #            doc["systemID"] = "/usr/share/autoinstall/dtd/profile.dtd";