Merge pull request #79 from lnussel/master

Don't use deprecated Progress.on

control/firstboot.xml

@@ -157,6 +157,8 @@
                 <module>
                     <label>Finish Setup</label>
                     <name>inst_congratulate</name>
+                    <enable_back>no</enable_back>
+                    <enable_next>no</enable_next>
                 </module>
 
             </modules>

package/yast2-firstboot.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Tue Jan 14 11:02:28 UTC 2020 - Ludwig Nussel <lnussel@suse.de>
+
+- Don't use deprecated Progress.on
+- Don't allow to go back in congratulate screen
+- Don't try to set keyboard in WSL
+- 4.2.9
+
 -------------------------------------------------------------------
 Tue Jan 14 08:24:30 UTC 2020 - Josef Reidinger <jreidinger@suse.com>
 

src/clients/firstboot.rb

@@ -32,6 +32,7 @@ def main
       Yast.import "Pkg"
       textdomain "firstboot"
 
+      Yast.import "Arch"
       Yast.import "Directory"
       Yast.import "Mode"
       Yast.import "Stage"
@@ -59,7 +60,7 @@ def main
       # generated yet (the X server started by YaST-Firstboot doesn't seem to
       # be enough to trigger the systemd mechanism that generates it), let's
       # enforce the keyboard map if we are running in graphic mode (bsc#950335)
-      Keyboard.Set(Keyboard.current_kbd)
+      Keyboard.Set(Keyboard.current_kbd) unless Yast::Arch.is_wsl
 
       # initialize package callbacks, since some of the modules run in the
       # firstboot workflow expect them to be initialized (bug #335979)

src/clients/firstboot_write.rb

@@ -65,7 +65,7 @@ def main
       )
 
 
-      Progress.on
+      @progress_orig = Progress.set(false)
 
       Progress.New(
         # Headline for last dialog of first boot workflow
@@ -111,6 +111,8 @@ def main
       Builtins.sleep(100)
       Progress.Finish
 
+      Progress.set(@progress_orig)
+
       :next 
 
       #EOF