From 931b89c009bec1737b8b70e79b8f6fbc8f0af119 Mon Sep 17 00:00:00 2001 From: weikeyou Date: Tue, 17 Apr 2018 09:09:15 +0800 Subject: [PATCH] Add '-E' for grep Maybe it is because merging conflict leads to the omission of the patch: https://review.openstack.org/#/c/558767/ Change-Id: I3f81787fc583187d95217b1a97b2dc64f3c182a1 --- zun/container/docker/host.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zun/container/docker/host.py b/zun/container/docker/host.py index 9040d2007..2df213c54 100644 --- a/zun/container/docker/host.py +++ b/zun/container/docker/host.py @@ -78,7 +78,7 @@ class Host(object): try: cmd = "mount |grep $(df " + CONF.docker.docker_data_root + \ " |awk 'FNR==2 {print $1}') | grep 'xfs'" \ - " |grep 'pquota|prjquota'" + " |grep -E 'pquota|prjquota'" utils.execute(cmd, shell=True) except exception.CommandError: sp_disk_quota = False