From ba7316919a11e46a115c7304e3199ff5da7a7b5b Mon Sep 17 00:00:00 2001
From: Mike Hiretsky <mh@calculate.ru>
Date: Thu, 22 Nov 2012 11:32:33 +0400
Subject: [PATCH] Fix create kernel

---
 pym/cl_kernel.py     | 14 +-------------
 pym/cl_kernel_cmd.py |  6 ++++--
 2 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/pym/cl_kernel.py b/pym/cl_kernel.py
index 3ddf926..456efad 100644
--- a/pym/cl_kernel.py
+++ b/pym/cl_kernel.py
@@ -106,19 +106,7 @@ class cl_kernel(color_print):
                    mrproper=False,target="all"):
         """Run kernel compilation"""
         clVars = self.clVars
-        for themePkg in ['media-gfx/cldx-themes',
-                         'media-gfx/cld-themes',
-                         'media-gfx/cldg-themes',
-                         'media-gfx/cls-themes',
-                         'media-gfx/cds-themes',
-                         'media-gfx/cmc-themes']:
-            installed = getPkgInstalled(themePkg,
-                                       prefix=self.clVars.Get('cl_chroot_path'))
-            if installed and installed[0]['PV'].startswith('12'):
-                themeName = "calculate"
-                break
-        else:
-            themeName = "tty1"
+        themeName = "calculate"
         standardParams = ["--splash=%s"%themeName, "--unionfs",
                           "--all-ramdisk-modules","--disklabel",
                           "--no-save-config", "--firmware","--udev",
diff --git a/pym/cl_kernel_cmd.py b/pym/cl_kernel_cmd.py
index c703820..54edbc0 100644
--- a/pym/cl_kernel_cmd.py
+++ b/pym/cl_kernel_cmd.py
@@ -126,7 +126,8 @@ class kernel_cmd(share_cmd):
                 if not self.logicObj._testKernelDirectory(values.k):
                     self.optobj.error("%s:'%s'"%
                         (_("wrong kernel source directory"),values.k))
-                elif not self.logicObj._testFullKernelDirectory(values.k) \
+                elif not values.initrd and \
+                     not self.logicObj._testFullKernelDirectory(values.k) \
                         and self.checkNotEbuildParam(values,"postinst"):
                     self.optobj.error(("%s:'%s'"%
                         (_("in directory of kernel source not "
@@ -137,7 +138,8 @@ class kernel_cmd(share_cmd):
                 else:
                     self.logicObj.clVars.Set('cl_kernel_src_path',values.k,True)
             elif self.checkNotEbuildParam(values,"postinst"):
-                if not self.logicObj._testFullKernelDirectory(
+                if not values.initrd and \
+                    not self.logicObj._testFullKernelDirectory(
                         self.logicObj.clVars.Get('cl_kernel_src_path')):
                     self.optobj.error((_("in default directory of kernel "
                        "source not enough needed files")+"\n"+