|
From: Jiri J. <jja...@re...> - 2013-12-04 14:29:02
|
From: Miroslav Vadkerti <mva...@re...>
On some machines using run_init in capp profile can
cause the sshd service startup failure.
Signed-off-by: Miroslav Vadkerti <mva...@re...>
---
audit-test/utils/tp_ssh_functions.bash | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/audit-test/utils/tp_ssh_functions.bash b/audit-test/utils/tp_ssh_functions.bash
index bcbc885..4b8280d 100644
--- a/audit-test/utils/tp_ssh_functions.bash
+++ b/audit-test/utils/tp_ssh_functions.bash
@@ -33,13 +33,17 @@ TIMEOUT=600
# Restart ssh daemon
function ssh_restart_daemon {
- expect -c "
+ if [ $PPROFILE = lspp ]; then
+ expect -c "
set timeout $TIMEOUT
spawn run_init service sshd restart
expect {
-nocase {password:} {send \"$PASSWD\r\"; exp_continue}
eof
}"
+ else
+ service sshd restart
+ fi
}
# Remove SSH_USE_STRONG_RNG from environment
--
1.8.3.1
|