diff options
| author |   Chris Larson <chris_larson@mentor.com> | 2011-01-12 09:43:06 +0000 |
|---|---|---|
| committer | Chris Larson <chris_larson@mentor.com> | 2011-01-17 12:40:17 -0700 |
| commit | a25c0750c7892990c59e8d6048b8c4d99410bcee (patch) | |
| tree | 8e3b16fa4c90962e2780ea317f3cb20e7c50a180 /recipes/busybox/files | |
| parent | 2f8634120c229def3504a61103aadae7af6d40ee (diff) | |
| download | openembedded-a25c0750c7892990c59e8d6048b8c4d99410bcee.tar.gz | |
busybox: move syslog config to /etc/default
The busybox syslog syslog.conf is parsed by the /etc/init.d script, not by the
syslog process itself, so it belongs in /etc/default. In addition, the file
format is *completely* different from the standard sysklogd configuration, so
while we should resolve the file conflict between busybox-syslog and sysklogd,
we should not use update-alternatives for it, so this is a cleaner solution.
Note: when upgrading with a modified /etc/syslog.conf, the old config will
stick around as /etc/syslog.conf-opkg.backup, and the user is then free to
move this to the new /etc/default location. This could be automated, but we
can't risk moving a real syslog /etc/syslog.conf into the busybox config file
location, so this is best.
Signed-off-by: Chris Larson <chris_larson@mentor.com>
Acked-by: Koen Kooi <koen@openembedded.org>
Acked-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'recipes/busybox/files')
| -rw-r--r-- | recipes/busybox/files/syslog | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/recipes/busybox/files/syslog b/recipes/busybox/files/syslog index 61d273b7cb..6e86346391 100644 --- a/recipes/busybox/files/syslog +++ b/recipes/busybox/files/syslog @@ -5,8 +5,8 @@ # Configuration file added by <bruno.randolf@4g-systems.biz> set -e -if [ -f /etc/syslog.conf ]; then - . /etc/syslog.conf +if [ -f /etc/default/syslog ]; then + . /etc/default/syslog LOG_LOCAL=0 LOG_REMOTE=0 for D in $DESTINATION; do |