From 0e9530f28c6c44e37047e1d519f59a0f77240ce2 Mon Sep 17 00:00:00 2001
From: david hill <david.hill@mariadb.com>
Date: Tue, 17 May 2016 10:56:37 -0500
Subject: [PATCH] change

---
 oam/install_scripts/module_installer.sh | 20 +++++++++++---------
 procmgr/processmanager.cpp              | 12 ++++++------
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/oam/install_scripts/module_installer.sh b/oam/install_scripts/module_installer.sh
index 8a4ad0c0a..b2484411e 100755
--- a/oam/install_scripts/module_installer.sh
+++ b/oam/install_scripts/module_installer.sh
@@ -54,15 +54,17 @@ fi
 export INFINIDB_INSTALL_DIR=$installdir
 
 cloud=`$INFINIDB_INSTALL_DIR/bin/getConfig Installation Cloud`
-if [ $cloud = "amazon-ec2" ] || [ $cloud = "amazon-vpc" ]; then
-	cp $INFINIDB_INSTALL_DIR/local/etc/*.pem /root/. > /dev/null 2>&1
-
-	if test -f $INFINIDB_INSTALL_DIR/local/etc/pm1/fstab ; then
-		echo "Setup fstab on Module"
-		touch /etc/fstab
-		rm -f /etc/fstab.columnstoreSave
-		mv /etc/fstab /etc/fstab.columnstoreSave
-		cat $INFINIDB_INSTALL_DIR/local/etc/pm1/fstab >> /etc/fstab
+if [ $module = "um" ]; then
+	if [ $cloud = "amazon-ec2" ] || [ $cloud = "amazon-vpc" ]; then
+		cp $INFINIDB_INSTALL_DIR/local/etc/*.pem /root/. > /dev/null 2>&1
+	
+		if test -f $INFINIDB_INSTALL_DIR/local/etc/pm1/fstab ; then
+			echo "Setup fstab on Module"
+			touch /etc/fstab
+			rm -f /etc/fstab.columnstoreSave
+			cp /etc/fstab /etc/fstab.columnstoreSave
+			cat $INFINIDB_INSTALL_DIR/local/etc/pm1/fstab >> /etc/fstab
+		fi
 	fi
 fi
 
diff --git a/procmgr/processmanager.cpp b/procmgr/processmanager.cpp
index aa79b773a..78715db2e 100644
--- a/procmgr/processmanager.cpp
+++ b/procmgr/processmanager.cpp
@@ -4439,15 +4439,15 @@ int ProcessManager::addModule(oam::DeviceNetworkList devicenetworklist, std::str
 		if ( packageType == "deb" )
 			separator = "_";
 		//mariadb
-		calpontPackage = homedir + "/mariadbcolumnstore-*" + separator + systemsoftware.Version + "-" + systemsoftware.Release + "*." + packageType;
-		mysqlPackage = homedir + "/mariadbcolumnstore-storage-engine" + separator + systemsoftware.Version + "-" + systemsoftware.Release + "*." + packageType;
-		mysqldPackage = homedir + "/mariadbcolumnstore-mysql" + separator + systemsoftware.Version + "-" + systemsoftware.Release + "*." + packageType;
-		calpontPackage1 = homedir + "/mariadbcolumnstore-libs" + separator + systemsoftware.Version + "-" + systemsoftware.Release + "*." + packageType;
-		calpontPackage2 = homedir + "/mariadbcolumnstore-enterprise" + separator + systemsoftware.Version + "-" + systemsoftware.Release + "*." + packageType;
+		calpontPackage = homedir + "/mariadb-columnstore-*" + separator + systemsoftware.Version + "-" + systemsoftware.Release + "*." + packageType;
+		mysqlPackage = homedir + "/mariadb-columnstore-storage-engine" + separator + systemsoftware.Version + "-" + systemsoftware.Release + "*." + packageType;
+		mysqldPackage = homedir + "/mariadb-columnstore-mysql" + separator + systemsoftware.Version + "-" + systemsoftware.Release + "*." + packageType;
+		calpontPackage1 = homedir + "/mariadb-columnstore-libs" + separator + systemsoftware.Version + "-" + systemsoftware.Release + "*." + packageType;
+		calpontPackage2 = homedir + "/mariadb-columnstore-enterprise" + separator + systemsoftware.Version + "-" + systemsoftware.Release + "*." + packageType;
 	}
 	else
 	{
-		calpontPackage = homedir + "/mariadbcolumnstore*" + systemsoftware.Version + "-" + systemsoftware.Release + "*.bin.tar.gz";
+		calpontPackage = homedir + "/mariadb-columnstore*" + systemsoftware.Version + "-" + systemsoftware.Release + "*.bin.tar.gz";
 		mysqlPackage = calpontPackage;
 		mysqldPackage = calpontPackage;
 	}