diff --git a/cpackEngineRPM.cmake b/cpackEngineRPM.cmake
index e88c938ec..c4fc765cc 100644
--- a/cpackEngineRPM.cmake
+++ b/cpackEngineRPM.cmake
@@ -132,7 +132,6 @@ SET(CPACK_RPM_platform_USER_FILELIST
 "/usr/local/mariadb/columnstore/bin/post-mysqld-install"
 "/usr/local/mariadb/columnstore/bin/pre-uninstall"
 "/usr/local/mariadb/columnstore/bin/PrimProc"
-"/usr/local/mariadb/columnstore/bin/upgrade-columnstore.sh"
 "/usr/local/mariadb/columnstore/bin/run.sh"
 "/usr/local/mariadb/columnstore/bin/columnstore"
 "/usr/local/mariadb/columnstore/bin/columnstoreSyslog"
diff --git a/oam/install_scripts/post-install b/oam/install_scripts/post-install
index a08a17d0a..afc67a69f 100755
--- a/oam/install_scripts/post-install
+++ b/oam/install_scripts/post-install
@@ -18,9 +18,14 @@ for arg in "$@"; do
 	elif [ `expr -- "$arg" : '--rpmmode='` -eq 10 ]; then
 		rpmmode="`echo $arg | awk -F= '{print $2}'`"
 	elif [ `expr -- "$arg" : '--installdir='` -eq 13 ]; then
-		installdir="`echo $arg | awk -F= '{print $2}'`"
-		prefix=`dirname $installdir`
+		installdirTmp="`echo $arg | awk -F= '{print $2}'`"
+		if [ $installdirTmp == $installdir ] ; then
+			user=root
+		else
+			installdir=$installdirTmp
+			prefix=`dirname $installdir`
                 prefix=`dirname $prefix`
+		fi                
 	elif [ `expr -- "$arg" : '--user='` -eq 7 ]; then
 		user="`echo $arg | awk -F= '{print $2}'`"
 	elif [ `expr -- "$arg" : '--quiet'` -eq 7 ]; then