From fac1aa79cbedc374a3b03650572cd3f4daecb4f7 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@redhat.com>
Date: Wed, 30 Jun 2010 13:54:10 -0400
Subject: Remove support for hotkey interactive startup. (#605016)

It cannot work reliably as done in this way. (It's possible to do
surgery to do it in plymouth itself, but not here.)

Interactive startup via the 'confirm' commandline option is still
available.
---
 rc.d/rc.sysinit | 20 --------------------
 1 file changed, 20 deletions(-)

(limited to 'rc.d')

diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit
index 46c5ccdd..b8412507 100755
--- a/rc.d/rc.sysinit
+++ b/rc.d/rc.sysinit
@@ -104,10 +104,6 @@ else
  PRODUCT=$(sed "s/ release.*//g" /etc/system-release)
  echo "$PRODUCT"
 fi
-if [ "$PROMPT" != "no" ]; then
- echo -en $"\t\tPress 'I' to enter interactive startup."
- echo
-fi
 
 # Fix console loglevel
 if [ -n "$LOGLEVEL" ]; then
@@ -594,7 +590,6 @@ find /var/lock /var/run ! -type d -exec rm -f {} \;
 rm -f /var/lib/rpm/__db* &> /dev/null
 rm -f /var/gdm/.gdmfifo &> /dev/null
 
-{
 # Clean up utmp/wtmp
 > /var/run/utmp
 touch /var/log/wtmp
@@ -658,24 +653,9 @@ dmesg -s 131072 > /var/log/dmesg
 # create the crash indicator flag to warn on crashes, offer fsck with timeout
 touch /.autofsck &> /dev/null
 
-if [ "$PROMPT" != no ]; then
-    while :; do
-	pid=$(/sbin/pidof getkey)
-	[ -n "$pid" ] || [ -e /var/run/getkey_done ] && break
-	usleep 100000
-    done
-    [ -n "$pid" ] && kill -TERM "$pid" >/dev/null 2>&1
-fi
-} &
 if strstr "$cmdline" confirm ; then
 	touch /var/run/confirm
 fi
-if [ "$PROMPT" != "no" ]; then
-	/sbin/getkey i && touch /var/run/confirm
-	touch /var/run/getkey_done
-fi
-wait
-[ "$PROMPT" != no ] && rm -f /var/run/getkey_done
 
 # Let rhgb know that we're leaving rc.sysinit
 if [ -x /usr/bin/rhgb-client ] && /usr/bin/rhgb-client --ping ; then
-- 
cgit v1.2.1