View | Details | Raw Unified
Collapse All | Expand All

(-) /etc/init.d/xdm.orig (-8 / +40 lines)
 Lines 77-93    Link Here 
	SERVICE="${EXE##*/}"
	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() {
start() {
	setup_dm
	setup_dm
	
	
	ebegin "Setting up ${SERVICE}"
	if nox; then
	#save the prefered DM
		einfo "Skipping ${EXE}, received 'nox'"
	save_options "service" "${EXE}"
	else
	#tell init to run /etc/X11/startDM.sh after current
		ebegin "Setting up ${SERVICE}"
	#runlevel is finished (should *not* be in the "boot"
		#save the prefered DM
	#                      runlevel).
		save_options "service" "${EXE}"
	/sbin/telinit a &>/dev/null
		#tell init to run /etc/X11/startDM.sh after current
	eend 0
		#runlevel is finished (should *not* be in the "boot"
		#                      runlevel).
		/sbin/telinit a &>/dev/null
		eend 0
	fi
}
}
stop() {
stop() {