From 5d201923aa241370c96ae57126c9ecbb4309f8ce Mon Sep 17 00:00:00 2001
From: Mike Hiretsky <mh@calculate.ru>
Date: Fri, 29 Oct 2010 17:44:43 +0400
Subject: [PATCH] Add work with assemble.

---
 i18n/cl_builder_ru.mo | Bin 11002 -> 11832 bytes
 pym/cl_builder.py     |  67 ++++++++++++++++++++++++++++++++++------
 pym/cl_image_cmd.py   |  70 ++++++++++++++++++++++++++++++++++--------
 3 files changed, 114 insertions(+), 23 deletions(-)

diff --git a/i18n/cl_builder_ru.mo b/i18n/cl_builder_ru.mo
index fb7542d1d6f8f8d66741dcffd714a4b5f9a82d81..8cb38be5da7749ef5703557ae64c8add5eb6b2b3 100644
GIT binary patch
delta 2761
zcmaLXdrXye9LMqB;f|mPVxS>DTntDtFNowNxd>`zX{4rUM0il9aFlZ_XwCzYcEOpK
zY}OxHYueWAqNn2!QT}N;-HPYbtj#r@%YSsMS$`F4v-jsY2PIei#+TRcd7j_-UB18H
z^9-)+S?9l+7IWB8+(Z_!Fxr?ma7!HjDEkwP8IK1r7f;{>9Kad)3#OozXiOze!zt*+
zO#A@H;u*AXAmVMDWQ^aWjtDoLjT33G98+;C>Ib`UCVqrP_+vy@Qn=k@OymB1)IiH|
zIyPb+9*I2fLoH+gwSZeVj`2-Ga`=b2n8SlIRD-psjI^N!K8*R;k7{=#@;q*2xLsbv
za<q899<`vIsDa-{Cli>>^#CR@zWJ4k8V+I^jvp27uolO0y%itCH&H1)j_Rl%$KYku
z?{A_en8<!SfKyQmsYYd}0cm1hLM>o7`n9JYQ_;YeFdd^uhxafOHE=aDH&c)N84v&B
zu>&8**Kslia28&}M{q3rsDY|c8Qh44cmOq#-c<6h0WWexdwdm(F^%bJ1?8v}u12-n
zj2fT=wKb=48h(#TX$*~(p*++;^Y9^bqcXD>)$Sx(XpbTP8B~7bhB{7U6s2+ja?8}A
zg<e$3-$v$WK0&3nFLM71wz-VCjoRxbX1@Sm#X0yD*5V!1p{!-lPJG!<WiypOaR$1X
z{&YNo<#-9_ViE_T1{a}Tvwe~45Gu8qjJg;raXEHl1^$F3n9V+F!nK%#+fW(tAEL61
zN)OJ%IP$6vt8fK2;~ebAM{y7}!4i7Y{YG4cA4abKz-q2%l4teX9`OQB;d(6TRsWS?
z{bmal&Ey?if@e`FinYQ&D8jj1uR<1U4x&0Zfy&4a$cMyCU|BkJRj7%1QG5RxDzleS
znMmNo&%^mxqWAw5Dq7L!$mGp+EWkTRQcMA}QHNEi`#W(h9!HuO7qef3`S_fkBfDv?
zpeFh|@<Ny_X1NrL@d<3lcE&efQ>n&sraKe&pjOt43(>`>9B@;E+%ju$6L#P_yoq`Z
zYdG>$%{J6q^e(Q(3#bK5WHx(nEzZa5=&#TNeqDw2r~!{*CEh}1rkIyods&C2_$ltk
z8_43!b~bh@zK1*TBJ#-8FbgfH6<6YM)K>n5E?lhdzfv*0=)<sxc!p3XO7Uz$MV;sn
zE+d{IwBJg#22s)evMbKPO-AkW2txa>_x^E08DxG=MvJunN`(rOa$X&><rJ+{AD7`J
zoePp;%85E+sEnlIj$G(0#1k(Pam0FJDWRh5HW12!ioQR0i&ClbSQzI_X#a*vEESH5
zNg|?&XNjkY;bp_H3mrxsyz!BH^{8#qma5be{u-wmKGCYiM6MIjB3>YJ2)%kbL`#SY
zB8x~RRCMU{4Vb74irylfpC<_&&?@42LPcNED5vIp;&Yr=OxJwqoKI#M&LUEX1me)O
z^sMrN;^OA|)`m?5R*T1HZTGr2SWPXKx1qJ(*RaWI_H1yQf@1G~KMh1DB)c-2J=<G+
z)}+G5R!?)0*YbI&`#eQ~*u-nmNz3%Gsb!-z$s71N`Ak$`TS}s9WNBHc<!QCr%1Y}>
zO9E}9M?{rwaX0uZO~z{EiD#>uNi=zwO}p3UZZ=-G)8PL50e{+#s8RRUVV|>uhbnT%
z6oz(%Izw++_Nlwe33b>(`?TF-_u0YlvW6OG|9|7aV0vCuzJ1>Q((bj-hW3SCvwQf(
z-g`^7d&5gUn3)mC%9tIWdGsHxgACMT2bF>q+26zjzRUgAmDZ#jaQm#?Gn9v;`SCG+
z`&6jgKFMUiaK?a+&~6RL?0dP@#dViO|NVB*X|;z=&NIR}{-3czowV(ATK9#z&HcUo
X%g^X>-@Tv32JOC3SKwIT%Ba5q9TUT<

delta 2115
zcmXxkSx8h-9LMqFb!sNfN}bGUy;ho)re<lI?b%|BrdFmxzE~7wm=B7=v_L^o6c$uO
z)I-}t1>F|up`fy$2m&)ANQ5FX41$WFqWb>s+&TE4&s~o9ob&&mdpl}=Rfc<#d?yX9
zmKaU=VvPx7{{VhypZvy*#6FykzJM`9u@D#Ia?HX*n2L9CIKD(1KVmxi2Sx5@<2cTX
zF;PR+bD)mRn2)D%GQRNqiF7n+amFNJK5Bqs%)=U-fJeRiH&GMr#4*^5A^eN_ztni1
zh0}11mRibzR=yK8@L`;Yw^1G6diVc$h6YFa7og4ka@2~NPy?Sp4Riy?VyAci1J2^y
zmk{~?A`B_jn>iSTO{f$eLp|UsCgTIt09~kweZv$?9THh#4k|NikUz79A5FXg$K!F-
zz_&1nUoZ<T>KN9*IUMjzQ-Z^=3MseQj#IG_XW}``!B?mOd~{aEGB6WMQ3JG~N_iBs
z@gZu$Ur`J4Q&069l}P^e;9M@K1ofDU`%$U8g~~`5YJh&sz~L-cnV5&_SBHAe9#p38
zpay!4HhxBBG@gq*!la@0Mt(B+*NrkRG{+dT6;;DtrdN)?QJZTWo%Z5x+<`xEI@YnQ
zJUoF5@d*~Ae?;W%Sc^J8j>^;<T!9v=D#em82a7m3i!-nXHM3;4Y#QdFR$7j0uo>s!
z6VwA^nQa+n;~Wg*Y`lk>*mv)G26f)Rc^#@>2QI_#HxBgR+2mgyL~V|4)BqN<ky)sT
zY`~S+ipoqUs(&BO#T4qH{_9aIZ$rKRk5GH34>f@hb)uAEQ^A2!*^0`*b<_&qd*`+t
zSxF@_hB=6n@FFsI^8)q2KGgMzq-`^<M(zH~ScT89TKBm~70e!-toQ#E2W(995LaUt
zwxG@Ol%g}3kG-fB1xdqFtVUK~&f_+GiZz(aa;M-C)Py=vZ$U3^#3B5XCR~pP7~fpr
zpa?VRy+}8330^@B)Q^iXk5@o7ZNg)C2^rHAlJ99)gKc;i_1XrQg(f}&D{&jDME5ZU
z+3Q+=q^SgIs--4VOlY=)h-gz;qD>PSK#(lAsT6A3d};|1jO95CR}p+V+{NfMFVOf(
zg=VEjhTLy;94eKY2$d$<_yW6ofP}f5Y$c8)D6N}vFbjzaLYY&WPw>HW8wqop%B;3F
zy8a+1yt?j3NN)idcQ=c6?0O=JNF>x$8aA;RtP`3_pr*~MGS~#42lwp&Gmt1G%7|K`
zl+b?A>sT4hzmF5us+>?;LChqyQ`Jfc?ds*kG9udi-ht|^T^?<GMofShN30{XuNDw$
zvHD5h)!4Aru5LdS2s&Q^@i9&)t~=KGmC#|ezZ=%$JWC8%PJFP%a{i@^x18Egf#11i
VKleG0)Az+VRg(t#oDWkgtpAmy#AyHk

diff --git a/pym/cl_builder.py b/pym/cl_builder.py
index 564a7dd..95a0fd7 100644
--- a/pym/cl_builder.py
+++ b/pym/cl_builder.py
@@ -23,21 +23,23 @@ import sys
 import traceback
 from os import path
 from cl_utils import process,pathJoin,getRunCommands,getTupleVersion,\
-                        childMounts
+                        childMounts,_toUNICODE,isMount
 from subprocess import STDOUT,PIPE
 from cl_print import color_print
 from cl_datavars import DataVars
 from shutil import copy2 as copy_with_perm
 from cl_distr import IsoDistributive, DirectoryDistributive, \
                     DistributiveError
-from cl_template import template
+from cl_template import template,iniParser
 from cl_vars_share import varsShare
+from datetime import datetime
 
 from cl_kernel_utils import KernelConfig,InitRamFs
 
-from cl_lang import lang
 from server.utils import dialogYesNo
 import cl_overriding
+from cl_lang import lang
+lang().setLanguage(sys.modules[__name__])
 
 class printNoColor:
     def colorPrint(self,attr,fg,bg,string):
@@ -86,6 +88,7 @@ class cl_builder(color_print):
         self.startMessage = ""
         self.clTempl = None
         self.force = False
+        self.assembleIso = False
 
     def setNoColor(self):
         self.color = False
@@ -286,6 +289,7 @@ class cl_builder(color_print):
             return False
         elif not self.clVars.Get('cl_builder_kernel'):
             self.printERROR(_("Can not detect kernel"))
+            return False
         elif not self.clVars.Get('cl_builder_initrd_install'):
             self.printERROR(_("Can not detect initramfs"))
             return False
@@ -322,13 +326,13 @@ class cl_builder(color_print):
         self.targetDistr.installFrom(self.sourceDistr)
         self.printByResult(True)
 
-        self.targetDistr = PartitionDistributive(rootPartdev,flagRemoveDir=False)
-        dd = DirectoryDistributive(mp,parent=self.targetDistr)
-        self.removeVars('os_assemble_linux_ver', 'os_assemble_linux_shortname',
-                        'cl_assemble_image', 'cl_assemble_step_system',
-                        'cl_assemble_make', 'cl_assemble_step_world',
-                        'cl_assemble_step_newuse', 'cl_assemble_step_update',
-                        'cl_assemble_path')
+        #self.targetDistr = PartitionDistributive(rootPartdev,flagRemoveDir=False)
+        #dd = DirectoryDistributive(mp,parent=self.targetDistr)
+        #self.removeVars('os_assemble_linux_ver', 'os_assemble_linux_shortname',
+        #                'cl_assemble_image', 'cl_assemble_step_system',
+        #                'cl_assemble_make', 'cl_assemble_step_world',
+        #                'cl_assemble_step_newuse', 'cl_assemble_step_update',
+        #                'cl_assemble_path')
         return True
 
     def removeVars(self,*varsname):
@@ -424,6 +428,8 @@ class cl_builder(color_print):
                 self.printMessageForTest(_("Unmount built system volume"))
                 self.targetDistr.close()
                 self.printByResult(True)
+            if self.assembleIso:
+                self.restoreMount()
         except (BuilderError,DistributiveError),e:
             error = "%s\n%s" % (str(error),_("Unmounting error"))
         except KeyboardInterrupt,e:
@@ -437,3 +443,44 @@ class cl_builder(color_print):
             return False
         self.printSUCCESS(_("System has built successfully"))
         return True
+
+    def restoreMount(self):
+        """Mount /proc,/sys, remote, /dev to chroot"""
+        mountResources = (("/dev",None,None),
+                          ("/dev/shm",None,None),
+                          ("/dev/pts",None,None),
+                          (None,"-t proc","/proc"),
+                          (None,"-t sysfs","/sys"),
+                          ("/var/calculate/remote",None,None))
+        assemblePath = self.clVars.Get('cl_builder_path')
+        for source,opts,target in mountResources:
+            opts = opts or "-o bind"
+            target = target or source
+            self.printMessageForTest(_("Mounting %s")%(source or target))
+            target = pathJoin(assemblePath,target)
+            if not path.exists(target):
+                os.makedirs(target,mode=0755)
+            if source == isMount(target):
+                continue
+            args = ["mount"]+opts.split()+[str(source).lower(),target]
+            mountProcess = process(*args)
+            if mountProcess.failed():
+                raise BuilderError(_("Can not mount %(from)s to %(to)s")%
+                        {'from':source,'to':target})
+            self.printByResult(True)
+
+    def setAssembleData(self):
+        """Get assemble data from assemble.env"""
+        self.assembleIso = True
+        section = (self.clVars.Get('os_builder_linux_shortname'),
+                   self.clVars.Get('os_builder_arch_machine'))
+        envFile = '/etc/calculate/assemble.env'
+        envData = iniParser(envFile)
+        self.clVars.Set('cl_builder_path', _toUNICODE(envData.getVar(section,
+                          'cl_assemble_path')).encode('utf-8'),True)
+        linuxver = _toUNICODE(envData.getVar(section,
+                          'os_assemble_linux_ver')).encode('utf-8')
+        if not linuxver:
+            curdate = datetime.now()
+            linuxver =  "%04d%02d%02d"%(curdate.year,curdate.month,curdate.day)
+        self.clVars.Set('os_builder_linux_ver',linuxver ,True)
diff --git a/pym/cl_image_cmd.py b/pym/cl_image_cmd.py
index 154577a..42604e7 100644
--- a/pym/cl_image_cmd.py
+++ b/pym/cl_image_cmd.py
@@ -17,6 +17,8 @@
 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_utils import _toUNICODE
 import os
 from os import path
 from os import access,R_OK
@@ -28,11 +30,27 @@ from cl_template import iniParser
 from cl_lang import lang
 lang().setLanguage(sys.modules[__name__])
 
+OSSYSTEM_LIST=sorted(varsShare.dictNameSystem.keys())
 
 DESCRIPTION = _("The Calculate Linux image builder")
 CMD_OPTIONS = [{'shortOption':"f",
                 'longOption':"force",
                 'help':_("no questions during the creating process")
+               },
+               {'shortOption':"s",
+                'longOption':"os",
+                'optVal':"SYSTEM",
+                'type':'choice',
+                'choices_regignore':OSSYSTEM_LIST,
+                'help':_("select operation system")+
+                    " (%s)"%",".join(OSSYSTEM_LIST)
+               },
+               {'longOption':"march",
+                'optVal':"ARCH",
+                'type':'choice',
+                'choices':['x86_64','i686'],
+                'help':_("select arch for operation system") +
+                       " (%s)"%_("i686 or x86_64")
                }]
 USAGE = _("%prog [options] iso|squash")
 
@@ -48,28 +66,39 @@ class image_cmd(share_cmd):
                           check_values=self.checkOpts)
         self.logicObj = cl_builder()
         self.commands = ["iso","squash"]
+        self.envFile = "/etc/calculate/assemble.env"
         #self.optionsInitrdIncompatible = ["o","no_clean","m","mdadm","lvm",
         #                                  "k", "e","dmraid","c","ebuild",
         #                                  "symlink"]
 
-    def isScratch(self):
+    def __sectionName(self):
+        """Get section name of assemble.env by shortname and arch"""
+        return (self.logicObj.clVars.Get('os_builder_linux_shortname'),
+                self.logicObj.clVars.Get('os_builder_arch_machine'))
+
+    def isScratch(self,showError=True):
         """Detect scartch system"""
-        if self.logicObj.clVars.Get('os_scratch') == 'on':
-            return True
-        else:
-            self.printERROR(_("You should load system in the builder mode."))
-            return False
+        if not path.exists(self.envFile) \
+            or not self.logicObj.clVars.Get('cl_builder_path'):
+            if self.logicObj.clVars.Get('os_scratch') == 'on':
+                return True
+            else:
+                if showError:
+                    self.printERROR(
+                        _("You should load system in the builder mode"))
+                return False
+        return False
 
-    def isAssemble(self):
+    def isAssemble(self,showError=True):
         """Detect system assembling"""
-        detectAssemble = re.compile("^\[assemble\]",re.S)
-        if filter(detectAssemble.search,
-                      open("/etc/calculate/calculate2.env",'r')):
-            inidata = iniParser(inifile)
-            res = inidata.getVar("assemble","cl_assemble_step_world",
+        if path.exists(self.envFile) \
+            and self.logicObj.clVars.Get('cl_builder_path'):
+            inidata = iniParser(self.envFile)
+            res = inidata.getVar(self.__sectionName(),"cl_assemble_step_world",
                                  checkExistVar=True)
             if not res[0] or not "finish" in _toUNICODE(res[1]).encode('utf-8'):
-                self.printERROR(_("System assembling was not completed."))
+                if showError:
+                    self.printERROR(_("System assembling was not completed."))
                 return False
             return True
         else:
@@ -90,6 +119,21 @@ class image_cmd(share_cmd):
         if args:
             self.logicObj.clVars.Set('cl_action',args[0],True)
 
+        if values.s:
+            if self.isScratch(False):
+                self.optobj.error(_("'-s' not used in scratch mode"))
+            self.logicObj.clVars.Set('os_builder_linux_shortname',
+                                     values.s.upper(),True)
+        if values.march:
+            if self.isScratch(False):
+                self.optobj.error(_("'--march' not used in scratch mode"))
+            self.logicObj.clVars.Set('os_builder_arch_machine',
+                                     values.march.lower(),True)
+
+        if not self.isScratch(False) \
+            and path.exists(self.envFile):
+            self.logicObj.setAssembleData()
+
         if args and args[0] == "squash":
             self.logicObj.clVars.Set('cl_builder_iso_path','/mnt/flash',True)
         self.optobj.checkVarSyntax(values)