From: Maryam Tahhan <maryam.tahhan@intel.com>
Date: Mon, 20 Nov 2017 13:22:56 +0000 (+0000)
Subject: Merge "docker: Added docker container for running collectd"
X-Git-Tag: opnfv-6.0.0~73
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=dde33f975509dc47fe580a59f5ce3b615be23116;p=barometer.git

Merge "docker: Added docker container for running collectd"
---

dde33f975509dc47fe580a59f5ce3b615be23116
diff --cc systems/build_base_machine.sh
index a50baf2d,e0c8370d..dab2e761
--- a/systems/build_base_machine.sh
+++ b/systems/build_base_machine.sh
@@@ -58,13 -59,13 +59,13 @@@ distro_dir="$OS_NAME/$VERSION_ID
  if [ -d "$distro_dir" ] && [ -e "$distro_dir/build_base_machine.sh" ]; then
      $SUDO $distro_dir/build_base_machine.sh || die "$distro_dir/build_base_machine.sh failed"
  else
 -    die "$distro_dir is not yet supported"
 +    die "$distro_dir is not supported"
  fi
- 
- if [ ! -d /lib/modules/`uname -r`/build ] ; then
-     die "Kernel devel is not available for active kernel. It can be caused by recent kernel update. Please reboot and run $0 again."
+ if [ -z ${DOCKER+x} ]; then
+        if [ ! -d /lib/modules/`uname -r`/build ] ; then
+        die "Kernel devel is not available for active kernel. It can be caused by recent kernel update. Please reboot and run $0 again."
+        fi
  fi
- 
  # download and compile DPDK and Collectd
  if [ -f ../src/Makefile ] ; then
      cd ../src