summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
authorJoachim Naulet2008-11-05 12:21:04 +0100
committerJoachim Naulet2008-11-05 12:21:04 +0100
commit86714da70c6ef4e6dbd384e8c6cfb258c6a2c2e3 (patch)
tree50b18aff93f96a1ed044b158938f7f4dbf084679 /package
parentc5f3dd69a8173d5484bade3cdbebb2c2742865cf (diff)
Fixed telnetd bug on startup
Diffstat (limited to 'package')
-rw-r--r--package/busybox/spc2xx_16m_config4
-rw-r--r--package/busybox/spc2xx_defconfig4
-rw-r--r--package/initramfs/root/etc/init.d/telnet2
-rwxr-xr-xpackage/initramfs/root/etc/rcS.d/05syslogd8
4 files changed, 9 insertions, 9 deletions
diff --git a/package/busybox/spc2xx_16m_config b/package/busybox/spc2xx_16m_config
index 1e349a33bd..93e9b3027c 100644
--- a/package/busybox/spc2xx_16m_config
+++ b/package/busybox/spc2xx_16m_config
@@ -39,7 +39,7 @@ CONFIG_FEATURE_SYSLOG=y
# Build Options
#
CONFIG_STATIC=y
-CONFIG_NOMMU=y
+# CONFIG_NOMMU is not set
# CONFIG_BUILD_LIBBUSYBOX is not set
# CONFIG_FEATURE_INDIVIDUAL is not set
# CONFIG_FEATURE_SHARED_BUSYBOX is not set
@@ -668,7 +668,7 @@ CONFIG_ROUTE=y
# CONFIG_FEATURE_TELNET_TTYPE is not set
# CONFIG_FEATURE_TELNET_AUTOLOGIN is not set
CONFIG_TELNETD=y
-# CONFIG_FEATURE_TELNETD_STANDALONE is not set
+CONFIG_FEATURE_TELNETD_STANDALONE=y
# CONFIG_TFTP is not set
# CONFIG_TFTPD is not set
# CONFIG_FEATURE_TFTP_GET is not set
diff --git a/package/busybox/spc2xx_defconfig b/package/busybox/spc2xx_defconfig
index a7d93f0d3b..8cfc18a231 100644
--- a/package/busybox/spc2xx_defconfig
+++ b/package/busybox/spc2xx_defconfig
@@ -39,7 +39,7 @@ CONFIG_FEATURE_SYSLOG=y
# Build Options
#
CONFIG_STATIC=y
-CONFIG_NOMMU=y
+# CONFIG_NOMMU is not set
# CONFIG_BUILD_LIBBUSYBOX is not set
# CONFIG_FEATURE_INDIVIDUAL is not set
# CONFIG_FEATURE_SHARED_BUSYBOX is not set
@@ -668,7 +668,7 @@ CONFIG_ROUTE=y
# CONFIG_FEATURE_TELNET_TTYPE is not set
# CONFIG_FEATURE_TELNET_AUTOLOGIN is not set
CONFIG_TELNETD=y
-# CONFIG_FEATURE_TELNETD_STANDALONE is not set
+CONFIG_FEATURE_TELNETD_STANDALONE=y
# CONFIG_TFTP is not set
# CONFIG_TFTPD is not set
# CONFIG_FEATURE_TFTP_GET is not set
diff --git a/package/initramfs/root/etc/init.d/telnet b/package/initramfs/root/etc/init.d/telnet
index 11d74cdeba..0fc6d6fdb9 100644
--- a/package/initramfs/root/etc/init.d/telnet
+++ b/package/initramfs/root/etc/init.d/telnet
@@ -11,7 +11,7 @@ case "$1" in
# check that the server is present
[ -x /usr/sbin/telnetd ] || exit 0
echo "Starting TELNET server"
- /usr/sbin/telnetd &
+ /usr/sbin/telnetd -F &
touch /var/run/telnet.pid
echo $! > /var/run/telnet.pid
;;
diff --git a/package/initramfs/root/etc/rcS.d/05syslogd b/package/initramfs/root/etc/rcS.d/05syslogd
index ea2f038f76..1ef3d6ec83 100755
--- a/package/initramfs/root/etc/rcS.d/05syslogd
+++ b/package/initramfs/root/etc/rcS.d/05syslogd
@@ -4,19 +4,19 @@
#
# Start syslogd klog daemons
-SYSLOGD_OPTIONS=
-KLOGD_OPTIONS="-c 7"
+SYSLOGD_OPTIONS="-n"
+KLOGD_OPTIONS="-n -c 7"
if [ -f /sbin/syslogd ]
then
echo "Starting system logger"
- /sbin/syslogd $SYSLOGD_OPTIONS
+ /sbin/syslogd $SYSLOGD_OPTIONS &
fi
if [ -f /sbin/klogd ]
then
echo "Starting kernel logger"
- /sbin/klogd $KLOGD_OPTIONS
+ /sbin/klogd $KLOGD_OPTIONS &
fi
touch /var/lock/subsys/syslog