From 75e594b7b877f39be78bd78f159faccfb88ee972 Mon Sep 17 00:00:00 2001
From: "nslu2-linux.adm@bkbits.net" <nslu2-linux.adm@bkbits.net>
Date: Thu, 6 Jan 2005 13:40:07 +0000
Subject: Merge bk://oe-devel.bkbits.net/openembedded into
 bkbits.net:/repos/n/nslu2-linux/openembedded

2005/01/06 14:35:37+01:00 mn-solutions.de!schurig
Merge http://oe-devel@openembedded.bkbits.net/openembedded
into mnz66.mn-solutions.de:/usr/src/oe/p

2005/01/06 14:32:10+01:00 mn-solutions.de!schurig
support for lib5250-0

2005/01/06 14:31:57+01:00 mn-solutions.de!schurig
MNCI Ramses specific changes

2005/01/06 14:28:19+01:00 mn-solutions.de!schurig
somy busybox fixes

2005/01/06 13:42:32+01:00 uni-frankfurt.de!mickeyl
upgrade nano to 1.3.5. some patches are no longer necessary (yay)

BKrev: 41dd3fb7i1QFp1lB2qL7jHIusO_5GA
---
 packages/busybox/busybox-1.00/ramses/defconfig | 12 ++++++------
 packages/busybox/files/syslog                  | 10 +++++-----
 packages/busybox/files/syslog.conf             |  9 +++++++++
 3 files changed, 20 insertions(+), 11 deletions(-)

(limited to 'packages/busybox')

diff --git a/packages/busybox/busybox-1.00/ramses/defconfig b/packages/busybox/busybox-1.00/ramses/defconfig
index 30da7d82e1..94f175b5a3 100644
--- a/packages/busybox/busybox-1.00/ramses/defconfig
+++ b/packages/busybox/busybox-1.00/ramses/defconfig
@@ -15,9 +15,9 @@ CONFIG_FEATURE_BUFFERS_USE_MALLOC=y
 CONFIG_FEATURE_DEVFS=y
 CONFIG_FEATURE_DEVPTS=y
 # CONFIG_FEATURE_CLEAN_UP is not set
-CONFIG_FEATURE_SUID=y
-CONFIG_FEATURE_SUID_CONFIG=y
-CONFIG_FEATURE_SUID_CONFIG_QUIET is not set
+# CONFIG_FEATURE_SUID is not set
+# CONFIG_FEATURE_SUID_CONFIG is not set
+# CONFIG_FEATURE_SUID_CONFIG_QUIET is not set
 # CONFIG_SELINUX is not set
 
 #
@@ -195,7 +195,7 @@ CONFIG_SETKEYCODES=y
 CONFIG_MKTEMP=y
 # CONFIG_PIPE_PROGRESS is not set
 CONFIG_READLINK=y
-# CONFIG_FEATURE_READLINK_FOLLOW is not set
+CONFIG_FEATURE_READLINK_FOLLOW=y
 CONFIG_RUN_PARTS=y
 CONFIG_START_STOP_DAEMON=y
 CONFIG_WHICH=y
@@ -345,7 +345,7 @@ CONFIG_FEATURE_FANCY_PING=y
 CONFIG_ROUTE=y
 CONFIG_TELNET=y
 # CONFIG_FEATURE_TELNET_TTYPE is not set
-CONFIG_FEATURE_TELNET_AUTOLOGIN=y
+# CONFIG_FEATURE_TELNET_AUTOLOGIN is not set
 # CONFIG_TELNETD is not set
 # CONFIG_TFTP is not set
 CONFIG_TRACEROUTE=y
@@ -370,7 +370,7 @@ CONFIG_FEATURE_UDHCP_SYSLOG=y
 CONFIG_FREE=y
 CONFIG_KILL=y
 CONFIG_KILLALL=y
-CONFIG_PIDOF=y
+# CONFIG_PIDOF is not set
 CONFIG_PS=y
 CONFIG_RENICE=y
 CONFIG_TOP=y
diff --git a/packages/busybox/files/syslog b/packages/busybox/files/syslog
index 44698c5ce2..a999565e84 100644
--- a/packages/busybox/files/syslog
+++ b/packages/busybox/files/syslog
@@ -10,10 +10,10 @@ if [ -f /etc/syslog.conf ]; then
 	LOG_LOCAL=0
 	LOG_REMOTE=0
 	for D in $DESTINATION; do
-		if [ "$D" == "buffer" ]; then
+		if [ "$D" = "buffer" ]; then
 			SYSLOG_ARGS="$SYSLOG_ARGS -C $BUFFERSIZE"
 			LOG_LOCAL=1
-		elif [ "$D" == "file" ]; then
+		elif [ "$D" = "file" ]; then
 			if [ -n "$LOGFILE" ]; then
 				SYSLOG_ARGS="$SYSLOG_ARGS -O $LOGFILE"
 			fi
@@ -24,18 +24,18 @@ if [ -f /etc/syslog.conf ]; then
 				SYSLOG_ARGS="$SYSLOG_ARGS -b $ROTATEGENS"
 			fi
 			LOCAL=0
-		elif [ "$D" == "remote" ]; then
+		elif [ "$D" = "remote" ]; then
 			SYSLOG_ARGS="$SYSLOG_ARGS -R $REMOTE"
 			LOG_REMOTE=1
 		fi
 	done
-	if (( $LOG_LOCAL && $LOG_REMOTE )); then 
+	if [ "$LOG_LOCAL" = "1" -a "$LOG_REMOTE" = "1" ]; then
 		SYSLOG_ARGS="$SYSLOG_ARGS -L"
 	fi
 	if [ -n "$MARKINT" ]; then
 		SYSLOG_ARGS="$SYSLOG_ARGS -m $MARKINT"
 	fi
-	if [ "$REDUCE" == "yes" ]; then
+	if [ "$REDUCE" = "yes" ]; then
 		SYSLOG_ARGS="$SYSLOG_ARGS -S"
 	fi
 else
diff --git a/packages/busybox/files/syslog.conf b/packages/busybox/files/syslog.conf
index e69de29bb2..e2a2d58412 100644
--- a/packages/busybox/files/syslog.conf
+++ b/packages/busybox/files/syslog.conf
@@ -0,0 +1,9 @@
+DESTINATION="buffer"		# log destinations (buffer file remote)
+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
+BUFFERSIZE=64			# size of circular buffer [kByte]
+FOREGROUND=no			# run in foreground (don't use!)
-- 
cgit v1.2.3