Changeset 2971


Ignore:
Timestamp:
Jan 31, 2010, 6:35:39 PM (7 years ago)
Author:
gdb
Message:

Merged invirt-xen-config into hvirt branch

Location:
package_branches/invirt-xen-config/hvirt
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • package_branches/invirt-xen-config/hvirt

  • package_branches/invirt-xen-config/hvirt/debian/changelog

    r2831 r2971  
     1invirt-xen-config (0.0.27hvirt4) unstable; urgency=low
     2
     3  * Changed another xen.network -> xen
     4
     5 -- Greg Brockman <gdb@mit.edu>  Sun, 31 Jan 2010 18:32:59 -0500
     6
     7invirt-xen-config (0.0.27hvirt3) unstable; urgency=low
     8
     9  * Merged further updates to pkg version 0.0.27 into hvirt branch
     10
     11 -- Greg Brockman <gdb@mit.edu>  Fri, 01 Jan 2010 18:38:50 -0500
     12
     13invirt-xen-config (0.0.27hvirt2) unstable; urgency=low
     14
     15  * Merged updates to pkg version 0.0.27 into hvirt branch
     16
     17 -- Greg Brockman <gdb@mit.edu>  Fri, 01 Jan 2010 18:38:50 -0500
     18
    119invirt-xen-config (0.0.27hvirt1) unstable; urgency=low
    220
     
    1331  * Don't try to start sysvms in the invirt-xen-config init script. The
    1432    code has never been reliable.
    15 
    16  -- Evan Broder <broder@mit.edu>  Fri, 01 Jan 2010 17:58:57 -0600
    17 
     33  * Don't create iptables rules in vif-invirtroute - they don't do anything.
     34  * For simplicity, and because we've never used it, tear the IPv6
     35    "support" out of vif-invirtroute.
     36
     37  [ Quentin Smith ]
     38  * Increase dom0's weight to improve IO performance.
     39
     40 -- Evan Broder <broder@mit.edu>  Sun, 03 Jan 2010 14:37:34 -0600
     41 
    1842invirt-xen-config (0.0.26hvirt1) unstable; urgency=low
    1943
  • package_branches/invirt-xen-config/hvirt/debian/invirt-xen-config.init

    r2831 r2971  
    3535do_start() {
    3636    do_startup "start"
     37    xm sched-credit -d 0 -w 512
    3738}
    3839
  • package_branches/invirt-xen-config/hvirt/vif-invirtroute

    r2055 r2971  
    11#!/bin/bash
    2 
    3 
    4 
    5 
    62
    73#============================================================================
     
    2319# ip      list of IP networks for the vif, space-separated (default given in
    2420#         this script).
    25 # V6PREFIX  prefix of v6 address to use
    26 # Note that the v6 support is kind of broken because there's not really a way to populate the v6 prefix
     21#
    2722# This script will set up proxy arp  for any ip addresses that are being routed
    2823# type read to determine if the device is ioemu
     
    4944    offline)
    5045        do_without_error ifdown ${vif}
    51         if [ -f /var/run/radvd/radvd.pid.${vif} ] ; then
    52             do_without_error kill `cat /var/run/radvd/radvd.pid.${vif}`
    53             fi
    5446        ipcmd='del'
    5547        cmdprefix='do_without_error'
     
    5749esac
    5850
    59 v6prefix=${v6prefix:-}
    60 v6prefix=$(xenstore_read_default "$XENBUS_PATH/v6prefix" "$v6prefix")
    6151vif_type=$(xenstore_read_default "$XENBUS_PATH/type" "viffront")
    6252if [  ${vif_type} != "ioemu"  -o  x${qemu_online} = xyes ] ; then
     
    6656        for addr in ${ip} ; do
    6757            ${cmdprefix} ip route ${ipcmd} ${addr} dev ${dev} src ${main_ip}
    68             arpspoof -i $(invirt-getconf xen.network.iface) -t 18.181.0.1 ${addr}&
     58            arpspoof -i $(invirt-getconf xen.iface) -t 18.181.0.1 ${addr}&
    6959            sleep 5
    7060            kill %arpspoof
    7161        done
    7262    fi
    73 
    74     if [ x${v6prefix} != x ] ; then
    75         sed -e "s/@interface@/${dev}/" -e "s+@prefix@+${v6prefix}+" /etc/xen/radvd.conf.template >/var/run/radvd.conf.${vif}
    76         ${cmdprefix} ip -6 addr  ${ipcmd}  fe80::/64 scope link  dev ${dev}
    77         if [ $1 = online ] ; then
    78             radvd  -u radvd -C /var/run/radvd.conf.${vif} -p /var/run/radvd/radvd.pid.${vif}
    79         fi
    80         ${cmdprefix} ip -6 route ${ipcmd} ${v6prefix} dev ${dev}
    81     fi
    8263fi
    83 
    84 handle_iptable
    8564
    8665log debug "Successful vif-route $command for $vif."
Note: See TracChangeset for help on using the changeset viewer.