Attachment #204904 for bug #285929




#!/sbin/runscript
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/files/xdm-setup.initd-1,v 1.2 2009/09/17 16:30:22 williamh Exp $

depend() {
       need localmount
}

start() {
       if get_bootparam "nox" ; then
               touch /etc/init.d/.noxdm
       fi
}





# Start X Font Server before X
depend() {
	need localmount

	# this should start as early as possible
	# we can't do 'before *' as that breaks it

start() {
	local EXE= NAME= PIDFILE=
	setup_dm

        if get_bootparam "nox" ; then
		einfo "Skipping ${EXE}, nox option was passed"
		return 0
        fi
	fi
	
	ebegin "Setting up ${EXE##*/}"
	#save the prefered DM

Lines 59-65 src_install() { Link Here

(-)a/x11-apps/xinit/xinit-1.0.8-r8.ebuild (-1 lines)
59	exeinto /etc/X11/xinit	59	exeinto /etc/X11/xinit
60	doexe "${FILESDIR}"/xinitrc \|\| die	60	doexe "${FILESDIR}"/xinitrc \|\| die
61	newinitd "${FILESDIR}"/xdm.initd-3 xdm	61	newinitd "${FILESDIR}"/xdm.initd-3 xdm
62	newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup
63	newconfd "${FILESDIR}"/xdm.confd-1 xdm	62	newconfd "${FILESDIR}"/xdm.confd-1 xdm
64	newpamd "${FILESDIR}"/xserver.pamd xserver	63	newpamd "${FILESDIR}"/xserver.pamd xserver
65		64

Return to bug 285929

Lines 39-45 Link Here

(-)a/x11-apps/xinit/files/xdm.initd-3 (-7 / +6 lines)
39		39
40	# Start X Font Server before X	40	# Start X Font Server before X
41	depend() {	41	depend() {
42	need localmount xdm-setup	42	need localmount
43		43
44	# this should start as early as possible	44	# this should start as early as possible
45	# we can't do 'before *' as that breaks it	45	# we can't do 'before *' as that breaks it
Lines 126-137 vtstatic() { Link Here
126	start() {	126	start() {
127	local EXE= NAME= PIDFILE=	127	local EXE= NAME= PIDFILE=
128	setup_dm	128	setup_dm
129		129
130	if [ -f /etc/init.d/.noxdm ] ; then	130	if get_bootparam "nox" ; then
131	einfo "Skipping ${EXE}, /etc/init.d/.noxdm found"	131	einfo "Skipping ${EXE}, nox option was passed"
132	rm /etc/init.d/.noxdm	132	return 0
133	return 1	133	fi
134	fi
135		134
136	ebegin "Setting up ${EXE##*/}"	135	ebegin "Setting up ${EXE##*/}"
137	#save the prefered DM	136	#save the prefered DM

Lines 1-14 Link Here

(-)a/x11-apps/xinit/files/xdm-setup.initd-1 (-14 lines)
1	#!/sbin/runscript
2	# Copyright 1999-2009 Gentoo Foundation
3	# Distributed under the terms of the GNU General Public License v2
4	# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/files/xdm-setup.initd-1,v 1.2 2009/09/17 16:30:22 williamh Exp $
5
6	depend() {
7	need localmount
8	}
9
10	start() {
11	if get_bootparam "nox" ; then
12	touch /etc/init.d/.noxdm
13	fi
14	}