Author: JirkaH Date: 2011-01-06 16:08:02 +0100 (Thu, 06 Jan 2011) New Revision: 2329 Added: cfengine/files/xorg/xorg-generic.conf Modified: cfengine/prod/groups.conf cfengine/prod/xorg.conf Log: generic xorg settings added (standy of LCD screens disabled) Added: cfengine/files/xorg/xorg-generic.conf =================================================================== --- cfengine/files/xorg/xorg-generic.conf (rev 0) +++ cfengine/files/xorg/xorg-generic.conf 2011-01-06 15:08:02 UTC (rev 2329) @@ -0,0 +1,17 @@ +# If you have edited this file but would like it to be automatically updated +# again, run the following command: +# sudo dpkg-reconfigure -phigh xserver-xorg + +Section "ServerLayout" + Identifier "Default Layout" + Option "BlankTime" "0" + Option "StandbyTime" "0" + Option "SuspendTime" "0" + Option "OffTime" "0" +# Screen 0 "Default Screen" 0 0 +EndSection + +Section "Monitor" + Identifier "Configured Monitor" + Option "DPMS" "false" +EndSection Modified: cfengine/prod/groups.conf =================================================================== --- cfengine/prod/groups.conf 2011-01-04 17:21:20 UTC (rev 2328) +++ cfengine/prod/groups.conf 2011-01-06 15:08:02 UTC (rev 2329) @@ -13,6 +13,9 @@ #intel graphic card hw_video_intel = ( elvys0002 ) + #generic graphic card (autodetect) + hw_video_generic = ( elvys0003 elvys0004 ) + #real kiosk hw_kiosk = ( elvys0002 elvys0003 elvys0004 ) Modified: cfengine/prod/xorg.conf =================================================================== --- cfengine/prod/xorg.conf 2011-01-04 17:21:20 UTC (rev 2328) +++ cfengine/prod/xorg.conf 2011-01-06 15:08:02 UTC (rev 2329) @@ -1,6 +1,14 @@ #Xorg settings copy: + hw_video_generic:: + "${local_files_path}/xorg/xorg-generic.conf" + dest=/etc/X11/xorg.conf + typecheck=off + mode=0644 + type=checksum + define=X_server_restart + hw_video_intel:: "${local_files_path}/xorg/xorg-intel.conf" dest=/etc/X11/xorg.conf