Show help for zone creation

[people/stevee/network.git] / src / dhclient-script

diff --git a/src/dhclient-script b/src/dhclient-script
index 5a6e8a3954c9bcc77ec77376ec4b1d176e4f05e2..fd5c6f13e6a22e1bc063df728a2a4ecbbf4eb07f 100644 (file)
--- a/src/dhclient-script
+++ b/src/dhclient-script
@@ -41,6 +41,13 @@ case "${reason}" in
                # Flush all other aborted IP addresses
                ipv6_address_flush "${interface}"
 
+               # Disable autoconf because DHCP is handling this
+               ipv6_device_autoconf_disable "${interface}"
+
+               # Enable forwarding because we are acting as a host
+               # to uplink network zones.
+               ipv6_device_forwarding_enable "${interface}" --accept-ra
+
                # Wait until DAD for the link-local address has finished
                for address in $(ipv6_device_get_addresses "${interface}" --scope="link"); do
                        ipv6_wait_for_dad "${address}" "${interface}" && exit ${EXIT_OK}
@@ -60,15 +67,18 @@ case "${reason}" in
                                --valid-lifetime="${new_max_life}" --preferred-lifetime="${new_preferred_life}"
 
                        # Save configuration
-                       routing_db_set "${interface}" "ipv6" "local-ip-address" "${new_ip6_address}/${new_ip6_prefixlen}"
-                       routing_db_set "${interface}" "ipv6" "active" 1
-                       #routing_db_set "${interface}" "ipv6" "domain-name" "${new_
+                       db_set "${interface}/ipv6/local-ip-address" "${new_ip6_address}/${new_ip6_prefixlen}"
+                       db_set "${interface}/ipv6/active" 1
+                       #db_set "${interface}/ipv6/domain-name" "${new_
+
+                       # Update the routing tables
+                       routing_update "${interface}" ipv6
 
                        exit 0
 
                # Handle Prefix Delegation
                elif isset new_ip6_prefix; then
-                       routing_db_set "${interface}" "ipv6" "delegated-prefix" "${new_ip6_prefix}"
+                       db_set "${interface}/ipv6/delegated-prefix" "${new_ip6_prefix}"
 
                        exit 0
                fi
@@ -80,7 +90,7 @@ case "${reason}" in
                if isset new_ip6_address && isset new_ip6_prefixlen; then
                        # Update nameservers if those have changed
                        if [[ "${old_dhcp6_name_servers}" != "${new_dhcp6_name_servers}" ]]; then
-                               routing_db_set "${interface}" "ipv6" "domain-name-servers" "${new_dhcp6_name_servers}"
+                               db_set "${interface}/ipv6/domain-name-servers" "${new_dhcp6_name_servers}"
                                dns_generate_resolvconf
                        fi
 
@@ -97,10 +107,17 @@ case "${reason}" in
                                ipv6_address_del "${old_ip6_address}/${old_ip6_prefixlen}" "${interface}"
                        fi
 
+                       # Update the database
+                       db_set "${interface}/ipv6/local-ip-address" \
+                               "${new_ip6_address}/${new_ip6_prefixlen}"
+
                        # Add the new one
                        ipv6_address_add "${new_ip6_address}/${new_ip6_prefixlen}" "${interface}" \
                                --valid-lifetime="${new_max_life}" --preferred-lifetime="${new_preferred_life}"
 
+                       # Update the routing tables
+                       routing_update "${interface}" ipv6
+
                        exit ${EXIT_OK}
 
                # Handle Prefix Delegation
@@ -111,7 +128,7 @@ case "${reason}" in
                        fi
 
                        log DEBUG "The delegated prefix has changed from ${old_ip6_prefix} to ${new_ip6_prefix}"
-                       routing_db_set "${interface}" "ipv6" "delegated-prefix" "${new_ip6_prefix}"
+                       db_set "${interface}/ipv6/delegated-prefix" "${new_ip6_prefix}"
 
                        exit ${EXIT_OK}
                fi
@@ -128,6 +145,19 @@ case "${reason}" in
                        --preferred-lifetime=0 || exit ${EXIT_ERROR}
                ;;
 
+       EXPIRE6|FAIL6|RELEASE6|STOP6)
+               # Remove the currently configured addresses from the device.
+               ipv6_address_flush "${interface}"
+
+               # Reset autoconf mode and disable forwarding
+               ipv6_device_forwarding_disable "${interface}"
+               ipv6_device_autoconf_disable "${interface}"
+
+               db_delete "${interface}/ipv6"
+
+               exit 0
+               ;;
+
        # IPv4
 
        PREINIT)
@@ -202,13 +232,16 @@ case "${reason}" in
                                        fi
 
                                        # Save configuration
-                                       routing_db_set ${interface} ipv4 type "ipv4-dhcp"
-                                       routing_db_set ${interface} ipv4 local-ip-address "${new_ip_address}/${new_prefix}"
-                                       routing_db_set ${interface} ipv4 remote-ip-address "${new_routers}"
-                                       routing_db_set ${interface} ipv4 active 1
-                                       routing_db_set ${interface} ipv4 domain-name "${new_domain_name}"
-                                       routing_db_set ${interface} ipv4 domain-name-servers "${new_domain_name_servers}"
-                                       routing_db_set ${interface} ipv4 domain-name-servers-priority "${DNS_SERVER_DYNAMIC_PRIORITY}"
+                                       db_set "${interface}/ipv4/type" "ipv4-dhcp"
+                                       db_set "${interface}/ipv4/local-ip-address" \
+                                               "${new_ip_address}/${new_prefix}"
+                                       db_set "${interface}/ipv4/remote-ip-address" "${new_routers}"
+                                       db_set "${interface}/ipv4/active" 1
+                                       db_set "${interface}/ipv4/domain-name" "${new_domain_name}"
+                                       db_set "${interface}/ipv4/domain-name-servers" \
+                                               "${new_domain_name_servers}"
+                                       db_set "${interface}/ipv4/domain-name-servers-priority" \
+                                               "${DNS_SERVER_DYNAMIC_PRIORITY}"
 
                                        # Update the routing tables.
                                        routing_update ${interface} ipv4
@@ -229,7 +262,7 @@ case "${reason}" in
                        ipv4_flush_device ${interface}
                fi
 
-               routing_db_remove ${interface} ipv4
+               db_delete "${interface}/ipv4"
                routing_default_update
 
                exit 0