View | Details | Raw Unified | Return to bug 246158
Collapse All | Expand All

(-)xdm.orig (+16 lines)
Lines 140-145 Link Here
140 
		 "$DISPLAYMANAGER_STARTS_XSERVER" = "no" ]; then
 140 
		 "$DISPLAYMANAGER_STARTS_XSERVER" = "no" ]; then
141 
		XDMOPTIONS="--no-console"
 141 
		XDMOPTIONS="--no-console"
142 
	fi
 142 
	fi
143 
	# Graphical failsafe mode (Bug #246158).
144 
	#
145 
	# Needs changes in kernel commandline of "Failsafe" entry in
146 
	# /boot/grub/menu.lst.
147 
	#
148 
	#  * use the same "vga" option value as in the non-"Failsafe" entry
149 
	#  * remove "3" option (runlevel)
150 
	#  * add "x11failsafe" option
151 
	if cat /proc/cmdline | grep -q x11failsafe; then
152 
            if [ -f /etc/X11/xorg.conf.install ]; then
153 
		export XORGCONFIG=xorg.conf.install
154 
            else
155 
                rc_status -u
156 
                rc_exit
157 
            fi
158 
	fi
143 
	startproc -p $PIDFILE $DISPLAYMANAGER $XDMOPTIONS || rc_failed
 159 
	startproc -p $PIDFILE $DISPLAYMANAGER $XDMOPTIONS || rc_failed
144 
	# After a crash or a kill signal we may have
 160 
	# After a crash or a kill signal we may have
145 
	# a wrong owner ship of /dev/xconsole
 161 
	# a wrong owner ship of /dev/xconsole

Return to bug 246158