if orig_ifname:
logger.verbose('net:InitInterfaces orig_ifname = %s' % orig_ifname)
- details = {}
- details['ONBOOT']='yes'
- details['USERCTL']='no'
- if interface['mac']:
- details['HWADDR'] = interface['mac']
- if interface['is_primary']:
- details['PRIMARY']='yes'
-
- if interface['method'] == "static":
- details['BOOTPROTO'] = "static"
- details['IPADDR'] = interface['ip']
- details['NETMASK'] = interface['netmask']
- details['GATEWAY'] = interface['gateway']
- if interface['is_primary']:
- gateway = interface['gateway']
- if interface['dns1']:
- details['DNS1'] = interface['dns1']
- if interface['dns2']:
- details['DNS2'] = interface['dns2']
-
- elif interface['method'] == "dhcp":
- details['BOOTPROTO'] = "dhcp"
- details['PERSISTENT_DHCLIENT'] = "yes"
- if interface['hostname']:
- details['DHCP_HOSTNAME'] = interface['hostname']
- else:
- details['DHCP_HOSTNAME'] = hostname
- if not interface['is_primary']:
- details['DHCLIENTARGS'] = "-R subnet-mask"
+ details = prepDetails(interface)
if 'interface_tag_ids' in interface:
version = 4.3
"IWCONFIG", "IWPRIV" ] :
details [settingname] = setting['value']
details ['TYPE']='Wireless'
+ # Bridge setting
+ elif settingname in [ 'BRIDGE' ]:
+ details['BRIDGE'] = setting['value']
else:
logger.log("net:InitInterfaces WARNING: ignored setting named %s"%setting[name_key])
else:
logger.log("net:InitInterfaces WARNING: interface alias (%s) not matched to an interface"% details['ALIAS'])
device_id -= 1
+ elif 'BRIDGE' in details:
+ #The bridge inherits the mac of the first attached interface.
+ if 'IFNAME' in details:
+ ifname = details['IFNAME']
+ device_id -= 1
+ elif orig_ifname:
+ ifname = orig_ifname
+ device_id -= 1
+ if 'PRIMARY' in details: del details['PRIMARY']
+ logger.log('net:InitInterfaces: Bridge detected. Adding %s to devices_map' % ifname)
+ devices_map[ifname] = details
+ bridgeName = details['BRIDGE']
+
+ logger.log('net:InitInterfaces: Adding bridge %s' % bridgeName)
+ bridgeDetails = prepDetails(interface)
+ bridgeDetails['TYPE'] = 'Bridge'
+ devices_map[bridgeName] = bridgeDetails
else:
if 'IFNAME' in details:
ifname = details['IFNAME']
logger.log("net:InitInterfaces WARNING: possibly blowing away %s configuration"%ifname)
devices_map[ifname] = details
device_id += 1
+ logger.log('net:InitInterfaces: Device map: %r' % devices_map)
m = modprobe.Modprobe()
try:
m.input("%s/etc/modprobe.conf" % root)
lo = "ifcfg-lo"
if lo in ifcfgs: ifcfgs.remove(lo)
- # remove known devices from icfgs list
+ # remove known devices from ifcfgs list
for (dev, details) in devices_map.iteritems():
ifcfg = 'ifcfg-'+dev
if ifcfg in ifcfgs: ifcfgs.remove(ifcfg)
# Process ifcfg-$dev changes / additions
newdevs = []
+ table = 10
for (dev, details) in devices_map.iteritems():
(fd, tmpnam) = tempfile.mkstemp(dir=sysconfig)
f = os.fdopen(fd, "w")
src_route_changed = False
if ('PRIMARY' not in details and 'GATEWAY' in details and
details['GATEWAY'] != ''):
- i = len(dev) - 1
- while dev[i - 1].isdigit():
- i -= 1
- table = 10 + int(dev[i:])
+ table += 1
(fd, rule_tmpnam) = tempfile.mkstemp(dir=sysconfig)
os.write(fd, "from %s lookup %d\n" % (details['IPADDR'], table))
os.close(fd)
logger.verbose('net:InitInterfaces bringing up %s' % dev)
os.system("/sbin/ifup %s" % dev)
+##
+# Prepare the interface details.
+#
+def prepDetails(interface):
+ details = {}
+ details['ONBOOT'] = 'yes'
+ details['USERCTL'] = 'no'
+ if interface['mac']:
+ details['HWADDR'] = interface['mac']
+ if interface['is_primary']:
+ details['PRIMARY'] = 'yes'
+
+ if interface['method'] == "static":
+ details['BOOTPROTO'] = "static"
+ details['IPADDR'] = interface['ip']
+ details['NETMASK'] = interface['netmask']
+ details['GATEWAY'] = interface['gateway']
+ if interface['is_primary']:
+ gateway = interface['gateway']
+ if interface['dns1']:
+ details['DNS1'] = interface['dns1']
+ if interface['dns2']:
+ details['DNS2'] = interface['dns2']
+
+ elif interface['method'] == "dhcp":
+ details['BOOTPROTO'] = "dhcp"
+ details['PERSISTENT_DHCLIENT'] = "yes"
+ if interface['hostname']:
+ details['DHCP_HOSTNAME'] = interface['hostname']
+ else:
+ details['DHCP_HOSTNAME'] = hostname
+ if not interface['is_primary']:
+ details['DHCLIENTARGS'] = "-R subnet-mask"
+
+ return details
+
if __name__ == "__main__":
import optparse
import sys
parser.add_option("-p", "--program", action="store", type="string",
dest="program", default="plnet")
(options, args) = parser.parse_args()
+ options.root = ''
+ options.verbose = True
if len(args) != 1 or options.root is None:
print sys.argv
print >>sys.stderr, "Missing root or node_id"