If the libraties are included on top-level, the script will exit when being
included on the host where those files don't exist. This results in 6relayd's
init-script not being enabled due to the run-level link not being set when
preparing the rootfs on the build host.

Signed-off-by: Daniel Golle <dgo...@allnet.de>
---
 package/network/ipv6/6relayd/files/6relayd.init | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/package/network/ipv6/6relayd/files/6relayd.init 
b/package/network/ipv6/6relayd/files/6relayd.init
index 790396e..82cd24d 100644
--- a/package/network/ipv6/6relayd/files/6relayd.init
+++ b/package/network/ipv6/6relayd/files/6relayd.init
@@ -1,8 +1,6 @@
 #!/bin/sh /etc/rc.common
 # Copyright (c) 2011-2012 OpenWrt.org
 START=80
-. /lib/functions/network.sh
-. /lib/functions/service.sh
 
 start_6relayd() {
        local cfg="$1"
@@ -106,6 +104,8 @@ restart_affected_6relayd() {
 }
 
 restart_affected() {
+       . /lib/functions/service.sh
+       . /lib/functions/network.sh
        local net="$1"
        config_load 6relayd
        config_foreach restart_affected_6relayd server "$net"
@@ -113,6 +113,7 @@ restart_affected() {
 }
 
 stop() {
+       . /lib/functions/service.sh
        for pid in /var/run/6relayd-*.pid; do
                SERVICE_PID_FILE="$pid"
                service_stop /usr/sbin/6relayd
@@ -121,6 +122,8 @@ stop() {
 }
 
 start() {
+       . /lib/functions/service.sh
+       . /lib/functions/network.sh
        config_load 6relayd
        config_foreach start_6relayd server
        config_foreach start_6relayd relay relay
-- 
1.8.1.1

_______________________________________________
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

Reply via email to