Merge branch 'master' of git.calculate.ru:/calculate-lib

13 years ago · 6ae82084ba
parent 50b513d303 6d553e2abc
commit 6ae82084ba
2 changed files with 4 additions and 2 deletions
--- a/pym/cl_fill.py
+++ b/pym/cl_fill.py
@ -222,6 +222,8 @@ class fillVars(varsShare):
                    mapUuidDev = dict(map(lambda x:(path.basename(x),
                                    path.normpath(path.join(uuidpath,
                                    os.readlink(x)))), uuidDevs))
+                else:
+                    mapUuidDev = {}
                if re.match("^UUID=.*$",rootparam):
                    uuid = rootparam[5:]
                    if uuid in mapUuidDev:
--- a/pym/cl_utils.py
+++ b/pym/cl_utils.py
@ -599,8 +599,8 @@ def isFstabMount(pathname,mapDevUuid={}):
        absPath = "swap"
    else:
        absPath = os.path.abspath(pathname)
-    if not mapDevUuid:
-        devuuid = '/dev/disk/by-uuid'
+    devuuid = '/dev/disk/by-uuid'
+    if not mapDevUuid and os.path.exists(devuuid):
        mapDevUuid.update(
            map(lambda x:("UUID=%s"%os.path.basename(x),
                    os.path.normpath(os.path.join(devuuid,os.readlink(x)))),