Merge ~xnox/curtin:rocky into curtin:master

Proposed by Dimitri John Ledkov
Status: Merged
Approved by: Dan Bungert
Approved revision: 9ef03d7f83de26f4c130df4a7d741b27375e01fc
Merge reported by: Server Team CI bot
Merged at revision: not available
Proposed branch: ~xnox/curtin:rocky
Merge into: curtin:master
Diff against target: 36 lines (+4/-3)
2 files modified
curtin/distro.py (+3/-2)
pylintrc (+1/-1)
Reviewer Review Type Date Requested Status
Dan Bungert Approve
Server Team CI bot continuous-integration Approve
Review via email: mp+415604@code.launchpad.net

Commit message

Add rocky linux as a RHEL-like variant

To post a comment you must log in.
Revision history for this message
Dimitri John Ledkov (xnox) wrote :

Entirely untested, and coded based on inspecting RPMs empirically.

Revision history for this message
Server Team CI bot (server-team-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Server Team CI bot (server-team-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Server Team CI bot (server-team-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
Francesco Santagata (phrancesco) wrote :

Hi,

I patched distro.py inside this one curtin package:

https://launchpad.net/~dbungert/+archive/ubuntu/curtin-lp-1955671

It's working.

I tested on two VMs (1 Bios + 1 UEFI).

With this "https://launchpad.net/~dbungert/+archive/ubuntu/curtin-lp-1955671"
BIOS Centos 8.4 OK, Rocky 8.4 OK
UEFI Centos 8.4 OK, Rocky 8.4 KO

With your latest patch of distro.py Rocky 8.4 on UEFI is working.

Minor Issue, at boot time it tests a lot of efi files before finding the right one...
The first time is really slow, then the "scan" goes much faster.

I have a screen capture of it.

BR
Francesco

PS
please let me know if you need a more clean test... got some problems with "git+ssh" a lost a little bit of focus.

Revision history for this message
Dan Bungert (dbungert) wrote :

Thanks Dimitri!
Tested by Francesco as mentioned on linked bug.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/curtin/distro.py b/curtin/distro.py
2index ed4824a..16ce2c5 100644
3--- a/curtin/distro.py
4+++ b/curtin/distro.py
5@@ -23,7 +23,8 @@ from .log import LOG
6
7 DistroInfo = namedtuple('DistroInfo', ('variant', 'family'))
8 DISTRO_NAMES = ['arch', 'centos', 'debian', 'fedora', 'freebsd', 'gentoo',
9- 'opensuse', 'redhat', 'rhel', 'sles', 'suse', 'ubuntu']
10+ 'opensuse', 'redhat', 'rhel', 'sles', 'suse', 'ubuntu',
11+ 'rocky']
12
13
14 # python2.7 lacks PEP 435, so we must make use an alternative for py2.7/3.x
15@@ -37,7 +38,7 @@ DISTROS = distro_enum(*DISTRO_NAMES)
16 OS_FAMILIES = {
17 DISTROS.debian: [DISTROS.debian, DISTROS.ubuntu],
18 DISTROS.redhat: [DISTROS.centos, DISTROS.fedora, DISTROS.redhat,
19- DISTROS.rhel],
20+ DISTROS.rhel, DISTROS.rocky],
21 DISTROS.gentoo: [DISTROS.gentoo],
22 DISTROS.freebsd: [DISTROS.freebsd],
23 DISTROS.suse: [DISTROS.opensuse, DISTROS.sles, DISTROS.suse],
24diff --git a/pylintrc b/pylintrc
25index 1b5fa1a..7a50917 100644
26--- a/pylintrc
27+++ b/pylintrc
28@@ -7,7 +7,7 @@ jobs=0
29 # List of members which are set dynamically and missed by pylint inference
30 # system, and so shouldn't trigger E1101 when accessed. Python regular
31 # expressions are accepted.
32-generated-members=redhat,centos,fedora,debian,suse,opensuse,sles,arch,ubuntu,rhel,freebsd,gentoo
33+generated-members=redhat,centos,fedora,debian,suse,opensuse,sles,arch,ubuntu,rhel,freebsd,gentoo,rocky
34
35 # List of module names for which member attributes should not be checked
36 # (useful for modules/projects where namespaces are manipulated during runtime

Subscribers

People subscribed via source and target branches