diff options
| author |   Robert Yang <liezhi.yang@windriver.com> | 2015-06-29 20:26:36 -0700 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-07-01 15:38:23 +0100 |
| commit | e322019d9fb820187263b242e10e750a46dd1bfd (patch) | |
| tree | 4fdea30e6cd71e4789f46deb95fb9613ba6986dd /meta/recipes-extended/logrotate/logrotate/disable-check-different-filesystems.patch | |
| parent | 61f2a6a18dcda22d7b0e236f9150674bff2764a7 (diff) | |
| download | openembedded-core-contrib-e322019d9fb820187263b242e10e750a46dd1bfd.tar.gz | |
logrotate: 3.8.8 -> 3.9.1
Updated:
- act-as-mv-when-rotate.patch
- disable-check-different-filesystems.patch
- update-the-manual.patch
- base_contains -> bb.utils.contains
[YOCTO #7346]
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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 | 26 |
1 files changed, 12 insertions, 14 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..793d702598 100644 --- a/meta/recipes-extended/logrotate/logrotate/disable-check-different-filesystems.patch +++ b/meta/recipes-extended/logrotate/logrotate/disable-check-different-filesystems.patch @@ -3,7 +3,7 @@ Disable the check for different filesystems The logrotate supports rotate log across different filesystems now, so disable the check for different filesystems. -Upstream-Status: Submitted +Upstream-Status: Pending Signed-off-by: Robert Yang <liezhi.yang@windriver.com> --- @@ -11,24 +11,22 @@ Signed-off-by: Robert Yang <liezhi.yang@windriver.com> 1 file changed, 9 deletions(-) diff --git a/config.c b/config.c -index e0eadb7..c23092f 100644 +index dbbf563..64e66f6 100644 --- a/config.c +++ b/config.c -@@ -1515,15 +1515,6 @@ static int readConfigFile(const char *configFile, struct logInfo *defConfig) - dirName, strerror(errno)); - goto error; +@@ -1493,15 +1493,6 @@ static int readConfigFile(const char *configFile, struct logInfo *defConfig) + goto error; + } } - - if (sb.st_dev != sb2.st_dev -- && !(newlog->flags & (LOG_FLAG_COPYTRUNCATE | LOG_FLAG_COPY))) { -- message(MESS_ERROR, -- "%s:%d olddir %s and log file %s " -- "are on different devices\n", configFile, -- lineNum, newlog->oldDir, newlog->files[i]); -- goto error; +- && !(newlog->flags & (LOG_FLAG_COPYTRUNCATE | LOG_FLAG_COPY | LOG_FLAG_TMPFILENAME))) { +- message(MESS_ERROR, +- "%s:%d olddir %s and log file %s " +- "are on different devices\n", configFile, +- lineNum, newlog->oldDir, newlog->files[i]); +- goto error; - } } - } + } --- -1.7.9.5 |