From 1076a5a6bd7ab0d54ffc1bd8f6f7bf01c1b4c055 Mon Sep 17 00:00:00 2001 From: Mike Hiretsky Date: Wed, 28 Sep 2011 15:44:58 +0400 Subject: [PATCH] Move refresh udev and lvm from cl_fill_install to cl_install. --- pym/cl_fill_install.py | 7 +------ pym/cl_install.py | 7 ++++++- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pym/cl_fill_install.py b/pym/cl_fill_install.py index e877401..27b0881 100644 --- a/pym/cl_fill_install.py +++ b/pym/cl_fill_install.py @@ -29,7 +29,7 @@ from cl_utils import isMount,typeFile,getTupleVersion,pathJoin,isFstabMount,\ FStab, lspci, getInstalledVideo,getDeviceType, \ getPartitionType, getOsProberHash, getProgPath, \ getRaidPartitions, getLvmPartitions, getLvmGroups, \ - refreshLVM, refreshUdev, getPasswdUsers + getPasswdUsers from cl_distr import DistributiveRepository,PartitionDistributive from cl_fill import clLocale from operator import itemgetter @@ -325,11 +325,6 @@ class fillVars(object, glob_attr): else: return devpath - # refresh information about LVM - refreshLVM() - # refresh information about device in udevadm info - refreshUdev() - devicesHash = self.Get('os_device_hash') sysBlockPath = '/sys/block' # get disks from sys block which not contains partitions diff --git a/pym/cl_install.py b/pym/cl_install.py index 4d30f2f..c723dc5 100644 --- a/pym/cl_install.py +++ b/pym/cl_install.py @@ -28,7 +28,7 @@ from cl_utils import runOsCommand,appendProgramToEnvFile, \ detectDeviceForPartition,listDirectory, \ cmpVersion,STDOUT,getUdevDeviceInfo, \ getLvmPartitions,getInstalledVideo, \ - getSupportArch + getSupportArch, refreshLVM, refreshUdev from cl_vars_share import varsShare from cl_kernel_utils import KernelConfig,InitRamFs @@ -801,6 +801,11 @@ class cl_install(color_print, SignalInterrupt): Spinner().setWriteFunc(self.defaultPrint) cl_overriding.exit = installExit cl_overriding.printERROR = overprintERROR + # refresh information about LVM + refreshLVM() + # refresh information about device in udevadm info + refreshUdev() + def setNoColor(self): self.color = False