Merge branch 'SLE-15-SP3' into fix-modules-list

yast · Apr 6, 2021 · 5deca67 · 5deca67
2 parents b8c2289 + 790ec05
commit 5deca67
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/package/autoyast2.changes b/package/autoyast2.changes
@@ -1,9 +1,15 @@
 -------------------------------------------------------------------
-Tue Apr  6 11:03:13 UTC 2021 - Imobach Gonzalez Sosa <igonzalezsosa@suse.com>
+Tue Apr  6 13:45:16 UTC 2021 - Imobach Gonzalez Sosa <igonzalezsosa@suse.com>
 
 - Use 'module' instead of 'listentry' when exporting pre-modules
   and post-modules lists (bsc#1184342).
 
+-------------------------------------------------------------------
+Tue Apr  6 12:45:29 UTC 2021 - Imobach Gonzalez Sosa <igonzalezsosa@suse.com>
+
+- Show the <ask-list> only once during autoinstallation
+  (bsc#1184317).
+
 -------------------------------------------------------------------
 Mon Apr  5 08:41:25 UTC 2021 - Imobach Gonzalez Sosa <igonzalezsosa@suse.com>
 

diff --git a/src/lib/autoinstall/clients/inst_autoinit.rb b/src/lib/autoinstall/clients/inst_autoinit.rb
@@ -165,7 +165,10 @@ def autoinit_scripts
         return :abort if Yast::UI.PollInput == :abort && Yast::Popup.ConfirmAbort(:painless)
 
         loop do
+          # ask-list
+          Yast::AutoinstGeneral.Import(Yast::Profile.current.fetch("general", {}))
           askDialog
+
           # Pre-Scripts
           Yast::AutoinstScripts.Import(Yast::Profile.current["scripts"] || {})
           Yast::AutoinstScripts.Write("pre-scripts", false)