[Astlinux-commits] SF.net SVN: astlinux:[7300] branches/1.0/project/astlinux/target_skeleton/ etc/init.d/network

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

Revision: 7300
          http://sourceforge.net/p/astlinux/code/7300
Author:   abelbeck
Date:     2015-11-01 23:40:18 +0000 (Sun, 01 Nov 2015)
Log Message:
-----------
dhcpv6, support special case when DHCP/DHCPv6 is enabled but DHCPV6_CLIENT_REQUEST_ADDRESS=no, then allow a static IPv6 address to be assigned.

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

Modified: branches/1.0/project/astlinux/target_skeleton/etc/init.d/network
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/init.d/network	2015-11-01 19:24:21 UTC (rev 7299)
+++ branches/1.0/project/astlinux/target_skeleton/etc/init.d/network	2015-11-01 23:40:18 UTC (rev 7300)
@@ -616,7 +616,8 @@
     sleep 4
 
     # No DHCPv6 - Static IPv6 if defined
-    if [ "$IPV6" = "yes" -a "$EXT2DHCPV6_CLIENT_ENABLE" != "yes" -a -n "$EXT2IPV6" -a -n "$EXT2GWIPV6" ]; then
+    if [ "$IPV6" = "yes" -a -n "$EXT2IPV6" -a -n "$EXT2GWIPV6" ] && \
+       [ "$EXT2DHCPV6_CLIENT_ENABLE" != "yes" ]; then
       ip -6 addr add $EXT2IPV6 dev $EXT2IF
       for x in $EXT2ROUTESIPV6; do
         ip -6 route add $x via $EXT2GWIPV6 dev $EXT2IF metric 1
@@ -636,7 +637,8 @@
     ifplugd -apq -t2 -u3 -d3 -i $EXTIF -r /etc/ifplugd/udhcpc.action
 
     # No DHCPv6 - Static IPv6 if defined
-    if [ "$IPV6" = "yes" -a "$DHCPV6_CLIENT_ENABLE" != "yes" -a -n "$EXTIPV6" -a -n "$EXTGWIPV6" ]; then
+    if [ "$IPV6" = "yes" -a -n "$EXTIPV6" -a -n "$EXTGWIPV6" ] && \
+       [ "$DHCPV6_CLIENT_ENABLE" != "yes" -o "$DHCPV6_CLIENT_REQUEST_ADDRESS" = "no" ]; then
       ip -6 addr add $EXTIPV6 dev $EXTIF
       ip -6 route add default via $EXTGWIPV6 dev $EXTIF metric 1
     fi

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