summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEnrico Jörns <ejo@pengutronix.de>2023-03-31 12:26:19 +0200
committerSteve Sakoman <steve@sakoman.com>2023-04-14 06:30:30 -1000
commitcd8f96966965c8cf0adfbd5a13581158f8acaeab (patch)
tree796bcc5da4ec400ae029d9b15327c1cbba2d947c
parentb0716ad948690988fd27fa31fd97ba8bef841cf5 (diff)
downloadpoky-cd8f96966965c8cf0adfbd5a13581158f8acaeab.tar.gz
oeqa/utils/qemurunner: replace hard-coded user 'root' in debug output
Since login user is configurable with boot_patterns['send_login_user'], unconditionally using 'root' in the debug message can be confusing. Also fix the debug message to say 'Logged in' instead of 'Logged'. (From OE-Core rev: 386f55d2ba5783038c810dfde98b421191fa00de) Signed-off-by: Enrico Jorns <ejo@pengutronix.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 900e3d42b918b5a33d8d952b3a8078fbe72ba98f) Signed-off-by: Steve Sakoman <steve@sakoman.com>
-rw-r--r--meta/lib/oeqa/utils/qemurunner.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/lib/oeqa/utils/qemurunner.py b/meta/lib/oeqa/utils/qemurunner.py
index 1aaba02bd8..a455b3b389 100644
--- a/meta/lib/oeqa/utils/qemurunner.py
+++ b/meta/lib/oeqa/utils/qemurunner.py
@@ -511,7 +511,7 @@ class QemuRunner:
511 (status, output) = self.run_serial(self.boot_patterns['send_login_user'], raw=True, timeout=120) 511 (status, output) = self.run_serial(self.boot_patterns['send_login_user'], raw=True, timeout=120)
512 if re.search(self.boot_patterns['search_login_succeeded'], output): 512 if re.search(self.boot_patterns['search_login_succeeded'], output):
513 self.logged = True 513 self.logged = True
514 self.logger.debug("Logged as root in serial console") 514 self.logger.debug("Logged in as %s in serial console" % self.boot_patterns['send_login_user'].replace("\n", ""))
515 if netconf: 515 if netconf:
516 # configure guest networking 516 # configure guest networking
517 cmd = "ifconfig eth0 %s netmask %s up\n" % (self.ip, self.netmask) 517 cmd = "ifconfig eth0 %s netmask %s up\n" % (self.ip, self.netmask)
@@ -522,7 +522,7 @@ class QemuRunner:
522 self.logger.debug("Couldn't configure guest networking") 522 self.logger.debug("Couldn't configure guest networking")
523 else: 523 else:
524 self.logger.warning("Couldn't login into serial console" 524 self.logger.warning("Couldn't login into serial console"
525 " as root using blank password") 525 " as %s using blank password" % self.boot_patterns['send_login_user'].replace("\n", ""))
526 self.logger.warning("The output:\n%s" % output) 526 self.logger.warning("The output:\n%s" % output)
527 except: 527 except:
528 self.logger.warning("Serial console failed while trying to login") 528 self.logger.warning("Serial console failed while trying to login")