diff mbox series

[V1] framework/crb: fix _is_container error

Message ID 20230113080445.67548-1-linglix.chen@intel.com (mailing list archive)
State Accepted
Headers show
Series [V1] framework/crb: fix _is_container error | expand

Checks

Context Check Description
ci/Intel-dts-format-test success Testing OK
ci/Intel-dts-pylama-test success Testing OK
ci/Intel-dts-suite-test success Testing OK

Commit Message

Lingli Chen Jan. 13, 2023, 8:04 a.m. UTC
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(-)

Comments

Lijuan Tu Jan. 29, 2023, 1:44 a.m. UTC | #1
On Fri, 13 Jan 2023 03:04:45 -0500, Lingli Chen <linglix.chen@intel.com> wrote:
> 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>


Applied, thanks
diff mbox series

Patch

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