From e4aa86e528ec35e7940c68511c64ce48883eaf92 Mon Sep 17 00:00:00 2001
From: david hill <david.hill@mariadb.com>
Date: Tue, 12 Sep 2017 09:08:55 -0500
Subject: [PATCH] fixed module _installer code issue

---
 oam/install_scripts/module_installer.sh | 6 +-----
 oamapps/postConfigure/postConfigure.cpp | 2 +-
 procmgr/main.cpp                        | 2 ++
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/oam/install_scripts/module_installer.sh b/oam/install_scripts/module_installer.sh
index 01a0eff16..f296750bc 100755
--- a/oam/install_scripts/module_installer.sh
+++ b/oam/install_scripts/module_installer.sh
@@ -58,11 +58,7 @@ ServerTypeInstall=`$COLUMNSTORE_INSTALL_DIR/bin/getConfig Installation ServerTyp
 cloud=`$COLUMNSTORE_INSTALL_DIR/bin/getConfig Installation Cloud`
 if [ $cloud = "amazon-ec2" ] || [ $cloud = "amazon-vpc" ]; then
 	cp $COLUMNSTORE_INSTALL_DIR/local/etc/credentials $HOME/.aws/. > /dev/null 2>&1
-	if [ $user = "root" ]; then
-		sed -i -e s/#runuser/runuser/g /etc/rc.local
-	else
-                sudo sed -i -e 's/#sudo runuser/sudo runuser/g' /etc/rc.local
-	fi
+        sudo sed -i -e 's/#sudo runuser/sudo runuser/g' /etc/rc.d/rc.local
 
 	if [ $module = "pm" ]; then
 		if test -f $COLUMNSTORE_INSTALL_DIR/local/etc/pm1/fstab ; then
diff --git a/oamapps/postConfigure/postConfigure.cpp b/oamapps/postConfigure/postConfigure.cpp
index 9e269d58c..b416378ce 100644
--- a/oamapps/postConfigure/postConfigure.cpp
+++ b/oamapps/postConfigure/postConfigure.cpp
@@ -1071,7 +1071,7 @@ int main(int argc, char *argv[])
 		}
 		
 		// setup to start on reboot
-		system("sudo sed -i -e 's/#sudo runuser/sudo runuser/g' /etc/rc.local >/dev/null 2>&1");
+		system("sudo sed -i -e 's/#sudo runuser/sudo runuser/g' /etc/rc.d/rc.local >/dev/null 2>&1");
 	}
 	
 	if ( pmwithum )
diff --git a/procmgr/main.cpp b/procmgr/main.cpp
index bca25c09e..9c8e6a69d 100644
--- a/procmgr/main.cpp
+++ b/procmgr/main.cpp
@@ -170,6 +170,8 @@ int main(int argc, char **argv)
 	if ( DBRootStorageType == "hdfs" )
 		HDFS = true;
 
+	log.writeLog(__LINE__, "DBRootStorageType = " + DBRootStorageType, LOG_TYPE_DEBUG);
+
 	//PMwithUM config 
 	try {
 		oam.getSystemConfig( "PMwithUM", PMwithUM);