Author: lslezak Date: Mon Sep 12 18:16:32 2011 New Revision: 65668 URL: http://svn.opensuse.org/viewcvs/yast?rev=65668&view=rev Log: - updated testsuite (systemd support) (bnc#664548) - 2.21.0 Modified: trunk/tftp-server/VERSION trunk/tftp-server/package/yast2-tftp-server.changes trunk/tftp-server/testsuite/tests/readwrite.out Modified: trunk/tftp-server/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/tftp-server/VERSION?rev=65668&r1=65667&r2=65668&view=diff ============================================================================== --- trunk/tftp-server/VERSION (original) +++ trunk/tftp-server/VERSION Mon Sep 12 18:16:32 2011 @@ -1 +1 @@ -2.18.0 +2.21.0 Modified: trunk/tftp-server/package/yast2-tftp-server.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/tftp-server/package/yast2-tftp-server.changes?rev=65668&r1=65667&r2=65668&view=diff ============================================================================== --- trunk/tftp-server/package/yast2-tftp-server.changes (original) +++ trunk/tftp-server/package/yast2-tftp-server.changes Mon Sep 12 18:16:32 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Sep 12 16:10:22 UTC 2011 - lslezak@suse.cz + +- updated testsuite (systemd support) (bnc#664548) +- 2.21.0 + +------------------------------------------------------------------- Fri Aug 5 12:35:37 CEST 2011 - tgoettlicher@suse.de - fixed .desktop file (bnc #681249) Modified: trunk/tftp-server/testsuite/tests/readwrite.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/tftp-server/testsuite/tests/readwrite.out?rev=65668&r1=65667&r2=65668&view=diff ============================================================================== --- trunk/tftp-server/testsuite/tests/readwrite.out (original) +++ trunk/tftp-server/testsuite/tests/readwrite.out Mon Sep 12 18:16:32 2011 @@ -1,13 +1,11 @@ Execute .target.bash_output "/usr/bin/lsof -i :tftp -Fc" $["exit":0, "stderr":"", "stdout":"p3316\ncxinetd\n"] -Read .init.scripts.exists "xinetd" true -Read .init.scripts.runlevel "xinetd" $["inetd":$["start":[], "stop":[]], "network":$["start":[], "stop":[]], "networkmanager":$["start":["3", "5"], "stop":["3", "5"]], "xinetd":$["start":["3", "5"], "stop":["3", "5"]]] +Execute .target.bash "/sbin/chkconfig -l xinetd | /usr/bin/grep -q '[0-6]:on'" 0 Dir .etc.xinetd_d.tftp.section: ["tftp"] Read .etc.xinetd_d.tftp.value.tftp.disable nil Read .etc.xinetd_d.tftp.value.tftp.server_args "-s -v /srv/boot" -Read .init.scripts.exists "SuSEfirewall2_init" true -Read .init.scripts.runlevel "SuSEfirewall2_init" $["inetd":$["start":[], "stop":[]], "network":$["start":[], "stop":[]], "networkmanager":$["start":["3", "5"], "stop":["3", "5"]], "xinetd":$["start":["3", "5"], "stop":["3", "5"]]] -Read .init.scripts.exists "SuSEfirewall2_init" true -Execute .target.bash "/etc/init.d/SuSEfirewall2_init status" $["TERM":"raw"] 0 +Execute .target.bash "/sbin/chkconfig -l SuSEfirewall2_init | /usr/bin/grep -q '[0-6]:on'" 0 +Execute .target.bash "/sbin/chkconfig -l SuSEfirewall2_setup | /usr/bin/grep -q '[0-6]:on'" 0 +Execute .target.bash "/sbin/service SuSEfirewall2_init status" $["TERM":"raw"] 0 Return true Write .etc.xinetd_d.tftp.value.tftp."{" "" true Write .etc.xinetd_d.tftp.value_type.tftp."{" 1 true @@ -20,14 +18,9 @@ Write .etc.xinetd_d.tftp.value.tftp.server_args "-v -s /srv/boot" true Write .etc.xinetd_d.tftp nil true Execute .target.mkdir "/srv/boot" 0 -Read .init.scripts.exists "xinetd" true -Read .init.scripts.exists "xinetd" true -Read .init.scripts.exists "xinetd" true Read .init.scripts.runlevel "xinetd" $["inetd":$["start":[], "stop":[]], "network":$["start":[], "stop":[]], "networkmanager":$["start":["3", "5"], "stop":["3", "5"]], "xinetd":$["start":["3", "5"], "stop":["3", "5"]]] Read .init.scripts.comment "xinetd" $["inetd":$[], "network":$[], "networkmanager":$[], "xinetd":$[]] Execute .target.bash "/usr/bin/killall in.tftpd" 0 -Read .init.scripts.exists "xinetd" true -Execute .target.bash_output "/etc/init.d/xinetd restart" $["TERM":"raw"] $["exit":0, "stderr":"", "stdout":"p3316\ncxinetd\n"] -Read .init.scripts.exists "SuSEfirewall2_init" true -Execute .target.bash "/etc/init.d/SuSEfirewall2_init status" $["TERM":"raw"] 0 +Execute .target.bash_output "/sbin/service xinetd restart" $["TERM":"raw"] $["exit":0, "stderr":"", "stdout":"p3316\ncxinetd\n"] +Execute .target.bash "/sbin/service SuSEfirewall2_init status" $["TERM":"raw"] 0 Return true -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org