6relayd: fix shell library includes in init-script

Thanks to Daniel Golle

SVN-Revision: 35262

diff --git a/package/network/ipv6/6relayd/Makefile b/package/network/ipv6/6relayd/Makefile
index a0b504f96a9e49c02f8f1bebef29308a8c98e592..d6d530dcad4023a095375a4ed4d925c222f209d3 100644 (file)
--- a/package/network/ipv6/6relayd/Makefile
+++ b/package/network/ipv6/6relayd/Makefile
@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=6relayd
-PKG_VERSION:=2013-01-21
+PKG_VERSION:=2013-01-21.1
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2

diff --git a/package/network/ipv6/6relayd/files/6relayd.init b/package/network/ipv6/6relayd/files/6relayd.init
index 74b9d52f793c1d85c0c9682c28ddf3663077e481..f35f80c609dea426a99c14ab13969f1cfc6c372b 100644 (file)
--- 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"
@@ -107,6 +105,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"
@@ -114,6 +114,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
@@ -122,6 +123,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