xCAT/confluent
2
0
Fork 0
mirror of https://github.com/xcat2/confluent.git synced 2025-01-13 19:27:51 +00:00
Code Issues Projects Releases Wiki Activity

Recognize Ubuntu 20.04.2

Browse Source
This commit is contained in:
Jarrod Johnson 2021-07-28 14:31:04 -04:00
parent a25a10cb86
commit 08f226a3bf
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
confluent_server/confluent/osimage.py
View File

@ -18,7 +18,7 @@ import yaml
COPY = 1
EXTRACT = 2
READFILES = set([
'README.diskdefines',
'.disk/info',
'media.1/products',
'media.2/products',
'.DISCINFO',
@ -336,26 +336,24 @@ def check_esxi(isoinfo):
}
def check_ubuntu(isoinfo):
if 'README.diskdefines' not in isoinfo[1]:
if '.disk/info' not in isoinfo[1]:
return None
arch = None
variant = None
ver = None
diskdefs = isoinfo[1]['README.diskdefines']
diskdefs = isoinfo[1]['.disk/info']
for info in diskdefs.split(b'\n'):
if not info:
continue
_, key, val = info.split(b' ', 2)
val = val.strip()
if key == b'ARCH':
arch = val
if arch == b'amd64':
arch = b'x86_64'
elif key == b'DISKNAME':
variant, ver, _ = val.split(b' ', 2)
if variant != b'Ubuntu-Server':
return None
if variant:
info = info.split(b' ')
name = info[0].strip()
ver = info[1].strip()
arch = info[-2].strip()
if name != b'Ubuntu-Server':
return None
if arch == b'amd64':
arch = b'x86_64'
if ver:
if not isinstance(ver, str):
ver = ver.decode('utf8')
if not isinstance(arch, str):