From: Lingli Chen <linglix.chen@intel.com>
To: dts@dpdk.org
Cc: Lingli Chen <linglix.chen@intel.com>
Subject: [dts][PATCH V1] framework/crb: fix _is_container error
Date: Fri, 13 Jan 2023 03:04:45 -0500 [thread overview]
Message-ID: <20230113080445.67548-1-linglix.chen@intel.com> (raw)
fix dts commit 311c7f04 (fix _is_container error on FreeBSD)
Adjust the judgment order according to FreeBSD
Signed-off-by: Lingli Chen <linglix.chen@intel.com>
---
framework/crb.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/framework/crb.py b/framework/crb.py
index f15df730..4ffee558 100644
--- a/framework/crb.py
+++ b/framework/crb.py
@@ -1054,12 +1054,12 @@ class Crb(object):
return True
elif self.send_expect("df -h / |grep overlay ", "# "):
return True
+ elif self.get_os_type() == "freebsd":
+ return False
elif self.send_expect(
"systemd-detect-virt -c|egrep '(systemd-nspawn|lxc|docker|podman|rkt|wsl|container-other)$' ",
"# ",
):
return True
- elif self.get_os_type() == "freebsd":
- return False
else:
return False
--
2.17.1
next reply other threads:[~2023-01-13 9:05 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-13 8:04 Lingli Chen [this message]
2023-01-29 1:44 ` lijuan.tu
-- strict thread matches above, loose matches on Subject: below --
2023-01-10 2:31 Lingli Chen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230113080445.67548-1-linglix.chen@intel.com \
--to=linglix.chen@intel.com \
--cc=dts@dpdk.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).