gryf/boxpy
1
0
Fork 0
mirror of https://github.com/gryf/boxpy.git synced 2025-12-19 13:37:58 +01:00
Code Issues Projects Releases Wiki Activity

Bump Fedora version

Browse Source
This commit is contained in:
gryf
2024-11-15 08:18:46 +01:00
parent 62b86d5f81
commit 81ab5de7c4
2 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
README.rst
View File

@@ -42,6 +42,7 @@ Tested distros
- 38 - 38
- 39 - 39
- 40 - 40
- 41
- Centos Stream - Centos Stream
- 8 - 8
- 9 - 9

16
box.py
View File

@@ -1038,6 +1038,7 @@ class Image:
return False return False
LOG.info('Calculating checksum for "%s"', self._img_fname) LOG.info('Calculating checksum for "%s"', self._img_fname)
LOG.debug('Checksum file: "%s"', self._checksum_file)
fname = os.path.join(self._tmp, self._checksum_file) fname = os.path.join(self._tmp, self._checksum_file)
expected_sum = self._get_checksum(fname) expected_sum = self._get_checksum(fname)
@@ -1135,14 +1136,23 @@ class Fedora(Image):
REVISION = {'37': '1.7', REVISION = {'37': '1.7',
'38': '1.6', '38': '1.6',
'39': '1.5', '39': '1.5',
'40': '1.14'} '40': '1.14',
'41': '1.4'}
def __init__(self, vbox, version, arch, fname=None): def __init__(self, vbox, version, arch, fname=None):
super().__init__(vbox, version, arch) super().__init__(vbox, version, arch)
revision = self.REVISION[version] revision = self.REVISION[version]
if int(version) > 39: if int(version) >= 40:
if int(version) == 40:
# Started from Fedora 40 there is "Generic" in the image names.
self.IMG = "Fedora-Cloud-Base-Generic.%s-%s-%s.qcow2" self.IMG = "Fedora-Cloud-Base-Generic.%s-%s-%s.qcow2"
# Fedora 40 have messed up position of the items in filename.
self._img_fname = self.IMG % (arch, version, revision) self._img_fname = self.IMG % (arch, version, revision)
else:
# But in Fedora 41 there is no dot between Generic and
# version, but between version and arch.
self.IMG = "Fedora-Cloud-Base-Generic-%s-%s.%s.qcow2"
self._img_fname = self.IMG % (version, revision, arch)
else: else:
self._img_fname = self.IMG % (version, revision, arch) self._img_fname = self.IMG % (version, revision, arch)
self._img_url = self.URL % (version, arch, self._img_fname) self._img_url = self.URL % (version, arch, self._img_fname)
@@ -1229,7 +1239,7 @@ DISTROS = {'ubuntu': {'username': 'ubuntu',
'realname': 'fedora', 'realname': 'fedora',
'img_class': Fedora, 'img_class': Fedora,
'amd64': 'x86_64', 'amd64': 'x86_64',
'default_version': '40'}, 'default_version': '41'},
'centos': {'username': 'centos', 'centos': {'username': 'centos',
'realname': 'centos', 'realname': 'centos',
'img_class': CentosStream, 'img_class': CentosStream,