tags 581758 patch
severity 581758 minor
thank you
I'm lowering the severity because this is not realy a bug of
console-setup. I think I'd better postpone the following patch until
squeeze is released.
On Sat, May 15, 2010 at 05:30:46PM +0200, Petr Baudis wrote:
>
> Either keyboard-configuration setup should handle enabling the zapping
> without touching the rest of the layout setup, or it needs to be clearly
> documented that users can enable it themselves by appending
> "terminate:ctrl_alt_bksp" to XKBOPTIONS.
The following patch should make keyboard-configuration ask the option
questions even if the layout is not supported.
Index: debian/keyboard-configuration.config
===================================================================
--- debian/keyboard-configuration.config (revision 64701)
+++ debian/keyboard-configuration.config (working copy)
@@ -1147,6 +1147,14 @@
db_metaget keyboard-configuration/other description
other="$RET"
if [ "$unsupported_layout" = yes ]; then
+ case "$XKBLAYOUT" in
+ *,*)
+ latin=no
+ ;;
+ *)
+ latin=yes
+ ;;
+ esac
db_set keyboard-configuration/variantcode "$XKBVARIANT"
# skip the question without making Debconf loop
STATE=$(( $STATE + $STATE - $old_state ))
@@ -1236,10 +1244,7 @@
fi
;;
5)
- if \
- [ ! "$unsupported_layout" = yes \
- -a "$unsupported_options" = yes ]
- then
+ if [ "$unsupported_options" = yes ]; then
if [ -f $CONFIGFILE ]; then
db_subst keyboard-configuration/unsupported_config_options \
XKBOPTIONS "$XKBOPTIONS"
@@ -1275,10 +1280,7 @@
fi
;;
6)
- if \
- [ "$unsupported_layout" = yes \
- -o "$unsupported_options" = yes ]
- then
+ if [ "$unsupported_options" = yes ]; then
db_set keyboard-configuration/optionscode "$XKBOPTIONS"
# skip the questions without making Debconf loop
STATE=$(( $STATE + $STATE - $old_state ))
Anton Zinoviev
--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
