aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Crispin <john@openwrt.org>2013-12-09 17:29:34 +0000
committerJohn Crispin <john@openwrt.org>2013-12-09 17:29:34 +0000
commit31a2912cd9b8bf56a69ededeb0843136225a6117 (patch)
treeb464bf86b15d93f5b30a89a1a8e84e782ac3befd
parent0ef939c93b2335491935f2dda36fba763df4cf98 (diff)
downloadupstream-31a2912cd9b8bf56a69ededeb0843136225a6117.tar.gz
upstream-31a2912cd9b8bf56a69ededeb0843136225a6117.tar.bz2
upstream-31a2912cd9b8bf56a69ededeb0843136225a6117.zip
netifd: enable coredumps again
got broken due procd startup. Requires procd resource limit patch. Signed-off-by: Ulrich Weber <uw@xyne.com> SVN-Revision: 39020
-rwxr-xr-xpackage/network/config/netifd/files/etc/init.d/network8
-rw-r--r--package/system/procd/files/procd.sh5
2 files changed, 7 insertions, 6 deletions
diff --git a/package/network/config/netifd/files/etc/init.d/network b/package/network/config/netifd/files/etc/init.d/network
index 387fdbe5dd..9427a86357 100755
--- a/package/network/config/netifd/files/etc/init.d/network
+++ b/package/network/config/netifd/files/etc/init.d/network
@@ -6,13 +6,13 @@ STOP=90
USE_PROCD=1
start_service() {
- [ -e /proc/sys/kernel/core_pattern ] && {
- ulimit -c unlimited
- echo '/tmp/%e.%p.%s.%t.core' > /proc/sys/kernel/core_pattern
- }
procd_open_instance
procd_set_param command /sbin/netifd
procd_set_param respawn
+ [ -e /proc/sys/kernel/core_pattern ] && {
+ procd_set_param limits core="unlimited"
+ echo '/tmp/%e.%p.%s.%t.core' > /proc/sys/kernel/core_pattern
+ }
procd_close_instance
}
diff --git a/package/system/procd/files/procd.sh b/package/system/procd/files/procd.sh
index 2f97a5d7d2..73beaaf6b2 100644
--- a/package/system/procd/files/procd.sh
+++ b/package/system/procd/files/procd.sh
@@ -17,6 +17,7 @@
# data: arbitrary name/value pairs for detecting config changes (table)
# file: configuration files (array)
# netdev: bound network device (detects ifindex changes)
+# limits: resource limits (passed to the process)
#
# No space separation is done for arrays/tables - use one function argument per command line argument
#
@@ -123,7 +124,7 @@ _procd_set_param() {
local type="$1"; shift
case "$type" in
- env|data)
+ env|data|limits)
_procd_add_table "$type" "$@"
;;
command|netdev|file|respawn)
@@ -177,7 +178,7 @@ _procd_append_param() {
json_select "$type"
case "$type" in
- env|data)
+ env|data|limits)
_procd_add_table_data "$@"
;;
command|netdev|file|respawn)