Merge branch 'openSUSE-13_1'

Conflicts: VERSION control/control.xml package/yast2-installation.changes
yast · Nov 7, 2013 · d5b2fa3 · d5b2fa3
2 parents 850ecb7 + f76d230
commit d5b2fa3
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-3.1.3
+3.1.4
diff --git a/package/yast2-installation.changes b/package/yast2-installation.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Thu Nov  7 11:45:45 UTC 2013 - mfilka@suse.com
+
+- bnc#849391
+  - removed explicit start of second phase of SuSEfirewall2 
+    initialization. Not needed when systemd is in use.
+- 3.1.4
+
 -------------------------------------------------------------------
 Thu Oct 31 11:32:01 UTC 2013 - lslezak@suse.cz
 

diff --git a/src/clients/inst_restore_settings.rb b/src/clients/inst_restore_settings.rb
@@ -56,12 +56,6 @@ def main
 
       NetworkInterfaces.Read
 
-      # bugzilla #282871
-      # If firewall is enabled, only the initial script is started.
-      # Start also the final firewall phase.
-      Service.Start("SuSEfirewall2_setup") if SuSEFirewall.IsEnabled
-
-
       :auto 
 
       # EOF