Revision 1f5557ca

b/Makefile.am
606 606
dist_tools_SCRIPTS = \
607 607
	$(python_scripts) \
608 608
	tools/kvm-console-wrapper \
609
	tools/xm-console-wrapper \
609
	tools/xen-console-wrapper \
610 610
	tools/master-ip-setup
611 611

  
612 612
pkglib_python_scripts = \
b/lib/constants.py
163 163
SETUP_SSH = _autoconf.TOOLSDIR + "/setup-ssh"
164 164
KVM_IFUP = _autoconf.PKGLIBDIR + "/kvm-ifup"
165 165
KVM_CONSOLE_WRAPPER = _autoconf.PKGLIBDIR + "/tools/kvm-console-wrapper"
166
XM_CONSOLE_WRAPPER = _autoconf.PKGLIBDIR + "/tools/xm-console-wrapper"
166
XEN_CONSOLE_WRAPPER = _autoconf.PKGLIBDIR + "/tools/xen-console-wrapper"
167 167
ETC_HOSTS = "/etc/hosts"
168 168
DEFAULT_FILE_STORAGE_DIR = _autoconf.FILE_STORAGE_DIR
169 169
DEFAULT_SHARED_FILE_STORAGE_DIR = _autoconf.SHARED_FILE_STORAGE_DIR
b/lib/hypervisor/hv_xen.py
421 421
                                   kind=constants.CONS_SSH,
422 422
                                   host=instance.primary_node,
423 423
                                   user=constants.GANETI_RUNAS,
424
                                   command=[constants.XM_CONSOLE_WRAPPER,
425
                                            instance.name])
424
                                   command=[constants.XEN_CONSOLE_WRAPPER,
425
                                            constants.XEN_CMD, instance.name])
426 426

  
427 427
  def Verify(self):
428 428
    """Verify the hypervisor.
b/tools/xen-console-wrapper
1
#!/bin/bash
2
#
3

  
4
# Copyright (C) 2011 Google Inc.
5
#
6
# This program is free software; you can redistribute it and/or modify
7
# it under the terms of the GNU General Public License as published by
8
# the Free Software Foundation; either version 2 of the License, or
9
# (at your option) any later version.
10
#
11
# This program is distributed in the hope that it will be useful, but
12
# WITHOUT ANY WARRANTY; without even the implied warranty of
13
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
14
# General Public License for more details.
15
#
16
# You should have received a copy of the GNU General Public License
17
# along with this program; if not, write to the Free Software
18
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
19
# 02110-1301, USA.
20

  
21
XEN_CMD="$1"
22
INSTANCE="$2"
23

  
24
unpause() {
25
  ispaused=$(xm list -l "$INSTANCE" 2>/dev/null |
26
             sed -n 's/^[[:blank:]]*(state ..\(.\)...)/\1/p')
27
  [[ "$ispaused" == "p" ]] || return
28
  # As there is no way to be sure when xm console has actually connected to the
29
  # instance, sleep for a few seconds before unpausing the instance. This is a
30
  # tradeoff between missing some console output if the node is overloaded and
31
  # making the user wait everytime when the node isn't so busy.
32
  sleep 3
33
  # Send \r\n after notice as terminal is in raw mode
34
  printf "Instance $INSTANCE is paused, unpausing\r\n"
35
  xm unpause "$INSTANCE"
36
}
37

  
38
unpause &
39
exec $XEN_CMD console "$INSTANCE"
/dev/null
1
#!/bin/bash
2
#
3

  
4
# Copyright (C) 2011 Google Inc.
5
#
6
# This program is free software; you can redistribute it and/or modify
7
# it under the terms of the GNU General Public License as published by
8
# the Free Software Foundation; either version 2 of the License, or
9
# (at your option) any later version.
10
#
11
# This program is distributed in the hope that it will be useful, but
12
# WITHOUT ANY WARRANTY; without even the implied warranty of
13
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
14
# General Public License for more details.
15
#
16
# You should have received a copy of the GNU General Public License
17
# along with this program; if not, write to the Free Software
18
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
19
# 02110-1301, USA.
20

  
21
INSTANCE="$1"
22

  
23
unpause() {
24
  ispaused=$(xm list -l "$INSTANCE" 2>/dev/null |
25
             sed -n 's/^[[:blank:]]*(state ..\(.\)...)/\1/p')
26
  [[ "$ispaused" == "p" ]] || return
27
  # As there is no way to be sure when xm console has actually connected to the
28
  # instance, sleep for a few seconds before unpausing the instance. This is a
29
  # tradeoff between missing some console output if the node is overloaded and
30
  # making the user wait everytime when the node isn't so busy.
31
  sleep 3
32
  # Send \r\n after notice as terminal is in raw mode
33
  printf "Instance $INSTANCE is paused, unpausing\r\n"
34
  xm unpause "$INSTANCE"
35
}
36

  
37
unpause &
38
exec xm console "$INSTANCE"

Also available in: Unified diff