Merge f24ef3a into c39cef0

package/autoyast2.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Sep 18 11:22:49 UTC 2020 - Knut Anderssen <kanderssen@suse.com>
+
+- Reimport the initial configuration in case that the profile
+  is modified by pre-scripts (bsc#1175725)
+- 4.1.21
+
 -------------------------------------------------------------------
 Tue Sep  1 11:32:48 UTC 2020 - Imobach Gonzalez Sosa <igonzalezsosa@suse.com>
 

package/autoyast2.spec

@@ -22,7 +22,7 @@
 %endif
 
 Name:           autoyast2
-Version:        4.1.20
+Version:        4.1.21
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

src/clients/inst_autoinit.rb

@@ -171,11 +171,19 @@ def autoinit_scripts
         break if ret == :not_found
       end
 
-      # reimport scripts, for the case <ask> has changed them
-      AutoinstScripts.Import(Ops.get_map(Profile.current, "scripts", {}))
+      import_initial_config if modified_profile?
       :ok
     end
 
+    # Imports the initial profile configuration (report, general and
+    # pre-scripts sections)
+    def import_initial_config
+      # reimport scripts, for the case <ask> has changed them
+      Yast::AutoinstScripts.Import(Yast::Profile.current.fetch("scripts", {}))
+      Yast::Report.Import(Yast::Profile.current.fetch("report", {}))
+      Yast::AutoinstGeneral.Import(Yast::Profile.current.fetch("general", {}))
+    end
+
     # Checking profile for unsupported sections.
     def check_unsupported_profile_sections
       unsupported_sections = Y2ModuleConfig.unsupported_profile_sections
@@ -259,8 +267,7 @@ def processProfile
       Progress.NextStage
       Progress.Title(_("Initial Configuration"))
       Builtins.y2milestone("Initial Configuration")
-      Report.Import(Profile.current.fetch("report",{}))
-      AutoinstGeneral.Import(Profile.current.fetch("general",{}))
+      import_initial_config
 
       #
       # Copy the control file for easy access by user to  a pre-defined