Add recognizing composite cmdline param.

pym/cl_fill_install.py

@@ -855,7 +855,7 @@ class fillVars(object, glob_attr):
         reRightResolution = re.compile("^(\d+x\d+|auto)$",re.S)
         kernelResolution = self.getValueFromCmdLine("calculate",3)
         if kernelResolution and reRightResolution.match(kernelResolution):
-            return kernelResolution
+            return {'auto':''}.get(kernelResolution,kernelResolution)
 
         # default resolution
         return "" if self.Get('os_install_root_type') in ('livecd','usb-hdd') \
@@ -887,13 +887,20 @@ class fillVars(object, glob_attr):
     
     def get_os_install_x11_composite(self):
         """On/off composite"""
-        defaultCompositeOn = ["nvidia","intel"]
+        defaultCompositeOn = ("nvidia","intel","fglrx","nouveau")
+        composite = self.getValueFromCmdLine("calculate",5)
+        videodrv = self.getValueFromCmdLine("calculate",4)
+        if videodrv != "auto":
+            composite = {'nocomposite':'off', 'composite':'on'}.get(composite)
+        else:
+            composite = None
+
         if self.Get('os_x11_video_drv') in defaultCompositeOn:
             defaultComposite = "on"
         else:
             defaultComposite = "off"
         state = self.get_composite_from_xorgconf()
-        return state or defaultComposite
+        return composite or state or defaultComposite
 
     def get_os_install_linguas(self):
         """Current linguas"""