summaryrefslogtreecommitdiff
path: root/packages/busybox
diff options
context:
space:
mode:
authorJohn Bowler <jbowler@nslu2-linux.org>2005-08-04 16:56:45 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2005-08-04 16:56:45 +0000
commit319f88ac01cb5cb3ec90a088705e16c30c686d06 (patch)
treeb316fdf5fe4393e5e8a762632d378fef343cac2c /packages/busybox
parente55b4743a213d48ca3115ee862aed3c8cd2fade5 (diff)
parent6242c9152111da94a28ff1f39277d704824f7c5d (diff)
merge of 4f25673bce4a4b71f224f593c0e8891b8d43b7a5
and 9525011e1445925b5fb6a335db59a38e8e753ecf
Diffstat (limited to 'packages/busybox')
-rw-r--r--packages/busybox/busybox_1.00.bb3
-rw-r--r--packages/busybox/files/syslog.conf4
2 files changed, 4 insertions, 3 deletions
diff --git a/packages/busybox/busybox_1.00.bb b/packages/busybox/busybox_1.00.bb
index f6d03fe69f..988265d72c 100644
--- a/packages/busybox/busybox_1.00.bb
+++ b/packages/busybox/busybox_1.00.bb
@@ -10,7 +10,7 @@ HOMEPAGE = "http://www.busybox.net"
LICENSE = "GPL"
SECTION = "base"
PRIORITY = "required"
-PR = "r29"
+PR = "r30"
SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
file://add-getkey-applet.patch;patch=1 \
@@ -54,6 +54,7 @@ INITSCRIPT_PACKAGES = "${PN} ${PN}-httpd ${PN}-udhcpd"
INITSCRIPT_NAME_${PN}-httpd = "busybox-httpd"
INITSCRIPT_NAME_${PN}-udhcpd = "busybox-udhcpd"
INITSCRIPT_NAME_${PN} = "syslog"
+CONFFILES_${PN} = "${sysconfdir}/syslog.conf"
# This disables the syslog startup links in openslug (see openslug-init)
INITSCRIPT_PARAMS_${PN}_openslug = "start 20 ."
diff --git a/packages/busybox/files/syslog.conf b/packages/busybox/files/syslog.conf
index e2a2d58412..d4a0e02f5b 100644
--- a/packages/busybox/files/syslog.conf
+++ b/packages/busybox/files/syslog.conf
@@ -3,7 +3,7 @@ MARKINT=20 # intervall between --mark-- entries
LOGFILE=/var/log/messages # where to log (file)
REMOTE=loghost:514 # where to log (syslog remote)
REDUCE=no # reduce-size logging
-ROTATESIZE=0 # rotate log if grown beyond X [kByte]
-ROTATEGENS=3 # keep X generations of rotated logs
+#ROTATESIZE=0 # rotate log if grown beyond X [kByte] (incompatible with busybox)
+#ROTATEGENS=3 # keep X generations of rotated logs (incompatible with busybox)
BUFFERSIZE=64 # size of circular buffer [kByte]
FOREGROUND=no # run in foreground (don't use!)