Adapt changes file due to upstream update

yast · Nov 11, 2013 · f862bc0 · f862bc0
2 parents d985cf3 + 7741e01
commit f862bc0
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 10 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-3.1.4
+3.1.5
diff --git a/package/yast2-installation.changes b/package/yast2-installation.changes
@@ -1,9 +1,17 @@
 -------------------------------------------------------------------
-Fri Nov  8 15:23:47 UTC 2013 - vmoravec@suse.com
+Mon Nov 11 14:21:37 UTC 2013 - vmoravec@suse.com
 
+- 3.1.5
 - replace runlevel entries in control files with default_target
-  entries from
+  entries
 - replace dependency on yast2-runlevel with yast2-services-manager
+
+-------------------------------------------------------------------
+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
 
 -------------------------------------------------------------------

diff --git a/package/yast2-installation.spec b/package/yast2-installation.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-installation
-Version:        3.1.4
+Version:        3.1.5
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

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