diff options
Diffstat (limited to 'erts')
| -rw-r--r-- | erts/etc/unix/Install.src | 1 | ||||
| -rw-r--r-- | erts/etc/unix/run_erl.c | 8 | ||||
| -rw-r--r-- | erts/etc/win32/Install.c | 2 | ||||
| -rw-r--r-- | erts/etc/win32/erlang.ico | bin | 1398 -> 49853 bytes |
4 files changed, 10 insertions, 1 deletions
diff --git a/erts/etc/unix/Install.src b/erts/etc/unix/Install.src index 0f33258a28..420d2773ca 100644 --- a/erts/etc/unix/Install.src +++ b/erts/etc/unix/Install.src @@ -91,6 +91,7 @@ cp -p "$ERL_ROOT/erts-%I_VSN%/bin/dialyzer" . cp -p "$ERL_ROOT/erts-%I_VSN%/bin/typer" . cp -p "$ERL_ROOT/erts-%I_VSN%/bin/ct_run" . cp -p "$ERL_ROOT/erts-%I_VSN%/bin/escript" . +cp -p "reltool" "$ERL_ROOT/erts-%I_VSN%/bin/" # # Set a soft link to epmd diff --git a/erts/etc/unix/run_erl.c b/erts/etc/unix/run_erl.c index 53c779b1be..b69e31f784 100644 --- a/erts/etc/unix/run_erl.c +++ b/erts/etc/unix/run_erl.c @@ -1142,6 +1142,14 @@ static void daemon_init(void) sf_close(i); } + /* Necessary on some platforms */ + + open("/dev/null", O_RDONLY); /* Order is important! */ + open("/dev/null", O_WRONLY); + open("/dev/null", O_WRONLY); + + errno = 0; /* if set by open */ + OPEN_SYSLOG(); run_daemon = 1; } diff --git a/erts/etc/win32/Install.c b/erts/etc/win32/Install.c index dd02a9c111..2ccd610bb6 100644 --- a/erts/etc/win32/Install.c +++ b/erts/etc/win32/Install.c @@ -46,7 +46,7 @@ int main(int argc, char **argv) HANDLE module = GetModuleHandle(NULL); char *binaries[] = { "erl.exe", "werl.exe", "erlc.exe", "dialyzer.exe", "typer.exe", - "escript.exe", "ct_run.exe", NULL }; + "escript.exe", "reltool", "ct_run.exe", NULL }; char *scripts[] = { "start_clean.boot", "start_sasl.boot", NULL }; char fromname[MAX_PATH]; char toname[MAX_PATH]; diff --git a/erts/etc/win32/erlang.ico b/erts/etc/win32/erlang.ico Binary files differindex cee8b58af9..92857c507a 100644 --- a/erts/etc/win32/erlang.ico +++ b/erts/etc/win32/erlang.ico |