For simplicity, and because we've never used it, tear the IPv6

"support" out of vif-invirtroute.

svn path=/trunk/packages/invirt-xen-config/; revision=2860

diff --git a/debian/changelog b/debian/changelog
index d5a41b9..16ed857 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,11 +7,13 @@ invirt-xen-config (0.0.27) unstable; urgency=low
   * Don't try to start sysvms in the invirt-xen-config init script. The
     code has never been reliable.
   * Don't create iptables rules in vif-invirtroute - they don't do anything.
   * Don't try to start sysvms in the invirt-xen-config init script. The
     code has never been reliable.
   * Don't create iptables rules in vif-invirtroute - they don't do anything.

+  * For simplicity, and because we've never used it, tear the IPv6
+    "support" out of vif-invirtroute.

 
   [ Quentin Smith ]
   * Increase dom0's weight to improve IO performance.
 
 
   [ Quentin Smith ]
   * Increase dom0's weight to improve IO performance.
 

- -- Evan Broder <broder@mit.edu>  Sun, 03 Jan 2010 14:27:57 -0600
+ -- Evan Broder <broder@mit.edu>  Sun, 03 Jan 2010 14:37:34 -0600

 
 invirt-xen-config (0.0.26) unstable; urgency=low
 
 
 invirt-xen-config (0.0.26) unstable; urgency=low
 

diff --git a/vif-invirtroute b/vif-invirtroute
index 26464a0..8447805 100755 (executable)
--- a/vif-invirtroute
+++ b/vif-invirtroute
@@ -1,9 +1,5 @@
 #!/bin/bash
 
 #!/bin/bash
 

-
-
-
-

 #============================================================================
 # /etc/xen/vif-route
 #
 #============================================================================
 # /etc/xen/vif-route
 #

@@ -22,8 +18,7 @@
 # Read from the store:
 # ip      list of IP networks for the vif, space-separated (default given in
 #         this script).
 # Read from the store:
 # ip      list of IP networks for the vif, space-separated (default given in
 #         this script).

-# V6PREFIX  prefix of v6 address to use
-# Note that the v6 support is kind of broken because there's not really a way to populate the v6 prefix
+#

 # This script will set up proxy arp  for any ip addresses that are being routed
 # type read to determine if the device is ioemu
 
 # This script will set up proxy arp  for any ip addresses that are being routed
 # type read to determine if the device is ioemu
 

@@ -48,16 +43,11 @@ case "$command" in
         ;;
     offline)
         do_without_error ifdown ${vif}
         ;;
     offline)
         do_without_error ifdown ${vif}

-       if [ -f /var/run/radvd/radvd.pid.${vif} ] ; then
-           do_without_error kill `cat /var/run/radvd/radvd.pid.${vif}`
-           fi

         ipcmd='del'
         cmdprefix='do_without_error'
         ;;
 esac
 
         ipcmd='del'
         cmdprefix='do_without_error'
         ;;
 esac
 

-v6prefix=${v6prefix:-}
-v6prefix=$(xenstore_read_default "$XENBUS_PATH/v6prefix" "$v6prefix")

 vif_type=$(xenstore_read_default "$XENBUS_PATH/type" "viffront")
 if [  ${vif_type} != "ioemu"  -o  x${qemu_online} = xyes ] ; then
     if [ "${ip}" ] ; then
 vif_type=$(xenstore_read_default "$XENBUS_PATH/type" "viffront")
 if [  ${vif_type} != "ioemu"  -o  x${qemu_online} = xyes ] ; then
     if [ "${ip}" ] ; then

@@ -70,15 +60,6 @@ if [  ${vif_type} != "ioemu"  -o  x${qemu_online} = xyes ] ; then
            kill %arpspoof
        done 
     fi
            kill %arpspoof
        done 
     fi

-
-    if [ x${v6prefix} != x ] ; then
-       sed -e "s/@interface@/${dev}/" -e "s+@prefix@+${v6prefix}+" /etc/xen/radvd.conf.template >/var/run/radvd.conf.${vif}
-       ${cmdprefix} ip -6 addr  ${ipcmd}  fe80::/64 scope link  dev ${dev} 
-       if [ $1 = online ] ; then
-           radvd  -u radvd -C /var/run/radvd.conf.${vif} -p /var/run/radvd/radvd.pid.${vif}
-       fi
-       ${cmdprefix} ip -6 route ${ipcmd} ${v6prefix} dev ${dev} 
-    fi

 fi
 
 log debug "Successful vif-route $command for $vif."
 fi
 
 log debug "Successful vif-route $command for $vif."