diff --git a/README b/README index d65b1f1..8f43a46 100644 --- a/README +++ b/README @@ -4,7 +4,7 @@ INSTALL ------- calculate-install needs the following library version installed, in order to run: - calculate-lib >= 2.2.15 + calculate-lib >= 2.2.16 To install calculate-install , just execute the install script 'setup.py'. Example: diff --git a/pym/cl_fill_install.py b/pym/cl_fill_install.py index fa40a2f..4baee20 100644 --- a/pym/cl_fill_install.py +++ b/pym/cl_fill_install.py @@ -857,7 +857,7 @@ class fillVars(object, glob_attr): videoVal = self.getValueFromCmdLine("calculate","video") videoVal = {'i915':'intel'}.get(videoVal,videoVal) if not isPkgInstalled('xorg-server', - prefix=self.Get('cl_chroot_path') or \ + prefix=self.Get('cl_chroot_path')) or \ videoVal in available_drivers: return videoVal return self.getVideoByDefault(available_drivers) diff --git a/pym/cl_install.py b/pym/cl_install.py index 4d065e9..756f62f 100644 --- a/pym/cl_install.py +++ b/pym/cl_install.py @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -__version__ = "2.2.15" +__version__ = "2.2.16" __app__ = "calculate-install" import os @@ -26,7 +26,7 @@ from cl_utils import runOsCommand,appendProgramToEnvFile, \ removeProgramToEnvFile,pathJoin, \ scanDirectory,process,getTupleVersion, \ detectDeviceForPartition,listDirectory, \ - cmpVersion + cmpVersion,STDOUT from cl_vars_share import varsShare from cl_kernel_utils import KernelConfig,InitRamFs @@ -1545,9 +1545,10 @@ class cl_install(color_print, SignalInterrupt): raise DistributiveError(_("Cann't install bootloader")) mbrDisk = self.clVars.Get('os_install_mbr') + process("sync").success() grubProcess = process(cmdGrubInstall, - "--boot-directory=%s"%target.getBootDirectory(), - "/dev/%s"%mbrDisk, "-f") + "--boot-directory=%s"%target.getBootDirectory(), + "/dev/%s"%mbrDisk, "-f", stderr=STDOUT) if grubProcess.failed(): raise DistributiveError(_("Cann't install bootloader")) diff --git a/setup.py b/setup.py index 1da4539..f547a23 100755 --- a/setup.py +++ b/setup.py @@ -102,7 +102,7 @@ class cl_install_data(install_data): setup( name = 'calculate-install', - version = "2.2.15", + version = "2.2.16", description = "Calculate Linux installer", author = "Calculate Ltd.", author_email = "support@calculate.ru",