aboutsummaryrefslogtreecommitdiffstats
path: root/prefdm
diff options
context:
space:
mode:
authorBill Nottingham <notting@redhat.com>2006-10-12 17:51:04 +0000
committerBill Nottingham <notting@redhat.com>2006-10-12 17:51:04 +0000
commit80dc5a242d114fdab33401de252bc40b69fec94c (patch)
tree961beaf071a421525f7df642d1bf0f7a8f88a4e9 /prefdm
parenta82619e0a975dfb8bdb4c581cb24cadb1887f321 (diff)
downloadinitscripts-80dc5a242d114fdab33401de252bc40b69fec94c.tar
initscripts-80dc5a242d114fdab33401de252bc40b69fec94c.tar.gz
initscripts-80dc5a242d114fdab33401de252bc40b69fec94c.tar.bz2
initscripts-80dc5a242d114fdab33401de252bc40b69fec94c.tar.xz
initscripts-80dc5a242d114fdab33401de252bc40b69fec94c.zip
revert early-login support (#210836, essentially)
Diffstat (limited to 'prefdm')
-rwxr-xr-xprefdm36
1 files changed, 4 insertions, 32 deletions
diff --git a/prefdm b/prefdm
index 27f7c074..b2a5c3f1 100755
--- a/prefdm
+++ b/prefdm
@@ -27,40 +27,12 @@ fi
shopt -s execfail
-# If we're in early-login mode and something is running, bail out
-if grep -q early-login /proc/cmdline 2> /dev/null ; then
- if [ -n "$preferred" ]; then
- pidof $preferred >/dev/null 2>&1 && exit 0
- fi
- pidof gdm-binary >/dev/null 2>&1 && exit 0
- pidof kdm >/dev/null 2>&1 && exit 0
- pidof xdm >/dev/null 2>&1 && exit 0
-fi
-
-if [ -n "$preferred" ]; then
- $preferred "$@" >/dev/null 2>&1
- if [ $? -ne 127 ]; then
- exec $0 "$@"
- exit $?
- fi
-fi
+[ -n "$preferred" ] && exec $preferred "$@" >/dev/null 2>&1
# Fallbacks, in order
-gdm "$@" >/dev/null 2>&1
-if [ $? -ne 127 ]; then
- exec $0 "$@"
- exit $?
-fi
-kdm "$@" >/dev/null 2>&1
-if [ $? -ne 127 ]; then
- exec $0 "$@"
- exit $?
-fi
-xdm "$@" >/dev/null 2>&1
-if [ $? -ne 127 ]; then
- exec $0 "$@"
- exit $?
-fi
+exec gdm "$@" >/dev/null 2>&1
+exec kdm "$@" >/dev/null 2>&1
+exec xdm "$@" >/dev/null 2>&1
# catch all exit error
exit 1