30 lines
1.3 KiB
Diff
30 lines
1.3 KiB
Diff
|
From 7300cecce3fcb4cc7b4eab2167470cf70b4e295e Mon Sep 17 00:00:00 2001
|
||
|
|
From: Marek 'marx' Grac <mgrac@redhat.com>
|
||
|
|
Date: Mon, 22 Sep 2014 14:46:43 +0200
|
||
|
|
Subject: [PATCH 13/16] fence_apc: --shell-timeout was used instead of
|
||
|
|
--power-timeout
|
||
|
|
|
||
|
|
---
|
||
|
|
fence/agents/apc/fence_apc.py | 4 ++--
|
||
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/fence/agents/apc/fence_apc.py b/fence/agents/apc/fence_apc.py
|
||
|
|
index 83bfe07..f2080f1 100644
|
||
|
|
--- a/fence/agents/apc/fence_apc.py
|
||
|
|
+++ b/fence/agents/apc/fence_apc.py
|
||
|
|
@@ -170,9 +170,9 @@ def set_power_status(conn, options):
|
||
|
|
conn.send_eol(action)
|
||
|
|
conn.log_expect(options, "Enter 'YES' to continue or <ENTER> to cancel :", int(options["--shell-timeout"]))
|
||
|
|
conn.send_eol("YES")
|
||
|
|
- conn.log_expect(options, "Press <ENTER> to continue...", int(options["--shell-timeout"]))
|
||
|
|
+ conn.log_expect(options, "Press <ENTER> to continue...", int(options["--power-timeout"]))
|
||
|
|
conn.send_eol("")
|
||
|
|
- conn.log_expect(options, options["--command-prompt"], int(options["--shell-timeout"]))
|
||
|
|
+ conn.log_expect(options, options["--command-prompt"], int(options["--power-timeout"]))
|
||
|
|
conn.send(chr(03))
|
||
|
|
conn.log_expect(options, "- Logout", int(options["--shell-timeout"]))
|
||
|
|
conn.log_expect(options, options["--command-prompt"], int(options["--shell-timeout"]))
|
||
|
|
--
|
||
|
|
1.8.4.5
|
||
|
|
|