1
0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-08-05 16:15:50 +03:00

MCOL-604 and MCOL-607, undone some precious changes per review

This commit is contained in:
David Hill
2017-03-08 13:16:55 -06:00
parent 5cbc67c9c6
commit 620cdc4264
4 changed files with 7 additions and 4 deletions

View File

@@ -81,7 +81,10 @@ start() {
exit 0 exit 0
fi fi
($SUDO mkdir -p /var/lock/subsys && $SUDO chmod 755 /var/lock/subsys && $SUDO touch /var/lock/subsys/columnstore) >/dev/null 2>&1 if [ "$user" == "root" ]; then
(mkdir -p /var/lock/subsys && touch /var/lock/subsys/columnstore) >/dev/null 2>&1
else
($SUDO mkdir -p /var/lock/subsys && $SUDO chmod 777 /var/lock/subsys $SUDO touch /var/lock/subsys/columnstore) >/dev/null 2>&1
if [ -x $InstallDir/bin/columnstore.pre-start ]; then if [ -x $InstallDir/bin/columnstore.pre-start ]; then
$InstallDir/bin/columnstore.pre-start $InstallDir/bin/columnstore.pre-start

View File

@@ -215,7 +215,7 @@ else
$SUDO mkdir /var/lock/subsys > /dev/null 2>&1 $SUDO mkdir /var/lock/subsys > /dev/null 2>&1
$SUDO chmod 777 /var/lock/subsys > /dev/null 2>&1 $SUDO chmod 777 /var/lock/subsys > /dev/null 2>&1
$SUDO rm -f /var/lock/subsys/mysql-Columnstore $SUDO rm -f /var/lock/subsys/mysql-Columnstore
$SUDO chmod 644 /etc/fstab $SUDO chmod 666 /etc/fstab
sed -i -e s@/usr/local/mariadb/columnstore@$installdir@g $installdir/bin/columnstore.def sed -i -e s@/usr/local/mariadb/columnstore@$installdir@g $installdir/bin/columnstore.def
$SUDO cp $installdir/bin/columnstore.def /etc/default/columnstore $SUDO cp $installdir/bin/columnstore.def /etc/default/columnstore

View File

@@ -121,7 +121,7 @@ int main(int argc, char **argv)
// change permissions on /dev/shm // change permissions on /dev/shm
if ( !rootUser) if ( !rootUser)
{ {
string cmd = "sudo chmod 755 /dev/shm >/dev/null 2>&1"; string cmd = "sudo chmod 777 /dev/shm >/dev/null 2>&1";
system(cmd.c_str()); system(cmd.c_str());
} }

View File

@@ -952,7 +952,7 @@ void ProcessMonitor::processMessage(messageqcpp::ByteStream msg, messageqcpp::IO
// change permissions on /dev/shm // change permissions on /dev/shm
if ( !rootUser) if ( !rootUser)
{ {
cmd = "sudo chmod 755 /dev/shm >/dev/null 2>&1"; cmd = "sudo chmod 777 /dev/shm >/dev/null 2>&1";
system(cmd.c_str()); system(cmd.c_str());
} }