diff options
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/lib/oeqa/utils/qemurunner.py | 20 | 
1 files changed, 8 insertions, 12 deletions
| diff --git a/meta/lib/oeqa/utils/qemurunner.py b/meta/lib/oeqa/utils/qemurunner.py index 82335d8456..0631d43218 100644 --- a/meta/lib/oeqa/utils/qemurunner.py +++ b/meta/lib/oeqa/utils/qemurunner.py @@ -275,7 +275,7 @@ class QemuRunner:          reachedlogin = False          stopread = False          qemusock = None -        bootlog = '' +        bootlog = b''          data = b''          while time.time() < endtime and not stopread:              try: @@ -292,17 +292,13 @@ class QemuRunner:                  else:                      data = data + sock.recv(1024)                      if data: -                        try: -                            data = data.decode("utf-8", errors="surrogateescape") -                            bootlog += data -                            data = b'' -                            if re.search(".* login:", bootlog): -                                self.server_socket = qemusock -                                stopread = True -                                reachedlogin = True -                                self.logger.debug("Reached login banner") -                        except UnicodeDecodeError: -                            continue +                        bootlog += data +                        data = b'' +                        if b' login:' in bootlog: +                            self.server_socket = qemusock +                            stopread = True +                            reachedlogin = True +                            self.logger.debug("Reached login banner")                      else:                          socklist.remove(sock)                          sock.close() | 
