curtin-dev team mailing list archive

[Stamatis Katsaounis <mp+453304@xxxxxxxxxxxxxxxxxx>]

Stamatis Katsaounis has proposed merging ~skatsaounis/curtin:add-ol-support into curtin:master.

Commit message:
Add support for Oracle Linux

Requested reviews:
  curtin developers (curtin-dev)

For more details, see:
https://code.launchpad.net/~skatsaounis/curtin/+git/curtin/+merge/453304
-- 
Your team curtin developers is requested to review the proposed merge of ~skatsaounis/curtin:add-ol-support into curtin:master.

diff --git a/curtin/commands/install_grub.py b/curtin/commands/install_grub.py
index 2faa2c6..285e6a5 100644
--- a/curtin/commands/install_grub.py
+++ b/curtin/commands/install_grub.py
@@ -290,8 +290,8 @@ def gen_uefi_install_commands(grub_name, grub_target, grub_cmd, update_nvram,
         install_cmds.append(['dpkg-reconfigure', grub_name])
         install_cmds.append(['update-grub'])
     elif distroinfo.family == distro.DISTROS.redhat:
-        # RHEL distros uses 'redhat' for bootid
-        if bootid == 'rhel':
+        # RHEL and OL distros uses 'redhat' for bootid
+        if bootid in ['rhel', 'ol']:
             bootid = 'redhat'
         loader = find_efi_loader(target, bootid)
         if loader:
diff --git a/curtin/distro.py b/curtin/distro.py
index f608112..3284b69 100644
--- a/curtin/distro.py
+++ b/curtin/distro.py
@@ -20,7 +20,7 @@ from .log import LOG
 
 DistroInfo = namedtuple('DistroInfo', ('variant', 'family'))
 DISTRO_NAMES = ['arch', 'centos', 'debian', 'fedora', 'freebsd', 'gentoo',
-                'opensuse', 'redhat', 'rhel', 'sles', 'suse', 'ubuntu',
+                'ol', 'opensuse', 'redhat', 'rhel', 'sles', 'suse', 'ubuntu',
                 'rocky']
 
 
@@ -34,8 +34,8 @@ DISTROS = distro_enum(*DISTRO_NAMES)
 
 OS_FAMILIES = {
     DISTROS.debian: [DISTROS.debian, DISTROS.ubuntu],
-    DISTROS.redhat: [DISTROS.centos, DISTROS.fedora, DISTROS.redhat,
-                     DISTROS.rhel, DISTROS.rocky],
+    DISTROS.redhat: [DISTROS.centos, DISTROS.fedora, DISTROS.ol,
+                     DISTROS.redhat, DISTROS.rhel, DISTROS.rocky],
     DISTROS.gentoo: [DISTROS.gentoo],
     DISTROS.freebsd: [DISTROS.freebsd],
     DISTROS.suse: [DISTROS.opensuse, DISTROS.sles, DISTROS.suse],