Difuse/routing
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

olsrd: fix missing UCI_CONF_NAME

Browse source 
In procd there is no UCI_CONF_NAME env variable anymore.
Therefor call olsrd_generate_config() explicitly with this
variable.
This commit is contained in:
Nico Geyso 2015-02-24 12:56:24 +01:00 committed by Lars Gierth
parent a92eb8e2de
commit 43bdddbc5d
3 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
olsrd/files/olsrd.sh
View file

@ -757,6 +757,7 @@ olsrd_setup_smartgw_rules() {
} }
olsrd_generate_config() { olsrd_generate_config() {
UCI_CONF_NAME="$1"
SYSTEM_HOSTNAME= SYSTEM_HOSTNAME=
SYSTEM_LAT= SYSTEM_LAT=
SYSTEM_LON= SYSTEM_LON=

2
olsrd/files/olsrd4.init
View file

@ -9,6 +9,8 @@ CONF=/var/etc/olsrd.conf
OLSRD=olsrd OLSRD=olsrd
start_service() { start_service() {
olsrd_generate_config $OLSRD
procd_open_instance procd_open_instance
procd_set_param command /usr/sbin/olsrd -f $CONF -nofork procd_set_param command /usr/sbin/olsrd -f $CONF -nofork

2
olsrd/files/olsrd6.init
View file

@ -9,6 +9,8 @@ CONF=/var/etc/olsrd6.conf
OLSRD=olsrd6 OLSRD=olsrd6
start_service() { start_service() {
olsrd_generate_config $OLSRD
procd_open_instance procd_open_instance
procd_set_param command /usr/sbin/olsrd -f $CONF -nofork procd_set_param command /usr/sbin/olsrd -f $CONF -nofork