From b0ae26bdf55ebe27744e7862710332eb0a5193c8 Mon Sep 17 00:00:00 2001 From: florian Date: Sat, 4 Sep 2010 18:27:16 +0000 Subject: [PATCH] [package] olsrd.init add virtual interface name This patch add interface name handling for the NonOlsrIf Option in olsrd init script. e.g. NonOlsrIf=lan and not NonOlsrIf=eth0 Signed-off-by: Patrick Grimm git-svn-id: svn://svn.openwrt.org/openwrt/packages@22918 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- net/olsrd/Makefile | 2 +- net/olsrd/files/olsrd.init | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/net/olsrd/Makefile b/net/olsrd/Makefile index 84ed3498f..4f8dc4b34 100644 --- a/net/olsrd/Makefile +++ b/net/olsrd/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=olsrd PKG_VERSION:=0.6.0 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=http://www.olsr.org/releases/0.6 diff --git a/net/olsrd/files/olsrd.init b/net/olsrd/files/olsrd.init index 9b0dc02c8..67b5bbf88 100644 --- a/net/olsrd/files/olsrd.init +++ b/net/olsrd/files/olsrd.init @@ -171,6 +171,19 @@ olsrd_write_plparam() { shift value="$*" fi + if [ "$option" = 'NonOlsrIf' ]; then + if validate_varname "$value"; then + if get_ifname "$value"; then + ifname="$IFNAME" + echo "Info: mdns Interface '$value' ifname '$ifname' found" 1>&2 + else + echo "Warning: mdns Interface '$value' not found, skipped" 1>&2 + fi + else + warning_invalid_value olsrd "$cfg" "NonOlsrIf" + fi + [ -z "$ifname" ] || value=$ifname + fi echo -n "${N}${param}PlParam \"$option\" \"$value\""