Merge pull request #200 from AmedeeBulle/ol9.6-10.0

Updates for OL9.6 and 10.0

Author: AmedeeBulle

oracle-linux-image-tools/CHANGELOG.md

@@ -1,5 +1,27 @@
 # Release Notes
 
+## August 2025
+
+### New Features
+
+- Update for OL9U6, support for UEK8
+- Update for OL10U0
+- Vagrant VirtualBox: if `VAGRANT_GUEST_ADDITIONS_KERNEL` is set to `yes`, do not install the VirtualBox Guest Additions
+  if the kernel already support these (UEK kernel). Default is `no` for backwards compatibility
+
+### Changes
+
+- `CPU_NUM` now accepts topology information using the `virt-install` syntax: `VCPUS[,maxvcpus=MAX][,sockets=#][,cores=#][,threads=#]`
+- Vagrant VirtualBox: set display controller to `VMSVGA` (`VBoxVGA` being deprecated)
+- Vagrant: remove/cleanup old dependencies
+
+### Bug fixes
+
+- Fixed issue when `ISO_URL` is referring to a file (#196, contributed by @retekdk)
+- Vagrant: correctly set target kernel in motd, refactor installation of the
+  VirtualBox guest additions
+- use `uname -m` instead of `uname -i` which is deprecated
+
 ## March 2025
 
 Note: OL7 Premier Support ended on 31 December 2024, scripts will only be maintained for the OL8 and newer images.

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

@@ -159,8 +159,8 @@ load_env() {
   local distr_name
   # Note: OL7 media have space in the label which needs to be escaped
   # shellcheck disable=SC2001
-  distr_name=$(sed -e 's/^.*OracleLinux-R\([[:digit:]]\)-U\([[:digit:]]\+\)\(-Server\)\?-\([^-]\+\)\(-dvd\)\?\(-[[:digit:]]\+\)\?\.iso$/OL\1U\2_\4/' <<< "${ISO_URL}")
-  if [[ $distr_name =~ ^OL[6789]U ]]; then
+  distr_name=$(sed -e 's/^.*OracleLinux-R\([[:digit:]]\+\)-U\([[:digit:]]\+\)\(-Server\)\?-\([^-]\+\)\(-dvd\)\?\(-[[:digit:]]\+\)\?\.iso$/OL\1U\2_\4/' <<< "${ISO_URL}")
+  if [[ $distr_name =~ ^OL(6|7|8|9|(10))U ]]; then
     DISTR_NAME="${distr_name}"
   fi
 
@@ -357,7 +357,7 @@ stage_kickstart() {
 # OL installed based on the generated kickstart file.
 # Globals:
 # BOOT_COMMAND, BOOT_COMMAND_SERIAL_CONSOLE, BOOT_LOCATION, BOOT_MODE
-# CPU_NUM, DISK_SIZE_MB, ISO_CHECKSUM, ISO_PATH, KS_FILE
+# CPU_NUM, DISK_SIZE_MB, ISO_CHECKSUM, ISO_LABEL, ISO_PATH, KS_FILE
 # MEM_SIZE, SERIAL_CONSOLE, VM_NAME, WORKSPACE
 # Arguments:
 #   None
@@ -393,15 +393,15 @@ image_create() {
   fi
 
   # shellcheck disable=SC2294
- virt-install --os-type linux --os-variant "${OS_VARIANT}" --name "${VM_NAME}" \
-    --cpus "${CPU_NUM}" --memory "${MEM_SIZE}" \
+  virt-install --os-type linux --os-variant "${OS_VARIANT}" --name "${VM_NAME}" \
+    --vcpus "${CPU_NUM}" --memory "${MEM_SIZE}" \
     --controller "scsi,model=virtio-scsi" \
     --disk "path=${WORKSPACE}/${VM_NAME}/${VM_NAME}.qcow2,size=${DISK_SIZE_GB},bus=scsi,cache=unsafe" \
     --network default \
     --graphics none \
     --location "${iso_path}${location}" \
-    --initrd-inject="${WORKSPACE}/${VM_NAME}/${KS_FILE}" \
-    --extra-args="$(eval echo "${BOOT_COMMAND[@]}")" \
+    --initrd-inject "${WORKSPACE}/${VM_NAME}/${KS_FILE}" \
+    --extra-args "$(eval echo "${BOOT_COMMAND[@]}")" \
     --transient \
     "${virt_install_args[@]}"
 }

oracle-linux-image-tools/bin/provision-common.sh

@@ -44,6 +44,8 @@ common::ks_log() {
     cat /root/ks-post.log
     rm /root/ks-post.log
     common::echo_message "Kickstart post log - End"
+  else
+    common::echo_message "No Kickstart post log found"
   fi
 }
 

oracle-linux-image-tools/cloud/oci/ol10-aarch54

@@ -0,0 +1 @@
+ol10-slim

oracle-linux-image-tools/cloud/oci/ol10-slim

@@ -0,0 +1 @@
+ol9-slim

oracle-linux-image-tools/cloud/oci/provision.sh

@@ -2,7 +2,7 @@
 #
 # Provisioning script for OCI
 #
-# Copyright (c) 2020, 2024 Oracle and/or its affiliates.
+# Copyright (c) 2020, 2025 Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at
 # https://oss.oracle.com/licenses/upl
 #
@@ -26,18 +26,20 @@
 cloud::config()
 {
   common::echo_message "Setup network"
-  # simple eth0 configuration
-  cat > /etc/sysconfig/network-scripts/ifcfg-eth0 <<-EOF
-	DEVICE="eth0"
-	BOOTPROTO="dhcp"
-	ONBOOT="yes"
-	TYPE="Ethernet"
-	USERCTL="yes"
-	PEERDNS="yes"
-	IPV6INIT="no"
-	PERSISTENT_DHCLIENT="1"
-	EOF
-
+  if [[ -d /etc/sysconfig/network-scripts ]]; then
+    # simple eth0 configuration
+    cat > /etc/sysconfig/network-scripts/ifcfg-eth0 <<-EOF
+		DEVICE="eth0"
+		BOOTPROTO="dhcp"
+		ONBOOT="yes"
+		TYPE="Ethernet"
+		USERCTL="yes"
+		PEERDNS="yes"
+		IPV6INIT="no"
+		PERSISTENT_DHCLIENT="1"
+		EOF
+  fi
+  
   if [[ "${OCI_REPO_MAPPER,,}" =~ "yes"  ]]; then
     common::echo_message "Install repo mapper scripts"
     yum install -y "${YUM_VERBOSE}" jq

oracle-linux-image-tools/cloud/olvm/image-scripts.sh

@@ -69,7 +69,7 @@ cloud::image_package() {
     -v "${BUILD_NUMBER}" \
     -s "${DISK_SIZE_GB}" \
     -i "${VM_NAME}.qcow2" \
-    -c "${CPU_NUM}" \
+    -c "${CPU_NUM%%,*}" \
     -m "${MEM_SIZE}" \
     >"${package_filename}.ovf"
 

oracle-linux-image-tools/cloud/olvm/mk-envelope.py

@@ -3,7 +3,7 @@
 """
 Generate OLVM compatible OVF file.
 
-Copyright (c) 2020, 2022 Oracle and/or its affiliates.
+Copyright (c) 2020, 2025 Oracle and/or its affiliates.
 Licensed under the Universal Permissive License v 1.0 as shown at
 https://oss.oracle.com/licenses/upl
 
@@ -27,6 +27,7 @@
     'OL7': 5003,
     'OL8': 5006,
     'OL9': 5007,
+    'OL10': 5007,
 }
 
 

oracle-linux-image-tools/cloud/olvm/provision.sh

@@ -27,16 +27,18 @@ cloud::config()
 {
   common::echo_message "Setup network"
   # simple eth0 configuration
-  cat > /etc/sysconfig/network-scripts/ifcfg-eth0 <<-EOF
-	DEVICE="eth0"
-	BOOTPROTO="dhcp"
-	ONBOOT="yes"
-	TYPE="Ethernet"
-	USERCTL="yes"
-	PEERDNS="yes"
-	IPV6INIT="no"
-	PERSISTENT_DHCLIENT="1"
-	EOF
+  if [[ -d /etc/sysconfig/network-scripts ]]; then
+    cat > /etc/sysconfig/network-scripts/ifcfg-eth0 <<-EOF
+		DEVICE="eth0"
+		BOOTPROTO="dhcp"
+		ONBOOT="yes"
+		TYPE="Ethernet"
+		USERCTL="yes"
+		PEERDNS="yes"
+		IPV6INIT="no"
+		PERSISTENT_DHCLIENT="1"
+		EOF
+  fi
 }
 
 #######################################

oracle-linux-image-tools/cloud/vagrant-libvirt/image-scripts.sh

@@ -60,7 +60,7 @@ cloud::sysprep_args() {
 #   None
 #######################################
 cloud::image_package() {
-  local cpus="${VAGRANT_LIBVIRT_CPU_NUM:-$CPU_NUM}"
+  local cpus="${VAGRANT_LIBVIRT_CPU_NUM:-${CPU_NUM%%,*}}"
   local memory="${VAGRANT_LIBVIRT_MEM_SIZE:-$MEM_SIZE}"
 
   pushd "${WORKSPACE}/${VM_NAME}" || common::error "can't cd to image directory"