From 5c4016dbc7bdb8677621f53649e8bbea5a8a0d8c Mon Sep 17 00:00:00 2001
From: Mike Hiretsky <mh@calculate.ru>
Date: Fri, 9 Dec 2011 17:52:33 +0400
Subject: [PATCH] Add two options -l --timezone for images.

---
 pym/cl_builder.py      | 17 +++++++++++++++++
 pym/cl_image_cmd.py    | 13 ++++++++++++-
 pym/cl_vars_builder.py |  4 ++++
 3 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/pym/cl_builder.py b/pym/cl_builder.py
index a5cb40d..f032400 100644
--- a/pym/cl_builder.py
+++ b/pym/cl_builder.py
@@ -817,3 +817,20 @@ class cl_builder(color_print):
             self.clVars.Set('cl_builder_live_set',"on",True)
         else:
             self.clVars.Set('cl_builder_live_set',"off",True)
+
+    def setTimezone(self,timezone):
+        """Set timezone"""
+        if not path.exists(path.join("/usr/share/zoneinfo",timezone)) or \
+            timezone.startswith('/usr/share/zoneinfo'):
+            self.printERROR(_("%s timezone is wrong")%timezone)
+            return False
+        else:
+            self.clVars.Set('os_builder_clock_timezone',timezone,force=True)
+            return True
+
+    def setAllLocaleByLang(self,lang):
+        """Set all locale variable by specified lang"""
+        if not lang in self.clVars.Get('os_lang'):
+            return False
+        self.clVars.Set('os_builder_locale_lang',lang, True)
+        return True
diff --git a/pym/cl_image_cmd.py b/pym/cl_image_cmd.py
index fb3b3e5..32f2e35 100644
--- a/pym/cl_image_cmd.py
+++ b/pym/cl_image_cmd.py
@@ -17,7 +17,7 @@
 from cl_builder import cl_builder, __app__, __version__
 from cl_opt import opt
 from cl_share_cmd import share_cmd
-from cl_vars_share import varsShare
+from cl_vars_share import varsShare,clLocale
 from cl_utils import _toUNICODE, getSquashList
 import os
 from os import path
@@ -64,6 +64,15 @@ CMD_OPTIONS = [{'shortOption':"p",
                {'longOption':'noisohybrid',
                 'help':_("create the iso image without isohybrid")
                },
+               {'longOption':'lang',
+                'shortOption':'l',
+                'optVal':"LANG",
+                'help':_("language by default")
+               },
+               {'longOption':'timezone',
+                'optVal':"TIMEZONE",
+                'help':_("timezone by default")
+               },
                {'longOption':"set"},
                {'shortOption':"f",
                 'longOption':"force",
@@ -169,6 +178,8 @@ 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)
         self.optobj.checkVarSyntax(values)
         return (values, args)
 
diff --git a/pym/cl_vars_builder.py b/pym/cl_vars_builder.py
index bd5595e..cb87cef 100644
--- a/pym/cl_vars_builder.py
+++ b/pym/cl_vars_builder.py
@@ -154,6 +154,10 @@ class Data:
     cl_builder_image_path = {}
 
     cl_builder_live_set = {'value':'off'}
+
+    os_builder_locale_lang = {'mode':'w','value':''}
+
+    os_builder_clock_timezone = {'mode':'w','value':''}
     # lib vars
     cl_chroot_path = {}
     cl_env_path = {}