Merge branch 'SLE-12-SP5' into bsc-1175714-sle-15-ga

* SLE-12-SP5: Bump version and update changes file Use script elements in 'postpartitioning-scripts' Sle 12 sp5 bsc 1167596 (#584) loading network-online.target (#575) Travis fix Init script: Checking working network with network-online.target (#564)
yast · Sep 1, 2020 · 9e0b869 · 9e0b869
2 parents ec2e34b + 46b3b9e
commit 9e0b869
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/package/autoyast2.changes b/package/autoyast2.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Sep  1 11:32:48 UTC 2020 - Imobach Gonzalez Sosa <igonzalezsosa@suse.com>
+
+- Use <script> elements instead of <listentry> when exporting the
+  <postpartitioning-scripts> section (related to bsc#1175714).
+- 4.0.75
+
 -------------------------------------------------------------------
 Mon Jul  6 23:41:41 UTC 2020 - Knut Anderssen <kanderssen@suse.com>
 

diff --git a/package/autoyast2.spec b/package/autoyast2.spec
@@ -22,7 +22,7 @@
 %endif
 
 Name:           autoyast2
-Version:        4.0.74
+Version:        4.0.75
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

diff --git a/src/include/autoinstall/xml.rb b/src/include/autoinstall/xml.rb
@@ -54,6 +54,7 @@ def profileSetup
           "post-scripts"             => "script",
           "chroot-scripts"           => "script",
           "init-scripts"             => "script",
+          "postpartitioning-scripts" => "script",
           "local_domains"            => "domains",
           "masquerade_other_domains" => "domain",
           "masquerade_users"         => "masquerade_user",