Merge cc7c6f7 into a7d68b4

yast · Sep 2, 2020 · 481e039 · 481e039
2 parents a7d68b4 + cc7c6f7
commit 481e039
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 1 deletion.
diff --git a/package/autoyast2.changes b/package/autoyast2.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+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).
+- Saving log files of postpartitioning-scripts (bsc#1145269)
+  (schubi@suse.de).
+- 4.3.42
+
 -------------------------------------------------------------------
 Thu Aug 27 13:20:00 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.3.41
+Version:        4.3.42
 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
@@ -51,6 +51,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",

diff --git a/src/modules/AutoInstall.rb b/src/modules/AutoInstall.rb
@@ -265,6 +265,19 @@ def Finish(destdir)
         )
       )
 
+      # Saving postpartitioning-scripts scripts/logs
+      postpart_dir = AutoinstConfig.tmpDir + "/postpartitioning-scripts"
+      if Yast::FileUtils.Exists(postpart_dir)
+        SCR.Execute(
+          path(".target.bash"),
+          "/bin/cp #{postpart_dir}/* #{destdir}#{AutoinstConfig.scripts_dir}"
+        )
+        SCR.Execute(
+          path(".target.bash"),
+          "/bin/cp #{postpart_dir}/logs/* #{destdir}#{AutoinstConfig.logs_dir}"
+        )
+      end
+
       nil
     end