public inbox for pve-devel@lists.proxmox.com
 help / color / mirror / Atom feed
From: Thomas Lamprecht <t.lamprecht@proxmox.com>
To: Proxmox VE development discussion <pve-devel@lists.proxmox.com>,
	Stoiko Ivanov <s.ivanov@proxmox.com>
Subject: Re: [pve-devel] [PATCH installer] set console keymap on language selection
Date: Mon, 20 Jul 2020 18:00:25 +0200	[thread overview]
Message-ID: <0a383702-d731-c6f5-287d-148c685ae300@proxmox.com> (raw)
In-Reply-To: <20200720145429.18260-1-s.ivanov@proxmox.com>

On 20.07.20 16:54, Stoiko Ivanov wrote:
> This is an enhancement for #2804
> 
> Having a shell waiting on vt3, it improves user experience if it has the
> same keyboard map as the X11 installer.
> 
> This is accomplished by setting the contents of '/etc/default/keyboard' see
> keyboard (5) and then running setupcon (1). Simply calling `loadkeys` would not
> work, since the keymaps in debian are generated from the x11 definitions by
> ckbcomp and then saved in '/etc/console-setup/'.
> 
> Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
> ---
> roughly tested with a PBS-iso (can provide should someone else want to test it)
> in a VM (clicking on french yielded azerty, clicking on german qwertz,...) both
> worked. (just in case also tried getting rid of the setxkbmap call - setupcon
> does not magically set the keyboard map of a running X session)
>  proxinstall | 13 ++++++++++++-
>  1 file changed, 12 insertions(+), 1 deletion(-)
> 
> diff --git a/proxinstall b/proxinstall
> index 556c509..83ac95e 100755
> --- a/proxinstall
> +++ b/proxinstall
> @@ -2668,8 +2668,19 @@ sub create_country_view {
>  	if (my $kmap = $cmap->{kmaphash}->{$sel}) {
>  	    my $xkmap = $cmap->{kmap}->{$kmap}->{x11};
>  	    my $xvar = $cmap->{kmap}->{$kmap}->{x11var};
> -	    syscmd ("setxkbmap $xkmap $xvar") if !$opt_testmode;
>  	    $keymap = $kmap;
> +
> +	    if (! $opt_testmode) {
> +		syscmd ("setxkbmap $xkmap $xvar");
> +		my $kbd_config = qq{
> +		    XKBLAYOUT="$xkmap"
> +		    XKBVARIANT="$xvar"
> +		    BACKSPACE="guess"
> +		};
> +		$kbd_config =~ s/^\t{2} {4}//;

pretty fragile, a indentation change breaks this... why not s/^\s+//;

> +		write_config($kbd_config, '/etc/default/keyboard');
> +		syscmd ("setupcon");
> +	    }
>  	}
>      });
>  
> 





  reply	other threads:[~2020-07-20 16:00 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-07-20 14:54 Stoiko Ivanov
2020-07-20 16:00 ` Thomas Lamprecht [this message]
2020-07-20 16:02   ` Stoiko Ivanov

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=0a383702-d731-c6f5-287d-148c685ae300@proxmox.com \
    --to=t.lamprecht@proxmox.com \
    --cc=pve-devel@lists.proxmox.com \
    --cc=s.ivanov@proxmox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal