New kernel optimization.

pym/cl_kernel.py

@@ -406,8 +406,8 @@ class cl_kernel(color_print):
         if self.skipByChrootAndShortname():
             return True
         # check conflict options
-        if self.checkConflictOptions():
-            return True
+        #if self.checkConflictOptions():
+        #    return True
         bootDir = clVars.Get('cl_kernel_boot_path')
         clKernelUid = clVars.Get('cl_kernel_uid')
         initrdName = path.join(bootDir,"initramfs-%s-install"%clKernelUid)
@@ -426,7 +426,14 @@ class cl_kernel(color_print):
             os.unlink(path.realpath(optInitrdName))
         try:
             initRamFs = InitRamFs(initrdName)
-            return initRamFs.cleanInitRamFs(path.realpath(optInitrdName))
+            hr_video = {'nvidia':'nouveau',
+                        'ati':'radeon',
+                        'intel':'intel'}.get(clVars.Get('hr_video'),"")
+            x11_video_drv = self.clVars.Get('os_x11_video_drv')
+            if x11_video_drv == hr_video:
+                x11_video_drv = ""
+            return initRamFs.cleanInitRamFs(path.realpath(optInitrdName),
+                                            x11_video_drv)
         except (OSError,IOError),e:
             self.printERROR(str(e))
             return False