Changeset 29065


Ignore:
Timestamp:
2011-11-13T23:15:58+01:00 (6 years ago)
Author:
nico
Message:

packages/olsrd: use new service functions

Location:
packages/net/olsrd
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • packages/net/olsrd/Makefile

    r26091 r29065  
    11#  
    2 # Copyright (C) 2009-2010 OpenWrt.org 
     2# Copyright (C) 2009-2011 OpenWrt.org 
    33# 
    44# This is free software, licensed under the GNU General Public License v2. 
     
    1010PKG_NAME:=olsrd 
    1111PKG_VERSION:=0.6.1 
    12 PKG_RELEASE:=3 
     12PKG_RELEASE:=4 
    1313 
    1414PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 
  • packages/net/olsrd/files/olsrd.init

    r24257 r29065  
    11#!/bin/sh /etc/rc.common 
     2# Copyright (C) 2008-2011 OpenWrt.org 
    23# Copyright (C) 2008  Alina Friedrichsen <x-alina@gmx.net> 
    34# Special thanks to bittorf wireless )) 
     5 
    46START=65 
     7 
     8SERVICE_DAEMONIZE=1 
     9SERVICE_WRITE_PID=1 
    510 
    611OLSRD_OLSRD_SCHEMA='ignore:internal config_file:internal DebugLevel=0 AllowNoInt=yes' 
     
    597602                sed -e 's/^\t\t[0-9.]*[ ][0-9.]*$//' < "$OLSRD_CONFIG_FILE" > /var/etc/olsrd.conf.ipv6 
    598603                sed -i '/[0-9]\{1,3\}\.[0-9]\{1,3\}\.[0-9]\{1,3\}\.[0-9]\{1,3\}/d' /var/etc/olsrd.conf.ipv6 
    599                 olsrd -f /var/etc/olsrd.conf.ipv6 -nofork < /dev/null > /dev/null & 
    600  
     604                service_start /usr/sbin/olsrd -f /var/etc/olsrd.conf.ipv6 -nofork 
    601605                sed -e 's/^IpVersion[ ][ ]*6$/IpVersion 4/' -e 's/^\t\t[A-Fa-f0-9.:]*[:][A-Fa-f0-9.:]*[ ][0-9]*$//' < "$OLSRD_CONFIG_FILE" > /var/etc/olsrd.conf.ipv4 
    602                 olsrd -f /var/etc/olsrd.conf.ipv4 -nofork < /dev/null > /dev/null & 
     606                service_start /usr/sbin/olsrd -f /var/etc/olsrd.conf.ipv4 -nofork 
    603607                sleep 3 
    604608                sysctl -w net.ipv6.bindv6only="$bindv6only" 
    605609        else 
    606                 olsrd -f "$OLSRD_CONFIG_FILE" -nofork < /dev/null > /dev/null & 
     610                service_start /usr/sbin/olsrd -f "$OLSRD_CONFIG_FILE" -nofork 
    607611        fi 
    608612} 
    609613 
    610614stop() { 
    611         killall olsrd 
    612 } 
     615        service_stop /usr/sbin/olsrd 
     616} 
Note: See TracChangeset for help on using the changeset viewer.