From bc6c1a7ad23a4816b2b82544ce99b6359cb0de5f 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?= <mh@calculate.ru>
Date: Mon, 28 Aug 2017 12:56:11 +0300
Subject: [PATCH] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD?=
 =?UTF-8?q?=D1=8B=20=D0=BE=D0=BF=D1=86=D0=B8=D0=B8=20=D0=B7=D0=B0=D0=B3?=
 =?UTF-8?q?=D1=80=D1=83=D0=B7=D0=BA=D0=B8=20dracut?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* добавлена опция rd.retry=40 для уменьшения времени ожидания запуска
запасного сценария загрузки
* удалены опции dolvm и domdadm, использованные в genkernel
---
 pym/install/variables/kernel.py | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/pym/install/variables/kernel.py b/pym/install/variables/kernel.py
index 2f2cb1d..f5b57e5 100644
--- a/pym/install/variables/kernel.py
+++ b/pym/install/variables/kernel.py
@@ -282,19 +282,16 @@ class VariableOsInstallKernelAttr(Variable):
     """
 
     def get(self):
-        # on usb-hdd install must be "delay=5"
-        attr = ""
-        rdauto = ""
-        if self.Get('os_install_root_type') == 'usb-hdd':
-            attr = " scandelay=5"
-        if self.Get('os_install_mdadm_set') == 'on':
-            attr += " domdadm"
-            rdauto = " rd.auto"
-        if self.Get('os_install_lvm_set') == 'on':
-            attr += " dolvm"
-            if not rdauto:
-                rdauto = " rd.auto"
-        return attr + rdauto
+        def generate():
+            # 5 sec for usb hdd boot
+            if self.Get('os_install_root_type') == 'usb-hdd':
+                yield "scandelay=5"
+            if (self.GetBool('os_install_mdadm_set') or
+                self.GetBool('os_install_lvm_set')):
+                yield "rd.auto"
+            yield "rd.retry=40"
+
+        return " ".join(generate())
 
 
 class VariableOsInstallKernelResume(ReadonlyVariable):