Attachment #220160 for bug #337238

View | Details | Raw Unified | Return to bug 337238
Collapse All | Expand All

Lines 1-4 Link Here

(-)/work/SRC/all/BASE/kbd/kbd.changes (+6 lines)
1	-------------------------------------------------------------------	1	-------------------------------------------------------------------
		2	Wed Jun 4 18:53:46 CEST 2008 - werner@suse.de
		3
		4	- Add "-C" option also to dumpkeys to make kbd init script work on
		5	/dev/console and /dev/tty even within e.g. xterm (bnc#337238)
		6
		7	-------------------------------------------------------------------
2	Mon May 19 12:39:16 CEST 2008 - jw@suse.de	8	Mon May 19 12:39:16 CEST 2008 - jw@suse.de
3		9
4	- added ru1_win-utf.map fixing bnc#337238	10	- added ru1_win-utf.map fixing bnc#337238




    test -c /dev/$tty		|| continue
    > /dev/$tty &> /dev/null	|| continue
    # 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
KBD_TTY="$newkbd"
unset newkbd

	    if test -n "$KBD_DELAY"; then
		KBDOPT="${KBDOPT:+$KBDOPT }-d $KBD_DELAY"
	    fi
	    if test -n "$KBDOPT" -a -x /bin/kbdrate ; then
		echo -n "Keyboard: "
		for tty in $KBD_TTY; do
		    /bin/kbdrate $KBDOPT < $tty 2> /dev/null
		    rc_status
		    case "$KBDOPT" in
		    *-s*) continue ;;
		    esac
		    KBDOPT="${KBDOPT:+$KBDOPT }-s"
		done
		rc_status -v1
	    fi
	fi

	case "$RUNLEVEL" in
	    S|N|1|\#) true ;;
	    *)
		trap "rm -f /dev/shm/defkeymap.map" EXIT SIGTERM
		dumpkeys -C ${KBD_TTY%% *} > /dev/shm/defkeymap.map

	        case $LOCALE_CHARMAP in
		    UTF-8)
			# Change the keyboard mapping in such a way that the
			# non-ASCII keys produce UTF-8 encoded multibyte sequences
			# instead of single bytes >= 0x80 in a legacy 8-bit encoding.
			loadkeys -C "$KBD_TTY" --unicode /dev/shm/defkeymap.map > /dev/null 2>&1
			;;
		    *) 
			;;
		esac

		if type -p cmp > /dev/null 2>&1 && cmp -s /etc/defkeymap.map /dev/shm/defkeymap.map
		    dumpkeys | cmp -s /etc/defkeymap.map
		then
		    rm -f /dev/shm/defkeymap.map
		fi

		if test -s /dev/shm/defkeymap.map ; then
		    # FIXME: this should be done much earlier
		    # to avoid bugzilla# 259694 or similar.
		    mv /dev/shm/defkeymap.map /etc/defkeymap.map
		    if test ! -z "$KEYMAP" && test "$KEYMAP" != "/etc/defkeymap.map" ; then
		        test ! -e "$KEYMAP" && KEYMAP=$K
			echo $KEYMAP > /etc/defkeymap.name
		    fi
		fi
		trap - EXIT SIGTERM
	esac

	;;

Lines 61-66 Link Here

(-)/work/SRC/all/BASE/kbd/kbd.spec (+2 lines)
61	Patch26: kbd-%{version}-setfont-no-cruft.diff	61	Patch26: kbd-%{version}-setfont-no-cruft.diff
62	Patch27: kbd-%{version}-be-nice-to-kdm.diff	62	Patch27: kbd-%{version}-be-nice-to-kdm.diff
63	Patch28: bnc147581_jp106.diff	63	Patch28: bnc147581_jp106.diff
		64	Patch29: kbd-%{version}-dumpkeys-C-opt.diff
64	BuildRoot: %{_tmppath}/%{name}-%{version}-build	65	BuildRoot: %{_tmppath}/%{name}-%{version}-build
65	PreReq: %fillup_prereq %insserv_prereq	66	PreReq: %fillup_prereq %insserv_prereq
66	BuildRequires: bison flex	67	BuildRequires: bison flex
Lines 117-122 Link Here
117	%patch26 -p1	118	%patch26 -p1
118	# %patch27 -p1 # obsoleted. #302010	119	# %patch27 -p1 # obsoleted. #302010
119	%patch28 -p1	120	%patch28 -p1
		121	%patch29 -p0
120		122
121	%build	123	%build
122	for i in `find data/keymaps/mac -type f` ; do	124	for i in `find data/keymaps/mac -type f` ; do

Return to bug 337238

Lines 95-104 Link Here

(-)/work/SRC/all/BASE/kbd/kbd.init (-13 / +24 lines)
95	test -c /dev/$tty \|\| continue	95	test -c /dev/$tty \|\| continue
96	> /dev/$tty &> /dev/null \|\| continue	96	> /dev/$tty &> /dev/null \|\| continue
97	# consider settings in /etc/sysconfig/keyboard:KBD_TTY	97	# consider settings in /etc/sysconfig/keyboard:KBD_TTY
98	if test -n "$KBD_TTY"; then	98	test -z "$KBD_TTY" && continue
99	echo "$KBD_TTY" \| grep -q $tty \|\| continue	99	case ":${KBD_TTY// /:}:" in
100	fi	100	:$tty:)
101	newkbd="${newkbd:+$newkbd }/dev/$tty"	101	newkbd="${newkbd:+$newkbd }/dev/$tty"
		102	esac
102	done	103	done
103	KBD_TTY="$newkbd"	104	KBD_TTY="$newkbd"
104	unset newkbd	105	unset newkbd
Lines 161-169 Link Here
161	if test -n "$KBD_DELAY"; then	162	if test -n "$KBD_DELAY"; then
162	KBDOPT="${KBDOPT:+$KBDOPT }-d $KBD_DELAY"	163	KBDOPT="${KBDOPT:+$KBDOPT }-d $KBD_DELAY"
163	fi	164	fi
164	if test -n "$KBDOPT" ; then	165	if test -n "$KBDOPT" -a -x /bin/kbdrate ; then
165	echo -n "Keyboard: "	166	echo -n "Keyboard: "
166	/bin/kbdrate $KBDOPT	167	for tty in $KBD_TTY; do
		168	/bin/kbdrate $KBDOPT < $tty 2> /dev/null
		169	rc_status
		170	case "$KBDOPT" in
		171	-s) continue ;;
		172	esac
		173	KBDOPT="${KBDOPT:+$KBDOPT }-s"
		174	done
167	rc_status -v1	175	rc_status -v1
168	fi	176	fi
169	fi	177	fi
Lines 446-477 Link Here
446	case "$RUNLEVEL" in	454	case "$RUNLEVEL" in
447	S\|N\|1\|\#) true ;;	455	S\|N\|1\|\#) true ;;
448	*)	456	*)
		457	trap "rm -f /dev/shm/defkeymap.map" EXIT SIGTERM
		458	dumpkeys -C ${KBD_TTY%% *} > /dev/shm/defkeymap.map
		459
449	case $LOCALE_CHARMAP in	460	case $LOCALE_CHARMAP in
450	UTF-8)	461	UTF-8)
451	# Change the keyboard mapping in such a way that the	462	# Change the keyboard mapping in such a way that the
452	# non-ASCII keys produce UTF-8 encoded multibyte sequences	463	# non-ASCII keys produce UTF-8 encoded multibyte sequences
453	# instead of single bytes >= 0x80 in a legacy 8-bit encoding.	464	# instead of single bytes >= 0x80 in a legacy 8-bit encoding.
454	( dumpkeys \| loadkeys -C "$KBD_TTY" --unicode ) > /dev/null 2>&1	465	loadkeys -C "$KBD_TTY" --unicode /dev/shm/defkeymap.map > /dev/null 2>&1
455	;;	466	;;
456	*)	467	*)
457	;;	468	;;
458	esac	469	esac
459	dumpkeys=yes	470
460	if type -p cmp > /dev/null 2>&1 && \	471	if type -p cmp > /dev/null 2>&1 && cmp -s /etc/defkeymap.map /dev/shm/defkeymap.map
461	dumpkeys \| cmp -s /etc/defkeymap.map
462	then	472	then
463	dumpkeys=no	473	rm -f /dev/shm/defkeymap.map
464	fi	474	fi
465		475
466	if test "$dumpkeys" = "yes" ; then	476	if test -s /dev/shm/defkeymap.map ; then
467	# FIXME: this should be done much earlier	477	# FIXME: this should be done much earlier
468	# to avoid bugzilla# 259694 or similar.	478	# to avoid bugzilla# 259694 or similar.
469	( dumpkeys > /etc/defkeymap.map ) > /dev/null 2>&1	479	mv /dev/shm/defkeymap.map /etc/defkeymap.map
470	if test ! -z "$KEYMAP" && test "$KEYMAP" != "/etc/defkeymap.map" ; then	480	if test ! -z "$KEYMAP" && test "$KEYMAP" != "/etc/defkeymap.map" ; then
471	test ! -e "$KEYMAP" && KEYMAP=$K	481	test ! -e "$KEYMAP" && KEYMAP=$K
472	echo $KEYMAP > /etc/defkeymap.name	482	echo $KEYMAP > /etc/defkeymap.name
473	fi	483	fi
474	fi	484	fi
		485	trap - EXIT SIGTERM
475	esac	486	esac
476		487
477	;;	488	;;