From 0e180e68ae88a1208dadb18a90ddad7dde2b93bc Mon Sep 17 00:00:00 2001
From: florian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sun, 9 Aug 2009 11:03:08 +0000
Subject: [PATCH] [package] fix miredo init scripts and bump release number
 (#5632)

git-svn-id: svn://svn.openwrt.org/openwrt/packages@17197 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 ipv6/miredo/Makefile                 |  4 ++--
 ipv6/miredo/files/miredo-server.init | 13 ++++---------
 ipv6/miredo/files/miredo.init        | 13 ++++---------
 3 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/ipv6/miredo/Makefile b/ipv6/miredo/Makefile
index d140eb372..5b5d50d61 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 4d51370f0..e5aca5f26 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 90e70c48b..74406fb67 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() {