|
|
|
@ -259,12 +259,15 @@ class fillVars(object, glob_attr):
|
|
|
|
|
disk_hash[dev][key] = value[1:-1]
|
|
|
|
|
# discard comment and empty string
|
|
|
|
|
devuuid = '/dev/disk/by-uuid'
|
|
|
|
|
mapUuidDev = dict(
|
|
|
|
|
map(lambda x:("UUID=%s"%os.path.basename(x),
|
|
|
|
|
os.path.normpath(os.path.join(devuuid,os.readlink(x)))),
|
|
|
|
|
filter(os.path.islink,
|
|
|
|
|
map(lambda x:os.path.join(devuuid,x),
|
|
|
|
|
os.listdir(devuuid)))))
|
|
|
|
|
if path.exists(devuuid):
|
|
|
|
|
mapUuidDev = dict(
|
|
|
|
|
map(lambda x:("UUID=%s"%os.path.basename(x),
|
|
|
|
|
os.path.normpath(os.path.join(devuuid,os.readlink(x)))),
|
|
|
|
|
filter(os.path.islink,
|
|
|
|
|
map(lambda x:os.path.join(devuuid,x),
|
|
|
|
|
os.listdir(devuuid)))))
|
|
|
|
|
else:
|
|
|
|
|
mapUuidDev = {}
|
|
|
|
|
mapDevUuid = dict(map(lambda x:(x[1],x[0]),mapUuidDev.items()))
|
|
|
|
|
mountOptionsList = \
|
|
|
|
|
filter(lambda x: x.strip() and not x.strip().startswith('#'),
|
|
|
|
|