Add missing stages to the autosetup client

yast · Mar 5, 2021 · 95b934c · 95b934c
1 parent 4c339ed
commit 95b934c
Showing 1 changed file with 13 additions and 2 deletions.
diff --git a/src/lib/autoinstall/clients/inst_autosetup.rb b/src/lib/autoinstall/clients/inst_autosetup.rb
@@ -69,13 +69,16 @@ def main
           _("Create partition plans"),
           _("Configure Bootloader"),
           _("Configure security settings"),
+          _("Set up configuration management system"),
           _("Registration"),
+          _("Configure Kdump"),
           _("Configure Software selections"),
           _("Configure Systemd Default Target"),
           _("Configure users and groups"),
           _("Import SSH keys/settings"),
           _("Set up user defined configuration files"),
-          _("Confirm License")
+          _("Confirm License"),
+          _("Configure firewall")
         ]
 
         @progress_descriptions = [
@@ -84,13 +87,16 @@ def main
           _("Creating partition plans..."),
           _("Configuring Bootloader..."),
           _("Configuring security settings"),
+          _("Setting up configuration management system..."),
           _("Registering the system..."),
+          _("Configuring Kdump..."),
           _("Configuring Software selections..."),
           _("Configuring Systemd Default Target..."),
           _("Importing users and groups configuration..."),
           _("Importing SSH keys/settings..."),
           _("Setting up user defined configuration files..."),
-          _("Confirming License...")
+          _("Confirming License..."),
+          _("Configuring the firewall")
         ]
 
         Progress.New(
@@ -257,8 +263,12 @@ def main
           Profile.remove_sections("configuration_management")
         end
 
+        return :abort if UI.PollInput == :abort && Popup.ConfirmAbort(:painless)
+        Progress.NextStage
+
         # Register system
         return :abort unless suse_register
+        Progress.NextStage
 
         # SLES only. Have to be run before software to add required packages to enable kdump
         if Builtins.haskey(Profile.current, "kdump")
@@ -365,6 +375,7 @@ def main
           end
         end
 
+        Progress.NextStage
         #
         # Run firewall configuration according to the profile
         #