diff options
| author | Bill Nottingham <notting@redhat.com> | 2010-06-30 13:54:10 -0400 |
|---|---|---|
| committer | Bill Nottingham <notting@redhat.com> | 2010-06-30 13:54:10 -0400 |
| commit | fac1aa79cbedc374a3b03650572cd3f4daecb4f7 (patch) | |
| tree | 8212c27889362fe6d6eb53fefe8bbe85ffa8ef76 | |
| parent | 9bfd6e85da6c7093bda75ba4a7227300a74a495a (diff) | |
| download | initscripts-fac1aa79cbedc374a3b03650572cd3f4daecb4f7.tar initscripts-fac1aa79cbedc374a3b03650572cd3f4daecb4f7.tar.gz initscripts-fac1aa79cbedc374a3b03650572cd3f4daecb4f7.tar.bz2 initscripts-fac1aa79cbedc374a3b03650572cd3f4daecb4f7.tar.xz initscripts-fac1aa79cbedc374a3b03650572cd3f4daecb4f7.zip | |
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.
| -rwxr-xr-x | rc.d/rc.sysinit | 20 | ||||
| -rw-r--r-- | sysconfig/init | 2 |
2 files changed, 0 insertions, 22 deletions
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 diff --git a/sysconfig/init b/sysconfig/init index 1a746088..17b574c5 100644 --- a/sysconfig/init +++ b/sysconfig/init @@ -17,8 +17,6 @@ SETCOLOR_WARNING="echo -en \\033[0;33m" SETCOLOR_NORMAL="echo -en \\033[0;39m" # default kernel loglevel on boot (syslog will reset this) LOGLEVEL=3 -# Set to anything other than 'no' to allow hotkey interactive startup... -PROMPT=yes # Set to 'yes' to allow probing for devices with swap signatures AUTOSWAP=no # What ttys should gettys be started on? |