X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=systems%2Fbuild_base_machine.sh;h=2537f95878bb49fc3a93fadd341da9a8974538d0;hb=905d4a2f817ace4c0410eca23aacbd1656a0e701;hp=f6f72b7ab3c8e085f03f9742004c4fd7d5104c8c;hpb=215a65015908064b6ca996286584933002f0287a;p=barometer.git

diff --git a/systems/build_base_machine.sh b/systems/build_base_machine.sh
index f6f72b7a..2537f958 100755
--- a/systems/build_base_machine.sh
+++ b/systems/build_base_machine.sh
@@ -46,14 +46,14 @@ then
     SUDO="sudo -E"
 fi
 
-# If there is version specific dir available then set distro_dir to that
-if [ -d "$OS_NAME/$VERSION_ID" ]; then
-    distro_dir="$OS_NAME/$VERSION_ID"
-else
-    # Fallback - Default distro_dir = OS name
-    distro_dir="$OS_NAME"
+if [ "$1" != "-f" ] && [ -d "/opt/collectd" ] || [ -d "/etc/collectd" ]
+then
+    die "collectd is already installed on this system, if you wish to reinstall please rerun the script with a -f argument"
 fi
 
+# If there is version specific dir available then set distro_dir to that
+distro_dir="$OS_NAME/$VERSION_ID"
+
 # build base system using OS specific scripts
 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"
@@ -68,7 +68,9 @@ fi
 # download and compile DPDK and Collectd
 if [ -f ../src/Makefile ] ; then
     cd ../src
+    make clobber || die "Make clobber failed"
     make || die "Make failed"
+    make install || die "Make install failed"
     cd -
 else
     die "Make failed; No Makefile"