From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 37C14608A7 for ; Thu, 13 Aug 2020 12:46:39 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 213E8194EE for ; Thu, 13 Aug 2020 12:46:09 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 6AB81194E2 for ; Thu, 13 Aug 2020 12:46:07 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id E57E3445E9 for ; Thu, 13 Aug 2020 12:46:06 +0200 (CEST) Date: Thu, 13 Aug 2020 12:45:58 +0200 From: Fabian =?iso-8859-1?q?Gr=FCnbichler?= To: Proxmox VE development discussion References: <20200720163116.28270-1-s.ivanov@proxmox.com> In-Reply-To: <20200720163116.28270-1-s.ivanov@proxmox.com> MIME-Version: 1.0 User-Agent: astroid/0.15.0 (https://github.com/astroidmail/astroid) Message-Id: <1597315547.d2roxsl164.astroid@nora.none> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-SPAM-LEVEL: Spam detection results: 0 AWL 0.034 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] applied: [PATCH installer v2] set console keymap on language selection X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Aug 2020 10:46:39 -0000 On July 20, 2020 6:31 pm, Stoiko Ivanov wrote: > This is an enhancement for #2804 >=20 > Having a shell waiting on vt3, it improves user experience if it has the > same keyboard map as the X11 installer. >=20 > This is accomplished by setting the contents of '/etc/default/keyboard' a= nd > then running `setupcon`. Simply calling `loadkeys` would not work, since = the > keymaps in debian are generated from the x11 definitions by ckbcomp and t= hen > saved in '/etc/console-setup/'. >=20 > Signed-off-by: Stoiko Ivanov > --- > v1->v2: > * incorporated Thomas' feedback, making the whitespace prefix stripping m= ore > robust (Thanks!) > * took a look at the generated file instead of only testing the keyboard = layout > (hence the 'gm' flags for the substition) > proxinstall | 13 ++++++++++++- > 1 file changed, 12 insertions(+), 1 deletion(-) >=20 > diff --git a/proxinstall b/proxinstall > index 556c509..edbb10e 100755 > --- a/proxinstall > +++ b/proxinstall > @@ -2668,8 +2668,19 @@ sub create_country_view { > if (my $kmap =3D $cmap->{kmaphash}->{$sel}) { > my $xkmap =3D $cmap->{kmap}->{$kmap}->{x11}; > my $xvar =3D $cmap->{kmap}->{$kmap}->{x11var}; > - syscmd ("setxkbmap $xkmap $xvar") if !$opt_testmode; > $keymap =3D $kmap; > + > + if (! $opt_testmode) { > + syscmd ("setxkbmap $xkmap $xvar"); > + my $kbd_config =3D qq{ > + XKBLAYOUT=3D"$xkmap" > + XKBVARIANT=3D"$xvar" > + BACKSPACE=3D"guess" > + }; > + $kbd_config =3D~ s/^\s+//gm; > + write_config($kbd_config, '/etc/default/keyboard'); > + syscmd ("setupcon"); > + } > } > }); > =20 > --=20 > 2.20.1 >=20 >=20 >=20 > _______________________________________________ > pve-devel mailing list > pve-devel@lists.proxmox.com > https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel >=20 >=20 >=20 =