Merge branch 'master' into goals_option

4 files changed, 303 insertions, 96 deletions

diff --git a/priv/templates/bin_windows b/priv/templates/bin_windows
index b3ce796..19c0d2d 100644
--- a/priv/templates/bin_windows
+++ b/priv/templates/bin_windows
@@ -73,6 +73,23 @@ cd %rootdir%
 @set "possible_sys=%rel_dir%\sys.config"
 @if exist "%possible_sys%" (
   set sys_config=-config "%possible_sys%"
+) else (
+  @if exist "%possible_sys%.orig" (
+    ren "%possible_sys%.orig" sys.config
+    set sys_config=-config "%possible_sys%"
+  )
+)
+
+:: Find the vm.args file
+:find_vm_args
+@set "possible_vm_args=%rel_dir%\vm.args"
+@if exist "%possible_vm_args%" (
+  set vm_args="%possible_vm_args%"
+) else (
+  @if exist "%possible_vm_args%.orig" (
+    ren "%possible_vm_args%.orig" vm.args
+    set vm_args="%possible_vm_args%"
+  )
 )
 @goto :eof
 
diff --git a/priv/templates/extended_bin b/priv/templates/extended_bin
index 11a0abc..a4cba4a 100755
--- a/priv/templates/extended_bin
+++ b/priv/templates/extended_bin
@@ -19,7 +19,7 @@ fi
 
 # OSX does not support readlink '-f' flag, work
 # around that
-case $OSTYPE in 
+case $OSTYPE in
     darwin*)
         SCRIPT=$(readlink $0 || true)
     ;;
@@ -150,10 +150,19 @@ relx_get_pid() {
 
 relx_get_nodename() {
     id="longname$(relx_gen_id)-${NAME}"
-    "$BINDIR/erl" -boot start_clean \
-        -boot_var ERTS_LIB_DIR "$ERTS_LIB_DIR" \
-        -eval '[_,H]=re:split(atom_to_list(node()),"@",[unicode,{return,list}]), io:format("~s~n",[H]), halt()' \
-        -noshell ${NAME_TYPE} $id
+    if [ -z "$COOKIE" ]; then
+        "$BINDIR/erl" -boot start_clean \
+                      -boot_var ERTS_LIB_DIR "$ERTS_LIB_DIR" \
+                      -eval '[_,H]=re:split(atom_to_list(node()),"@",[unicode,{return,list}]), io:format("~s~n",[H]), halt()' \
+                      -noshell ${NAME_TYPE} $id
+    else
+        # running with setcookie prevents a ~/.erlang.cookie from being created
+        "$BINDIR/erl" -boot start_clean \
+                      -boot_var ERTS_LIB_DIR "$ERTS_LIB_DIR" \
+                      -eval '[_,H]=re:split(atom_to_list(node()),"@",[unicode,{return,list}]), io:format("~s~n",[H]), halt()' \
+                      -setcookie ${COOKIE} \
+                      -noshell ${NAME_TYPE} $id
+    fi
 }
 
 # Connect to a remote node
@@ -167,8 +176,8 @@ relx_rem_sh() {
 
     # Setup remote shell command to control node
     exec "$BINDIR/erl" "$NAME_TYPE" "$id" -remsh "$NAME" -boot start_clean \
-         -boot_var ERTS_LIB_DIR "$ERTS_LIB_DIR" \
-         -setcookie "$COOKIE" -hidden -kernel net_ticktime $TICKTIME $VM_ARGS
+         -boot_var ERTS_LIB_DIR "$ERTS_LIB_DIR" $MAYBE_DIST_ARGS \
+         -setcookie "$COOKIE" -hidden -kernel net_ticktime $TICKTIME
 }
 
 # Generate a random id
@@ -180,15 +189,27 @@ relx_gen_id() {
 relx_nodetool() {
     command="$1"; shift
 
-    escript_emulator_args $ROOTDIR/bin/nodetool
+    # Generate a unique id used to allow multiple nodetool calls to the
+    # same node transparently
+    nodetool_id="maint$(relx_gen_id)-${NAME}"
 
-    "$ERTS_DIR/bin/escript" "$ROOTDIR/bin/nodetool" "$NAME_TYPE" "$NAME" \
-                                -setcookie "$COOKIE" "$command" $@
+    if [ -z "${START_EPMD}" ]; then
+        ERL_FLAGS="${ERL_FLAGS} ${MAYBE_DIST_ARGS} ${NAME_TYPE} $nodetool_id -setcookie ${COOKIE}" \
+                 "$ERTS_DIR/bin/escript" \
+                 "$ROOTDIR/bin/nodetool" \
+                 "$NAME_TYPE" "$NAME" \
+                 "$command" $@
+    else
+        ERL_FLAGS="${ERL_FLAGS} ${MAYBE_DIST_ARGS} ${NAME_TYPE} $nodetool_id -setcookie ${COOKIE}" \
+                 "$ERTS_DIR/bin/escript" \
+                 "$ROOTDIR/bin/nodetool" \
+                 $START_EPMD "$NAME_TYPE" "$NAME" "$command" $@
+    fi
 }
 
 # Run an escript in the node's environment
 relx_escript() {
-    shift; scriptpath="$1"; shift
+    scriptpath="$1"; shift
     export RELEASE_ROOT_DIR
 
     "$ERTS_DIR/bin/escript" "$ROOTDIR/$scriptpath" $@
@@ -231,23 +252,6 @@ replace_os_vars() {
     }1' < "$1" > "$2"
 }
 
-escript_emulator_args() {
-    if [ -n "${VM_ARGS}" ]; then
-        if grep -q '%%!' $1; then
-            cmd=$(echo sed -i"'.prev'" "'/%%!.*/ s| ${VM_ARGS}||'" $1)
-            eval "$cmd"
-            cmd=$(echo sed -i"'.prev'" "'/%%!.*/ s|$| ${VM_ARGS}|'" $1)
-            eval "$cmd"
-            rm ${1}.prev
-        else
-            cmd=$(echo sed -i"'.prev'" "'/#!.*/ a \\
-%%! ${VM_ARGS}\n'" $1)
-            eval "$cmd"
-            rm ${1}.prev
-        fi
-    fi
-}
-
 add_path() {
     # Use $CWD/$1 if exists, otherwise releases/VSN/$1
     IN_FILE_PATH=$2
@@ -267,9 +271,9 @@ check_replace_os_vars() {
     SRC_FILE_PATH="$IN_FILE_PATH.src"
     ORIG_FILE_PATH="$IN_FILE_PATH.orig"
     if [ -f "$SRC_FILE_PATH" ]; then
+        OUT_FILE_PATH=$(make_out_file_path $IN_FILE_PATH)
         replace_os_vars "$SRC_FILE_PATH" "$OUT_FILE_PATH"
     elif [ $RELX_REPLACE_OS_VARS ]; then
-        # Create a new file in the same location as original
         OUT_FILE_PATH=$(make_out_file_path $IN_FILE_PATH)
         # If vm.args.orig or sys.config.orig is present then use that
         if [ -f "$ORIG_FILE_PATH" ]; then
@@ -289,7 +293,8 @@ check_replace_os_vars() {
     else
         # If vm.arg.orig or sys.config.orig is present then use that
         if [ -f "$ORIG_FILE_PATH" ]; then
-           cp "$ORIG_FILE_PATH" "$OUT_FILE_PATH"
+            OUT_FILE_PATH=$(make_out_file_path $IN_FILE_PATH)
+            cp "$ORIG_FILE_PATH" "$OUT_FILE_PATH"
         fi
     fi
     echo $OUT_FILE_PATH
@@ -312,14 +317,24 @@ relx_run_hooks() {
     done
 }
 
+relx_disable_hooks() {
+    PRE_START_HOOKS=""
+    POST_START_HOOKS=""
+    PRE_STOP_HOOKS=""
+    POST_STOP_HOOKS=""
+    PRE_INSTALL_UPGRADE_HOOKS=""
+    POST_INSTALL_UPGRADE_HOOKS=""
+    STATUS_HOOK=""
+}
+
 relx_is_extension() {
     EXTENSION=$1
     case "$EXTENSION" in
         {{{ extensions }}})
-            echo "1" 
+            echo "1"
         ;;
         *)
-            echo "0" 
+            echo "0"
         ;;
     esac
 }
@@ -330,7 +345,7 @@ relx_get_extension_script() {
     # of the form:
     # foo_extension="path/to/foo_script";bar_extension="path/to/bar_script"
     {{{extension_declarations}}}
-    # get the command extension (eg. foo) and 
+    # get the command extension (eg. foo) and
     # obtain the actual script filename that it
     # refers to (eg. "path/to/foo_script"
     eval echo "$"${EXTENSION}_extension""
@@ -343,9 +358,29 @@ relx_run_extension() {
     shift
     # all extension script locations are expected to be
     # relative to the start script location
-    [ "$SCRIPT_DIR/$EXTENSION_SCRIPT" ] && . "$SCRIPT_DIR/$EXTENSION_SCRIPT" $@
+    [ "$SCRIPT_DIR/$EXTENSION_SCRIPT" ] && . "$SCRIPT_DIR/$EXTENSION_SCRIPT" "$@"
+}
+
+# given a list of arguments, identify the internal ones
+#   --relx-disable-hooks
+# and process them accordingly
+process_internal_args() {
+    for arg in $@
+    do
+      shift
+      case "$arg" in
+          --relx-disable-hooks)
+            relx_disable_hooks
+            ;;
+          *)
+            ;;
+      esac
+    done
 }
 
+# process internal arguments
+process_internal_args $@
+
 find_erts_dir
 export ROOTDIR="$RELEASE_ROOT_DIR"
 export BINDIR="$ERTS_DIR/bin"
@@ -433,39 +468,49 @@ NAME_ARG=$(eval echo "${NAME_ARG}")
 NAME_TYPE="$(echo "$NAME_ARG" | awk '{print $1}')"
 NAME="$(echo "$NAME_ARG" | awk '{print $2}')"
 
-# User can specify an sname without @hostname
-# This will fail when creating remote shell
-# So here we check for @ and add @hostname if missing
-case "${NAME}" in
-    *@*) ;;                             # Nothing to do
-    *)   NAME=${NAME}@$(relx_get_nodename);;  # Add @hostname
-esac
-
-# Export the variable so that it's available in the 'eval' calls
-export NAME
-
-# Make sure log directory exists
-mkdir -p "$RUNNER_LOG_DIR"
-
-test -z "$PIPE_DIR" && PIPE_BASE_DIR='/tmp/erl_pipes/'
-PIPE_DIR="${PIPE_DIR:-/tmp/erl_pipes/$NAME/}"
+# Extract dist arguments
+MAYBE_DIST_ARGS=""
+PROTO_DIST="$(grep '^-proto_dist' "$VMARGS_PATH" || true)"
+if [ "$PROTO_DIST" ]; then
+    MAYBE_DIST_ARGS="${PROTO_DIST}"
+fi
+START_EPMD="$(grep '^-start_epmd' "$VMARGS_PATH" || true)"
+if [ "$START_EPMD" ]; then
+    MAYBE_DIST_ARGS="${MAYBE_DIST_ARGS} ${START_EPMD}"
+fi
+EPMD_MODULE="$(grep '^-epmd_module' "$VMARGS_PATH" || true)"
+if [ "$EPMD_MODULE" ]; then
+    MAYBE_DIST_ARGS="${MAYBE_DIST_ARGS} ${EPMD_MODULE}"
+fi
 
 # Extract the target cookie
+# Do this before relx_get_nodename so we can use it and not create a ~/.erlang.cookie
 COOKIE_ARG="$(grep '^-setcookie' "$VMARGS_PATH" || true)"
 DEFAULT_COOKIE_FILE="$HOME/.erlang.cookie"
 if [ -z "$COOKIE_ARG" ]; then
     if [ -f "$DEFAULT_COOKIE_FILE" ]; then
         COOKIE="$(cat $DEFAULT_COOKIE_FILE)"
     else
-        echo "vm.args needs to have a -setcookie, or $DEFAULT_COOKIE_FILE (its permission must be 400) is required."
-        exit 1
+        echo "No cookie is set or found. This limits the scripts functionality, installing, upgrading, rpc and getting a list of versions will not work."
     fi
 else
     # Extract cookie name from COOKIE_ARG
     COOKIE="$(echo "$COOKIE_ARG" | awk '{print $2}')"
 fi
 
-VM_ARGS="$(grep -v -E '^#|^-name|^-sname|^-setcookie|^-heart|^-args_file' "$VMARGS_PATH" | xargs | sed -e 's/ / /g')"
+# User can specify an sname without @hostname
+# This will fail when creating remote shell
+# So here we check for @ and add @hostname if missing
+case "${NAME}" in
+    *@*) ;;                             # Nothing to do
+    *)   NAME=${NAME}@$(relx_get_nodename);;  # Add @hostname
+esac
+
+# Export the variable so that it's available in the 'eval' calls
+export NAME
+
+test -z "$PIPE_DIR" && PIPE_BASE_DIR='/tmp/erl_pipes/'
+PIPE_DIR="${PIPE_DIR:-/tmp/erl_pipes/$NAME/}"
 
 cd "$ROOTDIR"
 
@@ -492,10 +537,18 @@ case "$1" in
 
         test -z "$PIPE_BASE_DIR" || mkdir -m 1777 -p "$PIPE_BASE_DIR"
         mkdir -p "$PIPE_DIR"
+        if [ ! -w "$PIPE_DIR" ]
+        then
+            echo "failed to start, user '$USER' does not have write privileges on '$PIPE_DIR', either delete it or run node as a different user"
+            exit 1
+        fi
+
+        # Make sure log directory exists
+        mkdir -p "$RUNNER_LOG_DIR"
 
         relx_run_hooks "$PRE_START_HOOKS"
         "$BINDIR/run_erl" -daemon "$PIPE_DIR" "$RUNNER_LOG_DIR" \
-            "exec \"$RELEASE_ROOT_DIR/bin/$REL_NAME\" \"$START_OPTION\" $ARGS"
+            "exec \"$RELEASE_ROOT_DIR/bin/$REL_NAME\" \"$START_OPTION\" $ARGS --relx-disable-hooks"
         relx_run_hooks "$POST_START_HOOKS"
         ;;
 
@@ -543,6 +596,7 @@ case "$1" in
 
     escript)
         ## Run an escript under the node's environment
+        shift
         if ! relx_escript $@; then
             exit 1
         fi
@@ -555,6 +609,12 @@ case "$1" in
             exit 1
         fi
 
+        if [ ! -w "$PIPE_DIR" ]
+        then
+            echo "failed to attach, user '$USER' does not have sufficient privileges on '$PIPE_DIR', please run node as a different user"
+            exit 1
+        fi
+
         shift
         exec "$BINDIR/to_erl" "$PIPE_DIR"
         ;;
@@ -587,8 +647,6 @@ case "$1" in
 
         relx_run_hooks "$PRE_INSTALL_UPGRADE_HOOKS"
 
-        escript_emulator_args $ROOTDIR/bin/install_upgrade.escript
-
         exec "$BINDIR/escript" "$ROOTDIR/bin/install_upgrade.escript" \
              "$COMMAND" "{'$REL_NAME', \"$NAME_TYPE\", '$NAME', '$COOKIE'}" "$@"
 
@@ -603,8 +661,6 @@ case "$1" in
         fi
 
         COMMAND="$1"; shift
- 
-        escript_emulator_args $ROOTDIR/bin/install_upgrade.escript
 
         exec "$BINDIR/escript" "$ROOTDIR/bin/install_upgrade.escript" \
              "versions" "{'$REL_NAME', \"$NAME_TYPE\", '$NAME', '$COOKIE'}" "$@"
@@ -664,6 +720,7 @@ case "$1" in
         echo "$RELEASE_ROOT_DIR"
         logger -t "$REL_NAME[$$]" "Starting up"
 
+        relx_run_hooks "$PRE_START_HOOKS"
         # Start the VM
         exec "$BINDIR/erlexec" $FOREGROUNDOPTIONS \
             -boot "$BOOTFILE" -mode "$CODE_LOADING_MODE" \
@@ -671,6 +728,9 @@ case "$1" in
             -config "$RELX_CONFIG_PATH" \
             -args_file "$VMARGS_PATH" \
             -pa ${__code_paths} -- "$@"
+        # exec will replace the current image and nothing else gets
+        # executed from this point on, this explains the absence
+        # of the pre start hook
         ;;
     rpc)
         # Make sure a node IS running
@@ -728,7 +788,7 @@ case "$1" in
         if [ "$IS_EXTENSION" = "1" ]; then
             EXTENSION_SCRIPT=$(relx_get_extension_script $1)
             shift
-            relx_run_extension $EXTENSION_SCRIPT $@
+            relx_run_extension $EXTENSION_SCRIPT "$@"
             # all extension scripts are expected to exit
         else
             relx_usage $1
diff --git a/priv/templates/extended_bin_windows b/priv/templates/extended_bin_windows
index d30d78d..16e3d96 100644
--- a/priv/templates/extended_bin_windows
+++ b/priv/templates/extended_bin_windows
@@ -37,14 +37,18 @@
 @set vm_args=%rel_dir%\vm.args
 @set progname=erl.exe
 @set clean_boot_script=%release_root_dir%\bin\start_clean
-@set erlsrv="%bindir%\erlsrv.exe"
-@set epmd="%bindir%\epmd.exe"
-@set escript="%bindir%\escript.exe"
-@set werl="%bindir%\werl.exe"
-@set nodetool="%release_root_dir%\bin\nodetool"
+@set "erlsrv=%bindir%\erlsrv.exe"
+@set "epmd=%bindir%\epmd.exe"
+@set "escript=%bindir%\escript.exe"
+@set "werl=%bindir%\werl.exe"
+@set "erl=%bindir%\erl.exe"
+@set "nodetool=%release_root_dir%\bin\nodetool"
+@set "extensions0={{ extensions }}"
+@set "extensions1=%extensions0:|= %"
+@set "extensions=%extensions1: undefined=%"
 
 :: Extract node type and name from vm.args
-@for /f "usebackq tokens=1-2" %%I in (`findstr /b "\-name \-sname" "%vm_args%"`) do @(
+@for /f "usebackq tokens=1-2" %%I in ('findstr /b "\-name \-sname" "%vm_args%"') do @(
   set node_type=%%I
   set node_name=%%J
 )
@@ -73,9 +77,18 @@
     set "hostname=@%hostname%"
 )
 
-:: Extract cookie from vm.args
-@for /f "usebackq tokens=1-2" %%I in (`findstr /b \-setcookie "%vm_args%"`) do @(
-  set cookie=%%J
+:: Extract the target cookie
+:: Do this before relx_get_nodename so we can use it and not create a ~/.erlang.cookie
+@for /f "usebackq tokens=1-2" %%I in ('findstr /b \-setcookie "%vm_args%"') do @(
+  set "cookie=%%J"
+)
+@set "default_cookie_file=%USERPROFILE%\.erlang.cookie"
+@if "%cookie%" == "" @(
+        if exist "%default_cookie_file%" (
+                set /p cookie=<%default_cookie_file%
+        ) else (
+                echo No cookie is set or found. This limits the scripts functionality, installing, upgrading, rpc and getting a list of versions will not work.
+        )
 )
 
 :: Write the erl.ini file to set up paths relative to this script
@@ -83,7 +96,7 @@
 
 :: Collect any additional VM args into erl_opts
 @setlocal EnableDelayedExpansion
-@for /f "usebackq tokens=1-2" %%I in (`findstr /r "^[^#]" "%vm_args%"`) do @(
+@for /f "usebackq tokens=1-2" %%I in ('findstr /r "^[^#]" "%vm_args%"') do @(
   if not "%%I" == "-name" (
     if not "%%I" == "-sname" (
       if not "%%I" == "-setcookie" (
@@ -99,6 +112,7 @@
   copy "%rel_dir%\%rel_name%.boot" "%rel_dir%\start.boot" >nul
 )
 
+@if "%1"=="help" @goto usage
 @if "%1"=="install" @goto install
 @if "%1"=="uninstall" @goto uninstall
 @if "%1"=="start" @goto start
@@ -112,6 +126,10 @@
 @if "%1"=="attach" @goto attach
 @if "%1"=="remote_console" @goto attach
 @if "%1"=="" @goto usage
+
+@call :is_extension "%1"
+@if "%ERRORLEVEL%"=="0" @goto run_extension
+
 @echo Unknown command: "%1"
 
 @goto :eof
@@ -135,11 +153,10 @@
 :: Set the ERTS dir from erl
 :set_erts_dir_from_erl
 @for /f "delims=" %%i in ('where erl') do @(
-  set erl=%%i
+  set "erl=%%i"
 )
-@set dir_cmd="%erl%" -boot no_dot_erlang -noshell -eval "io:format(\"~s\", [filename:nativename(code:root_dir())])." -s init stop
-@for /f "delims=" %%i in ('%%dir_cmd%%') do @(
-  set erl_root=%%i
+@for /f "delims=" %%i in ('"%erl%" -boot no_dot_erlang -noshell -eval "io:format(\"~s\", [filename:nativename(code:root_dir())])." -s init stop') do @(
+  set "erl_root=%%i"
 )
 @set "erts_dir=%erl_root%\erts-%erts_vsn%"
 @set "rootdir=%erl_root%"
@@ -148,8 +165,22 @@
 :: Find the sys.config file
 :find_sys_config
 @set "possible_sys=%rel_dir%\sys.config"
-@if exist %possible_sys% (
+@if exist "%possible_sys%" (
   set sys_config=-config "%possible_sys%"
+) else (
+  @if exist "%possible_sys%.orig" (
+    ren "%possible_sys%.orig" sys.config
+    set sys_config=-config "%possible_sys%"
+  )
+)
+@goto :eof
+
+:: Find the vm.args file
+:find_vm_args
+@if not exist "%vm_args%" (
+  @if exist "%vm_args%.orig" (
+    ren "%vm_args%.orig" vm.args
+  )
 )
 @goto :eof
 
@@ -175,7 +206,63 @@
 
 :: Display usage information
 :usage
-@echo usage: %~n0 ^(install^|uninstall^|start^|stop^|restart^|upgrade^|downgrade^|console^|ping^|list^|attach^|remote_console^)
+@if "%2"=="install" (
+  @echo "Usage: %rel_name% install [VERSION]"
+  @echo "Installs a release package VERSION, it assumes that this"
+  @echo "release package tarball has already been deployed at one"
+  @echo "of the following locations:"
+  @echo "      releases/<relname>-<version>.tar.gz"
+  @echo "      releases/<version>/<relname>-<version>.tar.gz"
+  @echo "      releases/<version>/<relname>.tar.gz"
+  @echo ""
+  @echo "     --no-permanent   Install release package VERSION but"
+  @echo "                      don't make it permanent"
+  @goto :eof
+)
+@if "%2"=="uninstall" (
+  @echo "Usage: %rel_name% uninstall [VERSION]"
+  @echo "Uninstalls a release VERSION, it will only accept"
+  @echo "versions that are not currently in use"
+  @goto :eof
+)
+@if "%2"=="upgrade" (
+  @echo "Usage: %rel_name% upgrade [VERSION]"
+  @echo "Upgrades the currently running release to VERSION, it assumes"
+  @echo "that a release package tarball has already been deployed at one"
+  @echo "of the following locations:"
+  @echo "      releases/<relname>-<version>.tar.gz"
+  @echo "      releases/<version>/<relname>-<version>.tar.gz"
+  @echo "      releases/<version>/<relname>.tar.gz"
+  @echo ""
+  @echo "     --no-permanent   Install release package VERSION but"
+  @echo "                      don't make it permanent"
+  @goto :eof
+)
+@if "%2"=="downgrade" (
+  @echo "Usage: %rel_name% downgrade [VERSION]"
+  @echo "Downgrades the currently running release to VERSION, it assumes"
+  @echo "that a release package tarball has already been deployed at one"
+  @echo "of the following locations:"
+  @echo "      releases/<relname>-<version>.tar.gz"
+  @echo "      releases/<version>/<relname>-<version>.tar.gz"
+  @echo "      releases/<version>/<relname>.tar.gz"
+  @echo ""
+  @echo "     --no-permanent   Install release package VERSION but"
+  @echo "                      don't make it permanent"
+  @goto :eof
+)
+@call :is_extension "%2"
+@if "%ERRORLEVEL%"=="0" (
+  @if exist "%script_dir%\extensions\%2.cmd" (
+    call "%script_dir%\extensions\%2.cmd" help
+    @goto :eof
+  )
+)
+set commands=install uninstall start stop restart upgrade downgrade console ping list attach remote_console
+if not "%extensions%"=="" (
+  set "commands=%commands% %extensions%"
+)
+@echo Usage: %~n0 ^(%commands: =^|%^)
 @goto :eof
 
 :: Install the release as a Windows service
@@ -183,10 +270,10 @@
 :install
 set args=%erl_opts% -setcookie %cookie% ++ -rootdir \"%rootdir%\"
 set start_erl=%erts_dir%\bin\start_erl.exe
-set description=Erlang node %node_name% in %rootdir%
+set description=Erlang node %node_name%%hostname% in %rootdir%
 @if "" == "%2" (
   :: Install the service
-  %erlsrv% add %service_name% %node_type% "%node_name%" -c "%description%" -w "%rootdir%" -m "%start_erl%" -args "%args%" -stopaction "init:stop()."
+  %erlsrv% add %service_name% %node_type% "%node_name%%hostname%" -c "%description%" -w "%rootdir%" -m "%start_erl%" -args "%args%" -stopaction "init:stop()."
 ) else (
   :: relup and reldown
   goto relup
@@ -243,3 +330,35 @@ set description=Erlang node %node_name% in %rootdir%
 @start "%node_name% attach" %werl% %boot% ^
        -remsh %node_name%%hostname% %node_type% console -setcookie %cookie%
 @goto :eof
+
+:: Run extension script
+:run_extension
+@if exist "%script_dir%\extensions\%1.cmd" (
+  set _extension_params=%*
+  call set _extension_params=%%_extension_params:*%1=%%
+  call "%script_dir%\extensions\%1.cmd" %%_extension_params%%
+)
+
+@goto :eof
+
+:: Local Functions
+
+:is_extension
+
+@set "ext=%~1"
+
+:: Check for entries in the list, not at the ends
+@call set "ext_test_1=x%%extensions: %ext% =%%"
+
+:: Check for entry at the start of the list
+@call set "ext_test_2=x%%extensions:%ext% =%%"
+
+:: Check for entry at the end of the list
+@call set "ext_test_3=x%%extensions: %ext%=%%"
+
+@if not "%ext_test_1%"=="x%extensions%" exit /b 0
+@if not "%ext_test_2%"=="x%extensions%" exit /b 0
+@if not "%ext_test_3%"=="x%extensions%" exit /b 0
+
+@exit /b 1
+
diff --git a/priv/templates/nodetool b/priv/templates/nodetool
index 816be9c..9e24f32 100644
--- a/priv/templates/nodetool
+++ b/priv/templates/nodetool
@@ -8,9 +8,10 @@
 %% -------------------------------------------------------------------
 
 main(Args) ->
-    ok = start_epmd(),
     %% Extract the args
-    {RestArgs, TargetNode} = process_args(Args, [], undefined),
+    {RestArgs, TargetNode, StartEpmd} = process_args(Args, [], undefined, true),
+
+    ok = start_epmd(StartEpmd),
 
     %% See if the node is currently running  -- if it's not, we'll bail
     case {net_kernel:hidden_connect_node(TargetNode), net_adm:ping(TargetNode)} of
@@ -87,25 +88,35 @@ main(Args) ->
     end,
     net_kernel:stop().
 
-process_args([], Acc, TargetNode) ->
-    {lists:reverse(Acc), TargetNode};
-process_args(["-setcookie", Cookie | Rest], Acc, TargetNode) ->
+process_args([], Acc, TargetNode, StartEpmd) ->
+    {lists:reverse(Acc), TargetNode, StartEpmd};
+process_args(["-setcookie", Cookie | Rest], Acc, TargetNode, StartEpmd) ->
     erlang:set_cookie(node(), list_to_atom(Cookie)),
-    process_args(Rest, Acc, TargetNode);
-process_args(["-name", TargetName | Rest], Acc, _) ->
-    ThisNode = append_node_suffix(TargetName, "_maint_"),
-    {ok, _} = net_kernel:start([ThisNode, longnames]),
-    process_args(Rest, Acc, nodename(TargetName));
-process_args(["-sname", TargetName | Rest], Acc, _) ->
-    ThisNode = append_node_suffix(TargetName, "_maint_"),
-    {ok, _} = net_kernel:start([ThisNode, shortnames]),
-    process_args(Rest, Acc, nodename(TargetName));
-process_args([Arg | Rest], Acc, Opts) ->
-    process_args(Rest, [Arg | Acc], Opts).
-
-
-start_epmd() ->
+    process_args(Rest, Acc, TargetNode, StartEpmd);
+process_args(["-start_epmd", StartEpmd | Rest], Acc, TargetNode, _StartEpmd) ->
+    process_args(Rest, Acc, TargetNode, list_to_atom(StartEpmd));
+process_args(["-name", TargetName | Rest], Acc, _, StartEpmd) ->
+    maybe_start_node(TargetName, longnames),
+    process_args(Rest, Acc, nodename(TargetName), StartEpmd);
+process_args(["-sname", TargetName | Rest], Acc, _, StartEpmd) ->
+    maybe_start_node(TargetName, shortnames),
+    process_args(Rest, Acc, nodename(TargetName), StartEpmd);
+process_args([Arg | Rest], Acc, Opts, StartEpmd) ->
+    process_args(Rest, [Arg | Acc], Opts, StartEpmd).
+
+maybe_start_node(TargetName, Names) ->
+    case erlang:node() of
+        'nonode@nohost' ->
+            ThisNode = append_node_suffix(TargetName, "_maint_"),
+            {ok, _} = net_kernel:start([ThisNode, Names]);
+        _ ->
+            ok
+    end.
+
+start_epmd(true) ->
     [] = os:cmd("\"" ++ epmd_path() ++ "\" -daemon"),
+    ok;
+start_epmd(_) ->
     ok.
 
 epmd_path() ->