Merge pull request #122 from AmedeeBulle/ol8u9-ol9u3

Updates for OL8U9 / OL9U3

Author: totalamateurhour

oracle-linux-image-tools/README.md

@@ -11,9 +11,9 @@ The tool currently supports:
 
 - Distributions:
   - Oracle Linux 7 update 9 -- Slim (x86_64)
-  - Oracle Linux 8 update 8 -- Slim (x86_64 and aarch64)  
+  - Oracle Linux 8 update 9 -- Slim (x86_64 and aarch64)  
     __Note__: for aarch64, only Generic, OCI and UTM clouds are supported
-  - Oracle Linux 9 update 2 -- Slim (x86_64 and aarch64)  
+  - Oracle Linux 9 update 3 -- Slim (x86_64 and aarch64)  
     __Note__: for aarch64, only Generic, OCI and UTM clouds are supported
 - Clouds:
   - Microsoft Azure cloud  
@@ -53,11 +53,11 @@ The build script requires a Linux environment and has been tested on Oracle Linu
    - Oracle Linux 7:  
      `yum --enablerepo=ol7_kvm_utils group install "Virtualization Host"`  
      or  
-     `yum --enablerepo=ol7_developer install VirtualBox-6.1`
+     `yum --enablerepo=ol7_developer install VirtualBox-7.0`
    - Oracle Linux 8:  
      `dnf module install virt`  
      or  
-     `dnf --enablerepo=ol8_developer install VirtualBox-6.1`
+     `dnf --enablerepo=ol8_developer install VirtualBox-7.0`
 1. Install `kpartx` and `qemu-img` to manipulate the artifacts
    - Oracle Linux 7:  
      `yum --enablerepo=ol7_kvm_utils install kpartx qemu-img`

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

@@ -413,14 +413,20 @@ packer_conf() {
   local KS_CONFIG="http://{{ .HTTPIP }}:{{ .HTTPPort }}/${KS_FILE}"
   # shellcheck disable=SC2034
   local CONSOLE=""
-  local modifyvm_console=""
+  local vbox_manage=""
   local qemu_serial_console=""
   if [[ "${SERIAL_CONSOLE,,}" = "yes" ]]; then
     # shellcheck disable=SC2034
     CONSOLE=" console=tty0 console=ttyS0"
-    modifyvm_console='["modifyvm", "{{.Name}}", "--uart1", "0x3f8", 4, "--uartmode1", "file", "'"${WORKSPACE}/${VM_NAME}"'/serial-console.txt"],'
+    vbox_manage='["modifyvm", "{{.Name}}", "--uart1", "0x3f8", 4, "--uartmode1", "file", "'"${WORKSPACE}/${VM_NAME}"'/serial-console.txt"],'
     qemu_serial_console='[ "-serial", "file:'"${WORKSPACE}/${VM_NAME}"'/serial-console.txt" ]'
   fi
+  # VirtualBox 7 requires flag to allow guest to reach host
+  if common::is_vbox ; then
+    if [[ $(vboxmanage --version) =~ ^7\. ]]; then
+      vbox_manage+='["modifyvm", "{{.Name}}", "--nat-localhostreachable1", "on"],'
+    fi
+  fi
 
   cat > "${WORKSPACE}/${VM_NAME}.pkrvars.hcl" <<-EOF
 		# Variables file for ${VM_NAME}
@@ -437,7 +443,7 @@ packer_conf() {
 		$(eval echo -e "\"$(printf '  \\"%s\\",\\n' "${BOOT_COMMAND[@]}")\"")
 		]
 		shutdown_command      = "${SHUTDOWN_CMD}"
-		vbox_manage           = [ ${modifyvm_console} ]
+		vbox_manage           = [ ${vbox_manage} ]
 		x2apic                = "${X2APIC}"
 		${QEMU_BINARY:+qemu_binary           = ${q}$QEMU_BINARY${q}}
 		qemu_args             = [ ${qemu_serial_console} ]

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

@@ -3,7 +3,7 @@
 # env file.
 
 # Distribution name
-DISTR_NAME="OL8U8_aarch64"
+DISTR_NAME="OL8U9_aarch64"
 
 # Distribution release
 readonly ORACLE_RELEASE=8
@@ -15,7 +15,7 @@ SETUP_SWAP="yes"
 ROOT_FS="xfs"
 
 # Label of the ISO image
-ISO_LABEL="OL-8-8-0-BaseOS-aarch64"
+ISO_LABEL="OL-8-9-0-BaseOS-aarch64"
 
 # Boot command
 # Variables MUST be escaped as they are evaluated at build time.

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

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

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

@@ -3,7 +3,7 @@
 # env file.
 
 # Distribution name
-DISTR_NAME="OL9U2_aarch64"
+DISTR_NAME="OL9U3_aarch64"
 
 # Distribution release
 readonly ORACLE_RELEASE=9
@@ -15,7 +15,7 @@ SETUP_SWAP="yes"
 ROOT_FS="xfs"
 
 # Label of the ISO image
-ISO_LABEL="OL-9-2-0-BaseOS-aarch64"
+ISO_LABEL="OL-9-3-0-BaseOS-aarch64"
 
 # Boot command
 # Variables MUST be escaped as they are evaluated at build time.

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

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

oracle-linux-image-tools/packer-template/virtualbox-x86-64.pkr.hcl

@@ -17,7 +17,7 @@ source "virtualbox-iso" "x86-64" {
   ssh_password           = var.ssh_password
   ssh_private_key_file   = var.ssh_private_key_file
   ssh_port               = 22
-  ssh_wait_timeout       = "30m"
+  ssh_wait_timeout       = "60m"
   http_directory         = local.http_directory
   boot_wait              = "20s"
   boot_command           = var.boot_command