console enhancements

stefanha · Oct 10, 2019 · 128f646 · 128f646
1 parent bfd1b86
commit 128f646
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/kvirt/kvm/__init__.py b/kvirt/kvm/__init__.py
@@ -1018,16 +1018,13 @@ def console(self, name, tunnel=False, web=False):
         else:
             xml = vm.XMLDesc(0)
             root = ET.fromstring(xml)
+            host = self.host
             for element in list(root.getiterator('graphics')):
                 attributes = element.attrib
                 if attributes['listen'] == '127.0.0.1':
-                    if not os.path.exists("i_am_a_container"):
-                        tunnel = True
-                    elif self.host not in ['127.0.0.1', 'localhost']:
+                    if not os.path.exists("i_am_a_container") or self.host not in ['127.0.0.1', 'localhost']:
                         tunnel = True
                         host = '127.0.0.1'
-                else:
-                    host = self.host
                 protocol = attributes['type']
                 port = attributes['port']
                 localport = port
@@ -1073,7 +1070,12 @@ def serialconsole(self, name):
                 print("No serial Console found. Leaving...")
                 return
             elif self.host in ['localhost', '127.0.0.1']:
-                os.system('virsh -c %s console %s' % (self.url, name))
+                cmd = 'virsh -c %s console %s' % (self.url, name)
+                if self.debug or os.path.exists("/i_am_a_container"):
+                    msg = "Run the following command:\n%s" % cmd
+                    common.pprint(msg)
+                else:
+                    os.system(cmd)
             else:
                 for element in serial:
                     serialport = element.find('source').get('service')