From 47cfc98f11e758cf092da42e08aadf62cd37c481 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9F=D0=B0=D0=B2=D0=B5=D0=BB=20=D0=98=D0=B2=D0=B0=D0=BD?= =?UTF-8?q?=D0=BE=D0=B2?= Date: Tue, 19 Jul 2022 17:12:50 +0300 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B0=20=D0=BF=D0=BE=D0=B4=D0=B4=D0=B5=D1=80=D0=BA=D0=B0?= =?UTF-8?q?=20=D0=BD=D0=BE=D0=B2=D0=BE=D0=B3=D0=BE=20=D0=BF=D1=83=D1=82?= =?UTF-8?q?=D0=B8=20=D0=BA=20=D0=BF=D0=BE=D1=80=D1=82=D0=B5=D0=B6=D0=B0?= =?UTF-8?q?=D0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pym/install/variables/system.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pym/install/variables/system.py b/pym/install/variables/system.py index fb970eb..70041f5 100644 --- a/pym/install/variables/system.py +++ b/pym/install/variables/system.py @@ -725,8 +725,12 @@ class VariableOsNvidiaMask(ReadonlyVariable): chrootPath = image.getDirectory() else: chrootPath = self.Get("cl_chroot_path") - nvidiaeclass = path.join(chrootPath, - 'usr/portage/eclass/nvidia-driver.eclass') + if os.path.isdir(path.join(self.Get('cl_chroot_path'), 'var/db/repos/gentoo')): + nvidiaeclass = path.join(chrootPath, + 'var/db/repos/gentoo/eclass/nvidia-driver.eclass') + else: + nvidiaeclass = path.join(chrootPath, + 'usr/portage/eclass/nvidia-driver.eclass') if not os.access(nvidiaeclass, os.R_OK): return "" #TODO investigate