xCAT/confluent
2
0
Fork 0
mirror of https://github.com/xcat2/confluent.git synced 2024-11-23 01:53:28 +00:00
Code Issues Projects Releases Wiki Activity

Add keymap from donor system

Browse Source 
RHEL requires this to autoinstall graphically.
This commit is contained in:
Jarrod Johnson 2020-05-18 14:17:57 -04:00
parent 9caf8056ec
commit ceefb936c2
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
confluent_server/confluent/selfservice.py
View File

@ -10,6 +10,7 @@ import time
import yaml
currtz = None
keymap = 'us'
currlocale = 'en_US.UTF-8'
currtzvintage = None
@ -86,12 +87,20 @@ def handle_request(env, start_response):
for line in langinfo:
line = line.strip()
if line.startswith(b'System Locale:'):
currlocale = line.split(b'=')[-1]
if not currlocale:
ccurrlocale = line.split(b'=')[-1]
if not ccurrlocale:
continue
if not isinstance(currlocale, str):
currlocale = currlocale.decode('utf8')
break
if not isinstance(ccurrlocale, str):
ccurrlocale = ccurrlocale.decode('utf8')
currlocale = ccurrlocale
elif line.startswith(b'VC Keymap:'):
ckeymap = line.split(b':')[-1]
ckeymap = ckeymap.strip()
if not ckeymap:
continue
if not isinstance(ckeymap, str):
ckeymap = ckeymap.decode('utf8')
keymap = ckeymap
tdc = subprocess.check_output(['timedatectl']).split(b'\n')
for ent in tdc:
ent = ent.strip()
@ -103,6 +112,7 @@ def handle_request(env, start_response):
ncfg['timezone'] = currtz
break
ncfg['locale'] = currlocale
ncfg['keymap'] = keymap
ncfg['nameservers'] = []
for dns in deployinfo.get(
'services.dns', {}).get('value', '').split(','):