import sys, os, traceback
import string
import socket
+import re
import utils
from Exceptions import *
dns2
hostname
domainname
+
+ the mac address is read from the machine unless it exists in the
+ configuration file.
"""
log.write( "\n\nStep: Reading node configuration file.\n" )
except IOError, e:
pass
- utils.sysexec_noerr( "umount /dev/fd0", log )
+ utils.sysexec_noerr( "umount %s" % mount_point, log )
if __parse_configuration_file( vars, log, conf_file_contents):
return 1
else:
except IOError, e:
pass
- utils.sysexec_noerr( "umount /dev/fd0", log )
+ utils.sysexec_noerr( "umount %s" % mount_point, log )
continue
log.write( "Checking removable device %s\n" % device )
-
- # ok, try to mount it and see if we have a conf file.
- full_device= "/dev/%s1" % device
- try:
- utils.sysexec( "mount -o ro -t ext2,msdos %s %s" \
- % (full_device,mount_point), log )
- except BootManagerException, e:
- continue
-
- conf_file_path= "%s/%s" % (mount_point,NEW_CONF_FILE_NAME)
- if os.access( conf_file_path, os.R_OK ):
+ partitions= file("/proc/partitions", "r")
+ for line in partitions:
+ if not re.search("%s[0-9]*$" % device, line):
+ continue
+
try:
- conf_file= file(conf_file_path,"r")
- conf_file_contents= conf_file.read()
- conf_file.close()
- except IOError, e:
- pass
-
- utils.sysexec_noerr( "umount %s" % full_device, log )
- if __parse_configuration_file( vars, log, conf_file_contents):
- return 1
- else:
- raise BootManagerException("Found configuration file plnode.txt " \
- "on floppy, but was unable to parse it.")
-
+ # major minor #blocks name
+ parts= string.split(line)
+
+ # ok, try to mount it and see if we have a conf file.
+ full_device= "/dev/%s" % parts[3]
+ except IndexError, e:
+ continue
+
+ try:
+ utils.sysexec( "mount -o ro -t ext2,msdos %s %s" \
+ % (full_device,mount_point), log )
+ except BootManagerException, e:
+ continue
+
+ conf_file_path= "%s/%s" % (mount_point,NEW_CONF_FILE_NAME)
+ if os.access( conf_file_path, os.R_OK ):
+ try:
+ conf_file= file(conf_file_path,"r")
+ conf_file_contents= conf_file.read()
+ conf_file.close()
+ except IOError, e:
+ pass
+
+ utils.sysexec_noerr( "umount %s" % mount_point, log )
+ if __parse_configuration_file( vars, log, conf_file_contents):
+ return 1
+ else:
+ raise BootManagerException("Found configuration file plnode.txt " \
+ "on floppy, but was unable to parse it.")
+
# 3. check standard floppy disk for old file name planet.cnf
def __parse_configuration_file( vars, log, file_contents ):
"""
parse a configuration file, set keys in var NETWORK_SETTINGS
- in vars (see comment for function ReadNodeConfiguration)
+ in vars (see comment for function ReadNodeConfiguration). this
+ also reads the mac address from the machine if successful parsing
+ of the configuration file is completed.
"""
BOOT_CD_VERSION= vars["BOOT_CD_VERSION"]
if name == "DOMAIN_NAME":
NETWORK_SETTINGS['domainname']= string.lower(value)
+ if name == "NET_DEVICE":
+ NETWORK_SETTINGS['mac']= string.upper(value)
+
+
except IndexError, e:
log.write( "Unable to parse configuration file\n" )
return 0
NETWORK_SETTINGS["dns1"]= ""
NETWORK_SETTINGS["dns2"]= ""
-
log.write("Successfully read and parsed node configuration file.\n" )
-
+ # if the mac wasn't specified, read it in from the system.
+ if NETWORK_SETTINGS["mac"] == "":
+ device= "eth0"
+ mac_addr= utils.get_mac_from_interface(device)
+
+ if mac_addr is None:
+ log.write( "Could not get mac address for device eth0.\n" )
+ return 0
+
+ NETWORK_SETTINGS["mac"]= string.upper(mac_addr)
+
+ log.write( "Got mac address %s for device %s\n" %
+ (NETWORK_SETTINGS["mac"],device) )
+
+
+ # now, if the conf file didn't contain a node id, post the mac address
+ # to plc to get the node_id value
if vars['NODE_ID'] is None or vars['NODE_ID'] == 0:
log.write( "Configuration file does not contain the node_id value.\n" )
log.write( "Querying PLC for node_id.\n" )
bs_request= BootServerRequest.BootServerRequest()
-
- try:
- ifconfig_file= file("/tmp/ifconfig","r")
- ifconfig= ifconfig_file.read()
- ifconfig_file.close()
- except IOError:
- log.write( "Unable to read ifconfig output from /tmp/ifconfig\n" )
- return 0
- postVars= {"ifconfig" : ifconfig}
+ postVars= {"mac_addr" : NETWORK_SETTINGS["mac"]}
result= bs_request.DownloadFile( "%s/getnodeid.php" %
SUPPORT_FILE_DIR,
None, postVars, 1, 1,
log.write( "Hostname %s correctly resolves to %s:\n" %
(hostname,node_ip) )
-
- # 3.x cds, with a node_key on the floppy, can update their mac address
- # at plc, so get it here
- if BOOT_CD_VERSION[0] == 3 and vars['WAS_NODE_ID_IN_CONF'] == 1:
- eth_device= "eth0"
- try:
- hw_addr_file= file("/sys/class/net/%s/address" % eth_device, "r")
- hw_addr= hw_addr_file.read().strip().upper()
- hw_addr_file.close()
- except IOError, e:
- raise BootmanagerException, \
- "could not get hw address for device %s" % eth_device
-
- NETWORK_SETTINGS['mac']= hw_addr
-
vars["NETWORK_SETTINGS"]= NETWORK_SETTINGS
git://git.onelab.eu / bootmanager.git / blobdiff