summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--application/busybox/include/libbb.h2
-rw-r--r--application/busybox/libbb/vfork_daemon_rexec.c4
-rw-r--r--application/busybox/networking/httpd.c2
-rw-r--r--devkit/plc/Makefile1
-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
8 files changed, 13 insertions, 14 deletions
diff --git a/application/busybox/include/libbb.h b/application/busybox/include/libbb.h
index cf681f5776..9f208b3902 100644
--- a/application/busybox/include/libbb.h
+++ b/application/busybox/include/libbb.h
@@ -731,7 +731,7 @@ enum {
# define bb_daemonize_or_rexec(flags, argv) bb_daemonize_or_rexec(flags)
# define bb_daemonize(flags) bb_daemonize_or_rexec(flags, bogus)
#else
- void bb_re_exec(char **argv) ATTRIBUTE_NORETURN;
+ void re_exec(char **argv) ATTRIBUTE_NORETURN;
void forkexit_or_rexec(char **argv);
extern bool re_execed;
int BUG_fork_is_unavailable_on_nommu(void);
diff --git a/application/busybox/libbb/vfork_daemon_rexec.c b/application/busybox/libbb/vfork_daemon_rexec.c
index cc01f6bc33..1567d89be6 100644
--- a/application/busybox/libbb/vfork_daemon_rexec.c
+++ b/application/busybox/libbb/vfork_daemon_rexec.c
@@ -201,7 +201,7 @@ int spawn_and_wait(char **argv)
}
#if !BB_MMU
-void bb_re_exec(char **argv)
+void re_exec(char **argv)
{
/* high-order bit of first char in argv[0] is a hidden
* "we have (already) re-execed, don't do it again" flag */
@@ -223,7 +223,7 @@ void forkexit_or_rexec(char **argv)
if (pid) /* parent */
exit(0);
/* child - re-exec ourself */
- bb_re_exec(argv);
+ re_exec(argv);
}
#else
/* Dance around (void)...*/
diff --git a/application/busybox/networking/httpd.c b/application/busybox/networking/httpd.c
index c2faa4f8eb..5e6037cbe7 100644
--- a/application/busybox/networking/httpd.c
+++ b/application/busybox/networking/httpd.c
@@ -2225,7 +2225,7 @@ static void mini_httpd_nommu(int server_socket, int argc, char **argv)
xdup2(0, 1);
/* Run a copy of ourself in inetd mode */
- bb_re_exec(argv_copy);
+ re_exec(argv_copy);
}
/* parent, or vfork failed */
close(n);
diff --git a/devkit/plc/Makefile b/devkit/plc/Makefile
index db56316a9b..89fc010d61 100644
--- a/devkit/plc/Makefile
+++ b/devkit/plc/Makefile
@@ -13,7 +13,6 @@ obj-m := plc_drv.o
EXTRA_CFLAGS := -I$(TOPDIR)/include \
-I$(RTAI_DIR)/rtai-core/include \
- -I$(PWD)/../boottable \
-Wstrict-prototypes -Wno-trigraphs -fno-strict-aliasing \
-fno-common -fomit-frame-pointer -fno-builtin -mlittle-endian \
-mapcs-32 -D__LINUX_ARM_ARCH__=5 -march=armv5te \
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