From: Steven Barth <cyrus@openwrt.org>
Date: Mon, 21 Jan 2013 11:27:03 +0000 (+0000)
Subject: 6relayd: fix shell library includes in init-script
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=38080ae550fe8924f3362db063466bc5e155d7f2;p=openwrt%2Fstaging%2Fyousong.git

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 a0b504f96a..d6d530dcad 100644
--- 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 74b9d52f79..f35f80c609 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"
@@ -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