diff options
| author | Bill Nottingham <notting@redhat.com> | 2010-07-01 13:43:05 -0400 |
|---|---|---|
| committer | Bill Nottingham <notting@redhat.com> | 2010-07-01 13:43:05 -0400 |
| commit | f52556d2fa9a547295a28be62a3f1c2c8d733e18 (patch) | |
| tree | 9d2c3c0bb463ac86ed6b487827fcb959549fb861 | |
| parent | 38a23d2cccd320425e34d34dc1033122b976160b (diff) | |
| download | initscripts-f52556d2fa9a547295a28be62a3f1c2c8d733e18.tar initscripts-f52556d2fa9a547295a28be62a3f1c2c8d733e18.tar.gz initscripts-f52556d2fa9a547295a28be62a3f1c2c8d733e18.tar.bz2 initscripts-f52556d2fa9a547295a28be62a3f1c2c8d733e18.tar.xz initscripts-f52556d2fa9a547295a28be62a3f1c2c8d733e18.zip | |
Use plymouth wait-keystroke, etc. for interactive mode, not getkey. (#605016)
getkey won't work right in a plymouth context.
| -rwxr-xr-x | rc.d/rc.sysinit | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit index 0c489bf4..420e59a3 100755 --- a/rc.d/rc.sysinit +++ b/rc.d/rc.sysinit @@ -594,7 +594,8 @@ 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 -{ +[ "$PROMPT" != no ] && plymouth watch-keystroke --command "touch /var/run/confirm" --keys=Ii & + # Clean up utmp/wtmp > /var/run/utmp touch /var/log/wtmp @@ -658,24 +659,10 @@ 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" -o -e /var/run/getkey_done ] && break - usleep 100000 - done - [ -n "$pid" ] && kill -TERM "$pid" >/dev/null 2>&1 -fi -} & +[ "$PROMPT" != no ] && plymouth --ignore-keystroke=Ii 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 |