From 80dc5a242d114fdab33401de252bc40b69fec94c Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@redhat.com>
Date: Thu, 12 Oct 2006 17:51:04 +0000
Subject: revert early-login support (#210836, essentially)

---
 initscripts.spec |  6 ------
 inittab          |  2 +-
 inittab.s390     |  2 +-
 prefdm           | 36 ++++--------------------------------
 rc.d/rc.sysinit  |  4 ++--
 5 files changed, 8 insertions(+), 42 deletions(-)

diff --git a/initscripts.spec b/initscripts.spec
index 2e27492d..6e90a1d9 100644
--- a/initscripts.spec
+++ b/initscripts.spec
@@ -69,12 +69,6 @@ chmod 600 /var/log/btmp
 /sbin/chkconfig --add netfs
 /sbin/chkconfig --add network
 
-# Handle converting prefdm to run-once
-if fgrep -q "x:5:respawn:/etc/X11/prefdm -nodaemon" /etc/inittab ; then
-    sed --in-place=.rpmsave 's|^x:5:respawn:/etc/X11/prefdm -nodaemon|x:5:once:/etc/X11/prefdm -nodaemon|g' /etc/inittab
-fi
-
-
 %preun
 if [ $1 = 0 ]; then
   /sbin/chkconfig --del netfs
diff --git a/inittab b/inittab
index 9149d729..de9dc70a 100644
--- a/inittab
+++ b/inittab
@@ -50,4 +50,4 @@ pr:12345:powerokwait:/sbin/shutdown -c "Power Restored; Shutdown Cancelled"
 6:2345:respawn:/sbin/mingetty tty6
 
 # Run xdm in runlevel 5
-x:5:once:/etc/X11/prefdm -nodaemon
+x:5:respawn:/etc/X11/prefdm -nodaemon
diff --git a/inittab.s390 b/inittab.s390
index bf94dc68..6c0a7ee1 100644
--- a/inittab.s390
+++ b/inittab.s390
@@ -45,4 +45,4 @@ pr:12345:powerokwait:/sbin/shutdown -c "Power Restored; Shutdown Cancelled"
 1:2345:respawn:/sbin/mingetty console --noclear
 
 # Run xdm in runlevel 5
-x:5:once:/etc/X11/prefdm -nodaemon
+x:5:respawn:/etc/X11/prefdm -nodaemon
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
diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit
index 028e4d31..168a5636 100755
--- a/rc.d/rc.sysinit
+++ b/rc.d/rc.sysinit
@@ -348,7 +348,7 @@ RHGB_STARTED=0
 mount -n /dev/pts >/dev/null 2>&1
 [ -n "$SELINUX_STATE" ] && restorecon /dev/pts >/dev/null 2>&1
 
-if strstr "$cmdline" rhgb && ! strstr "$cmdline" early-login && [ "$BOOTUP" = "color" -a "$GRAPHICAL" = "yes" -a -x /usr/bin/rhgb ]; then
+if strstr "$cmdline" rhgb && [ "$BOOTUP" = "color" -a "$GRAPHICAL" = "yes" -a -x /usr/bin/rhgb ]; then
    LC_MESSAGES= /usr/bin/rhgb
    RHGB_STARTED=1
 fi
@@ -741,7 +741,7 @@ fi
 
 
 # Start the graphical boot, if necessary and not done yet.
-if strstr "$cmdline" rhgb && ! strstr "$cmdline" early-login && [ "$RHGB_STARTED" -eq 0 -a "$BOOTUP" = "color" -a "$GRAPHICAL" = "yes" -a -x /usr/bin/rhgb ]; then
+if strstr "$cmdline" rhgb && [ "$RHGB_STARTED" -eq 0 -a "$BOOTUP" = "color" -a "$GRAPHICAL" = "yes" -a -x /usr/bin/rhgb ]; then
    LC_MESSAGES= /usr/bin/rhgb
    RHGB_STARTED=1
 fi
-- 
cgit v1.2.1