ia64/xen-unstable

changeset 6684:cbf43be4cc17

merge
author iap10@firebug.cl.cam.ac.uk
date Wed Sep 07 17:29:17 2005 +0000 (2005-09-07)
parents 216a8a934246 32cc65db459a
children 7d0fb56b4a91
files linux-2.6-xen-sparse/arch/xen/i386/mm/hypervisor.c tools/examples/vif-bridge tools/examples/vif-route
line diff
     1.1 --- a/tools/examples/vif-bridge	Wed Sep 07 17:28:49 2005 +0000
     1.2 +++ b/tools/examples/vif-bridge	Wed Sep 07 17:29:17 2005 +0000
     1.3 @@ -80,7 +80,7 @@ if [ "${brcmd}" == "addif" ] ; then
     1.4  fi
     1.5  ifconfig ${vif} $OP
     1.6  
     1.7 -if [ ${ip} ] ; then
     1.8 +if [ "${ip}" ] ; then
     1.9  
    1.10      # If we've been given a list of IP networks, allow pkts with these src addrs.
    1.11      for addr in ${ip} ; do
     2.1 --- a/tools/examples/vif-route	Wed Sep 07 17:28:49 2005 +0000
     2.2 +++ b/tools/examples/vif-route	Wed Sep 07 17:29:17 2005 +0000
     2.3 @@ -63,7 +63,7 @@ case $OP in
     2.4          ;;
     2.5  esac
     2.6  
     2.7 -if [ ${ip} ] ; then
     2.8 +if [ "${ip}" ] ; then
     2.9  
    2.10      # If we've been given a list of IP networks, allow pkts with these src addrs.
    2.11      for addr in ${ip} ; do