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):