Accepting request 32965 from Base:System
checked in (request 32965) OBS-URL: https://build.opensuse.org/request/show/32965 OBS-URL: https://build.opensuse.org/package/show/Base:System/kbd?expand=0&rev=14
This commit is contained in:
parent
ca00658ccf
commit
c227591713
@ -1,8 +1,3 @@
|
|||||||
-------------------------------------------------------------------
|
|
||||||
Fri Feb 19 14:39:29 CET 2010 - anicka@suse.cz
|
|
||||||
|
|
||||||
- respect KBD_TTY="" set in sysconfig (bnc#405658)
|
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Tue Feb 16 11:14:18 PST 2010 - vuntz@opensuse.org
|
Tue Feb 16 11:14:18 PST 2010 - vuntz@opensuse.org
|
||||||
|
|
||||||
|
13
kbd.init
13
kbd.init
@ -80,18 +80,23 @@ fi
|
|||||||
|
|
||||||
#
|
#
|
||||||
# Calculate KBD_TTY array only once
|
# Calculate KBD_TTY array only once
|
||||||
|
# Caution: Keep in sync with earlykbd.init
|
||||||
#
|
#
|
||||||
|
|
||||||
KBD_TTY_DEFAULT="${KBD_TTY:-tty1 tty2 tty3 tty4 tty5 tty6}"
|
# >=tty7 left out intentionaly (Bug #302010)
|
||||||
|
KBD_TTY_DEFAULT="tty1 tty2 tty3 tty4 tty5 tty6"
|
||||||
|
|
||||||
newkbd=""
|
newkbd=""
|
||||||
for tty in $KBD_TTY_DEFAULT; do
|
for tty in $KBD_TTY_DEFAULT; do
|
||||||
# >=tty7 left out intentionaly (Bug #302010)
|
|
||||||
test ${tty#tty} -ge 7 2>/dev/null && continue
|
|
||||||
test -w /dev/$tty || continue
|
test -w /dev/$tty || continue
|
||||||
test -c /dev/$tty || continue
|
test -c /dev/$tty || continue
|
||||||
> /dev/$tty &> /dev/null || continue
|
> /dev/$tty &> /dev/null || continue
|
||||||
newkbd="${newkbd:+$newkbd }/dev/$tty"
|
# consider settings in /etc/sysconfig/keyboard:KBD_TTY
|
||||||
|
test -z "$KBD_TTY" && continue
|
||||||
|
case ":${KBD_TTY// /:}:" in
|
||||||
|
*:$tty:*)
|
||||||
|
newkbd="${newkbd:+$newkbd }/dev/$tty"
|
||||||
|
esac
|
||||||
done
|
done
|
||||||
KBD_TTY="$newkbd"
|
KBD_TTY="$newkbd"
|
||||||
unset newkbd
|
unset newkbd
|
||||||
|
Loading…
Reference in New Issue
Block a user