Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Don't use deprecated Progress.on #79

Merged
merged 4 commits into from
Jan 16, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions control/firstboot.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
8 changes: 8 additions & 0 deletions package/yast2-firstboot.changes
Original file line number Diff line number Diff line change
@@ -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>

Expand Down
3 changes: 2 additions & 1 deletion src/clients/firstboot.rb
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ def main
Yast.import "Pkg"
textdomain "firstboot"

Yast.import "Arch"
Yast.import "Directory"
Yast.import "Mode"
Yast.import "Stage"
Expand Down Expand Up @@ -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)
Expand Down
4 changes: 3 additions & 1 deletion src/clients/firstboot_write.rb
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ def main
)


Progress.on
@progress_orig = Progress.set(false)

Progress.New(
# Headline for last dialog of first boot workflow
Expand Down Expand Up @@ -111,6 +111,8 @@ def main
Builtins.sleep(100)
Progress.Finish

Progress.set(@progress_orig)

:next

#EOF
Expand Down