Author: lslezak Date: Fri Dec 19 13:09:46 2008 New Revision: 54290 URL: http://svn.opensuse.org/viewcvs/yast?rev=54290&view=rev Log: - fixed FTP service check for vsftpd in standalone mode Modified: trunk/instserver/src/Instserver.ycp Modified: trunk/instserver/src/Instserver.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/instserver/src/Instserver.ycp?rev=54290&r1=54289&r2=54290&view=diff ============================================================================== --- trunk/instserver/src/Instserver.ycp (original) +++ trunk/instserver/src/Instserver.ycp Fri Dec 19 13:09:46 2008 @@ -106,6 +106,13 @@ } +boolean vsftpd_is_standalone() +{ + boolean ret = SCR::Execute(.target.bash, "grep -q '^listen=YES$' /etc/vsftpd.conf") == 0; + + y2milestone("vsftpd in standalone mode: %1", ret); + return ret; +} /** * Create links @@ -302,7 +309,7 @@ // check if vsftpd is configured in standalone mode (listen=YES) (bnc#438694) // see 'man vsftpd.conf' - boolean vsftpd_standalone = SCR::Execute(.target.bash, "grep -q '^listen=YES$' /etc/vsftpd.conf") == 0; + boolean vsftpd_standalone = vsftpd_is_standalone(); if (vsftpd_standalone) { @@ -762,6 +769,15 @@ boolean FTPValid(map config) { + if (vsftpd_is_standalone()) + { + // is the service running? + boolean ret = (Service::Status("vsftpd") == 0 ); + y2milestone("FTP (vsftpd) server running: %1", ret); + + return ret; + } + // read the current configuration map resource = (map)ReadServiceSettings("inetd_auto"); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org