[Uludag-commits] r16254 - trunk/yali/yali/gui

[uludag-commits at pardus.org.tr]

Author: gokmen.goksel
Date: Thu Dec  6 11:47:28 2007
New Revision: 16254

Modified:
   trunk/yali/yali/gui/ScrGoodbye.py
Log:
if oeminstall exists dont merge the xorg.conf, zorg will create a new one at next boot..

Modified: trunk/yali/yali/gui/ScrGoodbye.py
=================================================================
--- trunk/yali/yali/gui/ScrGoodbye.py	(original)
+++ trunk/yali/yali/gui/ScrGoodbye.py	Thu Dec  6 11:47:28 2007
@@ -177,8 +177,11 @@
             return True
 
         def migrateXorgConf():
-            yali.postinstall.migrate_xorg_conf(ctx.installData.keyData.X)
-            ctx.debugger.log("xorg.conf merged.")
+            if not yali.sysutils.checkYaliParams(param=ctx.consts.firstBootParam):
+                yali.postinstall.migrate_xorg_conf(ctx.installData.keyData.X)
+                ctx.debugger.log("xorg.conf merged.")
+            else:
+                ctx.debugger.log("xorg.conf merge skipped its oeminstall.")
             return True
 
         def setPackages():