From a5d446cde80c95a4070427bfcdc8a1e2f3842c84 Mon Sep 17 00:00:00 2001
From: Mike Hiretsky <mh@calculate.ru>
Date: Tue, 1 Feb 2011 17:46:05 +0300
Subject: [PATCH] Add check conflict options.

---
 i18n/cl_builder_ru.mo | Bin 13964 -> 14046 bytes
 pym/cl_kernel.py      |  21 +++++++++++++++++++++
 2 files changed, 21 insertions(+)

diff --git a/i18n/cl_builder_ru.mo b/i18n/cl_builder_ru.mo
index 5aefcc54d3bc1dc07f6c886f9d907952a49d825a..236c52c872668888fa72808b8300f8a5e9660cbb 100644
GIT binary patch
delta 2491
zcmZwHZA_JA9LMoLAR$O#AV)>f1E_&eJeWN|sDL~e!azkd@ZktZ1PCE0RP#*T+%!=W
znANJ4wpzAjhNh*oG#AwiJa6hn8f&vQ+}ey)Q?t3gKhCYMx_18e=enP+hyQimXMf8`
zi+3byLcdYEh?&IIAhTomW(WsLQkYpRCSw9F#W~o3akw8d@i^+apPlnt7|D6cB(prs
z##G#a)9@pVG4t9bDsC?P<ah_?ay~QM|6m@@=DZpo!k5sEJxBxgF)qMMn2fg^6CU*6
zUygcj6RMpKjKaS0`(CpTsAO<q5EJo+^FVZje@63AGtI^6xB=C1H^$>Z=l)4l1}~!q
z@;fS1F4CaqvQhWfIld_A-;Pjm<0;e#e{lR8mC~5W{u!jBI?lscxCTj<ZAZPg8=u5u
zIKGsq0pG?M7)=_K`ZQEK#psQuvfjDTjxNq$L0vzJYWOqMOn!9k-$7+0iaaWn=^U7>
z<)b=Sftqm>YR~kb2KEU~!RwfcccWN;jVy)U$hs9FgSAT3%r~R<;ZB^7docx1;X?cc
zpFkI_rePVX;~l6acn6d4d(;5`M1B^?^cUdN81nxJl@cy!=G{n}b_n(0d$<rkN2T-z
zrein{YYB2tGp=#$M0I!o=iwPt=0;G@2Tk=abprCUd@o0JP>mJ%DrVs|RO)BZx<<YT
zHLy~2qX!v_?Lt<=UPCR(aa2aXb?*O)T>)nQpfb9Z!(u#ux#%6Hl0{`QZxv$+DkFWk
z5-*~@3K!GgiCNf$=P?tL=rseYaS8TdHV$JUhB0k@{}rh7KGf1&LHhGrFw<13%CH<e
zQ6u{XAH#`m{{V83HqC=Y=*4&(LZ$dRmSO}KpT-(gN3WwY`!#B!G3>~vupBe!-}X__
zjq|t~Z#w5?OuK;dy|@Z5V+qcoH|^dwR0nT44k14q<M1fD_!nD-1<0#*5H+Cz)cd2D
zP5&0d^!1%qpc-t#LhMJLv8$-v9r&<+pqa=eYe6kRAFAOYd=~#jO{j{Ur~w^DW#kO%
zxxY|LmP}_}rL>v~?^rjo-1aW&a~ni8H0s<><f1w#L6T(e<68U<t1*#plYMJm<P|%D
z8t4VoXFZA~cpH~vK`Qz0rgE5k)L=L}uK*iS-{%P|#A~<|=aX0dJFFGe@Gg7~KSaGB
zMVc6kwW22U2J)(1#47v)HKAg@;XSxJo&4ue2_ql5x`8}n`!FBBKy`c<^Dv)$Q?)%<
zif8e0e1Op&!W`_!VN^!y$hVf@D^#X`L&j=BeDg13=0+-H!%m=Pd<82pl2)~5^{CJ3
zC<fqW;$B%zWf4*9T+s8pZgqqvrLv*-LP%ObNAFljVu6-UlW8Tk5RBcz2rZ2U8%V?w
z%IFkA8CEu*Cn^XfsH%7E#1wBEH5F!K69_)l@uJP}j8lIBBZ*+5#koe>@0X3#nhB3{
zr3?8_7%%HMt|DASF`><-FF~c;tT!k$E}*hEK6Hk68&_5kTIEfIN)a(>yyib_2W>kg
zekGxNYJ1ib@dT;0t;8BayGUg*p#@gyB(#VT#4=(%p<TL!k(>*So8CzMUg2-{erf0(
z3yltL=e%hkG^{i<wz93x)6ux4!CmWVuI+60bkw_Bx7D{dd%6cIqw}WCecN}^H|YD)
W_o?rk?=-cuzSIBnXn)Ghu>SxM<q?_y

delta 2410
zcmX}se@s<n9LMqR6$!bT)V+#a=*B^keq73Xfsn`&sGC;^LLsOOEI{yrP-$vT+?kuJ
z+*k|m%$7toT>Vp94%)1Z>W^~$ur;?ft(DfAn|fPYbN%|G*89Uf_UwMo>pAB+=RD8z
zeV%jA4v!7HX9M#O8D$r79q~<;*%XfDaG(_U%?dGu%drY?z)lR~C|2MrsQbS1&M#md
z=S2(68Zd(8ID!Ru1ecn*HbceX!WW)tT*3LGMVT8bu$c2EycUPh!M(@}Y!WMR25-g-
zo`I_~?W<AGZ9u)J4+FS=uH7{|OeMyJcd!)Cc{gM&&dewuHPaY|@BviENi0FvYkvck
z!H-Y_`5u+2t4M?Hi=f(@JqIQI+jCSLJc=6Or=I6gDb2nnGXn?JaRpwF2_#uIfO>8_
z)?f<N(Mi;RFJcj9kp`u{81<eSbc0k{yoMgk=X?+9`a#r--$c#igx8)%Wn><CR4N?~
zOx7w<9W<b3yb-l$_M!&%IxfL)u^fL5u>KlZ5xtRhTZIhP;;8-Cfwy2cM(_aMj_=_r
zOyf!{<*n+l4VC&GcoV*c8rWyZ&rWlw#9#1Mbe58T&A5ep@Gjeox^XwEqZd%A`~;);
z6Dsuq9@0!>o{gvud$A11P#K#>-G2rh{1ca90SCQ5>QY%xr5|hYI4b3rQ6mr1iw3qF
z9jr#iV4cV+*f44-TvR4s_1fRZXMAQ~qxMjO!y4?xdYr;qbk9>sP;q!#DM?}*9!7l)
zY21f-q+tlhu>$|W7)I&64twxUoWlF?9O}C-WBNKzqL$`eRDa(gnR2a^>9%sA5jC<S
zScN~J1`u#EGpxq7oVQ~MPM}i!AvWXBxEf<Ls-qE9W?x3l^b+2IE7*}5_$I8Se;cRL
z!G)7^7wD8;<D7S6J08U*{2R4v<MgTyws}sV26BSKZJ5S&SjfK^k60gSLeHa~pG9Tr
z5{BsC%E*IWScgj0Akt>XP`mpyY6dwsW;Ry?Y6+647f;|LcnWo2IXh7U8bD=a40Ye<
zsG0wZtd2$L)a4m#p~5oTPSodi5cQ&2RQq434jdXulI_8VaS}JG9oete&Ns@fwiWdm
zzl6%%TX;WS#@$#)8Xm<D%E^D6$})CdC3c}QFpl@)8RWmh!sL}CSQNKlC+Y<sBYj(#
zG-;p-<Pm!kJ8=><kw5TRjPVWMg~zd8*Q4a0Hme~o_uv*($8Tc;{)YUlihMU?KUU)m
zzKCf&grkgJnFx?)rG5mJ;uJDQJBFk9Ba#H`;^WtZ542KwkjgA-t%AH=o1+zdxS6<8
zbl=@Xk9R@$^O*G#nw3g->Qv53-}aPmL1|n|q{)mB!vteBKcS`3a?T?Pi2-5>p$sdV
zNurfdhB{Ko1rhfNYATH0<`cy_p*%!1&eg~{<`LP%R_|KWQ*0uJh{p((T?GFDb46>}
zM&uI-LYquqfLBt%+_0}b70WGhcW`Mvp;dm|YhH^By}H;*G!aVt215DNw(KKH2vTd?
z2<;Fpn#vkN3#{@qp+#IwtRuPz?b15d^UK_DNIURK;qUeT(x3AAgV|4UJ~$onH|I|8
N3)UA*UyS_j{|_d=>!Sbw

diff --git a/pym/cl_kernel.py b/pym/cl_kernel.py
index 7950366..2d4b96e 100644
--- a/pym/cl_kernel.py
+++ b/pym/cl_kernel.py
@@ -358,11 +358,32 @@ class cl_kernel(color_print):
                 return False
         return True
 
+    def checkConflictOptions(self):
+        """Clean initrd from needless modules"""
+        # section which must contains equealent modules and kernel buildins
+        importantSections = ['File systems','Pseudo filesystems',
+                             'CDROM.*Filesystems', 'DOS.*Filesystems',
+                             'SCSI Transport']
+        # get dictionary from current config
+        curConfig = dict(KernelConfig().getSectionParams(*importantSections))
+        # get config of new kernel
+        newConfig = KernelConfig(configFile=self._getNewName("config"))
+        newConfig = newConfig.getSectionParams(*importantSections)
+        # find and return conflict option
+        # options, which M in new config and Y in current config
+        return filter(lambda x: x[1]=="M" and
+                                 x[0] in curConfig and
+                                 curConfig[x[0]]=="Y",
+                                 newConfig)
+
     def cleanInitrd(self):
         """Discard from initrd non-critical modules"""
         clVars = self.clVars
         if self.skipByChrootAndShortname():
             return True
+        # check conflict options
+        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)