Merge pull request #1129 from yast/show_dialog_explicit

Show dialog explicit
yast · Dec 17, 2024 · d6e59e1 · d6e59e1
2 parents e95ed3f + bd5ffb4
commit d6e59e1
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/package/yast2-installation.changes b/package/yast2-installation.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Tue Dec 17 15:56:21 UTC 2024 - Josef Reidinger <[email protected]>
+
+- skip showing reboot message in autoinstallation and
+  autoupgrade mode only if not explicitly set on command line
+  (bsc#1231522)
+- 4.7.3
+
 -------------------------------------------------------------------
 Tue Dec 17 15:05:22 UTC 2024 - Ladislav Slezák <[email protected]>
 

diff --git a/package/yast2-installation.spec b/package/yast2-installation.spec
@@ -16,7 +16,7 @@
 #
 
 Name:           yast2-installation
-Version:        4.7.2
+Version:        4.7.3
 Release:        0
 Summary:        YaST2 - Installation Parts
 License:        GPL-2.0-only

diff --git a/src/lib/installation/clients/inst_finish.rb b/src/lib/installation/clients/inst_finish.rb
@@ -137,7 +137,6 @@ def write
 
     def report_messages
       return if Misc.boot_msg.empty?
-      return if Mode.auto
 
       # --------------------------------------------------------------
       # Check if there is a message left to display
@@ -148,6 +147,10 @@ def report_messages
       if Linuxrc.reboot_timeout
         Report.DisplayMessages(true, Linuxrc.reboot_timeout)
       else
+        # Skip in autoinstallation and autoupgrade mode only if not explicitly
+        # set on command line (bsc#1231522)
+        return if Mode.auto
+
         # Display the message and wait for user to accept it
         # also live installation - bzilla #297691
         Report.DisplayMessages(true,