- added IPV6_AUTOCONF variable to interface configuration

  set it to "no" if you don't want kernel to autoconfigure IPv6 address
  on interfaces (prefix:MAC stuff)

svn-id: @793

diff --git a/sysconfig/interfaces/ifcfg-description b/sysconfig/interfaces/ifcfg-description
index e9767250af22e3f3c45c4712bdfc70528a6d340c..51003d8351b56a07dcfa835afdc0a49136be72d0 100644 (file)
--- a/sysconfig/interfaces/ifcfg-description
+++ b/sysconfig/interfaces/ifcfg-description
@@ -1,4 +1,4 @@
-#      $Id: ifcfg-description,v 1.10 2000/07/20 10:07:00 mis Exp $
+#      $Id: ifcfg-description,v 1.11 2000/09/03 02:29:02 baggins Exp $
        DEVICE=<real device name>:<aliasnumber>
 or
        DEVICE=<name>
@@ -16,6 +16,7 @@ IPV6_ADDR="<IPv6 addres1>/<prefix len> <IPv6 addres2>/<prefix len> <...>"
 [ MULTICAST={|no|yes} ]
 [ ARP={no|yes} ]
 [ SRC_ADDR=<IPv4 addres> ]
+[ IPV6_AUTOCONF={no|yes} ]
        
 [ IPXFRAMETYPE={802.2|802.2TR|802.3|EtherII|SNAP} ]
 [ IPXNETWORK= ]

diff --git a/sysconfig/network-scripts/ifup b/sysconfig/network-scripts/ifup
index 200d7ecadc3589d93f5cfaafa780c7417f8f859c..67451bd8463a7d5707b005944b5ee77cc7c04eb6 100755 (executable)
--- a/sysconfig/network-scripts/ifup
+++ b/sysconfig/network-scripts/ifup
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-#      $Id: ifup,v 1.45 2000/08/04 15:25:45 baggins Exp $
+#      $Id: ifup,v 1.46 2000/09/03 02:29:02 baggins Exp $
 #
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 
@@ -88,9 +88,9 @@ if [ -z "$NETMASK" -a -n "$PREFIX" ]; then
        NETMASK="`calcnetmask $PREFIX`"
 fi
 
-is_yes "$MULTICAST"      && MULTICAST=on               || MULTICAST=off
-[ -n "$SRC_ADDR" ]       && SRC_ADDR="src ${SRC_ADDR}" || SRC_ADDR=""
-[ -n "$SCOPE" ]          && SCOPE="scope ${SCOPE}"     || SCOPE=""
+is_yes "$MULTICAST"    && MULTICAST=on                 || MULTICAST=off
+[ -n "$SRC_ADDR" ]     && SRC_ADDR="src ${SRC_ADDR}"   || SRC_ADDR=""
+[ -n "$SCOPE" ]                && SCOPE="scope ${SCOPE}"       || SCOPE=""
 
 if [ "$ARP" ]; then
        is_yes "$ARP"    && ARP=on      || ARP=off
@@ -167,6 +167,7 @@ else
 
     ip link set ${DEVICE} multicast ${MULTICAST} arp ${ARP} up
 
+    # IPv4 rules
     if [ "$IPv4" = "yes" ]; then
        if [ -n "$REMIP" ]; then
            ip -family inet addr add ${IPADDR} peer ${REMIP} dev ${DEVICE} label ${FULLDEVNAME} ${SCOPE}
@@ -179,9 +180,9 @@ else
         done
     fi
 
-
     # IPv6 rules
     if is_yes "${IPV6_NETWORKING}"; then
+      proc_net ipv6/conf/${DEVICE}/autoconf start 0 1 IPV6_AUTOCONF "IPv6 address autoconfiguration on ${DEVICE}"
 
       for ADDR6 in ${IPV6_ADDR} ; do
        ip -family inet6 addr add ${ADDR6} dev ${DEVICE} label ${FULLDEVNAME}
@@ -201,7 +202,6 @@ else
          fi
        fi
       fi
-
     fi
 
     if [ "${GATEWAY}" != "" ]; then