diff options
author | Enrico Jörns <ejo@pengutronix.de> | 2023-03-31 12:26:19 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-03-31 23:30:36 +0100 |
commit | ff7b3d6810a968d7456af84940e9ceefdfc2598a (patch) | |
tree | ddd6e6e0efa6607ef38f0c152a8fc5a5c30b1a05 /meta/lib/oeqa/utils/qemurunner.py | |
parent | a5f848f0e0ab57302c487594a59096babb738168 (diff) | |
download | poky-ff7b3d6810a968d7456af84940e9ceefdfc2598a.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: 900e3d42b918b5a33d8d952b3a8078fbe72ba98f)
Signed-off-by: Enrico Jorns <ejo@pengutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oeqa/utils/qemurunner.py')
-rw-r--r-- | meta/lib/oeqa/utils/qemurunner.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/lib/oeqa/utils/qemurunner.py b/meta/lib/oeqa/utils/qemurunner.py index 05385763ac..9d6fe4fe59 100644 --- a/meta/lib/oeqa/utils/qemurunner.py +++ b/meta/lib/oeqa/utils/qemurunner.py | |||
@@ -516,7 +516,7 @@ class QemuRunner: | |||
516 | (status, output) = self.run_serial(self.boot_patterns['send_login_user'], raw=True, timeout=120) | 516 | (status, output) = self.run_serial(self.boot_patterns['send_login_user'], raw=True, timeout=120) |
517 | if re.search(self.boot_patterns['search_login_succeeded'], output): | 517 | if re.search(self.boot_patterns['search_login_succeeded'], output): |
518 | self.logged = True | 518 | self.logged = True |
519 | self.logger.debug("Logged as root in serial console") | 519 | self.logger.debug("Logged in as %s in serial console" % self.boot_patterns['send_login_user'].replace("\n", "")) |
520 | if netconf: | 520 | if netconf: |
521 | # configure guest networking | 521 | # configure guest networking |
522 | cmd = "ifconfig eth0 %s netmask %s up\n" % (self.ip, self.netmask) | 522 | cmd = "ifconfig eth0 %s netmask %s up\n" % (self.ip, self.netmask) |
@@ -527,7 +527,7 @@ class QemuRunner: | |||
527 | self.logger.debug("Couldn't configure guest networking") | 527 | self.logger.debug("Couldn't configure guest networking") |
528 | else: | 528 | else: |
529 | self.logger.warning("Couldn't login into serial console" | 529 | self.logger.warning("Couldn't login into serial console" |
530 | " as root using blank password") | 530 | " as %s using blank password" % self.boot_patterns['send_login_user'].replace("\n", "")) |
531 | self.logger.warning("The output:\n%s" % output) | 531 | self.logger.warning("The output:\n%s" % output) |
532 | except: | 532 | except: |
533 | self.logger.warning("Serial console failed while trying to login") | 533 | self.logger.warning("Serial console failed while trying to login") |