ia64/xen-unstable

changeset 1619:61b15b778938

bitkeeper revision 1.1026.1.5 (40e18059BIr0LJ7EXKzYZYTXl3XGNA)

Fix misplaced exit in vifctl.
author mjw@wray-m-3.hpl.hp.com
date Tue Jun 29 14:44:41 2004 +0000 (2004-06-29)
parents e1096b6535bc
children 716d743558b3
files BitKeeper/etc/ignore tools/xen/lib/util/Brctl.py tools/xen/vifctl
line diff
     1.1 --- a/BitKeeper/etc/ignore	Tue Jun 29 12:58:42 2004 +0000
     1.2 +++ b/BitKeeper/etc/ignore	Tue Jun 29 14:44:41 2004 +0000
     1.3 @@ -52,3 +52,4 @@ xen/tools/figlet/figlet
     1.4  xen/xen
     1.5  xen/xen-syms
     1.6  xen/xen.*
     1.7 +tools/xc/lib/.xc_rrobin.o.d
     2.1 --- a/tools/xen/lib/util/Brctl.py	Tue Jun 29 12:58:42 2004 +0000
     2.2 +++ b/tools/xen/lib/util/Brctl.py	Tue Jun 29 14:44:41 2004 +0000
     2.3 @@ -33,7 +33,6 @@ def vif_bridge_add(params):
     2.4      """Add the network interface for vif on dom to a bridge.
     2.5      """
     2.6      cmd(CMD_BRCTL, 'addif %(bridge)s %(vif)s' % params)
     2.7 -    return bridge
     2.8  
     2.9  def vif_bridge_rem(params):
    2.10      """Remove the network interface for vif on dom from a bridge.
    2.11 @@ -122,11 +121,11 @@ def reconfigure(interface, bridge):
    2.12      global opts
    2.13      intf_info = ifconfig(interface)
    2.14      if not intf_info:
    2.15 -        print 'Interface not found:', interface
    2.16 +        print >>sys.stderr, 'Interface not found:', interface
    2.17          return
    2.18      #bridge_info = ifconfig(bridge)
    2.19      #if not bridge_info:
    2.20 -    #    print 'Bridge not found:', bridge
    2.21 +    #    print >>sys.stderr, 'Bridge not found:', bridge
    2.22      #    return
    2.23      route_info = routes()
    2.24      intf_info['bridge'] = bridge
    2.25 @@ -137,7 +136,7 @@ def reconfigure(interface, bridge):
    2.26              r['interface'] == interface):
    2.27              intf_info['gateway'] = r['gateway']
    2.28      if not intf_info['gateway']:
    2.29 -        print 'Gateway not found: ', interface
    2.30 +        print >>sys.stderr, 'Gateway not found: ', interface
    2.31          return
    2.32      cmd(CMD_IFCONFIG,
    2.33          '%(bridge)s %(address)s netmask %(mask)s broadcast %(broadcast)s up'
     3.1 --- a/tools/xen/vifctl	Tue Jun 29 12:58:42 2004 +0000
     3.2 +++ b/tools/xen/vifctl	Tue Jun 29 14:44:41 2004 +0000
     3.3 @@ -40,6 +40,7 @@ class VifControl:
     3.4          self.name = 'vifctl'
     3.5      
     3.6      def main(self, args):
     3.7 +        #print self.name, args
     3.8          if len(args) < 2:
     3.9              usage(args)
    3.10          self.name = args[0]
    3.11 @@ -85,7 +86,7 @@ class VifControl:
    3.12          for x in req:
    3.13              if not d[x]:
    3.14                  print >>sys.stderr, 'Missing parameter:', x
    3.15 -            sys.exit(1)
    3.16 +                sys.exit(1)
    3.17          return d
    3.18              
    3.19      def vifctl_help(self, args):