[packages] wide-dhcpv6: Fix request option variable names

git-svn-id: svn://svn.openwrt.org/openwrt/packages@21161 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/ipv6/wide-dhcpv6/Makefile b/ipv6/wide-dhcpv6/Makefile
index 64c03d1..42bc0a5 100644 (file)
--- a/ipv6/wide-dhcpv6/Makefile
+++ b/ipv6/wide-dhcpv6/Makefile
@@ -3,7 +3,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=wide-dhcpv6
 PKG_VERSION:=20080615
-PKG_RELEASE:=4
+PKG_RELEASE:=5
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/$(PKG_NAME)

diff --git a/ipv6/wide-dhcpv6/files/dhcp6c-state b/ipv6/wide-dhcpv6/files/dhcp6c-state
index 3134397..689ca88 100644 (file)
--- a/ipv6/wide-dhcpv6/files/dhcp6c-state
+++ b/ipv6/wide-dhcpv6/files/dhcp6c-state
@@ -5,14 +5,14 @@
 uci_revert_state dhcp6c state
 uci_set_state dhcp6c state "" dhcp6c_state
 uci_set_state dhcp6c state domain_name_servers "$new_domain_name_servers"
-uci_set_state dhcp6c state domain_name "$domain_name"                    
-uci_set_state dhcp6c state ntp_servers "$ntp_servers"                    
-uci_set_state dhcp6c state sip_server_address "$sip_server_address"      
-uci_set_state dhcp6c state sip_domain_name "$sip_domain_name"            
-uci_set_state dhcp6c state nis_server_address "$nis_server_address"      
-uci_set_state dhcp6c state nis_domain_name "$nis_domain_name"            
-uci_set_state dhcp6c state nisp_server_address "$nisp_server_address"    
-uci_set_state dhcp6c state nisp_domain_name "$nisp_domain_name"          
-uci_set_state dhcp6c state bcmcs_server_address "$bcmcs_server_address"  
-uci_set_state dhcp6c state bcmcs_domain_name "$bcmcs_domain_name"
+uci_set_state dhcp6c state domain_name "$new_domain_name"                    
+uci_set_state dhcp6c state ntp_servers "$new_ntp_servers"                    
+uci_set_state dhcp6c state sip_server_address "$new_sip_servers"
+uci_set_state dhcp6c state sip_server_domain_name "$new_sip_name"
+uci_set_state dhcp6c state nis_server_address "$new_nis_servers"      
+uci_set_state dhcp6c state nis_domain_name "$new_nis_name"            
+uci_set_state dhcp6c state nisp_server_address "$new_nisp_servers"    
+uci_set_state dhcp6c state nisp_domain_name "$new_nisp_name"          
+uci_set_state dhcp6c state bcmcs_server_address "$new_bcmcs_servers"  
+uci_set_state dhcp6c state bcmcs_server_domain_name "$new_bcmcs_name"
 

diff --git a/ipv6/wide-dhcpv6/files/dhcp6c.conf b/ipv6/wide-dhcpv6/files/dhcp6c.conf
index cd3ee77..4f99046 100644 (file)
--- a/ipv6/wide-dhcpv6/files/dhcp6c.conf
+++ b/ipv6/wide-dhcpv6/files/dhcp6c.conf
@@ -14,13 +14,13 @@ config 'dhcp6c' 'basic'
        option 'domain_name' '0'
        option 'ntp_servers' '0'
        option 'sip_server_address' '0'
-       option 'sip_domain_name' '0'
+       option 'sip_server_domain_name' '0'
        option 'nis_server_address' '0'
        option 'nis_domain_name' '0'
        option 'nisp_server_address' '0'
        option 'nisp_domain_name' '0'
        option 'bcmcs_server_address' '0'
-       option 'bcmcs_domain_name' '0'
+       option 'bcmcs_server_domain_name' '0'
        
        # Script to run when a reply is received
        option 'script' '/usr/bin/dhcp6c-state'