|
|
@ -1195,7 +1195,7 @@ class LinuxHardware(Hardware):
|
|
|
|
continue
|
|
|
|
continue
|
|
|
|
d = {}
|
|
|
|
d = {}
|
|
|
|
diskname = os.path.basename(sysdir)
|
|
|
|
diskname = os.path.basename(sysdir)
|
|
|
|
for key in ['vendor', 'model']:
|
|
|
|
for key in ['vendor', 'model', 'sas_address', 'sas_device_handle']:
|
|
|
|
d[key] = get_file_content(sysdir + "/device/" + key)
|
|
|
|
d[key] = get_file_content(sysdir + "/device/" + key)
|
|
|
|
|
|
|
|
|
|
|
|
for key,test in [ ('removable','/removable'), \
|
|
|
|
for key,test in [ ('removable','/removable'), \
|
|
|
@ -2130,7 +2130,7 @@ class LinuxNetwork(Network):
|
|
|
|
|
|
|
|
|
|
|
|
# If this is the default address, update default_ipv4
|
|
|
|
# If this is the default address, update default_ipv4
|
|
|
|
if 'address' in default_ipv4 and default_ipv4['address'] == address:
|
|
|
|
if 'address' in default_ipv4 and default_ipv4['address'] == address:
|
|
|
|
default_ipv4['broadcast'] = broadcast
|
|
|
|
default_ipv4['broadcast'] = broadcast
|
|
|
|
default_ipv4['netmask'] = netmask
|
|
|
|
default_ipv4['netmask'] = netmask
|
|
|
|
default_ipv4['network'] = network
|
|
|
|
default_ipv4['network'] = network
|
|
|
|
default_ipv4['macaddress'] = macaddress
|
|
|
|
default_ipv4['macaddress'] = macaddress
|
|
|
|