[patch] Fix >=x11-apps/xinit-1.0.8-r7 (real patch)

messfix.patch (text/plain), 1.83 KB, created by Fabio Erculiani (RETIRED) on 2009-09-22 10:17:33 UTC

diff --git a/x11-apps/xinit/files/xdm-setup.initd-1 b/x11-apps/xinit/files/xdm-setup.initd-1
deleted file mode 100644
index 3e03cfd..0000000
--- a/x11-apps/xinit/files/xdm-setup.initd-1
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/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
-}
diff --git a/x11-apps/xinit/files/xdm.initd-3 b/x11-apps/xinit/files/xdm.initd-3
index 46beb32..4839da4 100755
--- a/x11-apps/xinit/files/xdm.initd-3
+++ b/x11-apps/xinit/files/xdm.initd-3
@@ -39,7 +39,7 @@
 
 # Start X Font Server before X
 depend() {
-	need localmount xdm-setup
+	need localmount
 
 	# this should start as early as possible
 	# we can't do 'before *' as that breaks it
@@ -126,12 +126,11 @@ vtstatic() {
 start() {
 	local EXE= NAME= PIDFILE=
 	setup_dm
-	
-	if [ -f /etc/init.d/.noxdm ] ; then
-		einfo "Skipping ${EXE}, /etc/init.d/.noxdm found"
-		rm /etc/init.d/.noxdm
-		return 1
-	fi
+
+        if get_bootparam "nox" ; then
+		einfo "Skipping ${EXE}, nox option was passed"
+		return 0
+        fi
 	
 	ebegin "Setting up ${EXE##*/}"
 	#save the prefered DM
diff --git a/x11-apps/xinit/xinit-1.0.8-r8.ebuild b/x11-apps/xinit/xinit-1.0.8-r8.ebuild
index 3200b93..83ae666 100644
--- a/x11-apps/xinit/xinit-1.0.8-r8.ebuild
+++ b/x11-apps/xinit/xinit-1.0.8-r8.ebuild
@@ -59,7 +59,6 @@ src_install() {
 	exeinto /etc/X11/xinit
 	doexe "${FILESDIR}"/xinitrc || die
 	newinitd "${FILESDIR}"/xdm.initd-3 xdm
-	newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup
 	newconfd "${FILESDIR}"/xdm.confd-1 xdm
 	newpamd "${FILESDIR}"/xserver.pamd xserver