From 7c0eae7c065941922c5a76711adc0ffc705ea1c3 Mon Sep 17 00:00:00 2001
From: Markus Makela <markus.makela@mariadb.com>
Date: Mon, 15 Feb 2016 11:12:54 +0200
Subject: [PATCH] Added configurable executable file directory

This allows MaxScale to launch processes from the directory where
the `maxscale` executable is located.
---
 Getting-Started/Configuration-Guide.md |  8 ++++++++
 Tutorials/Administration-Tutorial.md   | 21 +--------------------
 maxscale.1                             |  3 +++
 3 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/Getting-Started/Configuration-Guide.md b/Getting-Started/Configuration-Guide.md
index be84ef5f0..946c52208 100644
--- a/Getting-Started/Configuration-Guide.md
+++ b/Getting-Started/Configuration-Guide.md
@@ -281,6 +281,14 @@ Configure the directory for the PID file for MaxScale. This file contains the Pr
 piddir=/tmp/maxscale_cache/
 ```
 
+#### `execdir`
+
+Configure the directory where the executable files reside. All internal processes which are launched will use this directory to look for executable files.
+
+```
+execdir=/usr/local/bin/
+```
+
 #### `language`
 
 Set the folder where the errmsg.sys file is located in. MaxScale will look for the errmsg.sys file installed with MaxScale from this folder.
diff --git a/Tutorials/Administration-Tutorial.md b/Tutorials/Administration-Tutorial.md
index 1a9351775..3ac9fb3d9 100644
--- a/Tutorials/Administration-Tutorial.md
+++ b/Tutorials/Administration-Tutorial.md
@@ -27,26 +27,7 @@ or
 ```
 It is also possible to start MaxScale by executing the maxscale command itself. Running the executable /usr/bin/maxscale will result in MaxScale running as a daemon process, unattached to the terminal in which it was started and using configuration files that it finds in the /etc directory.
 
-Options may be passed to the MaxScale binary that alter this default behavior, this options are documented in the table below.
-
-Switch|Long Option|Description
-------|-----------|-----------
-`-d`|`--nodaemon`|enable running in terminal process (default:disabled)
-`-f FILE`|`--config=FILE`|relative or absolute pathname of MaxScale configuration file (default:/etc/maxscale.cnf)
-`-l[file shm]`|`--log=[file shm]`|log to file or shared memory (default: file)
-`-L PATH`|`--logdir=PATH`|path to log file directory (default: /var/log/maxscale)
-`-D PATH`|`--datadir=PATH`|path to data directory, stored embedded mysql tables (default: /var/cache/maxscale)
-`-C PATH`|`--configdir=PATH`|path to configuration file directory (default: /etc/)
-`-B PATH`|`--libdir=PATH`|path to module directory (default: /usr/lib64/maxscale)
-`-A PATH`|`--cachedir=PATH`|path to cache directory (default: /var/cache/maxscale)
-`P PATH`|`--piddir=PATH`|PID file directory
-`-U USER`|`--user=USER`|run MaxScale as another user. The user ID and group ID of this user are used to run MaxScale.
-`-s [yes no]`|`--syslog=[yes no]`|log messages to syslog (default:yes)
-`-S [yes no]`|`--maxlog=[yes no]`|log messages to MaxScale log (default: yes)
-`-G [0 1]`|`--log_augmentation=[0 1]`|augment messages with the name of the function where the message was logged (default: 0). Primarily for development purposes.
-`-v`|`--version`|print version info and exit
-`-V`|`--version-full`|print version info and the commit ID the binary was built from
-`-?`|`--help`|show this help
+Options may be passed to the MaxScale binary that alter this default behavior. For a full list of all parameters, refer to the MaxScale help output by executing `maxscale --help`.
 
 Additional command line arguments can be passed to MaxScale with a configuration file placed at `/etc/sysconfig/maxscale` on RPM installations and `/etc/default/maxscale` file on DEB installations. Set the arguments in a variable called `MAXSCALE_OPTIONS` and remember to surround the arguments with quotes. The file should only contain environment variable declarations.
 
diff --git a/maxscale.1 b/maxscale.1
index c835ad265..0f5aec9b6 100644
--- a/maxscale.1
+++ b/maxscale.1
@@ -44,6 +44,9 @@ Path to cache directory. This is where MaxScale stores cached authentication dat
 .BR -P " \fIPATH\fB, --piddir=\fIPATH\fB"
 Location of MaxScale's PID file.
 .TP
+.BR -E " \fIPATH\fB, --execdir=\fIPATH\fB"
+Location of the executable files. When internal processes are launched from within MaxScale the binaries are assumed to be in this directory. If you have a custom location for binary executable files you need to add this parameter.
+.TP
 .BR -U " \fIUSER\fB, --user=\fIUSER\fB"
 Run MaxScale as another user. The user ID and group ID of this user are used to run MaxScale.
 .TP