From 95718ecbd752625f99479df8e8b6214c2cd22040 Mon Sep 17 00:00:00 2001 From: nbd Date: Wed, 23 May 2012 21:49:28 +0000 Subject: netifd: improve /sbin/ifup wifi hack, make it work properly with -a. fold /etc/init.d/netifd into /etc/init.d/network git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31850 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/netifd/files/etc/init.d/netifd | 31 ------------------------------- package/netifd/files/etc/init.d/network | 32 ++++++++++++++++++++++++++------ 2 files changed, 26 insertions(+), 37 deletions(-) delete mode 100755 package/netifd/files/etc/init.d/netifd (limited to 'package/netifd/files/etc') diff --git a/package/netifd/files/etc/init.d/netifd b/package/netifd/files/etc/init.d/netifd deleted file mode 100755 index 840083b61..000000000 --- a/package/netifd/files/etc/init.d/netifd +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/sh /etc/rc.common - -START=20 - -SERVICE_DAEMONIZE=1 -SERVICE_WRITE_PID=1 - -start() { - stop - [ -e /proc/sys/kernel/core_pattern ] && { - ulimit -c unlimited - echo '/tmp/%e.%p.%s.%t.core' > /proc/sys/kernel/core_pattern - } - service_start /sbin/netifd - sleep 1 -} - -restart() { - ifdown -a - sleep 1 - stop - start -} - -stop() { - service_stop /sbin/netifd -} - -reload() { - ubus call network reload -} diff --git a/package/netifd/files/etc/init.d/network b/package/netifd/files/etc/init.d/network index 9ef2506de..078a28595 100755 --- a/package/netifd/files/etc/init.d/network +++ b/package/netifd/files/etc/init.d/network @@ -1,23 +1,43 @@ #!/bin/sh /etc/rc.common -START=40 + +START=20 STOP=90 +SERVICE_DAEMONIZE=1 +SERVICE_WRITE_PID=1 + start() { + stop + [ -e /proc/sys/kernel/core_pattern ] && { + ulimit -c unlimited + echo '/tmp/%e.%p.%s.%t.core' > /proc/sys/kernel/core_pattern + } + service_start /sbin/netifd + setup_switch() { return 0; } include /lib/network setup_switch - ifup -a - grep -qs config /etc/config/wireless && { - /sbin/wifi up - } + sleep 1 } restart() { + ifdown -a + sleep 1 start + wifi +} + +shutdown() { + ifdown -a + stop } stop() { - /sbin/ifdown -a + service_stop /sbin/netifd +} + +reload() { + ubus call network reload } -- cgit v1.2.3