From 2ca357b2c95f4a98ebe4353b3fb54d6e3ab1c55e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A5=D0=B8=D1=80=D0=B5=D1=86=D0=BA=D0=B8=D0=B9=20=D0=9C?= =?UTF-8?q?=D0=B8=D1=85=D0=B0=D0=B8=D0=BB?= Date: Fri, 21 Dec 2018 16:46:17 +0300 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=BE=20=D0=B8=D1=81=D0=BF=D0=BE=D0=BB=D1=8C=D0=B7?= =?UTF-8?q?=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20=D1=83=D0=B6=D0=B5=20?= =?UTF-8?q?=D0=BE=D1=82=D1=84=D0=BE=D1=80=D0=BC=D0=B0=D1=82=D0=B8=D1=80?= =?UTF-8?q?=D0=BE=D0=B2=D0=B0=D0=BD=D0=BD=D1=8B=D1=85=20=D1=80=D0=B0=D0=B7?= =?UTF-8?q?=D0=B4=D0=B5=D0=BB=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit До исправления утилиты проверяли наличие утилиты mkfs. даже если раздел не нужно форматировать. --- pym/install/variables/disk.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pym/install/variables/disk.py b/pym/install/variables/disk.py index 5ef2b3b..2c4b641 100644 --- a/pym/install/variables/disk.py +++ b/pym/install/variables/disk.py @@ -1325,6 +1325,7 @@ class VariableOsLocationFormat(LocationHelper, Variable): availFS = set(self.Select('os_format_type', where='os_format_use', eq='yes')) + allAvailFS = self.Get('os_format_type') default_format = None if self.Get('os_root_type_ext') in RootType.HDD: @@ -1344,8 +1345,8 @@ class VariableOsLocationFormat(LocationHelper, Variable): return "swap" elif mount.startswith('/boot/efi'): return "vfat" - if dev in diskFormat and diskFormat[dev] in availFS: - if mount.count('/') == 1: + if dev in diskFormat and diskFormat[dev] in allAvailFS: + if mount.count('/') == 1 or mount == "/var/calculate": if FileSystemManager.checkFSForTypeMount( diskFormat[dev], osInstallRootType, mount):