@@ -136,7 +136,7 @@ init_ltp_netspace()
# -b run in background
# -c CMD specify command to run (this must be binary, not shell builtin/function)
# -s safe option, if something goes wrong, will exit with TBROK
-# -u USER for ssh/rsh (default root)
+# -u USER for ssh (default root)
# RETURN: 0 on success, 1 on failure
tst_rhost_run()
{
@@ -166,14 +166,12 @@ tst_rhost_run()
return 1
fi
- if [ -n "${TST_USE_SSH:-}" ]; then
- output=`ssh -n -q $user@$RHOST "sh -c \
- '$pre_cmd $cmd $post_cmd'" $out 2>&1 || echo 'RTERR'`
- elif [ -n "${TST_USE_NETNS:-}" ]; then
+ if [ -n "${TST_USE_NETNS:-}" ]; then
output=`$LTP_NETNS sh -c \
"$pre_cmd $cmd $post_cmd" $out 2>&1 || echo 'RTERR'`
else
- output=`rsh -n -l $user $RHOST "sh -c \
+ tst_require_cmds ssh
+ output=`ssh -n -q $user@$RHOST "sh -c \
'$pre_cmd $cmd $post_cmd'" $out 2>&1 || echo 'RTERR'`
fi
echo "$output" | grep -q 'RTERR$' && ret=1
rsh is not used nowadays. When was the first network library version added in 18739ff06 (2014), it was a default + and ssh replacement was optional. Netns based single machine testing was added in 5f8ca6cf0 (2016). After 6 years it's time to drop legacy rsh. ssh based testing setup requires only RHOST variable, TST_USE_SSH has been removed as unneeded. Also check for ssh in tst_rhost_run(). We still keep $LTP_RSH for some of the network stress tests, which has not been ported to tst_net.sh yet. Suggested-by: Alexey Kodanev <alexey.kodanev@oracle.com> Signed-off-by: Petr Vorel <pvorel@suse.cz> --- testcases/lib/tst_net.sh | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)