From 45f86a58317df95d6d326abf348b20700845f35f Mon Sep 17 00:00:00 2001 From: Mike Hiretsky Date: Wed, 25 Nov 2015 17:07:50 +0300 Subject: [PATCH] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD?= =?UTF-8?q?=D0=B8=D1=8F=20=D0=B4=D0=BB=D1=8F=20isoscan?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pym/calculate/lib/variables/system.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pym/calculate/lib/variables/system.py b/pym/calculate/lib/variables/system.py index 7e66380..ab51d2a 100644 --- a/pym/calculate/lib/variables/system.py +++ b/pym/calculate/lib/variables/system.py @@ -138,7 +138,7 @@ class RootType(object): Value.IsoScanGrub, Value.NetBoot) IsoScan = (Value.IsoScanFlash, Value.IsoScanGrub) - RebuildAvailable = (Value.LiveFlash, Value.IsoScanGrub, Value.IsoScanFlash) + RebuildAvailable = (Value.LiveFlash, Value.IsoScanFlash) Grubable = (Value.HDD, Value.USB_HDD, Value.IsoScanGrub) @@ -165,6 +165,11 @@ class VariableClIsoscanPath(ReadonlyVariable): def get(self): return getValueFromCmdLine("iso-scan/filename", 0) or "" +class VariableClIsoscanBasePath(ReadonlyVariable): + """ + Путь куда монтируется устройство isoscan + """ + value = Dracut.IsoScanPath class VariableClIsoscanFullpath(ReadonlyVariable): """ @@ -174,7 +179,8 @@ class VariableClIsoscanFullpath(ReadonlyVariable): def get(self): isoscan_path = self.Get('cl_isoscan_path') if isoscan_path: - return pathJoin(Dracut.IsoScanPath, isoscan_path) + isoscan_base_path = self.Get('cl_isoscan_base_path') + return pathJoin(isoscan_base_path, isoscan_path) return ""