Merge pull request #143 from AmedeeBulle/ol94-810

OLSS: Update for OL 9.4 and 8.10 releases

Author: totalamateurhour

oracle-linux-image-tools/README.md

@@ -11,8 +11,8 @@ They currently support:
 
 - Distributions:
   - Oracle Linux 7 update 9 -- Slim (x86_64 only)
-  - Oracle Linux 8 update 9 -- Slim (x86_64 and aarch64)
-  - Oracle Linux 9 update 3 -- Slim (x86_64 and aarch64)
+  - Oracle Linux 8 update 10 -- Slim (x86_64 and aarch64)
+  - Oracle Linux 9 update 4 -- Slim (x86_64 and aarch64)
 - Clouds:
   - Microsoft Azure cloud (x86_64)  
     Target packages: WALinuxAgent  
@@ -110,7 +110,7 @@ In that case, you will have to provide an URL to an installation tree and option
 Example for an Oracle Linux 9 using the UEK boot ISO:
 
 ```Shell
-ISO_URL="https://yum.oracle.com/ISOS/OracleLinux/OL9/u3/x86_64/OracleLinux-R9-U3-x86_64-boot-uek.iso"
+ISO_URL="https://yum.oracle.com/ISOS/OracleLinux/OL9/u4/x86_64/OracleLinux-R9-U4-x86_64-boot-uek.iso"
 REPO_URL="https://yum.oracle.com/repo/OracleLinux/OL9/baseos/latest/x86_64"
 REPO[AppStream]="https://yum.oracle.com/repo/OracleLinux/OL9/appstream/x86_64"
 REPO[ol9_UEKR7]="https://yum.oracle.com/repo/OracleLinux/OL9/UEKR7/x86_64"

oracle-linux-image-tools/bin/build-image.sh

@@ -486,6 +486,7 @@ image_cleanup() {
 
   virt-sysprep --delete "${BUILD_INFO}" \
     --truncate /etc/machine-id \
+    --truncate /etc/resolv.conf \
     -a "${WORKSPACE}/${VM_NAME}/${VM_NAME}.qcow2" \
     "${virt_sysprep_args[@]}"
 

oracle-linux-image-tools/distr/ol8-aarch64/env.properties

@@ -3,7 +3,7 @@
 # env file.
 
 # Distribution name
-DISTR_NAME="OL8U9_aarch64"
+DISTR_NAME="OL8U10_aarch64"
 
 # Distribution release
 readonly ORACLE_RELEASE=8

oracle-linux-image-tools/distr/ol8-aarch64/provision.sh

@@ -65,6 +65,7 @@ distr::kernel_config() {
   if [[ ${UEK_RELEASE} != 6 ]]; then
     if [[ ${KERNEL_MODULES,,} == "no" ]]; then
       common::echo_message "Removing kernel modules"
+      dnf mark install kernel-uek-core
       distr::remove_rpms kernel-uek-modules
     else
       common::echo_message "Ensure kernel modules are installed"

oracle-linux-image-tools/distr/ol8-slim/env.properties

@@ -3,7 +3,7 @@
 # env file.
 
 # Distribution name
-DISTR_NAME="OL8U9_x86_64"
+DISTR_NAME="OL8U10_x86_64"
 
 # Distribution release
 readonly ORACLE_RELEASE=8

oracle-linux-image-tools/distr/ol8-slim/provision.sh

@@ -69,6 +69,7 @@ distr::kernel_config() {
   if [[ ${KERNEL,,} = "uek" && ${UEK_RELEASE} != 6 ]]; then
     if [[ ${KERNEL_MODULES,,} == "no" ]]; then
       common::echo_message "Removing kernel modules"
+      dnf mark install kernel-uek-core
       distr::remove_rpms kernel-uek-modules
     else
       common::echo_message "Ensure kernel modules are installed"

oracle-linux-image-tools/distr/ol9-aarch64/env.properties

@@ -3,7 +3,7 @@
 # env file.
 
 # Distribution name
-DISTR_NAME="OL9U3_aarch64"
+DISTR_NAME="OL9U4_aarch64"
 
 # Distribution release
 readonly ORACLE_RELEASE=9

oracle-linux-image-tools/distr/ol9-aarch64/provision.sh

@@ -65,6 +65,7 @@ distr::kernel_config() {
 
   if [[ ${KERNEL_MODULES,,} == "no" ]]; then
     common::echo_message "Removing kernel modules and linux firmware"
+    dnf mark install kernel-uek-core
     distr::remove_rpms kernel-uek-modules linux-firmware
   else
     common::echo_message "Ensure kernel modules are installed"

oracle-linux-image-tools/distr/ol9-slim/env.properties

@@ -3,7 +3,7 @@
 # env file.
 
 # Distribution name
-DISTR_NAME="OL9U3_x86_64"
+DISTR_NAME="OL9U4_x86_64"
 
 # Distribution release
 readonly ORACLE_RELEASE=9

oracle-linux-image-tools/distr/ol9-slim/provision.sh

@@ -74,6 +74,7 @@ distr::kernel_config() {
   rm -rf /var/lib/dnf/*
   if [[ ${KERNEL_MODULES,,} == "no" ]]; then
     common::echo_message "Removing kernel modules and linux firmware"
+    dnf mark install "${kernel}-core"
     distr::remove_rpms "${kernel}-modules" linux-firmware
   else
     common::echo_message "Ensure kernel modules are installed"