shaba/virt-manager
1
0
Fork 0
mirror of https://github.com/virt-manager/virt-manager.git synced 2024-10-28 11:55:06 +03:00
Code Issues Projects Releases Wiki Activity

console: Hopefully fix remote SSH shell portability issues

Browse Source
This commit is contained in:
Cole Robinson 2010-08-23 16:37:41 -04:00
parent 218670cce9
commit a7caa33d2e
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/virtManager/console.py
View File

@ -549,17 +549,18 @@ class vmmConsolePages(gobject.GObject):
# to the desired behavior.
#
nc_params = "%s %s" % (vncaddr, str(vncport))
nc_cmd = [\
"nc -q 2>&1 | grep -q 'requires an argument';"
"if [ $? -eq 0 ] ; then"
" CMD='nc -q 0 %(nc_params)s';"
"else"
" CMD='nc %(nc_params)s';"
"fi;"
"sh -c \"$CMD\";" % {'nc_params': nc_params}
]
nc_cmd = (
"""nc -q 2>&1 | grep -q "requires an argument";"""
"""if [ $? -eq 0 ] ; then"""
""" CMD="nc -q 0 %(nc_params)s";"""
"""else"""
""" CMD="nc %(nc_params)s";"""
"""fi;"""
"""eval "$CMD";""" %
{'nc_params': nc_params})
argv += nc_cmd
argv.append("sh -c")
argv.append("'%s'" % nc_cmd)
argv_str = reduce(lambda x, y: x + " " + y, argv[1:])
logging.debug("Creating SSH tunnel: %s" % argv_str)