another bunch of fixes from testing

yast · Feb 8, 2018 · 6f9799d · 6f9799d
1 parent 9cba260
commit 6f9799d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/include/ftp-server/wid_functions.rb b/src/include/ftp-server/wid_functions.rb
@@ -118,8 +118,8 @@ def StartNowVsftpd
         SCR.Write(Builtins.add(path(".vsftpd"), "listen"), "YES")
         SCR.Write(Builtins.add(path(".vsftpd"), "listen_ipv6"), nil)
         SCR.Write(path(".vsftpd"), nil)
-        Service.enable("vsftp")
-        Service.start("vsftp")
+        Service.enable("vsftpd")
+        Service.start("vsftpd")
       end
       true
     end
@@ -138,8 +138,8 @@ def StopNowVsftpd
           result = true
         end
       else
-        Service.enable("vsftp")
-        Service.start("vsftp")
+        Service.enable("vsftpd")
+        Service.start("vsftpd")
       end
 
       true
@@ -160,7 +160,7 @@ def SaveAndRestartVsftpd
     #
     # init starting via socket and update status
     def InitStartStopRestart(key)
-      if FtpServer.InitStartViaSocket || Service.active?("vsftp")
+      if FtpServer.InitStartViaSocket || Service.active?("vsftpd")
         UI.ReplaceWidget(
           Id("_cwm_service_status_rp"),
           Label(_("FTP is running"))

diff --git a/src/modules/FtpServer.rb b/src/modules/FtpServer.rb
@@ -626,7 +626,7 @@ def Modified
     # Read all FtpServer settings
     # @return true on success
     def Read
-      Package.InstallAll("vsftp") # ensure it is there
+      Package.InstallAll(["vsftpd"]) # ensure it is there
       # FtpServer read dialog caption
       caption = _("Initializing FTP Configuration")
       steps = 2