Diff of /alx-src/branches/alxconf-060/functions/config_x11.sh

Parent Directory | Revision Log | Patch

	revision 3477 by niro, Fri Apr 13 18:12:52 2012 UTC	revision 5585 by niro, Wed Apr 23 13:18:35 2014 UTC
#	Line 8  config_display_manager()	Line 8  config_display_manager()
8	sed -i "s:@@USERNAME@@:${ALX_UNPRIV_USER}:" /etc/slim.conf	sed -i "s:@@USERNAME@@:${ALX_UNPRIV_USER}:" /etc/slim.conf
9
10	# windowmanager	# windowmanager
11	echo "exec startfluxbox" > ${ALX_UNPRIV_HOME}/.xinitrc	local CONFIG="${ALX_UNPRIV_HOME}/.xinitrc"
12		clearconfig
13		addconfig "exec startfluxbox"
14	}	}
15
16	config_x11()	config_x11()
#	Line 56  config_x11()	Line 58  config_x11()
58	clearconfig	clearconfig
59	addconfig 'Section "Device"'	addconfig 'Section "Device"'
60	addconfig ' Identifier "Card0"'	addconfig ' Identifier "Card0"'
61	addconfig " Driver \"${cfg_graphic_module}\""
62		if [[ $(alx-hwdetection system) = i845 ]]
63		then
64		addconfig ' # i845 hack - using vesa driver atm'
65		addconfig ' Driver "vesa"'
66		else
67		addconfig " Driver \"${cfg_graphic_module}\""
68		fi
69
70	addconfig 'EndSection'	addconfig 'EndSection'
71
72	# vnc module	# vnc module
#	Line 84  config_x11()	Line 94  config_x11()
94	# fallback	# fallback
95	[[ ${hsync} = 0-0 ]] && hsync="28-96"	[[ ${hsync} = 0-0 ]] && hsync="28-96"
96	[[ ${vsync} = 0-0 ]] && vsync="50-60"	[[ ${vsync} = 0-0 ]] && vsync="50-60"
97
98	addconfig	addconfig
99	addconfig " HorizSync ${hsync}"	addconfig " HorizSync ${hsync}"
100	addconfig " VertRefresh ${vsync}"	addconfig " VertRefresh ${vsync}"

---

Colored Diff Long Colored Diff Full Colored Diff Unidiff Context Diff Side by Side

Legend: Removed from v.3477   changed lines   Added in v.5585