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.

Sign up for GitHub

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

Jump to bottom

Sp2 merge #140

Merged
merged 6 commits into from
Oct 19, 2020
Merged

Sp2 merge #140

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
affba0a
Adapt Rakefile and Dockerfile for SLE-15-SP2
lslezak Apr 21, 2020
dc8fb48
do not enable firewall in autoyast (bsc#1177778)
jreidinger Oct 16, 2020
6497a99
changes
jreidinger Oct 16, 2020
cfa680b
Merge pull request #139 from yast/fix_enabling_firewall
jreidinger Oct 19, 2020
a4a998c
Merge remote-tracking branch 'origin/SLE-15-SP2' into sp2_merge
jreidinger Oct 19, 2020
039d9a4
Revert "Adapt Rakefile and Dockerfile for SLE-15-SP2"
jreidinger Oct 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 7 additions & 0 deletions package/yast2-firewall.changes
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
-------------------------------------------------------------------
Fri Oct 16 15:15:49 UTC 2020 - Josef Reidinger <jreidinger@suse.com>

- Do not enable firewall during first stage of AutoYaST
(bsc#1177778)
- 4.3.7

-------------------------------------------------------------------
Tue Oct 13 11:15:06 UTC 2020 - Knut Anderssen <kanderssen@suse.com>

Expand Down
2 changes: 1 addition & 1 deletion package/yast2-firewall.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@


Name: yast2-firewall
Version: 4.3.6
Version: 4.3.7
Release: 0
Summary: YaST2 - Firewall Configuration
Group: System/YaST
Expand Down
3 changes: 3 additions & 0 deletions src/lib/y2firewall/clients/installation_finish.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,9 @@ def configure_firewall
# Convenience method to enable / disable the firewalld service depending
# on the proposal settings
def configure_firewall_service
# do not run in autoyast as it is done in second stage (bsc#1177778)
return if Yast::Mode.auto
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As commented in #139 it probably should not be done in master as it should be already handled.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yast-firewall/src/lib/y2firewall/clients/installation_finish.rb

Line 63 in a4a998c

return Y2Firewall::Clients::Auto.new.write

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

After checked it is ok to be added.

# and also only installation, not upgrade one. NOTE: installation mode include auto
return unless Yast::Mode.installation

@settings.enable_firewall ? @firewalld.enable! : @firewalld.disable!
Expand Down