summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/logrotate/logrotate/disable-check-different-filesystems.patch
diff options
context:
space:
mode:
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.patch16
1 files changed, 7 insertions, 9 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 96ff098a3f..d7f9a02cc8 100644
--- a/meta/recipes-extended/logrotate/logrotate/disable-check-different-filesystems.patch
+++ b/meta/recipes-extended/logrotate/logrotate/disable-check-different-filesystems.patch
@@ -1,4 +1,4 @@
-From e47796c8e8270a3d14f0b06af8a9e916c2225514 Mon Sep 17 00:00:00 2001
+From 16c1833ade4c036b30b8761d2c4a5bd85cc65c44 Mon Sep 17 00:00:00 2001
From: Robert Yang <liezhi.yang@windriver.com>
Date: Tue, 8 Jan 2019 06:27:06 +0000
Subject: [PATCH] Disable the check for different filesystems
@@ -9,30 +9,28 @@ disable the check for different filesystems.
Upstream-Status: Pending
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
+
---
config.c | 9 ---------
1 file changed, 9 deletions(-)
diff --git a/config.c b/config.c
-index 633b843..99a4a3b 100644
+index d2488f1..1de3745 100644
--- a/config.c
+++ b/config.c
-@@ -1765,15 +1765,6 @@ duperror:
- goto error;
- }
+@@ -1902,15 +1902,6 @@ duperror:
}
+
+ free(ld);
-
- if (sb.st_dev != sb2.st_dev
- && !(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]);
+- lineNum, newlog->oldDir, newlog->files[j]);
- goto error;
- }
}
}
---
-2.18.1
-