From: jow Date: Tue, 8 Feb 2011 17:30:56 +0000 (+0000) Subject: [packages] radvd: use "::/64" placeholder for empty prefixes in interface sections... X-Git-Url: http://git.archive.openwrt.org/?a=commitdiff_plain;h=500c9dc69968425dbdf0e0e138fb24a6008bb474;p=packages.git [packages] radvd: use "::/64" placeholder for empty prefixes in interface sections (#8788) git-svn-id: svn://svn.openwrt.org/openwrt/packages@25424 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- diff --git a/ipv6/radvd/Makefile b/ipv6/radvd/Makefile index ee95baba4..a2ec0bc0f 100644 --- a/ipv6/radvd/Makefile +++ b/ipv6/radvd/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=radvd PKG_VERSION:=1.7 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://v6web.litech.org/radvd/dist \ diff --git a/ipv6/radvd/files/radvd.init b/ipv6/radvd/files/radvd.init index dbbe52cc8..08cd791aa 100644 --- a/ipv6/radvd/files/radvd.init +++ b/ipv6/radvd/files/radvd.init @@ -196,11 +196,7 @@ radvd_write_prefix() { done [ "$exist" -eq 0 ] && return 0 - config_get prefixes "$cfg" prefix - if [ -z "$prefixes" ]; then - prefixes=$(get_ip6addr "$IFNAME") || return 0 - fi - + config_get prefixes "$cfg" prefix "::/64" for prefix in $prefixes; do validate_ip6prefix "$prefix" || continue printf '\n\tprefix %s\n\t{\n' "$prefix"