Merge pull request #179 from yast/sshd_enablement

remove ssh_service_finish as it is handled now by firewall finish
yast · Apr 2, 2014 · f823aae · f823aae
2 parents 3e910f0 + 2258fd5
commit f823aae
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 91 deletions.
diff --git a/package/yast2-installation.changes b/package/yast2-installation.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Wed Apr  2 09:25:38 UTC 2014 - jreidinger@suse.com
+
+- remove ssh_service_finish as it is handle in
+  firewall_stage1_finish due to split of ssh port open and sshd
+  enablement (bnc#865056)
+- 3.1.61
+
 -------------------------------------------------------------------
 Sun Mar 30 17:15:03 UTC 2014 - mfilka@suse.com
 

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

diff --git a/src/clients/inst_finish.rb b/src/clients/inst_finish.rb
@@ -173,7 +173,6 @@ def main
             "firewall_stage1",
             "ntp-client",
             "ssh_settings",
-            "ssh_service",
             "save_hw_status",
             "users",
             "autoinst_scripts2",

diff --git a/src/clients/ssh_service_finish.rb b/src/clients/ssh_service_finish.rb