summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMihai Lindner <mihaix.lindner@linux.intel.com>2012-08-10 09:07:38 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-01-03 12:34:23 (GMT)
commit2ccb03f9b71db3bace4e60fafafcc2c80bd8b48f (patch)
treeae9b1e1eb2c655d8e5999a5cf548729e07c2b185
parent07f304f4e28dc596b1420ae1cb6607d7706108e4 (diff)
downloadpoky-2ccb03f9b71db3bace4e60fafafcc2c80bd8b48f.tar.gz
sysklogd: removed tabs from syslog.conf
Yocto #2926: syslog.conf should not have tabs within the selector field. Removed tabs from the selector field of syslog rules. Tabs or spaces should be used, in syslog.conf, only when separating selectors from actions. (From OE-Core rev: 1316be4e597332a629842b3f5a7dde8e45dd057d) (From OE-Core rev: c806466c8d4a9d0d4a66d34d3565d5879c2f2b0f) Signed-off-by: Mihai Lindner <mihaix.lindner@linux.intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Resolved merge conflicts with denzil branch. Signed-off-by: Scott Garman <scott.a.garman@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-extended/sysklogd/files/syslog.conf23
-rw-r--r--meta/recipes-extended/sysklogd/sysklogd_1.5.bb2
2 files changed, 13 insertions, 12 deletions
diff --git a/meta/recipes-extended/sysklogd/files/syslog.conf b/meta/recipes-extended/sysklogd/files/syslog.conf
index 7d1858c..0849de1 100644
--- a/meta/recipes-extended/sysklogd/files/syslog.conf
+++ b/meta/recipes-extended/sysklogd/files/syslog.conf
@@ -34,12 +34,13 @@ news.notice -/var/log/news.notice
34# Some `catch-all' logfiles. 34# Some `catch-all' logfiles.
35# 35#
36*.=debug;\ 36*.=debug;\
37 auth,authpriv.none;\ 37auth,authpriv.none;\
38 news.none;mail.none -/var/log/debug 38news.none;mail.none -/var/log/debug
39
39*.=info;*.=notice;*.=warn;\ 40*.=info;*.=notice;*.=warn;\
40 auth,authpriv.none;\ 41auth,authpriv.none;\
41 cron,daemon.none;\ 42cron,daemon.none;\
42 mail,news.none -/var/log/messages 43mail,news.none -/var/log/messages
43 44
44# 45#
45# Emergencies are sent to everybody logged in. 46# Emergencies are sent to everybody logged in.
@@ -51,9 +52,9 @@ news.notice -/var/log/news.notice
51# console I usually leave idle. 52# console I usually leave idle.
52# 53#
53#daemon,mail.*;\ 54#daemon,mail.*;\
54# news.=crit;news.=err;news.=notice;\ 55#news.=crit;news.=err;news.=notice;\
55# *.=debug;*.=info;\ 56#*.=debug;*.=info;\
56# *.=notice;*.=warn /dev/tty8 57#*.=notice;*.=warn /dev/tty8
57 58
58# The named pipe /dev/xconsole is for the `xconsole' utility. To use it, 59# The named pipe /dev/xconsole is for the `xconsole' utility. To use it,
59# you must invoke `xconsole' with the `-file' option: 60# you must invoke `xconsole' with the `-file' option:
@@ -64,7 +65,7 @@ news.notice -/var/log/news.notice
64# busy site.. 65# busy site..
65# 66#
66daemon.*;mail.*;\ 67daemon.*;mail.*;\
67 news.err;\ 68news.err;\
68 *.=debug;*.=info;\ 69*.=debug;*.=info;\
69 *.=notice;*.=warn |/dev/xconsole 70*.=notice;*.=warn |/dev/xconsole
70 71
diff --git a/meta/recipes-extended/sysklogd/sysklogd_1.5.bb b/meta/recipes-extended/sysklogd/sysklogd_1.5.bb
index b58094e..471c8c8 100644
--- a/meta/recipes-extended/sysklogd/sysklogd_1.5.bb
+++ b/meta/recipes-extended/sysklogd/sysklogd_1.5.bb
@@ -1,5 +1,5 @@
1require sysklogd.inc 1require sysklogd.inc
2PR = "r5" 2PR = "r6"
3 3
4SRC_URI[md5sum] = "e053094e8103165f98ddafe828f6ae4b" 4SRC_URI[md5sum] = "e053094e8103165f98ddafe828f6ae4b"
5SRC_URI[sha256sum] = "6169b8e91d29288e90404f01462b69e7f2afb1161aa419826fe4736c7f9eb773" 5SRC_URI[sha256sum] = "6169b8e91d29288e90404f01462b69e7f2afb1161aa419826fe4736c7f9eb773"