Add variable for kernel cmd suffix.

Fix func name. Fix param check.
Add error message for -l.

pym/cl_builder.py

@@ -828,9 +828,10 @@ class cl_builder(color_print):
             self.clVars.Set('os_builder_clock_timezone',timezone,force=True)
             return True
 
-    def setAllLocaleByLang(self,lang):
+    def setLang(self,lang):
         """Set all locale variable by specified lang"""
         if not lang in self.clVars.Get('os_lang'):
+            self.printERROR(_("specified language %s is unsupported")%lang)
             return False
         self.clVars.Set('os_builder_locale_lang',lang, True)
         return True

pym/cl_fill_builder.py

@@ -400,6 +400,7 @@ class fillVars(object, varsShare):
         return "0"
 
     def get_cl_builder_image_path(self):
+        """Path which contains images"""
         imagePath = ['/var/calculate/linux',
                   '/var/calculate/remote/linux',
                   '/usr/calculate/share/linux']
@@ -408,3 +409,17 @@ class fillVars(object, varsShare):
                      self.Get('os_builder_profile').replace('/','-'),
                      "linux"))
         return imagePath
+
+    def get_cl_builder_kernel_cmd(self):
+        """Suffix for kernel cmdline"""
+        suffix = ""
+        timezone = self.Get('os_builder_clock_timezone')
+        lang =     self.Get('os_builder_locale_lang') 
+        if timezone and lang:
+            suffix = "calculate=lang:%s,keymap:%s,timezone:%s" % \
+                (lang,lang,timezone)
+        elif timezone:
+            suffix = "calculate=,,timezone:%s"%(timezone)
+        elif lang:
+            suffix = "calculate=lang:%s,keymap:%s" % (lang,lang)
+        return suffix

pym/cl_image_cmd.py

@@ -178,8 +178,10 @@ class image_cmd(share_cmd):
 
         if args and args[0] == "squash":
             self.logicObj.clVars.Set('cl_builder_iso_path','/mnt/flash',True)
-        self.logicObj.setTimezone(values.timezone)
-        self.logicObj.setLang(values.l)
+        if not self.logicObj.setTimezone(values.timezone):
+            sys.exit(1)
+        if not self.logicObj.setLang(values.l):
+            sys.exit(1)
         self.optobj.checkVarSyntax(values)
         return (values, args)
 

pym/cl_vars_builder.py

@@ -158,6 +158,9 @@ class Data:
     os_builder_locale_lang = {'mode':'w','value':''}
 
     os_builder_clock_timezone = {'mode':'w','value':''}
+
+    cl_builder_kernel_cmd = {'mode':'w'}
+
     # lib vars
     cl_chroot_path = {}
     cl_env_path = {}