diff options
Diffstat (limited to 'meta/recipes-extended/logrotate/logrotate/act-as-mv-when-rotate.patch')
| -rw-r--r-- | meta/recipes-extended/logrotate/logrotate/act-as-mv-when-rotate.patch | 48 |
1 files changed, 23 insertions, 25 deletions
diff --git a/meta/recipes-extended/logrotate/logrotate/act-as-mv-when-rotate.patch b/meta/recipes-extended/logrotate/logrotate/act-as-mv-when-rotate.patch index 15f171ed6f..ce64040d5f 100644 --- a/meta/recipes-extended/logrotate/logrotate/act-as-mv-when-rotate.patch +++ b/meta/recipes-extended/logrotate/logrotate/act-as-mv-when-rotate.patch @@ -1,12 +1,9 @@ -From 68f29ab490cf987aa34b5f4caf1784b58a021308 Mon Sep 17 00:00:00 2001 -From: Robert Yang <liezhi.yang@windriver.com> -Date: Tue, 17 Feb 2015 21:08:07 -0800 -Subject: [PATCH] Act as the "mv" command when rotate log +Act as the "mv" command when rotate log Act as the "mv" command when rotate log, first rename, if failed, then read and write. -Upstream-Status: Pending +Upstream-Status: Submitted Signed-off-by: Robert Yang <liezhi.yang@windriver.com> --- @@ -14,10 +11,10 @@ Signed-off-by: Robert Yang <liezhi.yang@windriver.com> 1 file changed, 56 insertions(+), 9 deletions(-) diff --git a/logrotate.c b/logrotate.c -index 05e74c9..616418f 100644 +index 174a26b..b18b629 100644 --- a/logrotate.c +++ b/logrotate.c -@@ -1000,6 +1000,53 @@ int findNeedRotating(struct logInfo *log, int logNum, int force) +@@ -906,6 +906,53 @@ int findNeedRotating(struct logInfo *log, int logNum, int force) return 0; } @@ -71,7 +68,7 @@ index 05e74c9..616418f 100644 int prerotateSingleLog(struct logInfo *log, int logNum, struct logState *state, struct logNames *rotNames) { -@@ -1364,15 +1411,15 @@ int prerotateSingleLog(struct logInfo *log, int logNum, struct logState *state, +@@ -1268,15 +1315,15 @@ int prerotateSingleLog(struct logInfo *log, int logNum, struct logState *state, } message(MESS_DEBUG, @@ -90,21 +87,22 @@ index 05e74c9..616418f 100644 oldName, newName, strerror(errno)); hasErrors = 1; } -@@ -1511,10 +1558,10 @@ int rotateSingleLog(struct logInfo *log, int logNum, struct logState *state, - return 1; +@@ -1408,11 +1455,11 @@ int rotateSingleLog(struct logInfo *log, int logNum, struct logState *state, } - -- message(MESS_DEBUG, "renaming %s to %s\n", log->files[logNum], -+ message(MESS_DEBUG, "moving %s to %s\n", log->files[logNum], - tmpFilename); -- if (!debug && !hasErrors && rename(log->files[logNum], tmpFilename)) { -- message(MESS_ERROR, "failed to rename %s to %s: %s\n", -+ if (!debug && !hasErrors && mvFile(log->files[logNum], rotNames->finalName, log, prev_acl)) { -+ message(MESS_ERROR, "failed to move %s to %s: %s\n", - log->files[logNum], tmpFilename, - strerror(errno)); - if (errno == ENOENT) { -@@ -1912,7 +1959,7 @@ int rotateLogSet(struct logInfo *log, int force) + } + #endif /* WITH_ACL */ +- message(MESS_DEBUG, "renaming %s to %s\n", log->files[logNum], ++ message(MESS_DEBUG, "moving %s to %s\n", log->files[logNum], + rotNames->finalName); + if (!debug && !hasErrors && +- rename(log->files[logNum], rotNames->finalName)) { +- message(MESS_ERROR, "failed to rename %s to %s: %s\n", ++ mvFile(log->files[logNum], rotNames->finalName, log, prev_acl)) { ++ message(MESS_ERROR, "failed to move %s to %s: %s\n", + log->files[logNum], rotNames->finalName, + strerror(errno)); + hasErrors = 1; +@@ -1775,7 +1822,7 @@ int rotateLogSet(struct logInfo *log, int force) return hasErrors; } @@ -113,7 +111,7 @@ index 05e74c9..616418f 100644 { struct logState *p; FILE *f; -@@ -2076,7 +2123,7 @@ static int writeState(char *stateFilename) +@@ -1939,7 +1986,7 @@ static int writeState(char *stateFilename) fclose(f); if (error == 0) { @@ -122,7 +120,7 @@ index 05e74c9..616418f 100644 unlink(tmpFilename); error = 1; message(MESS_ERROR, "error renaming temp state file %s\n", -@@ -2362,7 +2409,7 @@ int main(int argc, const char **argv) +@@ -2223,7 +2270,7 @@ int main(int argc, const char **argv) rc |= rotateLogSet(log, force); if (!debug) @@ -132,5 +130,5 @@ index 05e74c9..616418f 100644 return (rc != 0); } -- -1.7.9.5 +1.7.10.4 |