--- /etc/init.d/xdm.orig	2005-07-07 14:17:59.000000000 -0700
+++ /etc/init.d/xdm	2005-07-07 14:40:11.000000000 -0700
@@ -77,17 +77,49 @@
 	SERVICE="${EXE##*/}"
 }
 
+cmdline_opt() {
+	if [[ "$#" -ne 1 ]]; then
+		return 1
+	fi
+
+	for opt in $(</proc/cmdline); do
+		case ${opt} in
+			${1}) eval ${1}="true" ;;
+		esac
+	done
+}
+
+nox() {
+	# Don't start X if we were passed 'nox' at boot (#83680)
+	cmdline_opt nox
+
+	if [[ "$?" -ne 0 ]]; then
+		return 1
+	fi
+
+	if [[ -n "${nox}" ]]; then
+		return 0
+	else
+		return 1
+	fi
+}
+
 start() {
 	setup_dm
 	
-	ebegin "Setting up ${SERVICE}"
-	#save the prefered DM
-	save_options "service" "${EXE}"
-	#tell init to run /etc/X11/startDM.sh after current
-	#runlevel is finished (should *not* be in the "boot"
-	#                      runlevel).
-	/sbin/telinit a &>/dev/null
-	eend 0
+	if nox; then
+		einfo "Skipping ${EXE}, received 'nox'"
+	else
+		ebegin "Setting up ${SERVICE}"
+		#save the prefered DM
+		save_options "service" "${EXE}"
+		#tell init to run /etc/X11/startDM.sh after current
+		#runlevel is finished (should *not* be in the "boot"
+		#                      runlevel).
+		/sbin/telinit a &>/dev/null
+		eend 0
+	fi
+
 }
 
 stop() {