Procházet zdrojové kódy

Adds Oracle 9 and aarch64 support

Antony Messerli před 2 roky
rodič
revize
0ba4c98528

+ 3 - 2
roles/netbootxyz/defaults/main.yml

@@ -384,8 +384,9 @@ releases:
     mirror: https://yum.oracle.com
     name: Oracle Linux
     paths:
-      7: /repo/OracleLinux/OL7/latest/x86_64
-      8: /repo/OracleLinux/OL8/baseos/latest/x86_64
+      7: /repo/OracleLinux/OL7/latest
+      8: /repo/OracleLinux/OL8/baseos/latest
+      9: /repo/OracleLinux/OL8/baseos/latest
   photon:
     enabled: true
     menu: linux

+ 1 - 0
roles/netbootxyz/templates/menu/linux-arm.ipxe.j2

@@ -12,6 +12,7 @@ item debian ${space} Debian
 item coreos ${space} Fedora CoreOS
 item gentoo ${space} Gentoo
 item fedora ${space} Fedora
+item oracle ${space} Oracle Linux
 item rhel ${space} Red Hat Enterprise Linux
 item rockylinux ${space} Rocky Linux
 item ubuntu ${space} Ubuntu

+ 6 - 4
roles/netbootxyz/templates/menu/oracle.ipxe.j2

@@ -8,6 +8,9 @@ goto ${menu} ||
 :oracle_menu
 set os Oracle Linux
 menu ${os}
+set os_arch ${arch}
+iseq ${os_arch} x86_64 && set os_arch x86_64 ||
+iseq ${os_arch} arm64 && set os_arch aarch64 ||
 item --gap ${os} Versions
 {% for key, value in endpoints.items() | sort %}
 {% if value.os == "oracle" %}
@@ -15,14 +18,13 @@ item {{ value.version }} ${space} ${os} {{ value.version }}
 {% endif %}
 {% endfor %}
 choose version || goto oracle_exit
-goto ${version}
-
+goto ${version}_${os_arch}
 
 {% for key, value in endpoints.items() | sort %}
 {% if value.os == "oracle" %}
-:{{ value.version }}
+:{{ value.version }}_{{ value.arch }}
 set url ${live_endpoint}{{ value.path }}
-set repo {{ releases.oracle.mirror }}{{ releases.oracle.paths[value.version|int] }}
+set repo {{ releases.oracle.mirror }}{{ releases.oracle.paths[value.version|int] }}/${os_arch}
 goto boot
 
 {% endif %}