[Uludag-commits] r16268 - trunk/comar/zorg

[uludag-commits at pardus.org.tr]

Author: fatih
Date: Fri Dec  7 11:02:35 2007
New Revision: 16268

Modified:
   trunk/comar/zorg/zorg
Log:
change kernel option: xorg=composite --> enable_composite

Modified: trunk/comar/zorg/zorg
=================================================================
--- trunk/comar/zorg/zorg	(original)
+++ trunk/comar/zorg/zorg	Fri Dec  7 11:02:35 2007
@@ -632,10 +632,13 @@
             run(*cmd)
 
 
-def getKernelOpt(cmdopt):
-    for cmd in "".join(loadFile("/proc/cmdline")).split():
-        if cmd.startswith("%s=" % cmdopt):
-            return cmd[len(cmdopt)+1:].split(",")
+def getKernelOpt(cmdopt=None):
+    if cmdopt:
+        for cmd in "".join(loadFile("/proc/cmdline")).split():
+            if cmd.startswith("%s=" % cmdopt):
+                return cmd[len(cmdopt)+1:].split(",")
+    else:
+        return "".join(loadFile("/proc/cmdline")).split()
 
     return ""
 
@@ -906,7 +909,7 @@
 
         keys_vc["AIGLX_OPTS"] = ""
 
-        if "composite" in getKernelOpt("xorg"):
+        if "enable_composite" in getKernelOpt():
             if cards[i].Driver in ("ati", "intel"):
                 keys_vc["AIGLX_OPTS"] = 'Option "XAANoOffscreenPixmaps" "true"'
 
@@ -946,7 +949,7 @@
         else:
             keys_mon["DEPTH"] = "16"
 
-        if cards[i].Driver == "ati" and "composite" in getKernelOpt("xorg"):
+        if cards[i].Driver == "ati" and "enable_composite" in getKernelOpt():
             keys_mon["DEPTH"] = "24"
 
         sec_monitor += template_monitor % keys_mon
@@ -1060,7 +1063,7 @@
     # Enable composite extension if requested
     keys_main["AIGLX_OPTS"] = ""
 
-    if "composite" in getKernelOpt("xorg"):
+    if "enable_composite" in getKernelOpt():
         keys_main["COMPOSITE"] = composite_option
 
         if cards[0].Driver in ("ati", "intel"):