[Astlinux-commits] SF.net SVN: astlinux:[8354] branches/1.0

[<abe...@us...>]

Revision: 8354
          http://sourceforge.net/p/astlinux/code/8354
Author:   abelbeck
Date:     2017-05-29 23:44:38 +0000 (Mon, 29 May 2017)
Log Message:
-----------
DHCPv6 Prefix Delegation, previously any 'IPv6 Autoconfig: [enabled]' got a PD regardless if 'IPv6/nn' was defined, this commit makes it such that 'IPv6/nn' must be undefined for it to get a PD, while any defined 'IPv6/nn' is used for Autoconfig for that interface.

Modified Paths:
--------------
    branches/1.0/package/dnsmasq/dnsmasq.init
    branches/1.0/project/astlinux/target_skeleton/etc/init.d/network

Modified: branches/1.0/package/dnsmasq/dnsmasq.init
===================================================================
--- branches/1.0/package/dnsmasq/dnsmasq.init	2017-05-29 16:04:48 UTC (rev 8353)
+++ branches/1.0/package/dnsmasq/dnsmasq.init	2017-05-29 23:44:38 UTC (rev 8354)
@@ -165,7 +165,7 @@
     esac
   done
 
-  if [ "$dhcpv6" = "yes" -a "$DHCPV6_CLIENT_REQUEST_PREFIX" != "no" ]; then
+  if [ "$dhcpv6" = "yes" -a "$DHCPV6_CLIENT_REQUEST_PREFIX" != "no" -a -z "$prefix" ]; then
     echo "
 dhcp-range=$tag,::1,constructor:$interface,ra-only,$leasetime"
     return 0

Modified: branches/1.0/project/astlinux/target_skeleton/etc/init.d/network
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/init.d/network	2017-05-29 16:04:48 UTC (rev 8353)
+++ branches/1.0/project/astlinux/target_skeleton/etc/init.d/network	2017-05-29 23:44:38 UTC (rev 8354)
@@ -109,27 +109,27 @@
       int=""
       case $iname in
         INTIF)
-          if [ -n "$INTIF" -a "$INTIF" != "none" -a -n "$INTIP" -a -n "$INTNM" ]; then
+          if [ -n "$INTIF" -a "$INTIF" != "none" -a -n "$INTIP" -a -n "$INTNM" -a -z "$INTIPV6" ]; then
             int="$INTIF"
           fi
           ;;
         INT2IF)
-          if [ -n "$INT2IF" -a "$INT2IF" != "none" -a -n "$INT2IP" -a -n "$INT2NM" ]; then
+          if [ -n "$INT2IF" -a "$INT2IF" != "none" -a -n "$INT2IP" -a -n "$INT2NM" -a -z "$INT2IPV6" ]; then
             int="$INT2IF"
           fi
           ;;
         INT3IF)
-          if [ -n "$INT3IF" -a "$INT3IF" != "none" -a -n "$INT3IP" -a -n "$INT3NM" ]; then
+          if [ -n "$INT3IF" -a "$INT3IF" != "none" -a -n "$INT3IP" -a -n "$INT3NM" -a -z "$INT3IPV6" ]; then
             int="$INT3IF"
           fi
           ;;
         INT4IF)
-          if [ -n "$INT4IF" -a "$INT4IF" != "none" -a -n "$INT4IP" -a -n "$INT4NM" ]; then
+          if [ -n "$INT4IF" -a "$INT4IF" != "none" -a -n "$INT4IP" -a -n "$INT4NM" -a -z "$INT4IPV6" ]; then
             int="$INT4IF"
           fi
           ;;
         DMZIF)
-          if [ -n "$DMZIF" -a "$DMZIF" != "none" -a -n "$DMZIP" -a -n "$DMZNM" ]; then
+          if [ -n "$DMZIF" -a "$DMZIF" != "none" -a -n "$DMZIP" -a -n "$DMZNM" -a -z "$DMZIPV6" ]; then
             int="$DMZIF"
           fi
           ;;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.