xdm-with-nox.patch

xdm-with-nox.patch (text/plain), 1.03 KB, created by William Hubbs on 2009-09-14 13:27:01 UTC

Index: xdm.initd-2
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-apps/xinit/files/xdm.initd-2,v
retrieving revision 1.3
diff -u -b -B -r1.3 xdm.initd-2
--- xdm.initd-2	31 Aug 2009 09:09:18 -0000	1.3
+++ xdm.initd-2	14 Sep 2009 13:22:09 -0000
@@ -112,18 +112,6 @@
 	fi
 }
 
-cmdline_opt() {
-	if [ $# -ne 1 ] || ! [ -r /proc/cmdline ]; then
-		return 1
-	fi
-
-	for opt in $(cat /proc/cmdline) ; do
-		[ "${opt}" = "${1}" ] && return 0
-	done
-
-	return 1
-}
-
 # Check to see if something is defined on our VT
 vtstatic() {
 	if [ -e /etc/inittab ] ; then
@@ -139,8 +127,15 @@
 	local EXE= NAME= PIDFILE=
 	setup_dm
 	
-	if cmdline_opt nox ; then
-		einfo "Skipping ${EXE}, received 'nox'"
+	if get_bootparam "nox" ; then
+		einfo "Skipping ${EXE}, received 'gentoo=nox'"
+		einfo "You must reboot to start ${EXE}"
+		return 0
+	fi
+	
+	if [ -f /etc/init.d/.noxdm ] ; then
+		einfo "Skipping ${EXE}, found /etc/init.d/.noxdm"
+		einfo "You must remove this file to start ${EXE}"
 		return 0
 	fi