Commit 1f5557ca authored by Guido Trotter's avatar Guido Trotter

Fix gnt-instance console with xl

- Rename xm-console-wrapper to xen-console-wrapper
- Pass the xen command to use as a parameter
Signed-off-by: default avatarGuido Trotter <ultrotter@google.com>
Reviewed-by: default avatarIustin Pop <iustin@google.com>
parent 57a6042e
......@@ -606,7 +606,7 @@ python_scripts = \
dist_tools_SCRIPTS = \
$(python_scripts) \
tools/kvm-console-wrapper \
tools/xm-console-wrapper \
tools/xen-console-wrapper \
tools/master-ip-setup
pkglib_python_scripts = \
......
......@@ -163,7 +163,7 @@ DAEMON_UTIL = _autoconf.PKGLIBDIR + "/daemon-util"
SETUP_SSH = _autoconf.TOOLSDIR + "/setup-ssh"
KVM_IFUP = _autoconf.PKGLIBDIR + "/kvm-ifup"
KVM_CONSOLE_WRAPPER = _autoconf.PKGLIBDIR + "/tools/kvm-console-wrapper"
XM_CONSOLE_WRAPPER = _autoconf.PKGLIBDIR + "/tools/xm-console-wrapper"
XEN_CONSOLE_WRAPPER = _autoconf.PKGLIBDIR + "/tools/xen-console-wrapper"
ETC_HOSTS = "/etc/hosts"
DEFAULT_FILE_STORAGE_DIR = _autoconf.FILE_STORAGE_DIR
DEFAULT_SHARED_FILE_STORAGE_DIR = _autoconf.SHARED_FILE_STORAGE_DIR
......
......@@ -421,8 +421,8 @@ class XenHypervisor(hv_base.BaseHypervisor):
kind=constants.CONS_SSH,
host=instance.primary_node,
user=constants.GANETI_RUNAS,
command=[constants.XM_CONSOLE_WRAPPER,
instance.name])
command=[constants.XEN_CONSOLE_WRAPPER,
constants.XEN_CMD, instance.name])
def Verify(self):
"""Verify the hypervisor.
......
......@@ -18,7 +18,8 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
# 02110-1301, USA.
INSTANCE="$1"
XEN_CMD="$1"
INSTANCE="$2"
unpause() {
ispaused=$(xm list -l "$INSTANCE" 2>/dev/null |
......@@ -35,4 +36,4 @@ unpause() {
}
unpause &
exec xm console "$INSTANCE"
exec $XEN_CMD console "$INSTANCE"
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment