From 0a80a26f6c177ba1143186ed5cdf817b2089dbca Mon Sep 17 00:00:00 2001
From: Michael Hanselmann <hansmi@google.com>
Date: Thu, 27 Mar 2008 14:39:25 +0000
Subject: [PATCH] Return first parameter of console command only once
Reviewed-by: iustinp
---
lib/cmdlib.py | 3 +--
scripts/gnt-instance | 4 ++--
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/lib/cmdlib.py b/lib/cmdlib.py
index 0d8657487..87fa149b6 100644
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@ -3160,8 +3160,7 @@ class LUConnectConsole(NoHooksLU):
console_cmd = hyper.GetShellCommandForConsole(instance)
# build ssh cmdline
- cmd = self.ssh.BuildCmd(node, "root", console_cmd, batch=True, tty=True)
- return cmd[0], cmd
+ return self.ssh.BuildCmd(node, "root", console_cmd, batch=True, tty=True)
class LUReplaceDisks(LogicalUnit):
diff --git a/scripts/gnt-instance b/scripts/gnt-instance
index a306087f9..fbd116458 100755
--- a/scripts/gnt-instance
+++ b/scripts/gnt-instance
@@ -505,11 +505,11 @@ def ConnectToInstanceConsole(opts, args):
instance_name = args[0]
op = opcodes.OpConnectConsole(instance_name=instance_name)
- cmd, argv = SubmitOpCode(op)
+ cmd = SubmitOpCode(op)
# drop lock and exec so other commands can run while we have console
utils.Unlock("cmd")
try:
- os.execvp(cmd, argv)
+ os.execvp(cmd[0], cmd)
finally:
sys.stderr.write("Can't run console command %s with arguments:\n'%s'" %
(cmd, " ".join(argv)))
--
GitLab