diff options
Diffstat (limited to 'meta/recipes-extended/logrotate/logrotate/disable-check-different-filesystems.patch')
-rw-r--r-- | meta/recipes-extended/logrotate/logrotate/disable-check-different-filesystems.patch | 30 |
1 files changed, 17 insertions, 13 deletions
diff --git a/meta/recipes-extended/logrotate/logrotate/disable-check-different-filesystems.patch b/meta/recipes-extended/logrotate/logrotate/disable-check-different-filesystems.patch index 43ebcffbae..0535a45e08 100644 --- a/meta/recipes-extended/logrotate/logrotate/disable-check-different-filesystems.patch +++ b/meta/recipes-extended/logrotate/logrotate/disable-check-different-filesystems.patch | |||
@@ -1,9 +1,12 @@ | |||
1 | Disable the check for different filesystems | 1 | From 263212af7b7fe1083f777255d91f029401391e4f Mon Sep 17 00:00:00 2001 |
2 | From: Robert Yang <liezhi.yang@windriver.com> | ||
3 | Date: Tue, 17 Feb 2015 21:18:39 -0800 | ||
4 | Subject: [PATCH] Disable the check for different filesystems | ||
2 | 5 | ||
3 | The logrotate supports rotate log across different filesystems now, so | 6 | The logrotate supports rotate log across different filesystems now, so |
4 | disable the check for different filesystems. | 7 | disable the check for different filesystems. |
5 | 8 | ||
6 | Upstream-Status: Submitted | 9 | Upstream-Status: Pending |
7 | 10 | ||
8 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> | 11 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> |
9 | --- | 12 | --- |
@@ -11,24 +14,25 @@ Signed-off-by: Robert Yang <liezhi.yang@windriver.com> | |||
11 | 1 file changed, 9 deletions(-) | 14 | 1 file changed, 9 deletions(-) |
12 | 15 | ||
13 | diff --git a/config.c b/config.c | 16 | diff --git a/config.c b/config.c |
14 | index e0eadb7..c23092f 100644 | 17 | index dbbf563..64e66f6 100644 |
15 | --- a/config.c | 18 | --- a/config.c |
16 | +++ b/config.c | 19 | +++ b/config.c |
17 | @@ -1515,15 +1515,6 @@ static int readConfigFile(const char *configFile, struct logInfo *defConfig) | 20 | @@ -1493,15 +1493,6 @@ static int readConfigFile(const char *configFile, struct logInfo *defConfig) |
18 | dirName, strerror(errno)); | 21 | goto error; |
19 | goto error; | 22 | } |
20 | } | 23 | } |
21 | - | 24 | - |
22 | - if (sb.st_dev != sb2.st_dev | 25 | - if (sb.st_dev != sb2.st_dev |
23 | - && !(newlog->flags & (LOG_FLAG_COPYTRUNCATE | LOG_FLAG_COPY))) { | 26 | - && !(newlog->flags & (LOG_FLAG_COPYTRUNCATE | LOG_FLAG_COPY | LOG_FLAG_TMPFILENAME))) { |
24 | - message(MESS_ERROR, | 27 | - message(MESS_ERROR, |
25 | - "%s:%d olddir %s and log file %s " | 28 | - "%s:%d olddir %s and log file %s " |
26 | - "are on different devices\n", configFile, | 29 | - "are on different devices\n", configFile, |
27 | - lineNum, newlog->oldDir, newlog->files[i]); | 30 | - lineNum, newlog->oldDir, newlog->files[i]); |
28 | - goto error; | 31 | - goto error; |
29 | - } | 32 | - } |
30 | } | 33 | } |
31 | } | 34 | } |
32 | 35 | ||
33 | -- | 36 | -- |
34 | 1.7.9.5 | 37 | 1.7.9.5 |
38 | |||