From: Florian Fainelli <florian@openwrt.org>
Date: Sun, 9 Aug 2009 11:03:08 +0000 (+0000)
Subject: [package] fix miredo init scripts and bump release number (#5632)
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=commitdiff_plain;h=e234c6d0b07bbc85bbf0e361101e99c51f52938b

[package] fix miredo init scripts and bump release number (#5632)


SVN-Revision: 17197
---

diff --git a/ipv6/miredo/Makefile b/ipv6/miredo/Makefile
index d140eb372d..5b5d50d611 100644
--- a/ipv6/miredo/Makefile
+++ b/ipv6/miredo/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2009 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=miredo
 PKG_VERSION:=1.1.7
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE_URL:=http://www.remlab.net/files/miredo/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
diff --git a/ipv6/miredo/files/miredo-server.init b/ipv6/miredo/files/miredo-server.init
index 4d51370f06..e5aca5f268 100644
--- a/ipv6/miredo/files/miredo-server.init
+++ b/ipv6/miredo/files/miredo-server.init
@@ -2,17 +2,12 @@
 # Copyright (C) 2006 OpenWrt.org
 START=50
 
-BIN=miredo-server
-DEFAULT=/etc/default/$BIN
-RUN_D=/var/run
-PID_F=$RUN_D/$BIN.pid
+PID_F=/var/run/miredo-server.pid
 
 start() {
-	[ -f $DEFAULT ] && . $DEFAULT
-	[ -d $RUN_D ] || mkdir -p $RUN_D
-	insmod ipv6
-	insmod tun
-	$BIN $OPTIONS
+	insmod ipv6 2>/dev/null
+	insmod tun 2>/dev/null
+	miredo-server -c /etc/miredo-server.conf
 }
 
 stop() {
diff --git a/ipv6/miredo/files/miredo.init b/ipv6/miredo/files/miredo.init
index 90e70c48bb..74406fb672 100644
--- a/ipv6/miredo/files/miredo.init
+++ b/ipv6/miredo/files/miredo.init
@@ -2,17 +2,12 @@
 # Copyright (C) 2006 OpenWrt.org
 START=50
 
-BIN=miredo
-DEFAULT=/etc/default/$BIN
-RUN_D=/var/run
-PID_F=$RUN_D/$BIN.pid
+PID_F=/var/run/miredo.pid
 
 start() {
-	[ -f $DEFAULT ] && . $DEFAULT
-	[ -d $RUN_D ] || mkdir -p $RUN_D
-	insmod ipv6
-	insmod tun
-	$BIN $OPTIONS
+	insmod ipv6 2>/dev/null
+	insmod tun 2>/dev/null
+	miredo -c /etc/miredo.conf
 }
 
 stop() {