Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 330355 | Differences between
and this patch

Collapse All | Expand All

(-)a/x11-base/xorg-server/Manifest (-2 / +12 lines)
Lines 1-19 Link Here
1
-----BEGIN PGP SIGNED MESSAGE-----
1
-----BEGIN PGP SIGNED MESSAGE-----
2
Hash: SHA1
2
Hash: SHA1
3
3
4
- -----BEGIN PGP SIGNED MESSAGE-----
5
Hash: SHA1
6
4
AUX 1.7.5.902-fix-tslib-1.0-check.patch 743 RMD160 139969e7c89ccbb6c86a93b7ea74aad2e942cd55 SHA1 621f3dea75aeb84a30279e5854b0ae256f653113 SHA256 03fced212933eb4502554c4fd629ead92027dc13f178ad5c43cd59b7ce615cea
7
AUX 1.7.5.902-fix-tslib-1.0-check.patch 743 RMD160 139969e7c89ccbb6c86a93b7ea74aad2e942cd55 SHA1 621f3dea75aeb84a30279e5854b0ae256f653113 SHA256 03fced212933eb4502554c4fd629ead92027dc13f178ad5c43cd59b7ce615cea
5
AUX xdm-setup.initd-1 339 RMD160 dd3f50da114627d2be776b41a0d7d967ebbff477 SHA1 d86813f810aab72b81a72c298c2d230554d8e82e SHA256 018bc6acc70c708d8e3935617b8da2b84a3f5502a4db4c4731c2eaea7d3f04c0
8
AUX xdm-setup.initd-1 339 RMD160 dd3f50da114627d2be776b41a0d7d967ebbff477 SHA1 d86813f810aab72b81a72c298c2d230554d8e82e SHA256 018bc6acc70c708d8e3935617b8da2b84a3f5502a4db4c4731c2eaea7d3f04c0
6
AUX xdm.confd-3 853 RMD160 363cd18f760650923e16579bf55f661e93dad63b SHA1 0027b98f2aeb5c43219fa4f9b7d81a05101bec6f SHA256 00af0d957ff1b4f31c1aa4701d93a54080408548792deafac5414cbfa13b89ec
9
AUX xdm.confd-3 853 RMD160 363cd18f760650923e16579bf55f661e93dad63b SHA1 0027b98f2aeb5c43219fa4f9b7d81a05101bec6f SHA256 00af0d957ff1b4f31c1aa4701d93a54080408548792deafac5414cbfa13b89ec
7
AUX xdm.initd-3 5394 RMD160 7810d9873cd27ab8130bf3bd5dd39a219b18a014 SHA1 52b20375c9e21671081d0dcdf99024fc63b8b2b8 SHA256 f0999a2c7486675e3eb549653e136afaf457400fc7ba17d77f0266a2291ebf42
10
AUX xdm.initd-3 5536 RMD160 c91345efdc2cf3f8edf1ad7e39d68854b952d50e SHA1 c49f1348de165a1248a41788155ea7266172be4e SHA256 bb63b886d738705d9ae05239c1de3cab2661bbee2dad48083303c60059e92584
8
AUX xorg-server-1.9-nouveau-default.patch 916 RMD160 0ebdf0fb76364b7fd0c520c3a2f7cc2cc1a83446 SHA1 daddde0f4f4276e12b87354d2e6825ed5c74c6eb SHA256 a7ff421dd928e3025194279f9afb7cc033a896b3417abe339741e9c6ed4b54ea
11
AUX xorg-server-1.9-nouveau-default.patch 916 RMD160 0ebdf0fb76364b7fd0c520c3a2f7cc2cc1a83446 SHA1 daddde0f4f4276e12b87354d2e6825ed5c74c6eb SHA256 a7ff421dd928e3025194279f9afb7cc033a896b3417abe339741e9c6ed4b54ea
9
AUX xorg-server-disable-acpi.patch 663 RMD160 7074ca5276369b746ea7606a0795232aafe07c90 SHA1 d300a37dd2e0a8aa3965948c13f6995e6767841d SHA256 5b3cc7c8bea18fe3ba81851d2846d19ffd8fab9cdf5d8f3a274846847e734200
12
AUX xorg-server-disable-acpi.patch 663 RMD160 7074ca5276369b746ea7606a0795232aafe07c90 SHA1 d300a37dd2e0a8aa3965948c13f6995e6767841d SHA256 5b3cc7c8bea18fe3ba81851d2846d19ffd8fab9cdf5d8f3a274846847e734200
10
AUX xorg-sets.conf 199 RMD160 33815115b6e8b8360af4f0778b0e2c5fb1a9aaee SHA1 b5a2fd01a97558fa909c67f510d8a59b55e20f57 SHA256 1201d0337ac69d9715f4454a86dfb8a7bd1ae6f4c2578042fc08f283a997597c
13
AUX xorg-sets.conf 199 RMD160 33815115b6e8b8360af4f0778b0e2c5fb1a9aaee SHA1 b5a2fd01a97558fa909c67f510d8a59b55e20f57 SHA256 1201d0337ac69d9715f4454a86dfb8a7bd1ae6f4c2578042fc08f283a997597c
11
EBUILD xorg-server-9999.ebuild 7820 RMD160 142cb0ebdb078f6bf0616cfcb289ef0744e9d4c3 SHA1 fd4bd06e7a2d6c15ec511ee22a2f2f16a816c959 SHA256 4e1efa19e4a3fd1680d5458a7c5fb07cfc96ebcfb2f7a86f6c2df7e12fba1f91
14
EBUILD xorg-server-9999.ebuild 7820 RMD160 142cb0ebdb078f6bf0616cfcb289ef0744e9d4c3 SHA1 fd4bd06e7a2d6c15ec511ee22a2f2f16a816c959 SHA256 4e1efa19e4a3fd1680d5458a7c5fb07cfc96ebcfb2f7a86f6c2df7e12fba1f91
12
MISC metadata.xml 499 RMD160 13985f2e8ee45fa43d4689f4c09ae4d3c8fe7e59 SHA1 b84c2d3e23c3eae539fa1c37aa0e0345083bedea SHA256 f2f68c9cdaf48810cc035fb5b3bb3467569be2aabbe5eb74405b75427d5193ba
15
MISC metadata.xml 499 RMD160 13985f2e8ee45fa43d4689f4c09ae4d3c8fe7e59 SHA1 b84c2d3e23c3eae539fa1c37aa0e0345083bedea SHA256 f2f68c9cdaf48810cc035fb5b3bb3467569be2aabbe5eb74405b75427d5193ba
13
-----BEGIN PGP SIGNATURE-----
16
- -----BEGIN PGP SIGNATURE-----
14
Version: GnuPG v2.0.16 (GNU/Linux)
17
Version: GnuPG v2.0.16 (GNU/Linux)
15
18
16
iEYEARECAAYFAkynY+oACgkQnGSe5QXeB7vueACgnOIhTWg+0CvwWrELRxbJ3jUj
19
iEYEARECAAYFAkynY+oACgkQnGSe5QXeB7vueACgnOIhTWg+0CvwWrELRxbJ3jUj
17
7DoAnjg2eNavJYB0bFU9GB66dYWkZKth
20
7DoAnjg2eNavJYB0bFU9GB66dYWkZKth
18
=NAUJ
21
=NAUJ
22
- -----END PGP SIGNATURE-----
23
-----BEGIN PGP SIGNATURE-----
24
Version: GnuPG v2.0.16 (GNU/Linux)
25
26
iEYEARECAAYFAkynZIsACgkQnGSe5QXeB7uGZQCeNKx4T6lZp0bRh/EEhMjb1bVT
27
2hwAn3K4CFRSyjXGAz0lZ8NlYX4c2P2k
28
=yD2g
19
-----END PGP SIGNATURE-----
29
-----END PGP SIGNATURE-----
(-)a/x11-base/xorg-server/files/xdm.initd-3 (-4 / +10 lines)
Lines 64-72 setup_dm() { Link Here
64
	PATH=${PATH}:$(. /etc/profile.env; echo "${ROOTPATH}")
64
	PATH=${PATH}:$(. /etc/profile.env; echo "${ROOTPATH}")
65
65
66
	NAME=
66
	NAME=
67
	BACKGROUND=0
67
	case "${MY_XDM}" in
68
	case "${MY_XDM}" in
68
		kdm|kde)
69
		kdm|kde)
69
			EXE="$(which kdm)"
70
			EXE=$(which kdm)
70
			PIDFILE=/var/run/kdm.pid
71
			PIDFILE=/var/run/kdm.pid
71
			;;
72
			;;
72
		kdm-*)
73
		kdm-*)
Lines 90-98 setup_dm() { Link Here
90
			EXE=/usr/bin/gpe-dm
91
			EXE=/usr/bin/gpe-dm
91
			PIDFILE=/var/run/gpe-dm.pid
92
			PIDFILE=/var/run/gpe-dm.pid
92
			;;
93
			;;
94
		lxdm)
95
			EXE=/usr/sbin/lxdm
96
			PIDFILE=/var/run/lxdm.pid
97
			BACKGROUND=1
98
			;;
93
		*)
99
		*)
94
			# first find out if there is such executable
100
			# first find out if there is such executable
95
			EXE="$(which ${MY_XDM} 2>/dev/null)"
101
			EXE=$(which ${MY_XDM} 2>/dev/null)
96
			PIDFILE="/var/run/${MY_XDM}.pid"
102
			PIDFILE="/var/run/${MY_XDM}.pid"
97
103
98
			# warn user that he is doing sick things if the exe was not found
104
			# warn user that he is doing sick things if the exe was not found
Lines 126-132 vtstatic() { Link Here
126
}
132
}
127
133
128
start() {
134
start() {
129
	local EXE NAME PIDFILE
135
	local EXE NAME PIDFILE BACKGROUND
130
	setup_dm
136
	setup_dm
131
137
132
	if [ -f /etc/.noxdm ]; then
138
	if [ -f /etc/.noxdm ]; then
Lines 141-146 start() { Link Here
141
	save_options "service" "${EXE}"
147
	save_options "service" "${EXE}"
142
	save_options "name"    "${NAME}"
148
	save_options "name"    "${NAME}"
143
	save_options "pidfile" "${PIDFILE}"
149
	save_options "pidfile" "${PIDFILE}"
150
	save_options "bkgnd"   "${BACKGROUND}"
144
151
145
	if [ -n "${CHECKVT-y}" ] ; then
152
	if [ -n "${CHECKVT-y}" ] ; then
146
		if vtstatic "${CHECKVT:-7}" ; then
153
		if vtstatic "${CHECKVT:-7}" ; then
147
- 

Return to bug 330355