Changeset 35570


Ignore:
Timestamp:
2013-02-12T09:23:54+01:00 (5 years ago)
Author:
cyrus
Message:

odhcp6c: allow setting a user-provided prefix as well

Location:
trunk/package/network/ipv6/odhcp6c
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/package/network/ipv6/odhcp6c/Makefile

    r35553 r35570  
    99 
    1010PKG_NAME:=odhcp6c 
    11 PKG_VERSION:=2013-02-11 
     11PKG_VERSION:=2013-02-12 
    1212PKG_RELEASE=$(PKG_SOURCE_VERSION) 
    1313 
  • trunk/package/network/ipv6/odhcp6c/files/dhcpv6.script

    r35419 r35570  
    2828                proto_add_ipv6_prefix "$prefix" 
    2929        done 
     30 
     31        [ -n "$USERPREFIX" ] && proto_add_ipv6_prefix "$USERPREFIX" 
    3032 
    3133        # Merge addresses 
  • trunk/package/network/ipv6/odhcp6c/files/dhcpv6.sh

    r35421 r35570  
    1111        proto_config_add_string "reqopts" 
    1212        proto_config_add_string "noslaaconly" 
     13        proto_config_add_string "ip6prefix" 
    1314} 
    1415 
     
    1718        local iface="$2" 
    1819 
    19         local reqaddress reqprefix clientid reqopts noslaaconly 
    20         json_get_vars reqaddress reqprefix clientid reqopts noslaaconly 
     20        local reqaddress reqprefix clientid reqopts noslaaconly ip6prefix 
     21        json_get_vars reqaddress reqprefix clientid reqopts noslaaconly ip6prefix 
    2122 
    2223 
     
    3637        done 
    3738 
     39        [ -n "$ip6prefix" ] && proto_export "USERPREFIX=$ip6prefix" 
    3840 
    3941        proto_export "INTERFACE=$config" 
Note: See TracChangeset for help on using the changeset viewer.