diff options
author | Bill Nottingham <notting@redhat.com> | 2006-10-12 17:51:35 +0000 |
---|---|---|
committer | Bill Nottingham <notting@redhat.com> | 2006-10-12 17:51:35 +0000 |
commit | e40dab0ecc1170218b1dc82ff00f578e08691669 (patch) | |
tree | 961beaf071a421525f7df642d1bf0f7a8f88a4e9 /prefdm | |
parent | e9f2896b16a2c9d043cb4a093a406184edbb680b (diff) | |
download | initscripts-e40dab0ecc1170218b1dc82ff00f578e08691669.tar initscripts-e40dab0ecc1170218b1dc82ff00f578e08691669.tar.gz initscripts-e40dab0ecc1170218b1dc82ff00f578e08691669.tar.bz2 initscripts-e40dab0ecc1170218b1dc82ff00f578e08691669.tar.xz initscripts-e40dab0ecc1170218b1dc82ff00f578e08691669.zip |
revert early-login support (#210386)
Diffstat (limited to 'prefdm')
-rwxr-xr-x | prefdm | 36 |
1 files changed, 4 insertions, 32 deletions
@@ -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 |