Merge pull request #281 from kobliha/export-at-the-end-of-installation

SuSEFirewall: Reading SuSEfirewall2 configuration whenever it's possible

library/network/src/modules/SuSEFirewall.rb

@@ -34,6 +34,10 @@
 
 module Yast
   class SuSEFirewallClass < Module
+    CONFIG_FILE = "/etc/sysconfig/SuSEfirewall2"
+
+    include Yast::Logger
+
     def main
       textdomain "base"
 
@@ -2460,17 +2464,9 @@ def Read
         return @fw_service_can_be_configured
       end
 
-      # bnc #429861
-      if Stage.initial
-        Builtins.y2warning("Stage::initial -> firewall can't be configured.")
-        FillUpEmptyConfig()
-        return false
-      end
-
-      if !SuSEFirewallIsInstalled()
-        Builtins.y2warning(
-          "Package not installed, disabling SuSEfirewall2-related functions."
-        )
+      # bnc #887406
+      if !FileUtils.Exists(CONFIG_FILE) || !SuSEFirewallIsInstalled()
+        log.warn "No firewall config -> firewall can't be read"
         FillUpEmptyConfig()
         return false
       end

package/yast2.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Thu Aug  7 12:14:16 UTC 2014 - locilka@suse.com
+
+- SuSEFirewall: Reading SuSEfirewall2 configuration whenever it's
+  possible instead of simply skipping it in Stage.initial - package
+  can be already available at the end of installation (bnc#887406)
+- 3.1.95
+
 -------------------------------------------------------------------
 Thu Aug  7 11:02:41 UTC 2014 - ancor@suse.com
 

package/yast2.spec

@@ -17,7 +17,7 @@
 
 
 Name:           yast2
-Version:        3.1.94
+Version:        3.1.95
 Release:        0
 URL:            https://github.com/yast/yast-yast2