X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=shell%2Fsysstat.sh;h=eada1b35994b9181a21a98284ae30fd96430ae6f;hb=b9b982379e3df32c324b0794f95670847ac8c3d4;hp=c72e23ae5d1b2b204a411730bc94bec10b2b3c5b;hpb=987dd81473e9c5090aab1e80ad47acd1f7974d7c;p=releng%2Fglobal-jjb.git

diff --git a/shell/sysstat.sh b/shell/sysstat.sh
index c72e23ae..eada1b35 100644
--- a/shell/sysstat.sh
+++ b/shell/sysstat.sh
@@ -11,19 +11,24 @@
 echo "---> sysstat.sh"
 set +e  # DON'T fail build if script fails.
 
+if awk -F/ '$2 == "docker"' /proc/self/cgroup | read -r; then
+    exit 0
+fi
+
+
 OS=$(facter operatingsystem)
 case "$OS" in
     Ubuntu)
         os_release=$(facter operatingsystemrelease)
         case $os_release in
-            16.04|18.04)
+            16.04|18.04|20.04)
                 if ! systemctl status sysstat > /dev/null; then
                     exit 0
                 fi
                 ;;
             14.04)
                 if [[ ! -f /etc/default/sysstat ]] || \
-                      ! grep --quiet 'ENABLED="true"' /etc/default/sysstat; then
+                        ! grep --quiet 'ENABLED="true"' /etc/default/sysstat; then
                     exit 0
                 fi
                 ;;