From 43bdddbc5d4ddaca4c6e995a2389c4ceaf95a53d Mon Sep 17 00:00:00 2001 From: Nico Geyso Date: Tue, 24 Feb 2015 12:56:24 +0100 Subject: [PATCH] olsrd: fix missing UCI_CONF_NAME In procd there is no UCI_CONF_NAME env variable anymore. Therefor call olsrd_generate_config() explicitly with this variable. --- olsrd/files/olsrd.sh | 1 + olsrd/files/olsrd4.init | 2 ++ olsrd/files/olsrd6.init | 2 ++ 3 files changed, 5 insertions(+) diff --git a/olsrd/files/olsrd.sh b/olsrd/files/olsrd.sh index 64117a2..b13ad33 100644 --- a/olsrd/files/olsrd.sh +++ b/olsrd/files/olsrd.sh @@ -757,6 +757,7 @@ olsrd_setup_smartgw_rules() { } olsrd_generate_config() { + UCI_CONF_NAME="$1" SYSTEM_HOSTNAME= SYSTEM_LAT= SYSTEM_LON= diff --git a/olsrd/files/olsrd4.init b/olsrd/files/olsrd4.init index 5f4b279..bcfedcd 100644 --- a/olsrd/files/olsrd4.init +++ b/olsrd/files/olsrd4.init @@ -9,6 +9,8 @@ CONF=/var/etc/olsrd.conf OLSRD=olsrd start_service() { + olsrd_generate_config $OLSRD + procd_open_instance procd_set_param command /usr/sbin/olsrd -f $CONF -nofork diff --git a/olsrd/files/olsrd6.init b/olsrd/files/olsrd6.init index 55a1e48..bb6ffb6 100644 --- a/olsrd/files/olsrd6.init +++ b/olsrd/files/olsrd6.init @@ -9,6 +9,8 @@ CONF=/var/etc/olsrd6.conf OLSRD=olsrd6 start_service() { + olsrd_generate_config $OLSRD + procd_open_instance procd_set_param command /usr/sbin/olsrd -f $CONF -nofork