Changeset 27685


Ignore:
Timestamp:
2011-07-18T14:44:53+02:00 (5 years ago)
Author:
jow
Message:

[packages_10.03.1] merge r27682, r27683

Location:
branches/packages_10.03.1/ipv6/radvd
Files:
1 deleted
2 edited

Legend:

Unmodified
Added
Removed
  • branches/packages_10.03.1/ipv6/radvd/Makefile

    r27679 r27685  
    1010PKG_NAME:=radvd 
    1111PKG_VERSION:=1.8 
    12 PKG_RELEASE:=1 
     12PKG_RELEASE:=2 
    1313 
    1414PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz 
     
    2121include $(INCLUDE_DIR)/package.mk 
    2222 
    23 define Package/radvd 
     23define Package/radvd/Default 
    2424  SECTION:=ipv6 
    2525  CATEGORY:=IPv6 
    26   TITLE:=IPv6 Routing Advertisement Daemon 
     26  TITLE:=IPv6 Routing Advertisement 
    2727  URL:=http://v6web.litech.org/radvd/ 
    2828  DEPENDS:=+kmod-ipv6 
    2929endef 
    3030 
     31define Package/radvd 
     32  $(call Package/radvd/Default) 
     33  TITLE+= Daemon 
     34endef 
     35 
    3136define Package/radvd/description 
    32 IPv6 Routing Advertisement Daemon. 
     37radvd is the router advertisement daemon for IPv6. It listens to router 
     38solicitations and sends router advertisements as described in "Neighbor 
     39Discovery for IP Version 6 (IPv6)" (RFC 4861).  With these advertisements hosts 
     40can automatically configure their addresses and some other parameters. They also 
     41can choose a default router based on these advertisements. 
     42endef 
     43 
     44define Package/radvdump 
     45  $(call Package/radvd/Default) 
     46  TITLE+= Dumper 
     47endef 
     48 
     49define Package/radvdump/description 
     50radvdump prints out the contents of incoming router advertisements sent by radvd 
     51or some other software implementing (parts of) "Neighbor Discovery for IP 
     52Version 6 (IPv6)" (RFC 4861). 
    3353endef 
    3454 
     
    5171        $(INSTALL_DIR) $(1)/usr/sbin 
    5272        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/radvd $(1)/usr/sbin/ 
     73endef 
     74 
     75define Package/radvdump/install 
     76        $(INSTALL_DIR) $(1)/usr/sbin 
    5377        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/radvdump $(1)/usr/sbin/ 
    5478endef 
    5579 
    5680$(eval $(call BuildPackage,radvd)) 
     81$(eval $(call BuildPackage,radvdump)) 
  • branches/packages_10.03.1/ipv6/radvd/files/radvd.init

    r25546 r27685  
    77 
    88RADVD_PREFIX_STRING_OPTIONS='AdvValidLifetime AdvPreferredLifetime' 
    9 RADVD_PREFIX_BOOLEAN_OPTIONS='AdvOnLink AdvAutonomous AdvRouterAddr' 
     9RADVD_PREFIX_BOOLEAN_OPTIONS='AdvOnLink AdvAutonomous AdvRouterAddr DeprecatePrefix DecrementLifetimes' 
    1010 
    1111RADVD_ROUTE_STRING_OPTIONS='AdvRouteLifetime AdvRoutePreference' 
    12  
    13 RADVD_RDNSS_STRING_OPTIONS='AdvRDNSSLifetime' 
    14  
    15 RADVD_DNSSL_STRING_OPTIONS='AdvDNSSLLifetime' 
     12RADVD_ROUTE_BOOLEAN_OPTIONS='RemoveRoute' 
     13 
     14RADVD_RDNSS_STRING_OPTIONS='AdvRDNSSLifetime FlushRDNSS' 
     15 
     16RADVD_DNSSL_STRING_OPTIONS='AdvDNSSLLifetime FlushDNSSL' 
    1617 
    1718validate_varname() { 
     
    223224                done 
    224225 
     226                config_get value "$cfg" Base6Interface 
     227                if [ -n "$value" ]; then 
     228                        if ifname=$(get_ifname "$value"); then 
     229                                printf '\t\t%s %s;\n' "Base6Interface" "$ifname" 
     230                        fi 
     231                fi 
     232 
    225233                config_get value "$cfg" Base6to4Interface 
    226234                if [ -n "$value" ]; then 
     
    266274                        validate_radvd_string "$value" || continue 
    267275                        printf '\t\t%s %s;\n' "$name" "$value" 
     276                done 
     277 
     278                for name in $RADVD_ROUTE_BOOLEAN_OPTIONS; do 
     279                        config_get value "$cfg" "$name" 
     280                        [ -z "$value" ] && continue 
     281                        config_get_bool value "$cfg" "$name" 0 
     282                        if [ "$value" -ne 0 ]; then  
     283                                printf '\t\t%s on;\n' "$name" 
     284                        else 
     285                                printf '\t\t%s off;\n' "$name" 
     286                        fi 
    268287                done 
    269288 
Note: See TracChangeset for help on using the changeset viewer.