Attachment #249345 for bug #330355

Lines 5-11 AUX 00-xhost 255 RMD160 4009438bd6ffbd718ea0221d6a1b8641c51a101c SHA1 91adb21d02 Link Here

(-)a/x11-apps/xinit/Manifest (-1 / +1 lines)
5	AUX 0001-Gentoo-specific-customizations-r1.patch 1476 RMD160 9168172406dd84e94229dafa3ac320b10e1349e0 SHA1 839224a56ce908c7a8a7f1a10924fc03e634aace SHA256 2fc0b500e71548cdeff42b84505e9493ed0fe8c94f403eacae95bb6310dbce34	5	AUX 0001-Gentoo-specific-customizations-r1.patch 1476 RMD160 9168172406dd84e94229dafa3ac320b10e1349e0 SHA1 839224a56ce908c7a8a7f1a10924fc03e634aace SHA256 2fc0b500e71548cdeff42b84505e9493ed0fe8c94f403eacae95bb6310dbce34
6	AUX Xsession 2187 RMD160 ffb290e9a8656b17d7744797456a45df53cafd79 SHA1 8ba8de5114871f8500f428a03f87a42714d0ce14 SHA256 bdf2cceaafb71762bc1c6491f9bd8cc24089dea7ef65b0a030acadf7f4aa4ab3	6	AUX Xsession 2187 RMD160 ffb290e9a8656b17d7744797456a45df53cafd79 SHA1 8ba8de5114871f8500f428a03f87a42714d0ce14 SHA256 bdf2cceaafb71762bc1c6491f9bd8cc24089dea7ef65b0a030acadf7f4aa4ab3
7	AUX chooser.sh 1301 RMD160 47ae0768ed54f235443399bdf08632c9f5cd3d10 SHA1 c378244ce59d74c966d564b3b34ac8168e3d0352 SHA256 5808080351f80c56b5ab78946103551a628925a0a3a95417b28002bf6e088212	7	AUX chooser.sh 1301 RMD160 47ae0768ed54f235443399bdf08632c9f5cd3d10 SHA1 c378244ce59d74c966d564b3b34ac8168e3d0352 SHA256 5808080351f80c56b5ab78946103551a628925a0a3a95417b28002bf6e088212
8	AUX startDM.sh 858 RMD160 d7ef866ddd09e3d4117b3363aaa6382a9b8cd153 SHA1 1b826dfb4d5a184d6d7cc1995d685b55c9c188ac SHA256 a7aca1e37e5b8fecb49aa96c4e2850547a47e154edabcdbd1cfcb8ab49337549	8	AUX startDM.sh 951 RMD160 b2d170d2c8c924e36e86b4874caa127da1542340 SHA1 b6c874fd7a4a5aafdabdb0ccbd47c79a7701d106 SHA256 a36379331da4ce1b85eae228350bb555426d4960b45bfc8ad09befcdc25fc72d
9	AUX xserver.pamd 125 RMD160 4b75f8bf5e68ac7181a22beaccc153ac250eb8e9 SHA1 e35845021328044659036b9f82a95c17f21beb25 SHA256 f179c3417b94295fe12776f9da4a08898a3ee4199e26abff6457717caeb29bb2	9	AUX xserver.pamd 125 RMD160 4b75f8bf5e68ac7181a22beaccc153ac250eb8e9 SHA1 e35845021328044659036b9f82a95c17f21beb25 SHA256 f179c3417b94295fe12776f9da4a08898a3ee4199e26abff6457717caeb29bb2
10	AUX xserverrc 30 RMD160 7575b72f2f5ec4afba3e3700c213a7fbe40a0f8d SHA1 febf89ebfcc056c16bf70a4e651f4074af71b224 SHA256 18c040add4d137aaa58f76b134088acb1269dd291a14bcc283765c6c897d49fe	10	AUX xserverrc 30 RMD160 7575b72f2f5ec4afba3e3700c213a7fbe40a0f8d SHA1 febf89ebfcc056c16bf70a4e651f4074af71b224 SHA256 18c040add4d137aaa58f76b134088acb1269dd291a14bcc283765c6c897d49fe
11	EBUILD xinit-9999.ebuild 1654 RMD160 a6a1ba9ad8e0cba5592b8e6d671b4dd65a85d52f SHA1 82349f6e72b353870bad4231948fe62f40c8615b SHA256 29f2390a98ecc339b95b6677c79a904aaa557b1d9141a4b1c1ee8b36efd4a0ec	11	EBUILD xinit-9999.ebuild 1654 RMD160 a6a1ba9ad8e0cba5592b8e6d671b4dd65a85d52f SHA1 82349f6e72b353870bad4231948fe62f40c8615b SHA256 29f2390a98ecc339b95b6677c79a904aaa557b1d9141a4b1c1ee8b36efd4a0ec




. /etc/init.d/functions.sh

# baselayout-1 compat
if ! type get_options >/dev/null 2>&1 ; then
	[ -r "${svclib}"/sh/rc-services.sh ] && . "${svclib}"/sh/rc-services.sh
fi


export GDK_USE_XFT=1

export SVCNAME=xdm
EXEC=$(get_options service)
NAME=$(get_options name)
PIDFILE=$(get_options pidfile)
BACKGROUND=$(get_options bkgnd)

yesno "${BACKGROUND}" || unset BACKGROUND

start-stop-daemon --start --exec ${EXEC} ${BACKGROUND:+--background} \
		${NAME:+--name ${NAME}} ${PIDFILE:+--pidfile ${PIDFILE}} || \
	eerror "ERROR: could not start the Display Manager"

# vim:ts=4
- 

Return to bug 330355

Lines 10-16 Link Here

(-)a/x11-apps/xinit/files/startDM.sh (-8 / +10 lines)
10	. /etc/init.d/functions.sh	10	. /etc/init.d/functions.sh
11		11
12	# baselayout-1 compat	12	# baselayout-1 compat
13	if ! type get_options >/dev/null 2>/dev/null ; then	13	if ! type get_options >/dev/null 2>&1 ; then
14	[ -r "${svclib}"/sh/rc-services.sh ] && . "${svclib}"/sh/rc-services.sh	14	[ -r "${svclib}"/sh/rc-services.sh ] && . "${svclib}"/sh/rc-services.sh
15	fi	15	fi
16		16
Lines 19-30 fi Link Here
19	export GDK_USE_XFT=1	19	export GDK_USE_XFT=1
20		20
21	export SVCNAME=xdm	21	export SVCNAME=xdm
22	EXEC="$(get_options service)"	22	EXEC=$(get_options service)
23	NAME="$(get_options name)"	23	NAME=$(get_options name)
24	PIDFILE="$(get_options pidfile)"	24	PIDFILE=$(get_options pidfile)
		25	BACKGROUND=$(get_options bkgnd)
25		26
26	start-stop-daemon --start --exec ${EXEC} \	27	yesno "${BACKGROUND}" \|\| unset BACKGROUND
27	${NAME:+--name} ${NAME} ${PIDFILE:+--pidfile} ${PIDFILE} \|\| \	28
28	eerror "ERROR: could not start the Display Manager"	29	start-stop-daemon --start --exec ${EXEC} ${BACKGROUND:+--background} \
		30	${NAME:+--name ${NAME}} ${PIDFILE:+--pidfile ${PIDFILE}} \|\| \
		31	eerror "ERROR: could not start the Display Manager"
29		32
30	# vim:ts=4	33	# vim:ts=4
31	-