summaryrefslogtreecommitdiff
path: root/package/busybox
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-03-11 17:14:24 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2014-03-11 17:14:24 +0100
commitf3263184cac3be831d7d92d295acfca97fae3df6 (patch)
tree4397bb68e025ac48a131c13d96f1acc19b27ae2f /package/busybox
parent5e9198fbda131c3c3a1dde9091dfe9d935d28c5a (diff)
parentd65d767c45ebce8001ec1e028fba9d7881b5f847 (diff)
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/busybox')
-rw-r--r--package/busybox/Makefile2
-rw-r--r--package/busybox/files/syslog.init8
2 files changed, 7 insertions, 3 deletions
diff --git a/package/busybox/Makefile b/package/busybox/Makefile
index 1fe63ff0a..c1923708e 100644
--- a/package/busybox/Makefile
+++ b/package/busybox/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= busybox
PKG_VERSION:= 1.21.1
-PKG_RELEASE:= 4
+PKG_RELEASE:= 5
PKG_MD5SUM:= 795394f83903b5eec6567d51eebb417e
PKG_DESCR:= core utilities for embedded systems
PKG_SECTION:= base
diff --git a/package/busybox/files/syslog.init b/package/busybox/files/syslog.init
index 7a84815a6..7a85430ca 100644
--- a/package/busybox/files/syslog.init
+++ b/package/busybox/files/syslog.init
@@ -11,10 +11,14 @@ autostart)
;;
start)
/sbin/syslogd $syslogd_flags
- /sbin/klogd
+ if [ -f /proc/sys/kernel/printk ];then
+ /sbin/klogd
+ fi
;;
stop)
- kill $(pgrep -f /sbin/klogd)
+ if [ -f /proc/sys/kernel/printk ];then
+ kill $(pgrep -f /sbin/klogd)
+ fi
kill $(pgrep -f /sbin/syslogd)
;;
restart)