Merge branch 'maint'

2 files changed, 8 insertions, 5 deletions

diff --git a/erts/doc/src/run_erl.xml b/erts/doc/src/run_erl.xml
index a9b6a7e2c6..e4c1b943c4 100644
--- a/erts/doc/src/run_erl.xml
+++ b/erts/doc/src/run_erl.xml
@@ -181,6 +181,12 @@
       <item>
         <p>Controls the number of log files written before older
           files are reused. Defaults to 5, minimum is 2, maximum is 1000.</p>
+	<p>Note that, as a way to indicate the newest file, <c>run_erl</c> will
+	delete the oldest log file to maintain a "hole" in the file
+	sequences. For example, if log files #1, #2, #4 and #5 exists, that
+	means #2 is the latest and #4 is the oldest. You will therefore at most
+	get one less log file than the value set by
+	<c>RUN_ERL_LOG_GENERATIONS</c>.</p>
       </item>
       <tag><c>RUN_ERL_LOG_MAXSIZE</c></tag>
       <item>
diff --git a/erts/etc/unix/run_erl.c b/erts/etc/unix/run_erl.c
index f928163705..725343d701 100644
--- a/erts/etc/unix/run_erl.c
+++ b/erts/etc/unix/run_erl.c
@@ -1346,11 +1346,8 @@ static int sf_open(const char *path, int type, mode_t mode) {
 }
 
 static int sf_close(int fd) {
-    int res = 0;
-
-    do { res = close(fd); } while(res < 0 && errno == EINTR);
-
-    return res;
+    /* "close() should not be retried after an EINTR" */
+    return close(fd);
 }
 
 /* Extract any control sequences that are ment only for run_erl