From d68c86a6e026fb2cebf5b0c5300392f0141263c8 Mon Sep 17 00:00:00 2001 From: Mike Hiretsky Date: Thu, 21 Jul 2011 12:28:41 +0400 Subject: [PATCH] Add determine symlink on device. --- pym/cl_install.py | 5 ++++- pym/cl_vars_install.py | 3 +++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/pym/cl_install.py b/pym/cl_install.py index 71cbba4..887dd43 100644 --- a/pym/cl_install.py +++ b/pym/cl_install.py @@ -26,7 +26,7 @@ from cl_utils import runOsCommand,appendProgramToEnvFile, \ removeProgramToEnvFile,pathJoin, \ scanDirectory,process,getTupleVersion, \ detectDeviceForPartition,listDirectory, \ - cmpVersion,STDOUT + cmpVersion,STDOUT,getUdevDeviceInfo from cl_vars_share import varsShare from cl_kernel_utils import KernelConfig,InitRamFs @@ -602,6 +602,9 @@ class convertDictOpt: dictOptions.update(optProperties) return dictOptions optDevice = optProperties["dev"] + optProperties["dev"] = \ + getUdevDeviceInfo(name=optDevice).get('DEVNAME',optDevice) + optDevice = optProperties["dev"] dataPart = filter(lambda x: x[0]==optDevice, self.varDiskData) if not dataPart: dataPart = [["",False,"","","",""]] diff --git a/pym/cl_vars_install.py b/pym/cl_vars_install.py index e2f0ff3..ed7ef81 100644 --- a/pym/cl_vars_install.py +++ b/pym/cl_vars_install.py @@ -64,6 +64,9 @@ class Data: # list filesystem for partition devices os_disk_format = {} + # list type (lvm,raid,partition,disk) + os_disk_type = {} + # install list filesystem for partition devices os_install_disk_format = {}