Merge a4a998c into 8fe8d17

yast · Oct 19, 2020 · abae3ee · abae3ee
2 parents 8fe8d17 + a4a998c
commit abae3ee
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 2 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,3 +1,3 @@
-FROM registry.opensuse.org/yast/head/containers/yast-ruby:latest
+FROM registry.opensuse.org/yast/sle-15/sp2/containers/yast-ruby
 COPY . /usr/src/app
 
diff --git a/Rakefile b/Rakefile
@@ -1,5 +1,7 @@
 require "yast/rake"
 
+Yast::Tasks.submit_to :sle15sp2
+
 Yast::Tasks.configuration do |conf|
   # lets ignore license check for now
   conf.skip_license_check << /.*/

diff --git a/package/yast2-firewall.changes b/package/yast2-firewall.changes
@@ -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>
 

diff --git a/package/yast2-firewall.spec b/package/yast2-firewall.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-firewall
-Version:        4.3.6
+Version:        4.3.7
 Release:        0
 Summary:        YaST2 - Firewall Configuration
 Group:          System/YaST

diff --git a/src/lib/y2firewall/clients/installation_finish.rb b/src/lib/y2firewall/clients/installation_finish.rb
@@ -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
+        # and also only installation, not upgrade one. NOTE: installation mode include auto
         return unless Yast::Mode.installation
 
         @settings.enable_firewall ? @firewalld.enable! : @firewalld.disable!